chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add comments and minor refactor - refs #7255

Browse Source
1.9.x
Daniel Barreto 11 years ago
parent 66631c4f23
commit 09b01b9be6
8 changed files with 132 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/forum/editpost.php
  2. 135
      main/forum/forumfunction.inc.php
  3. 2
      main/forum/newthread.php
  4. 1
      main/forum/reply.php
  5. 1
      main/forum/viewthread_flat.inc.php
  6. 1
      main/forum/viewthread_nested.inc.php
  7. 1
      main/forum/viewthread_threaded.inc.php
  8. 35
      main/inc/ajax/forum.ajax.php

4
main/forum/editpost.php
Unescape View File

@ -193,8 +193,9 @@ echo "</th>";
echo "</tr>";
echo '</table>';
// The form for the reply
// Set forum attachment data into $_SESSION
getAttachedFiles($current_forum['forum_id'], $current_thread['thread_id'], $current_post['post_id']);
// The form for the reply
$values = show_edit_post_form($forum_setting, $current_post, $current_thread, $current_forum, isset($_SESSION['formelements']) ? $_SESSION['formelements'] : '');
if (!empty($values) and isset($_POST['SubmitPost'])) {
@ -217,6 +218,7 @@ if (!empty($values) and isset($_POST['SubmitPost'])) {
}
}
} else {
// Only show Forum attachment ajax form when do not pass form submit
$attachmentAjaxForm = getAttachmentAjaxForm($current_forum['forum_id'], $current_thread['thread_id'], $current_post['post_id']);
echo $attachmentAjaxForm;
}

135
main/forum/forumfunction.inc.php
Unescape View File

