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

Minor - improve documentation, remove unused code and fix code style - refs CT#7255

Browse Source
1.9.x
Daniel Barreto 11 years ago
parent bc5d7e519a
commit d41069f7cb
4 changed files with 292 additions and 150 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. 2
      main/css/base.css
  2. 60
      main/forum/forumfunction.inc.php
  3. 378
      main/forum/viewthread_threaded.inc.php
  4. 2
      main/inc/lib/database.lib.php

2
main/css/base.css
Unescape View File

@ -44,7 +44,7 @@ header #logo img{
margin-left: 30px;
}
/*buttom load ajax form*/
/* button load ajax form */
.button-load{
background: url("../img/icons/64/file_upload.png") no-repeat center 20px;

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

@ -26,6 +26,8 @@ use \ChamiloSession as Session;
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
define('FORUM_NEW_POST', 0);
get_notifications_of_user();
$htmlHeadXtra[] = api_get_jquery_libraries_js(array('jquery-ui', 'jquery-upload'));
@ -2447,9 +2449,10 @@ function show_add_post_form($current_forum, $forum_setting, $action = '', $id =
$form->setConstants(array('sec_token' => $token));
// Delete from $_SESSION forum attachment from other posts
clearAttachedFiles(0);
// and keep only attachments for new post
clearAttachedFiles(FORUM_NEW_POST);
// Get forum attachment ajax table to add it to form
$attachmentAjaxTable = getAttachmentAjaxTable(0, $current_forum['forum_id']);
$attachmentAjaxTable = getAttachmentsAjaxTable(0, $current_forum['forum_id']);
$ajaxHtml = $attachmentAjaxTable;
$form->addElement('html', $ajaxHtml);
$form->display();
@ -2865,7 +2868,7 @@ function show_edit_post_form($forum_setting, $current_post, $current_thread, $cu
// Delete from $_SESSION forum attachment from other posts
clearAttachedFiles($current_post['post_id']);
// Get forum attachment ajax table to add it to form
$fileData = getAttachmentAjaxTable($current_post['post_id'], $current_forum['forum_id']);
$fileData = getAttachmentsAjaxTable($current_post['post_id'], $current_forum['forum_id']);
$form->addElement('html', $fileData);
$form->display();
}
@ -3995,18 +3998,22 @@ function get_attachment($post_id)
function getAllAttachment($postId)
{
$forum_table_attachment = Database :: get_course_table(TABLE_FORUM_ATTACHMENT);
$course_id = api_get_course_int_id();
$array = array();
$forumAttachmentTable = Database :: get_course_table(TABLE_FORUM_ATTACHMENT);
$courseId = api_get_course_int_id();
$postId = intval($postId);
$sql = "SELECT id, path, filename, comment FROM $forum_table_attachment
WHERE c_id = $course_id AND post_id = $postId";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
while($row = Database::fetch_array($result)) {
$array[] = $row;
}
}
$columns = array('id', 'path', 'filename', 'comment');
$conditions = array(
'where' => array(
'c_id = ? AND post_id = ?' => array($courseId, $postId)
)
);
$array = Database::select(
$columns,
$forumAttachmentTable,
$conditions,
'all',
'ASSOC'
);
return $array;
}
@ -4761,13 +4768,12 @@ function editAttachedFile($array, $id, $courseId = null) {
/**
* 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 $forumId Forum ID from where the post are
* @param $threadId Thread ID where forum post are
* @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)
function getAttachmentAjaxForm($forumId, $threadId, $postId)
{
// Init variables
$forumId = intval($forumId);
@ -4779,21 +4785,9 @@ function getAttachmentAjaxForm($forumId, $threadId, $postId, $path = null)
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 = '<div class="form-ajax">
<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><div class="button-load">
'.get_lang('UploadFiles').'</div>
@ -4806,9 +4800,9 @@ function getAttachmentAjaxForm($forumId, $threadId, $postId, $path = null)
/**
* Return a table where the attachments will be set
* @param null $postId Forum Post ID
* @return string The Forum Attachment Ajax Table
* @return string The Forum Attachments Ajax Table
*/
function getAttachmentAjaxTable($postId = null)
function getAttachmentsAjaxTable($postId = null)
{
// Init variables
$postId = intval($postId);
@ -4831,7 +4825,7 @@ function getAttachmentAjaxTable($postId = null)
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'] .
$fileDataContent .= '<tr id="' . $uploadedFile['id'] . '" ><td>' . $uploadedFile['name'] . '</td><td>' . $uploadedFile['size'] . '</td><td>&nbsp;' . $uploadedFile['result'] .
' </td><td> <input style="width:90%;" type="text" value="' . $uploadedFile['comment'] . '" name="file_comments[]"> </td><td>' .
$uploadedFile['delete'] . '</td>' .
'<input type="hidden" value="' . $uploadedFile['id'] .'" name="file_ids[]">' . '</tr>';

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

@ -21,8 +21,8 @@
* @package chamilo.forum
*/
require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
$forumUrl = api_get_path(WEB_CODE_PATH).'forum/';
require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php';
$forumUrl = api_get_path(WEB_CODE_PATH) . 'forum/';
$rows = get_posts($_GET['thread']);
$rows = calculate_children($rows);
@ -30,7 +30,7 @@ $rows = calculate_children($rows);
if (isset($_GET['post']) && $_GET['post']) {
$display_post_id = intval($_GET['post']);
} else {
// we need to display the first post
// We need to display the first post
reset($rows);
$current = current($rows);
$display_post_id = $current['post_id'];
@ -38,64 +38,75 @@ if (isset($_GET['post']) && $_GET['post']) {
// Are we in a lp ?
$origin = '';
if(isset($_GET['origin'])) {
if (isset($_GET['origin'])) {
$origin = Security::remove_XSS($_GET['origin']);
}
// Delete attachment file.
if ((isset($_GET['action']) && $_GET['action']=='delete_attach') && isset($_GET['id_attach'])) {
if (
isset($_GET['action']) &&
$_GET['action']=='delete_attach' &&
isset($_GET['id_attach'])
) {
delete_attachment(0, $_GET['id_attach']);
if (!isset($_GET['thread'])) {
exit;
}
}
// Displaying the thread (structure)
// Displaying the thread (structure)
$thread_structure="<div class=\"structure\">".get_lang('Structure')."</div>";
$counter=0;
$count=0;
$prev_next_array=array();
$thread_structure = "<div class=\"structure\">" .
get_lang('Structure') . "</div>";
$counter = 0;
$count = 0;
$prev_next_array = array();
$clean_forum_id = intval($_GET['forum']);
$clean_thread_id = intval($_GET['thread']);
$forumId = intval($_GET['forum']);
$threadId = intval($_GET['thread']);
$group_id = api_get_group_id();
foreach ($rows as $post) {
$counter++;
$indent=$post['indent_cnt']*'20';
$thread_structure.= "<div style=\"margin-left: ".$indent."px;\">";
$indent = $post['indent_cnt'] * '20';
$thread_structure .= "<div style=\"margin-left: " . $indent . "px;\">";
if (isset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]) AND
!empty($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]) AND
!empty($whatsnew_post_info[$_GET['forum']][$post['thread_id']])
if (
!empty($whatsnew_post_info[$forumId][$post['thread_id']]) AND
isset($whatsnew_post_info[$forumId][$threadId][$post['post_id']]) AND
!empty($whatsnew_post_info[$forumId][$threadId][$post['post_id']])
) {
$post_image = Display::return_icon('forumpostnew.gif');
} else {
$post_image = Display::return_icon('forumpost.gif');
}
$thread_structure.= $post_image;
if (isset($_GET['post']) &&
$_GET['post'] == $post['post_id'] OR
($counter==1 AND !isset($_GET['post']))
$thread_structure .= $post_image;
if (
isset($_GET['post']) &&
$_GET['post'] == $post['post_id'] || (
$counter == 1 AND !isset($_GET['post'])
)
) {
$thread_structure .= '<strong>'.prepare4display($post['post_title']).'</strong></div>';
$prev_next_array[]= $post['post_id'];
$thread_structure .= '<strong>' .
prepare4display($post['post_title']) . '</strong></div>';
$prev_next_array[] = $post['post_id'];
} else {
if ($post['visible']=='0') {
$class=' class="invisible"';
if ($post['visible'] == '0') {
$class = ' class="invisible"';
} else {
$class='';
$class = '';
}
$count_loop=($count==0)?'&amp;id=1' : '';
$thread_structure.= "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".$clean_forum_id."&thread=".$clean_thread_id."&post=".$post['post_id']."&amp;origin=$origin$count_loop\" $class>".
prepare4display($post['post_title'])."</a></div>";
$prev_next_array[]=$post['post_id'];
$count_loop = ($count == 0) ? '&id=1' : '';
$thread_structure .= "<a href=\"viewthread.php?" . api_get_cidreq() .
"&forum=" . $forumId . "&thread=" . $threadId .
"&post=" . $post['post_id'] . "&origin=$origin$count_loop\"" .
"$class>" . prepare4display($post['post_title']) . "</a></div>";
$prev_next_array[] = $post['post_id'];
}
$count++;
}
$locked = api_resource_is_locked_by_gradebook($clean_thread_id, LINK_FORUM_THREAD);
$locked = api_resource_is_locked_by_gradebook($threadId, LINK_FORUM_THREAD);
/* NAVIGATION CONTROLS */
@ -104,13 +115,13 @@ $max = count($prev_next_array);
$next_id = $current_id + 1;
$prev_id = $current_id - 1;
// text
// Text
$first_message = get_lang('FirstMessage');
$last_message = get_lang('LastMessage');
$next_message = get_lang('NextMessage');
$prev_message = get_lang('PrevMessage');
// images
// Images
$first_img = Display::return_icon(
'action_first.png',
get_lang('FirstMessage'),
@ -132,36 +143,48 @@ $next_img = Display::return_icon(
array('style' => 'vertical-align: middle;')
);
// links
$first_href = $forumUrl.'viewthread.php?'.api_get_cidreq().'&amp;forum='.$clean_forum_id.'&amp;thread='.$clean_thread_id.'&amp;gradebook='.$gradebook.'&id=1&amp;post='.$prev_next_array[0];
$last_href = $forumUrl.'viewthread.php?'.api_get_cidreq().'&amp;forum='.$clean_forum_id.'&amp;thread='.$clean_thread_id.'&amp;gradebook='.$gradebook.'&post='.$prev_next_array[$max-1];
$prev_href = $forumUrl.'viewthread.php?'.api_get_cidreq().'&amp;forum='.$clean_forum_id.'&amp;thread='.$clean_thread_id.'&amp;gradebook='.$gradebook.'&post='.$prev_next_array[$prev_id];
$next_href = $forumUrl.'viewthread.php?'.api_get_cidreq().'&amp;forum='.$clean_forum_id.'&amp;thread='.$clean_thread_id.'&amp;gradebook='.$gradebook.'&post='.$prev_next_array[$next_id];
// Links
$first_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() .
'&forum=' . $forumId . '&thread=' . $threadId .
'&gradebook=' . $gradebook . '&id=1&post=' . $prev_next_array[0];
$last_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() .
'&forum=' . $forumId . '&thread=' . $threadId .
'&gradebook=' . $gradebook . '&post=' . $prev_next_array[$max-1];
$prev_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() .
'&forum=' . $forumId . '&thread=' . $threadId .
'&gradebook=' . $gradebook . '&post=' . $prev_next_array[$prev_id];
$next_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() .
'&forum=' . $forumId . '&thread=' . $threadId .
'&gradebook=' . $gradebook . '&post=' . $prev_next_array[$next_id];
echo '<center style="margin-top: 10px; margin-bottom: 10px;">';
//go to: first and previous
if ((int)$current_id > 0) {
echo '<a href="'.$first_href.'" '.$class.' title='.$first_message.'>'.$first_img.' '.$first_message.'</a>';
echo '<a href="'.$prev_href.'" '.$class_prev.' title='.$prev_message.'>'.$prev_img.' '.$prev_message.'</a>';
// Go to: first and previous
if (((int) $current_id) > 0) {
echo '<a href="' . $first_href . '" ' . $class . ' title=' .
$first_message . '>' . $first_img . ' ' . $first_message .'</a>';
echo '<a href="' . $prev_href . '" ' . $class_prev . ' title=' .
$prev_message . '>' . $prev_img . ' ' . $prev_message . '</a>';
} else {
echo '<b><span class="invisible">'.$first_img.' '.$first_message.'</b></span>';
echo '<b><span class="invisible">'.$prev_img.' '.$prev_message.'</b></span>';
echo '<b><span class="invisible">' .
$first_img . ' ' . $first_message . '</b></span>';
echo '<b><span class="invisible">' .
$prev_img . ' ' . $prev_message . '</b></span>';
}
// current counter
echo ' [ '.($current_id+1).' / '.$max.' ] ';
// Current counter
echo ' [ ' . ($current_id + 1) . ' / ' . $max . ' ] ';
// go to: next and last
if (($current_id+1) < $max) {
echo '<a href="'.$next_href.'" '.$class_next.' title='.$next_message.'>'.$next_message.' '.$next_img.'</a>';
echo '<a href="'.$last_href.'" '.$class.' title='.$last_message.'>'.$last_message.' '.$last_img.'</a>';
// Go to: next and last
if (($current_id + 1) < $max) {
echo '<a href="' . $next_href . '" ' . $class_next . ' title=' . $next_message . '>' . $next_message . ' ' . $next_img . '</a>';
echo '<a href="' . $last_href . '" ' . $class . ' title=' . $last_message . '>' . $last_message . ' ' . $last_img . '</a>';
} else {
echo '<b><span class="invisible">'.$next_message.' '.$next_img.'</b></span>';
echo '<b><span class="invisible">'.$last_message.' '.$last_img.'</b></span>';
echo '<b><span class="invisible">' . $next_message . ' ' . $next_img . '</b></span>';
echo '<b><span class="invisible">' . $last_message . ' ' . $last_img . '</b></span>';
}
echo '</center>';
// the style depends on the status of the message: approved or not
// The style depends on the status of the message: approved or not
if ($rows[$display_post_id]['visible'] == '0') {
$titleclass = 'forum_message_post_title_2_be_approved';
$messageclass = 'forum_message_post_text_2_be_approved';
@ -172,63 +195,118 @@ if ($rows[$display_post_id]['visible'] == '0') {
$leftclass = 'forum_message_left';
}
// Displaying the message
// Displaying the message
// we mark the image we are displaying as set
unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$rows[$display_post_id]['post_id']]);
// We mark the image we are displaying as set
unset($whatsnew_post_info[$forumId][$threadId][$rows[$display_post_id]['post_id']]);
echo "<table width=\"100%\" class=\"forum_table\" cellspacing=\"5\" border=\"0\">";
echo "<table width=\"100%\" class=\"forum_table\" cellspacing=\"5\" border=\"0\">";
echo "<tr>";
echo "<td rowspan=\"3\" class=\"$leftclass\">";
$username = sprintf(get_lang('LoginX'), $rows[$display_post_id]['username']);
if ($rows[$display_post_id]['user_id']=='0') {
if ($rows[$display_post_id]['user_id'] == '0') {
$name = prepare4display($rows[$display_post_id]['poster_name']);
} else {
$name = api_get_person_name($rows[$display_post_id]['firstname'], $rows[$display_post_id]['lastname']);
}
if (api_get_course_setting('allow_user_image_forum')) {
echo '<br />'.display_user_image($rows[$display_post_id]['user_id'],$name, $origin).'<br />';
echo '<br />' . display_user_image($rows[$display_post_id]['user_id'], $name, $origin) . '<br />';
}
echo display_user_link($rows[$display_post_id]['user_id'], $name, $origin, $username)."<br />";
echo api_convert_and_format_date($rows[$display_post_id]['post_date']).'<br /><br />';
// get attach id
$attachment_list=get_attachment($display_post_id);
$id_attach = !empty($attachment_list)?$attachment_list['id']:'';
echo display_user_link(
$rows[$display_post_id]['user_id'],
$name,
$origin,
$username
) . "<br />";
echo api_convert_and_format_date(
$rows[$display_post_id]['post_date']
) . '<br /><br />';
// Get attach id
$attachment_list = get_attachment($display_post_id);
$id_attach = !empty($attachment_list) ? $attachment_list['id'] : '';
// The user who posted it can edit his thread only if the course admin allowed this in the properties of the forum
// The course admin him/herself can do this off course always
if (GroupManager::is_tutor_of_group(api_get_user_id(), $group_id) OR ($current_forum['allow_edit']==1 AND $row['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
if (
GroupManager::is_tutor_of_group(api_get_user_id(), $group_id) OR (
$current_forum['allow_edit'] == 1 AND
$row['user_id'] == $_user['user_id']
) OR (
api_is_allowed_to_edit(false,true) && !(
api_is_course_coach() &&
$current_forum['session_id'] != $_SESSION['id_session']
)
)
) {
if ($locked == false) {
echo "<a href=\"editpost.php?".api_get_cidreq()."&forum=".$clean_forum_id."&thread=".$clean_thread_id."&post=".$rows[$display_post_id]['post_id']."&amp;id_attach=".$id_attach."\">".
Display::return_icon('edit.png',get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
echo "<a href=\"editpost.php?" . api_get_cidreq() .
"&forum=" . $forumId . "&thread=" . $threadId .
"&post=" . $rows[$display_post_id]['post_id'] .
"&id_attach=" . $id_attach . "\">" .
Display::return_icon(
'edit.png',
get_lang('Edit'),
array(),
ICON_SIZE_SMALL
) . '</a>';
}
}
if (GroupManager::is_tutor_of_group(api_get_user_id(), $group_id) OR
api_is_allowed_to_edit(false,true) &&
!(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])
if (
GroupManager::is_tutor_of_group(api_get_user_id(), $group_id) OR
api_is_allowed_to_edit(false,true) && !(
api_is_course_coach() &&
$current_forum['session_id'] != $_SESSION['id_session']
)
) {
if ($locked == false) {
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".$clean_forum_id."&amp;thread=".$clean_thread_id."&amp;action=delete&amp;content=post&amp;id=".$rows[$display_post_id]['post_id']."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES))."')) return false;\">".Display::return_icon('delete.png',get_lang('Delete'), array(), ICON_SIZE_SMALL)."</a>";
echo "<a href=\"" . api_get_self() . "?" . api_get_cidreq() .
"&forum=" . $forumId . "&thread=" . $threadId .
"&action=delete&content=post&id=" .
$rows[$display_post_id]['post_id'] .
"\" onclick=\"javascript:if(!confirm('" .
addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES)) .
"')) return false;\">" . Display::return_icon(
'delete.png',
get_lang('Delete'),
array(),
ICON_SIZE_SMALL
)."</a>";
}
display_visible_invisible_icon('post', $rows[$display_post_id]['post_id'], $rows[$display_post_id]['visible'],array('forum'=>$clean_forum_id,'thread'=>$clean_thread_id, 'post'=>Security::remove_XSS($_GET['post']) ));
echo "";
//verified the post minor
$my_post=get_posts($_GET['thread']);
$id_posts=array();
display_visible_invisible_icon(
'post',
$rows[$display_post_id]['post_id'],
$rows[$display_post_id]['visible'],
array(
'forum' => $forumId,
'thread' => $threadId,
'post' => Security::remove_XSS($_GET['post']) ));
// Verified the post minor
$my_post = get_posts($_GET['thread']);
$id_posts = array();
if (!empty($my_post) && is_array($my_post)) {
foreach ($my_post as $post_value) {
$id_posts[]=$post_value['post_id'];
$id_posts[] = $post_value['post_id'];
}
sort($id_posts,SORT_NUMERIC);
sort($id_posts, SORT_NUMERIC);
reset($id_posts);
//the post minor
$post_minor=(int)$id_posts[0];
$post_id = isset($_GET['post'])?(int)$_GET['post']:0;
if (!isset($_GET['id']) && $post_id>$post_minor) {
echo "<a href=\"viewthread.php?".api_get_cidreq()."&amp;gidReq=".Security::remove_XSS($_GET['gidReq'])."&amp;forum=".$clean_forum_id."&amp;thread=".$clean_thread_id."&amp;origin=".$origin."&amp;action=move&amp;post=".$rows[$display_post_id]['post_id']."\">".Display::return_icon('move.png',get_lang('MovePost'), array(), ICON_SIZE_SMALL)."</a>";
// The post minor
$post_minor = (int) $id_posts[0];
$post_id = isset($_GET['post']) ? (int) $_GET['post'] : 0;
if (!isset($_GET['id']) && $post_id > $post_minor) {
echo "<a href=\"viewthread.php?" . api_get_cidreq() .
"&gidReq=" . Security::remove_XSS($_GET['gidReq']) .
"&forum=" . $forumId . "&thread=" . $threadId .
"&origin=" . $origin . "&action=move&post=" .
$rows[$display_post_id]['post_id'] . "\">" .
Display::return_icon(
'move.png',
get_lang('MovePost'),
array(),
ICON_SIZE_SMALL
) . "</a>";
}
}
}
@ -237,53 +315,100 @@ $user_status = api_get_status_of_user_in_course(
$rows[$display_post_id]['user_id'],
api_get_course_id()
);
if (api_is_allowed_to_edit(null,true)) {
if (api_is_allowed_to_edit(null, true)) {
if ($post_id > $post_minor) {
$current_qualify_thread=show_qualify('1', $rows[$display_post_id]['user_id'],$_GET['thread']);
$current_qualify_thread = show_qualify(
'1',
$rows[$display_post_id]['user_id'],
$_GET['thread']
);
if ($locked == false) {
echo "<a href=\"forumqualify.php?".api_get_cidreq()."&amp;forum=".$clean_forum_id."&amp;thread=".$clean_thread_id."&amp;action=list&amp;post=".$rows[$display_post_id]['post_id']."&amp;user=".$rows[$display_post_id]['user_id']."&amp;user_id=".$rows[$display_post_id]['user_id']."&amp;origin=".$origin."&amp;idtextqualify=".$current_qualify_thread."\" >".Display::return_icon('new_test_small.gif',get_lang('Qualify'))."</a>";
echo "<a href=\"forumqualify.php?" . api_get_cidreq() .
"&forum=" . $forumId . "&thread=" . $threadId .
"&action=list&post=" . $rows[$display_post_id]['post_id'] .
"&user=" . $rows[$display_post_id]['user_id'] . "&user_id=" .
$rows[$display_post_id]['user_id'] . "&origin=" . $origin .
"&idtextqualify=" . $current_qualify_thread .
"\" >" . Display::return_icon(
'new_test_small.gif',
get_lang('Qualify')
) . "</a>";
}
}
}
if (($current_forum_category && $current_forum_category['locked']==0) AND $current_forum['locked']==0 AND $current_thread['locked']==0 OR api_is_allowed_to_edit(false,true)) {
if ($_user['user_id'] OR ($current_forum['allow_anonymous']==1 AND !$_user['user_id'])) {
if (!api_is_anonymous() && api_is_allowed_to_session_edit(false,true)) {
echo '<a href="reply.php?'.api_get_cidreq().'&amp;forum='.$clean_forum_id.'&amp;thread='.$clean_thread_id.'&amp;post='.$rows[$display_post_id]['post_id'].'&amp;action=replymessage&amp;origin='. $origin .'">'.Display :: return_icon('message_reply_forum.png', get_lang('ReplyToMessage'))."</a>";
echo '<a href="reply.php?'.api_get_cidreq().'&amp;forum='.$clean_forum_id.'&amp;thread='.$clean_thread_id.'&amp;post='.$rows[$display_post_id]['post_id'].'&amp;action=quote&amp;origin='. $origin .'">'.Display :: return_icon('quote.gif', get_lang('QuoteMessage'))."</a>";
if (
(
$current_forum_category &&
$current_forum_category['locked'] == 0
) AND $current_forum['locked'] == 0 AND
$current_thread['locked'] == 0 OR
api_is_allowed_to_edit(false,true)
) {
if (
$_user['user_id'] OR (
$current_forum['allow_anonymous'] == 1 AND
!$_user['user_id']
)
) {
if (
!api_is_anonymous() &&
api_is_allowed_to_session_edit(false, true)
) {
echo '<a href="reply.php?' . api_get_cidreq() .
'&forum=' . $forumId . '&thread=' . $threadId .
'&post=' . $rows[$display_post_id]['post_id'] .
'&action=replymessage&origin=' . $origin . '">' .
Display::return_icon(
'message_reply_forum.png',
get_lang('ReplyToMessage')
) . "</a>";
echo '<a href="reply.php?' . api_get_cidreq() .
'&forum=' . $forumId . '&thread=' . $threadId .
'&post=' . $rows[$display_post_id]['post_id'] .
'&action=quote&origin=' . $origin . '">' .
Display::return_icon(
'quote.gif',
get_lang('QuoteMessage')
) . "</a>";
}
}
} else {
if ($current_forum_category && $current_forum_category['locked']==1) {
echo get_lang('ForumcategoryLocked').'<br />';
if ($current_forum_category && $current_forum_category['locked'] == 1) {
echo get_lang('ForumcategoryLocked') . '<br />';
}
if ($current_forum['locked']==1) {
echo get_lang('ForumLocked').'<br />';
if ($current_forum['locked'] == 1) {
echo get_lang('ForumLocked') . '<br />';
}
if ($current_thread['locked']==1) {
echo get_lang('ThreadLocked').'<br />';
if ($current_thread['locked'] == 1) {
echo get_lang('ThreadLocked') . '<br />';
}
}
echo "</td>";
// note: this can be removed here because it will be displayed in the tree
if (isset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$rows[$display_post_id]['post_id']]) AND
!empty($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$rows[$display_post_id]['post_id']]) AND
// Note: this can be removed here because it will be displayed in the tree
if (
isset($whatsnew_post_info[$forumId][$threadId][$rows[$display_post_id]['post_id']]) AND
!empty($whatsnew_post_info[$forumId][$threadId][$rows[$display_post_id]['post_id']]) AND
!empty($whatsnew_post_info[$_GET['forum']][$rows[$display_post_id]['thread_id']])
) {
$post_image=Display::return_icon('forumpostnew.gif');
$post_image = Display::return_icon('forumpostnew.gif');
} else {
$post_image=Display::return_icon('forumpost.gif');
$post_image = Display::return_icon('forumpost.gif');
}
if ($rows[$display_post_id]['post_notification']=='1' AND $rows[$display_post_id]['poster_id']==$_user['user_id']) {
$post_image.=Display::return_icon('forumnotification.gif',get_lang('YouWillBeNotified'));
if (
$rows[$display_post_id]['post_notification'] == '1' AND
$rows[$display_post_id]['poster_id'] == $_user['user_id']
) {
$post_image .= Display::return_icon('forumnotification.gif',get_lang('YouWillBeNotified'));
}
// The post title
echo "<td class=\"$titleclass\">".prepare4display($rows[$display_post_id]['post_title'])."</td>";
echo "<td class=\"$titleclass\">" .
prepare4display($rows[$display_post_id]['post_title']) . "</td>";
echo "</tr>";
// The post message
echo "<tr>";
echo "<td class=\"$messageclass\">".prepare4display($rows[$display_post_id]['post_text'])."</td>";
echo "<td class=\"$messageclass\">" .
prepare4display($rows[$display_post_id]['post_text']) . "</td>";
echo "</tr>";
// The check if there is an attachment
@ -293,22 +418,45 @@ if (!empty($attachment_list) && is_array($attachment_list)) {
echo '<tr><td height="50%">';
$realname = $attachment['path'];
$user_filename = $attachment['filename'];
echo Display::return_icon('attachment.gif',get_lang('Attachment'));
echo Display::return_icon('attachment.gif', get_lang('Attachment'));
echo '<a href="download.php?file=';
echo $realname;
echo ' "> '.$user_filename.' </a>';
echo '<span class="forum_attach_comment" >'.Security::remove_XSS($attachment['comment'], STUDENT).'</span>';
if (($current_forum['allow_edit']==1 AND $rows[$display_post_id]['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;origin='.Security::remove_XSS($_GET['origin']).'&amp;action=delete_attach&amp;id_attach='.$attachment['id'].'&amp;forum='.$clean_forum_id.'&amp;thread='.$clean_thread_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTESt)).'\')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a><br />';
echo ' "> ' . $user_filename . ' </a>';
echo '<span class="forum_attach_comment">' .
Security::remove_XSS($attachment['comment'], STUDENT) . '</span>';
if (
(
$current_forum['allow_edit'] == 1 AND
$rows[$display_post_id]['user_id'] == $_user['user_id']
) OR (
api_is_allowed_to_edit(false, true) && !(
api_is_course_coach() &&
$current_forum['session_id'] != $_SESSION['id_session']
)
)
) {
echo '&nbsp;&nbsp;<a href="' . api_get_self() . '?' .
api_get_cidreq() . '&origin=' .
Security::remove_XSS($_GET['origin']) .
'&action=delete_attach&id_attach=' .
$attachment['id'] . '&forum=' . $forumId .
'&thread=' . $threadId .
'" onclick="javascript:if(!confirm(\'' .
addslashes(api_htmlentities(
get_lang('ConfirmYourChoice'), ENT_QUOTESt)
) . '\')) return false;">' . Display::return_icon(
'delete.gif',
get_lang('Delete')
).'</a><br />';
}
echo '</td></tr>';
}
}
// The post has been displayed => it can be removed from the what's new array
if (isset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']])) {
unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]);
unset($_SESSION['whatsnew_post_info'][$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]);
if (isset($whatsnew_post_info[$forumId][$threadId][$row['post_id']])) {
unset($whatsnew_post_info[$forumId][$threadId][$row['post_id']]);
unset($_SESSION['whatsnew_post_info'][$forumId][$threadId][$row['post_id']]);
}
echo "</table>";

2
main/inc/lib/database.lib.php
Unescape View File

@ -1176,7 +1176,7 @@ class Database
* @todo known issues, it doesn't work when using LIKE conditions
* @example array('where'=> array('course_code LIKE "?%"'))
* @example array('where'=> array('type = ? AND category = ?' => array('setting', 'Plugins'))
* @example array('where'=> array('name = "Julio" AND lastname = "montoya"))
* @example array('where'=> array('name = "Julio" AND lastname = "montoya"'))
*/
public static function select($columns, $table_name, $conditions = array(), $type_result = 'all', $option = 'ASSOC')

Write Preview
Loading…
Cancel
Save