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

[svn r18434] Logic changes - Fixed Allow to Qualify a teacher subscribed like a student - see FS#3609

Browse Source
skala
Cristian Fasanando 16 years ago
parent b2a117c3bf
commit ca162b8f37
2 changed files with 23 additions and 14 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. 29
      main/forum/forumfunction.inc.php
  2. 8
      main/forum/viewforum.php

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

@ -1509,11 +1509,14 @@ function get_thread_information($thread_id) {
function get_thread_users_details($thread_id, $db_name = null) {
$t_posts = Database :: get_course_table(TABLE_FORUM_POST, (empty($db_name)?null:$db_name));
$t_users = Database :: get_main_table(TABLE_MAIN_USER);
$sql = "SELECT DISTINCT user_id, lastname, firstname, thread_id
FROM $t_posts , $t_users
WHERE poster_id = user_id
$t_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql = "SELECT DISTINCT user.user_id, user.lastname, user.firstname, thread_id
FROM $t_posts , $t_users user, $t_course_user course_user
WHERE poster_id = user.user_id
AND user.user_id = course_user.user_id
AND thread_id = '".Database::escape_string($thread_id)."'
AND status not in('1')";
AND course_user.status NOT IN('1')
AND course_code = '".api_get_course_id()."'";
$result = api_sql_query($sql, __FILE__, __LINE__);
return $result;
@ -1532,17 +1535,20 @@ function get_thread_users_qualify($thread_id, $db_name = null) {
$t_posts = Database :: get_course_table(TABLE_FORUM_POST, (empty($db_name)?null:$db_name));
$t_qualify = Database :: get_course_table(TABLE_FORUM_THREAD_QUALIFY, (empty($db_name)?null:$db_name));
$t_users = Database :: get_main_table(TABLE_MAIN_USER);
$t_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql = "SELECT post.poster_id, user.lastname, user.firstname, post.thread_id,user.user_id,qualify.qualify
FROM $t_posts post,
$t_qualify qualify,
$t_users user
$t_users user,
$t_course_user course_user
WHERE
post.poster_id = user.user_id
AND post.poster_id = qualify.user_id
AND post.poster_id = qualify.user_id
AND user.user_id = course_user.user_id
AND qualify.thread_id = '".Database::escape_string($thread_id)."'
AND user.status not in('1')
AND course_user.status not in('1')
AND course_code = '".api_get_course_id()."'
GROUP BY post.poster_id ";
$result = api_sql_query($sql, __FILE__, __LINE__);
return $result;
@ -1561,6 +1567,7 @@ function get_thread_users_not_qualify($thread_id, $db_name = null) {
$t_posts = Database :: get_course_table(TABLE_FORUM_POST, (empty($db_name)?null:$db_name));
$t_qualify = Database :: get_course_table(TABLE_FORUM_THREAD_QUALIFY, (empty($db_name)?null:$db_name));
$t_users = Database :: get_main_table(TABLE_MAIN_USER);
$t_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql1 = "select user_id FROM $t_qualify WHERE thread_id = '".$thread_id."'";
$result1 = api_sql_query($sql1,__FILE__,__LINE__);
@ -1574,11 +1581,13 @@ function get_thread_users_not_qualify($thread_id, $db_name = null) {
$cad=substr($cad,0,strlen($cad)-1);
}
$sql = "SELECT DISTINCT user.user_id, user.lastname, user.firstname, post.thread_id
FROM $t_posts post, $t_users user
FROM $t_posts post, $t_users user,$t_course_user course_user
WHERE post.poster_id = user.user_id
AND user.user_id NOT IN (".$cad.")
AND user.user_id = course_user.user_id
AND post.thread_id = '".Database::escape_string($thread_id)."'
AND user.status not in('1')";
AND course_user.status not in('1')
AND course_code = '".api_get_course_id()."'";
$result = api_sql_query($sql, __FILE__, __LINE__);
return $result;

8
main/forum/viewforum.php
Unescape View File

@ -190,7 +190,7 @@ if ($my_action == 'notify' AND isset($_GET['content']) AND isset($_GET['id'])) {
// student list
if ($my_action == 'liststd' AND isset($_GET['content']) AND isset($_GET['id']) AND $userinf['status']=='1') {
if ($my_action == 'liststd' AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit()) {
switch($_GET['list']) {
case "qualify":
@ -230,7 +230,7 @@ if ($my_action == 'liststd' AND isset($_GET['content']) AND isset($_GET['id']) A
if ($_GET['list']=='qualify') {
$table_list.= '<th>'.get_lang('Qualification').'</th>';
}
if ($userinf['status']=='1') {
if (api_is_allowed_to_edit()) {
$table_list.= '<th>'.get_lang('Qualify').'</th>';
}
$table_list.= '</tr>';
@ -249,7 +249,7 @@ if ($my_action == 'liststd' AND isset($_GET['content']) AND isset($_GET['id']) A
if ($_GET['list']=='qualify') {
$table_list.= '<td>'.$row_student_list['qualify'].'/'.$max_qualify.'</td>';
}
if ($userinf['status']=='1') {
if (api_is_allowed_to_edit()) {
$current_qualify_thread=show_qualify('1',$_GET['cidReq'],$my_forum,$row_student_list['user_id'],$_GET['id']);
$table_list.= '<td><a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($my_forum).'&thread='.Security::remove_XSS($_GET['id']).'&user='.$row_student_list['user_id'].'&user_id='.$row_student_list['user_id'].'&idtextqualify='.$current_qualify_thread.'&origin='.$origin.'">'.icon('../img/'.$icon_qualify,get_lang('Qualify')).'</a></td></tr>';
}
@ -434,7 +434,7 @@ if(is_array($threads)) {
}
$icon_liststd = 'group.gif';
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;forum=".Security::remove_XSS($my_forum)."&origin=".$origin."&amp;action=notify&amp;content=thread&amp;gidReq=".$_SESSION['toolgroup']."&amp;id=".$row['thread_id']."\">".icon('../img/'.$iconnotify,get_lang('NotifyMe'))."</a>";
if ($userinf['status']=='1') {
if (api_is_allowed_to_edit()) {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;forum='.Security::remove_XSS($my_forum).'&origin='.$origin.'&amp;action=liststd&amp;content=thread&amp;gidReq='.$_SESSION['toolgroup'].'&amp;id='.$row['thread_id'].'">'.icon('../img/'.$icon_liststd,get_lang('StudentList')).'</a>';
}
echo "</td>\n";

Write Preview
Loading…
Cancel
Save