@ -56,7 +56,7 @@ function setFocus() {
$("#title_file").focus();
}
</script>';
// The next javascript script is to manage ajax upload file
$htmlHeadXtra[] = "
<script>
$(function () {
@ -84,8 +84,9 @@ $(function () {
});
});
</script>";
// Recover Thread ID, will be used to generate delete attachment URL to do ajax
$threadId = isset($_REQUEST['thread']) ? intval($_REQUEST['thread']) : '';
// The next javascript script is to delete file by ajax
$htmlHeadXtra[] =
'<script>
function enableDeleteFile() {
@ -2378,7 +2379,9 @@ function show_add_post_form($current_forum, $forum_setting, $action = '', $id =
$values = $form->exportValues();
}
// Delete from $_SESSION forum attachment from other posts
clearAttachedFiles(0);
// Get forum attachment ajax table to add it to form
$fileData = getAttachmentAjaxTable(0, $current_forum['forum_id']);
$form->addElement('html', $fileData);
$form->addElement('html', '</div>');
@ -4007,7 +4010,7 @@ function getAllAttachment($postId)
* Delete the all the attachments from the DB and the file according to the post's id or attach id(optional)
* @param post id
* @param int $id_attach
* @param bool $display
* @param bool $display to show or not result message
* @return void
* @author Julio Montoya Dokeos
* @version october 2014, chamilo 1.9.8
@ -4703,22 +4706,31 @@ function _phorum_recursive_sort($rows, &$threads, $seed = 0, $indent = 0)
}
/**
* @param $array
* @param $id
* @param null $courseId
* @return int
* Update forum attachment data, used to update comment and post ID.
* @param $array Array (field => value) to update forum attachment row.
* @param $id Attach ID to find row to update.
* @param null $courseId Course ID to find row to update.
* @return int Number of affected rows.
*/
function editAttachedFile($array, $id, $courseId = null) {
// Init variables
$setString = '';
$id = intval($id);
$courseId = intval($courseId);
if (empty($courseId)) {
// $courseId can be null, use api method
$courseId= api_get_course_int_id();
}
$id = intval($id);
if ($id > 0) {
/*
* Check if Attachment ID and Course ID are greater than zero
* and array of field values is not empty
*/
if ($id > 0 && $courseId > 0 && !empty($array) && is_array($array)) {
foreach($array as $key => &$item) {
$item = Database::escape_string($item);
$setString .= $key . ' = "' .$item . '", ';
}
// Delete last comma
$setString = substr($setString, 0, strlen($setString) - 2);
$forumAttachmentTable = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
$sql = "UPDATE $forumAttachmentTable SET $setString WHERE c_id = $courseId AND id = $id";
@ -4726,10 +4738,15 @@ function editAttachedFile($array, $id, $courseId = null) {
if ($result !== false) {
$affectedRows = Database::affected_rows($result);
if ($affectedRows > 0) {
/*
* If exist in $_SESSION variable, then delete them from it
* because they would be deprecated
*/
if (!empty($_SESSION['forum']['upload_file'][$courseId][$id])) {
unset($_SESSION['forum']['upload_file'][$courseId][$id]);
}
}
return $affectedRows;
}
}
@ -4738,73 +4755,91 @@ function editAttachedFile($array, $id, $courseId = null) {
}
/**
* @param $forumId
* @param $threadId
* @param $postId
* @param null $path
* @return string
* Return a form to upload asynchronously attachments to forum post.
* @param $forumId Forum ID from where the post is
* @param $threadId Thread ID where forum post is
* @param $postId Post ID to identify Post
* @param null $path Path where are forum attachment files
* @return string The Forum Attachment Ajax Form
*/
function getAttachmentAjaxForm($forumId, $threadId, $postId, $path = null)
{
// Init variables
$forumId = intval($forumId);
$postId = intval($postId);
$threadId = !empty($threadId) ? intval($threadId) : isset($_REQUEST['thread']) ? intval($_REQUEST['thread']) : '';
if ($forumId === 0) {
// Forum ID must be defined
return '';
}
$url = api_get_path(WEB_AJAX_PATH).'forum.ajax.php?forum=' . $forumId . '&thread=' . $threadId . '&postId=' . $postId . '&a=upload_file';
if (empty($path)) {
// If there is not path, use
$path = '/../upload/forum';
} else {
$testPath = api_get_path(SYS_COURSE_PATH).'/'.api_get_course_id().'/document'.$path;
// Check if path exists
if (!file_exists($testPath)) {
return '';
}
}
// Form
$formFileUpload = '
<center>
<form id="file_upload" action="'.$url.'" method="POST" enctype="multipart/form-data">
<input type="hidden" name="curdirpath" value="'.$path.'" />
<input type="file" name="user_upload" multiple>
<button type="submit">Upload</button>
'.get_lang('UploadFiles').'
</form>
</center>
';
return $formFileUpload;
}
/**
* Return a table where the attachments will be set
* @param null $postId Forum Post ID
* @return string The Forum Attachment Ajax Table
*/
function getAttachmentAjaxTable($postId = null)
{
// Init variables
$postId = intval($postId);
$courseId = api_get_course_int_id();
$attachIds = getAttachmentIdsByPostId($postId, $courseId);
$fileDataContent = '';
// Update comment to show if form did not pass validation
if (!empty($_POST['file_ids']) && is_array($_POST['file_ids'])) {
foreach ($_POST['file_ids'] as $key => $attachId) {
if (!empty($_REQUEST['file_ids']) && is_array($_REQUEST['file_ids'])) {
// 'file_ids is the name from forum attachment ajax form
foreach ($_REQUEST['file_ids'] as $key => $attachId) {
if (!empty($_SESSION['forum']['upload_file'][$courseId][$attachId]) && is_array($_SESSION['forum']['upload_file'][$courseId][$attachId])) {
// If exist forum attachment then update into $_SESSION data
$_SESSION['forum']['upload_file'][$courseId][$attachId]['comment'] = $_POST['file_comments'][$key];
}
}
}
// Get data to fill into attachment files table
$fileDataContent = '';
if (!empty($_SESSION['forum']['upload_file'][$courseId]) && is_array($_SESSION['forum']['upload_file'][$courseId])) {
$uploadedFiles = $_SESSION['forum']['upload_file'][$courseId];
foreach ($uploadedFiles as $k => $uploadedFile) {
if (!empty($uploadedFile) && in_array($uploadedFile['id'], $attachIds)) {
// Buil html table including an input with attachmentID
$fileDataContent .= '<tr id=' . $uploadedFile['id'] . ' ><td>' . $uploadedFile['name'] . '</td><td>' . $uploadedFile['size'] . '</td><td>&nbsp;' . $uploadedFile['result'] .
' </td><td> <input type="text" value="' . $uploadedFile['comment'] . '" name="file_comments[]"> </td><td>' .
$uploadedFile['delete'] . '</td>' .
'<input type="hidden" value="' . $uploadedFile['id'] .'" name="file_ids[]">' . '</tr>';
} else {
/*
* If attachment data is empty, then delete it from $_SESSION
* because could generate and empty row into html table
*/
unset($_SESSION['forum']['upload_file'][$courseId][$k]);
}
}
}
// User upload data
// Forum attachment Ajax table
$fileData = '
<div class="control-group ">
<label class="control-label">'.get_lang('AttachmentFilesList').'</label>
@ -4826,6 +4861,8 @@ function getAttachmentAjaxTable($postId = null)
}
/**
* Return an array of prepared attachment data to build forum attachment table
* Also, save this array into $_SESSION to do available the attachment data
* @param $forumId
* @param $threadId
* @param null $postId
@ -4834,22 +4871,26 @@ function getAttachmentAjaxTable($postId = null)
* @return array
*/
function getAttachedFiles($forumId, $threadId, $postId = null, $attachId = null, $courseId = null) {
// Init values
$forumId = intval($forumId);
$courseId = intval($courseId);
$attachId = intval($attachId);
$postId = intval($postId);
$threadId = !empty($threadId) ? intval($threadId) : isset($_REQUEST['thread']) ? intval($_REQUEST['thread']) : '';
if (empty($courseId)) {
// $courseId can be null, use api method
$courseId = api_get_course_int_id();
}
if (empty($forumId)) {
if (!empty($_REQUEST['forum'])) {
$forumId = intval($_REQUEST['forum']);
} else {
// if forum ID is empty, cannot generate delete url
return array();
}
}
// Check if exist at least one of them to filter forum attachment select query
if (empty($postId) && empty($attachId)) {
return array();
@ -4865,6 +4906,7 @@ function getAttachedFiles($forumId, $threadId, $postId = null, $attachId = null,
$result = Database::query($sql);
if ($result !== false && Database::num_rows($result) > 0) {
while ($row = Database::fetch_array($result, 'ASSOC')) {
// name contains an URL to download attachment file and its filename
$json['name'] = Display::url(
api_htmlentities($row['filename']),
api_get_path(WEB_CODE_PATH) . 'forum/download.php?file='.$row['path'],
@ -4872,8 +4914,11 @@ function getAttachedFiles($forumId, $threadId, $postId = null, $attachId = null,
);
$json['id'] = $row['id'];
$json['comment'] = $row['comment'];
// Format file size
$json['size'] = format_file_size($row['size']);
// Check if $row is consistent
if (!empty($row) && is_array($row)) {
// Set result as succes and bring delete URL
$json['result'] = Display::return_icon('accept.png', get_lang('Uploaded'));
$json['delete'] = '<a class="deleteLink" href="'.api_get_path(WEB_CODE_PATH) . 'forum/viewthread.php' .
'?' . api_get_cidreq() . '&amp;origin=' . Security::remove_XSS($_GET['origin']) .
@ -4881,9 +4926,10 @@ function getAttachedFiles($forumId, $threadId, $postId = null, $attachId = null,
'&amp;id_attach=' . $row['id'] . '">' .
Display::return_icon('delete.png',get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
} else {
// If not, set an exclamation result
$json['result'] = Display::return_icon('exclamation.png', get_lang('Error'));
}
// Store array data into $_SESSION
$_SESSION['forum']['upload_file'][$courseId][$json['id']] = $json;
}
}
@ -4892,54 +4938,77 @@ function getAttachedFiles($forumId, $threadId, $postId = null, $attachId = null,
}
/**
* Clear forum attachment data stored in $_SESSION,
* If is not defined post, it will clear all forum attachment data from course
* @param null $postId -1 : Clear all attachments from course stored in $_SESSION
* @param null $courseId
* 0 : Clear attachments from course, except from temporal post "0"
* but without delete them from file system and database
* Other values : Clear attachments from course except specified post
* and delete them from file system and database
* @param null $courseId : Course ID, if it is null, will use api_get_course_int_id()
* @return array
*/
function clearAttachedFiles($postId = null, $courseId = null) {
// Init variables
$courseId = intval($courseId);
$postId = intval($postId);
$array = array();
if (empty($courseId)) {
// $courseId can be null, use api method
$courseId = api_get_course_int_id();
}
if ($postId === -1) {
if (!empty($_SESSION['forum']['upload_file'][$courseId]))
unset($_SESSION['forum']['upload_file'][$courseId]);
// If post ID is -1 then delete course's attachment data from $_SESSION
if (!empty($_SESSION['forum']['upload_file'][$courseId])) {
$array = array_keys($_SESSION['forum']['upload_file'][$courseId]);
unset($_SESSION['forum']['upload_file'][$courseId]);
}
} else {
$attachIds = getAttachmentIdsByPostId($postId, $courseId);
if (!empty($_SESSION['forum']['upload_file'][$courseId]) &&
is_array($_SESSION['forum']['upload_file'][$courseId])) {
foreach ($_SESSION['forum']['upload_file'][$courseId] as $attachId => $attach) {
if (!in_array($attachId, $attachIds)) {
// If attach ID is not into specified post, delete attachment
// Save deleted attachment ID
$array[] = $attachId;
if ($postId !== 0) {
// Post 0 is temporal, delete them from file system and DB
delete_attachment(0, $attachId, false);
}
// Delete attachment data from $_SESSION
unset($_SESSION['forum']['upload_file'][$courseId][$attachId]);
}
}
}
}
return $array;
}
/**
* Returns an array of forum attachment ids into a course and forum post
* @param $postId
* @param null $courseId
* @return array
*/
function getAttachmentIdsByPostId($postId, $courseId = null) {
// Init variables
$array = array();
$courseId = intval($courseId);
$postId = intval($postId);
if (empty($courseId)) {
// $courseId can be null, use api method
$courseId = api_get_course_int_id();
}
$forumAttachmentTable = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
$sql = "SELECT id FROM $forumAttachmentTable WHERE c_id = $courseId AND post_id = $postId";
$result = Database::query($sql);
if ($result !== false && Database::num_rows($result) > 0) {
while ($row = Database::fetch_array($result,'ASSOC')) {
$array[] = $row['id'];
if ($courseId > 0) {
$forumAttachmentTable = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
$sql = "SELECT id FROM $forumAttachmentTable WHERE c_id = $courseId AND post_id = $postId";
$result = Database::query($sql);
if ($result !== false && Database::num_rows($result) > 0) {
while ($row = Database::fetch_array($result,'ASSOC')) {
$array[] = $row['id'];
}
}
}
return $array;

2
main/forum/newthread.php
Unescape View File

@ -158,12 +158,14 @@ echo '<span style="float:right;">'.search_link().'</span>';
echo '<a href="viewforum.php?origin='.$origin.'&forum='.Security::remove_XSS($_GET['forum']).'&'.api_get_cidreq().'">'.Display::return_icon('back.png',get_lang('BackToForum'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
// Set forum attachment data into $_SESSION
getAttachedFiles($current_forum['forum_id'], 0, 0);
$values = show_add_post_form($current_forum, $forum_setting, 'newthread', '', isset($_SESSION['formelements']) ? $_SESSION['formelements'] : null);
if (!empty($values) && isset($values['SubmitPost'])) {
// Add new thread in table forum_thread.
store_thread($current_forum, $values);
} else {
// Only show Forum attachment ajax form when do not pass form submit
$attachmentAjaxForm = getAttachmentAjaxForm($current_forum['forum_id'], $current_thread['thread_id'], 0);
echo $attachmentAjaxForm;
}

1
main/forum/reply.php
Unescape View File

@ -167,6 +167,7 @@ if (!empty($values) AND isset($_POST['SubmitPost'])) {
window.location = "'.$url.'";
</script>';
} else {
// Only show Forum attachment ajax form when do not pass form submit
$attachmentAjaxForm = getAttachmentAjaxForm($current_forum['forum_id'], $current_thread['thread_id'], 0);
echo $attachmentAjaxForm;
}

1
main/forum/viewthread_flat.inc.php
Unescape View File

@ -141,7 +141,6 @@ if (isset($current_thread['thread_id'])) {
// The check if there is an attachment
$attachment_list = get_attachment($row['post_id']);
$attachment_list = getAllAttachment($row['post_id']);
if (!empty($attachment_list) && is_array($attachment_list)) {
foreach ($attachment_list as $attachment) {

1
main/forum/viewthread_nested.inc.php
Unescape View File

@ -147,7 +147,6 @@ foreach ($rows as $post) {
// The check if there is an attachment
$attachment_list = getAllAttachment($post['post_id']);
if (!empty($attachment_list) && is_array($attachment_list)) {
foreach ($attachment_list as $attachment) {
echo '<tr><td height="50%">';

1
main/forum/viewthread_threaded.inc.php
Unescape View File

@ -288,7 +288,6 @@ echo "</tr>";
// The check if there is an attachment
$attachment_list = getAllAttachment($display_post_id);
if (!empty($attachment_list) && is_array($attachment_list)) {
foreach ($attachment_list as $attachment) {
echo '<tr><td height="50%">';

35
main/inc/ajax/forum.ajax.php
Unescape View File

@ -1,7 +1,9 @@
<?php
/* For licensing terms, see /license.txt */
/** For licensing terms, see /license.txt */
/**
* Responses to AJAX calls for forum attachments
* @package chamilo/forum
* @author Daniel Barreto Alva <daniel.barreto@beeznest.com>
*/
/**
@ -13,16 +15,19 @@ require_once api_get_path(LIBRARY_PATH).'document.lib.php';
/**
* Main code
*/
// Create a default error response
$json = array(
'error' => true,
'errorMessage' => 'ERROR',
);
$action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
// Check if exist action
if (!empty($action)) {
require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php';
$json = array(
'error' => true,
'errorMessage' => 'ERROR',
);
switch($action) {
case 'upload_file':
api_protect_course_script(true);
// First, protect this script
api_protect_course_script(false);
if (!empty($_FILES) && !empty($_REQUEST['forum'])) {
// The user is not allowed here if
// 1. the forum category, forum or thread is invisible (visibility==0)
@ -52,18 +57,25 @@ if (!empty($action)) {
$postId = isset($_REQUEST['postId'])? intval($_REQUEST['postId']) : null;
$json['postId'] = $postId;
if (!empty($courseId) && !is_null($forumId) && !is_null($threadId) && !is_null($postId)) {
// Save forum attachment
$attachId = add_forum_attachment_file('', $postId);
if ($attachId !== false) {
$json = getAttachedFiles($forumId, $threadId, $postId, $attachId, $courseId);
$json['error'] = false;
$json['errorMessage'] = 'Success';
// Get prepared array of attachment data
$array = getAttachedFiles($forumId, $threadId, $postId, $attachId, $courseId);
// Check if array data is consistent
if (isset($array['name'])) {
$json['error'] = false;
$json['errorMessage'] = 'Success';
$json = array_merge($json, $array);
}
}
}
}
break;
case 'delete_file':
// First, protect this script
api_protect_course_script(false);
// Check if set attachment ID and thread ID
if (isset($_REQUEST['attachId']) && isset($_REQUEST['thread'])) {
api_block_course_item_locked_by_gradebook($_REQUEST['thread'], LINK_FORUM_THREAD);
// The user is not allowed here if
@ -93,6 +105,7 @@ if (!empty($action)) {
// If pass all previous control, user can edit post
$attachId = $_REQUEST['attachId'];
$threadId = $_REQUEST['thread'];
// Delete forum attachment from database and file system
$affectedRows = delete_attachment(0, $attachId, false);
if ($affectedRows > 0) {
$json['error'] = false;

Write Preview
Loading…
Cancel
Save