From a79640715700efd9a1a64eeb5217a031037cd719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Fri, 8 May 2009 18:43:06 +0200 Subject: [PATCH] [svn r20414] fix several texts and icons --- main/forum/newthread.php | 4 +- main/forum/reply.php | 6 +- main/forum/viewforum.php | 956 +++++++++++++++---------------- main/forum/viewforumcategory.php | 2 +- main/forum/viewthread.php | 24 +- 5 files changed, 496 insertions(+), 496 deletions(-) diff --git a/main/forum/newthread.php b/main/forum/newthread.php index ca1b443e37..873a222be5 100644 --- a/main/forum/newthread.php +++ b/main/forum/newthread.php @@ -212,8 +212,8 @@ handle_forum_and_forumcategories(); // action links echo '
'; echo ''.search_link().''; -echo ''.Display::return_icon('back.png').' '.get_lang('BackToForumOverview').''; -echo ''.Display::return_icon('forum.gif').' '.get_lang('BackToForum').''; +echo ''.Display::return_icon('back.png',get_lang('BackToForumOverview')).' '.get_lang('BackToForumOverview').''; +echo ''.Display::return_icon('forum.gif',get_lang('BackToForum')).' '.get_lang('BackToForum').''; echo '
'; /* diff --git a/main/forum/reply.php b/main/forum/reply.php index 26d69ff6d5..ecefc8cf07 100644 --- a/main/forum/reply.php +++ b/main/forum/reply.php @@ -202,9 +202,9 @@ if (!$_user['user_id'] AND $current_forum['allow_anonymous']==0) { if ($origin != 'learnpath') { echo '
'; echo ''.search_link().''; - echo ''.Display::return_icon('back.png').' '.get_lang('BackToForumOverview').''; - echo ''.Display::return_icon('forum.gif').' '.get_lang('BackToForum').''; - echo ''.Display::return_icon('forumthread.gif').' '.get_lang('BackToThread').''; + echo ''.Display::return_icon('back.png',get_lang('BackToForumOverview')).' '.get_lang('BackToForumOverview').''; + echo ''.Display::return_icon('forum.gif',get_lang('BackToForum')).' '.get_lang('BackToForum').''; + echo ''.Display::return_icon('forumthread.gif',get_lang('BackToThread')).' '.get_lang('BackToThread').''; echo '
'; } else { echo '
 
'; diff --git a/main/forum/viewforum.php b/main/forum/viewforum.php index f37c2f1155..6fb4fb2ba2 100644 --- a/main/forum/viewforum.php +++ b/main/forum/viewforum.php @@ -1,479 +1,479 @@ -, Ghent University -* @Copyright Ghent University -* @Copyright Patrick Cool -* -* @package dokeos.forum -*/ - -// name of the language file that needs to be included -$language_file = array ( - 'forum', - 'group' -); - -// including the global dokeos file -require '../inc/global.inc.php'; - -// notice for unauthorized people. -api_protect_course_script(true); - -// the section (tabs) -$this_section=SECTION_COURSES; - -// including additional library scripts -require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'); -include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php'); -$nameTools=get_lang('Forum'); - - -//are we in a lp ? -$origin = ''; -$origin_string=''; -if (isset($_GET['origin'])) { - $origin = Security::remove_XSS($_GET['origin']); - $origin_string = '&origin='.$origin; -} - -/* ------------------------------------------------------------ - Including necessary files ------------------------------------------------------------ -*/ -require 'forumconfig.inc.php'; -require_once 'forumfunction.inc.php'; - -$userid=api_get_user_id(); -$userinf=api_get_user_info($userid); - -/* -============================================================================== - MAIN DISPLAY SECTION -============================================================================== -*/ - - -/* ------------------------------------------------------------ - Retrieving forum and forum categorie information ------------------------------------------------------------ -*/ -// we are getting all the information about the current forum and forum category. -// note pcool: I tried to use only one sql statement (and function) for this -// but the problem is that the visibility of the forum AND forum cateogory are stored in the item_property table - -$my_forum_group=isset($_GET['gidReq'])?$_GET['gidReq']:''; -$my_forum=isset($_GET['forum'])?$_GET['forum']:''; -$val=GroupManager::user_has_access($userid,$my_forum_group,GROUP_TOOL_FORUM); - -if(!empty($my_forum_group)){ - if (api_is_allowed_to_edit(false,true) || $val==true) { - $current_forum=get_forum_information($my_forum); // note: this has to be validated that it is an existing forum. - $current_forum_category=get_forumcategory_information($current_forum['forum_category']); - } -} else { - $result=get_forum_information($my_forum); - if($result['forum_of_group']==0){ - $current_forum=get_forum_information($my_forum); // note: this has to be validated that it is an existing forum. - $current_forum_category=get_forumcategory_information($current_forum['forum_category']); - } -} - - -/* ------------------------------------------------------------ - Header and Breadcrumbs ------------------------------------------------------------ -*/ -$my_search=isset($_GET['search'])?$_GET['search']:''; -$my_action=isset($_GET['action'])?$_GET['action']:''; - -if (isset($_SESSION['gradebook'])){ - $gradebook= $_SESSION['gradebook']; -} - -if (!empty($gradebook) && $gradebook=='view') { - $interbreadcrumb[]= array ( - 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], - 'name' => get_lang('Gradebook') - ); -} - -if (!empty($_GET['gidReq'])) { - $toolgroup = Database::escape_string($_GET['gidReq']); - api_session_register('toolgroup'); -} - -if (!empty($_SESSION['toolgroup'])) { - $_clean['toolgroup']=(int)$_SESSION['toolgroup']; - $group_properties = GroupManager :: get_group_properties($_clean['toolgroup']); - $interbreadcrumb[] = array ("url" => "../group/group.php", "name" => get_lang('Groups')); - $interbreadcrumb[] = array ("url"=>"../group/group_space.php?gidReq=".$_SESSION['toolgroup'], "name"=> get_lang('GroupSpace').' ('.$group_properties['name'].')'); - //$interbreadcrumb[]=array("url" => "index.php?search=".Security::remove_XSS($my_search),"name" => $nameTools); - //$interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&search=".Security::remove_XSS(urlencode($my_search)),"name" => prepare4display($current_forum_category['cat_title'])); - $interbreadcrumb[]=array("url" => "#","name" => prepare4display($current_forum['forum_title'])); - //viewforum.php?forum=".Security::remove_XSS($my_forum)."&origin=".$origin."&gidReq=".$_SESSION['toolgroup']."&search=".Security::remove_XSS(urlencode($my_search)), - -} else { - $interbreadcrumb[]=array("url" => "index.php?gradebook=$gradebook&search=".Security::remove_XSS($my_search),"name" => $nameTools); - $interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&search=".Security::remove_XSS(urlencode($my_search)),"name" => prepare4display($current_forum_category['cat_title'])); - $interbreadcrumb[]=array("url" => "#","name" => prepare4display($current_forum['forum_title'])); - //viewforum.php?forum=".Security::remove_XSS($my_forum)."&origin=".$origin."&search=".Security::remove_XSS(urlencode($my_search)) -} - -if ($origin=='learnpath') { - include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php'); -} else { - // the last element of the breadcrumb navigation is already set in interbreadcrumb, so give empty string - Display :: display_header(''); - //api_display_tool_title($nameTools); -} - -/* ------------------------------------------------------------ - Actions ------------------------------------------------------------ -*/ -$table_link = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); -// Change visibility of a forum or a forum category -if (($my_action=='invisible' OR $my_action=='visible') AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit(false,true)) { - $message=change_visibility($_GET['content'], $_GET['id'],$_GET['action']);// note: this has to be cleaned first -} -// locking and unlocking -if (($my_action=='lock' OR $my_action=='unlock') AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit(false,true)) { - $message=change_lock_status($_GET['content'], $_GET['id'],$my_action);// note: this has to be cleaned first -} -// deleting -if ($my_action=='delete' AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit(false,true)) { - $message=delete_forum_forumcategory_thread($_GET['content'],$_GET['id']); // note: this has to be cleaned first - //delete link - $sql_link='DELETE FROM '.$table_link.' WHERE ref_id='.Security::remove_XSS($_GET['id']).' and type=5 and course_code="'.api_get_course_id().'";'; - api_sql_query($sql_link); -} -// moving -if ($my_action=='move' and isset($_GET['thread']) AND api_is_allowed_to_edit(false,true)) { - $message=move_thread_form(); -} -// notification -if ($my_action == 'notify' AND isset($_GET['content']) AND isset($_GET['id'])) { - $return_message = set_notification($_GET['content'],$_GET['id']); - Display :: display_confirmation_message($return_message,false); -} - -// student list - -if ($my_action == 'liststd' AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit()) { - - switch($_GET['list']) { - case "qualify": - $student_list=get_thread_users_qualify($_GET['id']); - $nrorow3 =-2; - break; - case "notqualify": - $student_list=get_thread_users_not_qualify($_GET['id']); - $nrorow3 =-2; - break; - default: - $student_list=get_thread_users_details($_GET['id']); - $nrorow3 = Database::num_rows($student_list); - break; - } - $table_list = '


'.get_lang('ThreadUsersList').' :'.get_name_thread_by_id($_GET['id']).'

'; - if ($nrorow3>0 || $nrorow3==-2) { - $url = 'cidReq='.Security::remove_XSS($_GET['cidReq']).'&forum='.Security::remove_XSS($my_forum).'&action='.Security::remove_XSS($_GET['action']).'&content='.Security::remove_XSS($_GET['content']).'&id='.Security::remove_XSS($_GET['id']); - $table_list.= '
-
- - - - - - -
'.get_lang('AllStudents').''.get_lang('StudentsQualified').''.get_lang('StudentsNotQualified').'
-
- '; - - $icon_qualify = 'blog_new.gif'; - $table_list.= '

'; - // The column headers (to do: make this sortable) - $table_list.= ''; - $table_list.= ''; - - if ($_GET['list']=='qualify') { - $table_list.= ''; - } - if (api_is_allowed_to_edit()) { - $table_list.= ''; - } - $table_list.= ''; - $max_qualify=show_qualify('2',$_GET['cidReq'],$my_forum,$userid,$_GET['id']); - $counter_stdlist=0; - - if (Database::num_rows($student_list)>0) { - while ($row_student_list=Database::fetch_array($student_list)) { - if ($counter_stdlist%2==0) { - $class_stdlist="row_odd"; - } else { - $class_stdlist="row_even"; - } - $name_user_theme = $row_student_list['firstname'].' '.$row_student_list['lastname']; - $table_list.= ''; - if ($_GET['list']=='qualify') { - $table_list.= ''; - } - 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.= ''; - } - $counter_stdlist++; - } - } else { - if ($_GET['list']=='qualify'){ - $table_list.=''; - } else { - $table_list.=''; - } - } - - $table_list.= '
'.get_lang('NamesAndLastNames').''.get_lang('Qualification').''.get_lang('Qualify').'
'.$name_user_theme.''.$row_student_list['qualify'].'/'.$max_qualify.''.icon('../img/'.$icon_qualify,get_lang('Qualify')).'
'.get_lang('ThereIsNotQualifiedLearners').'
'.get_lang('ThereIsNotUnqualifiedLearners').'
'; - $table_list .= '
'; - } else { - $table_list .= get_lang('NoParticipation'); - } -} - - -/* ------------------------------------------------------------ - Is the user allowed here? ------------------------------------------------------------ -*/ -// if the user is not a course administrator and the forum is hidden -// then the user is not allowed here. -if (!api_is_allowed_to_edit(false,true) AND ($current_forum_category['visibility']==0 OR $current_forum['visibility']==0)) { - forum_not_allowed_here(); -} - -if ($origin == 'learnpath') { - echo '
 
'; -} - -/* ------------------------------------------------------------ - Display the action messages ------------------------------------------------------------ -*/ -if (!empty($message)) { - Display :: display_confirmation_message($message); -} - - -/* ------------------------------------------------------------ - Action Links ------------------------------------------------------------ -*/ -if ($origin!='learnpath') { - echo '
'; - if (empty($_SESSION['toolgroup'])){ - echo ''.search_link().''; - } - echo ''.Display::return_icon('back.png').' '.get_lang('BackToForumOverview').''; - // The link should appear when - // 1. the course admin is here - // 2. the course member is here and new threads are allowed - // 3. a visitor is here and new threads AND allowed AND anonymous posts are allowed - if (api_is_allowed_to_edit(false,true) OR ($current_forum['allow_new_threads']==1 AND isset($_user['user_id'])) OR ($current_forum['allow_new_threads']==1 AND !isset($_user['user_id']) AND $current_forum['allow_anonymous']==1)) { - if ($current_forum['locked'] <> 1 AND $current_forum['locked'] <> 1) { - echo ''.Display::return_icon('forumthread_new.gif',get_lang('NewTopic')).' '.get_lang('NewTopic').''; - } else { - echo get_lang('ForumLocked'); - } - } - echo '
'; -} - -/* ------------------------------------------------------------ - Display ------------------------------------------------------------ -*/ -echo "\n"; - -// the current forum -if ($origin != 'learnpath') { - echo "\t\n\t\t\n"; - echo "\t\n"; -} - -echo "\n"; -echo "\t\n"; - -// The column headers (to do: make this sortable) -echo "\t\n"; -echo "\t\t\n"; -echo "\t\t\n"; -echo "\t\t\n"; -echo "\t\t\n"; -echo "\t\t\n"; -echo "\t\t\n"; -echo "\t\t\n"; -echo "\t\n"; - -// getting al the threads -$threads=get_threads($my_forum); // note: this has to be cleaned first - -$whatsnew_post_info=isset($_SESSION['whatsnew_post_info'])?$_SESSION['whatsnew_post_info']:null; - -$counter=0; -if(is_array($threads)) { - foreach ($threads as $row) { - // thread who have no replies yet and the only post is invisible should not be displayed to students. - if (api_is_allowed_to_edit(false,true) OR !($row['thread_replies']=='0' AND $row['visible']=='0')) { - if($counter%2==0) { - $class="row_odd"; - } else { - $class="row_even"; - } - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - if ($row['user_id']=='0') { - $name=prepare4display($row['thread_poster_name']); - } else { - $name=$row['firstname'].' '.$row['lastname']; - } - echo "\t\t\n"; - if ($row['last_poster_user_id']=='0') { - $name=$row['poster_name']; - } else { - $name=$row['last_poster_firstname'].' '.$row['last_poster_lastname']; - } - - if($origin != 'learnpath') { - echo "\t\t\n"; - } else { - echo "\t\t\n"; - } - - // if the last post is invisible and it is not the teacher who is looking then we have to find the last visible post of the thread - if (($row['visible']=='1' OR api_is_allowed_to_edit(false,true)) && $origin!='learnpath') { - $last_post=$row['thread_date']." ".get_lang('By').' '.display_user_link($row['last_poster_user_id'], $name); - } elseif ($origin!='learnpath') { - $last_post_sql="SELECT post.*, user.firstname, user.lastname FROM $table_posts post, $table_users user WHERE post.poster_id=user.user_id AND visible='1' AND thread_id='".$row['thread_id']."' ORDER BY post_id DESC"; - $last_post_result=api_sql_query($last_post_sql, __FILE__, __LINE__); - $last_post_row=Database::fetch_array($last_post_result); - $name=$last_post_row['firstname'].' '.$last_post_row['lastname']; - $last_post=$last_post_row['post_date']." ".get_lang('By').' '.display_user_link($last_post_row['poster_id'], $name); - } else { - $last_post_sql="SELECT post.*, user.firstname, user.lastname FROM $table_posts post, $table_users user WHERE post.poster_id=user.user_id AND visible='1' AND thread_id='".$row['thread_id']."' ORDER BY post_id DESC"; - $last_post_result=api_sql_query($last_post_sql, __FILE__, __LINE__); - $last_post_row=Database::fetch_array($last_post_result); - $name=$last_post_row['firstname'].' '.$last_post_row['lastname']; - $last_post=$last_post_row['post_date']." ".get_lang('By').' '.$name; - } - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - } - $counter++; - - - } -} -echo "
"; - echo ''.prepare4display($current_forum['forum_title']).''; - - if (!empty ($current_forum['forum_comment'])) { - echo '
'.prepare4display($current_forum['forum_comment']).''; - } - - if (!empty ($current_forum_category['cat_title'])) { - echo '
'.prepare4display($current_forum_category['cat_title'])."
"; - } - echo "
".get_lang('Title')."".get_lang('Replies')."".get_lang('Views')."".get_lang('Author')."".get_lang('LastPost')."".get_lang('Actions')."
"; - $my_whatsnew_post_info=isset($whatsnew_post_info[$my_forum][$row['thread_id']])?$whatsnew_post_info[$my_forum][$row['thread_id']]:null; - if (is_array($my_whatsnew_post_info) and !empty($my_whatsnew_post_info)) { - echo icon('../img/forumthread.gif'); - } else { - echo icon('../img/forumthread.gif'); - } - - if ($row['thread_sticky']==1) { - echo icon('../img/exclamation.gif'); - } - echo ""; - echo "".prepare4display($row['thread_title'])."".$row['thread_replies']."".$row['thread_views']."".display_user_link($row['user_id'], $row['firstname'].' '.$row['lastname'])."".$row['firstname'].' '.$row['lastname']."".$last_post.""; - // get attach id - $attachment_list=get_attachment($row['post_id']); - $id_attach = !empty($attachment_list)?$attachment_list['id']:''; - - if ($origin != 'learnpath') { - if (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])) { - echo "".icon('../img/edit.gif',get_lang('Edit'))."\n"; - echo "".icon('../img/delete.gif',get_lang('Delete')).""; - display_visible_invisible_icon('thread', $row['thread_id'], $row['visibility'], array("forum"=>$my_forum,'origin'=>$origin,"gidReq"=>$_SESSION['toolgroup'])); - display_lock_unlock_icon('thread',$row['thread_id'], $row['locked'], array("forum"=>$my_forum,'origin'=>$origin,"gidReq"=>$_SESSION['toolgroup'])); - echo "".icon('../img/deplacer_fichier.gif',get_lang('MoveThread')).""; - } - } - $iconnotify = 'send_mail.gif'; - if (is_array(isset($_SESSION['forum_notification']['thread'])?$_SESSION['forum_notification']['thread']:null)) { - if (in_array($row['thread_id'],$_SESSION['forum_notification']['thread'])) { - $iconnotify = 'send_mail_checked.gif'; - } - } - $icon_liststd = 'group.gif'; - echo "".icon('../img/'.$iconnotify,get_lang('NotifyMe')).""; - if (api_is_allowed_to_edit() && $origin != 'learnpath') { - echo ''.icon('../img/'.$icon_liststd,get_lang('StudentList')).''; - } - echo "
"; -echo isset($table_list)?$table_list:''; -/* -============================================================================== - FOOTER -============================================================================== -*/ -if ($origin != 'learnpath') { - Display :: display_footer(); +, Ghent University +* @Copyright Ghent University +* @Copyright Patrick Cool +* +* @package dokeos.forum +*/ + +// name of the language file that needs to be included +$language_file = array ( + 'forum', + 'group' +); + +// including the global dokeos file +require '../inc/global.inc.php'; + +// notice for unauthorized people. +api_protect_course_script(true); + +// the section (tabs) +$this_section=SECTION_COURSES; + +// including additional library scripts +require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'); +include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php'); +$nameTools=get_lang('Forum'); + + +//are we in a lp ? +$origin = ''; +$origin_string=''; +if (isset($_GET['origin'])) { + $origin = Security::remove_XSS($_GET['origin']); + $origin_string = '&origin='.$origin; +} + +/* +----------------------------------------------------------- + Including necessary files +----------------------------------------------------------- +*/ +require 'forumconfig.inc.php'; +require_once 'forumfunction.inc.php'; + +$userid=api_get_user_id(); +$userinf=api_get_user_info($userid); + +/* +============================================================================== + MAIN DISPLAY SECTION +============================================================================== +*/ + + +/* +----------------------------------------------------------- + Retrieving forum and forum categorie information +----------------------------------------------------------- +*/ +// we are getting all the information about the current forum and forum category. +// note pcool: I tried to use only one sql statement (and function) for this +// but the problem is that the visibility of the forum AND forum cateogory are stored in the item_property table + +$my_forum_group=isset($_GET['gidReq'])?$_GET['gidReq']:''; +$my_forum=isset($_GET['forum'])?$_GET['forum']:''; +$val=GroupManager::user_has_access($userid,$my_forum_group,GROUP_TOOL_FORUM); + +if(!empty($my_forum_group)){ + if (api_is_allowed_to_edit(false,true) || $val==true) { + $current_forum=get_forum_information($my_forum); // note: this has to be validated that it is an existing forum. + $current_forum_category=get_forumcategory_information($current_forum['forum_category']); + } +} else { + $result=get_forum_information($my_forum); + if($result['forum_of_group']==0){ + $current_forum=get_forum_information($my_forum); // note: this has to be validated that it is an existing forum. + $current_forum_category=get_forumcategory_information($current_forum['forum_category']); + } +} + + +/* +----------------------------------------------------------- + Header and Breadcrumbs +----------------------------------------------------------- +*/ +$my_search=isset($_GET['search'])?$_GET['search']:''; +$my_action=isset($_GET['action'])?$_GET['action']:''; + +if (isset($_SESSION['gradebook'])){ + $gradebook= $_SESSION['gradebook']; +} + +if (!empty($gradebook) && $gradebook=='view') { + $interbreadcrumb[]= array ( + 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], + 'name' => get_lang('Gradebook') + ); +} + +if (!empty($_GET['gidReq'])) { + $toolgroup = Database::escape_string($_GET['gidReq']); + api_session_register('toolgroup'); +} + +if (!empty($_SESSION['toolgroup'])) { + $_clean['toolgroup']=(int)$_SESSION['toolgroup']; + $group_properties = GroupManager :: get_group_properties($_clean['toolgroup']); + $interbreadcrumb[] = array ("url" => "../group/group.php", "name" => get_lang('Groups')); + $interbreadcrumb[] = array ("url"=>"../group/group_space.php?gidReq=".$_SESSION['toolgroup'], "name"=> get_lang('GroupSpace').' ('.$group_properties['name'].')'); + //$interbreadcrumb[]=array("url" => "index.php?search=".Security::remove_XSS($my_search),"name" => $nameTools); + //$interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&search=".Security::remove_XSS(urlencode($my_search)),"name" => prepare4display($current_forum_category['cat_title'])); + $interbreadcrumb[]=array("url" => "#","name" => prepare4display($current_forum['forum_title'])); + //viewforum.php?forum=".Security::remove_XSS($my_forum)."&origin=".$origin."&gidReq=".$_SESSION['toolgroup']."&search=".Security::remove_XSS(urlencode($my_search)), + +} else { + $interbreadcrumb[]=array("url" => "index.php?gradebook=$gradebook&search=".Security::remove_XSS($my_search),"name" => $nameTools); + $interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&search=".Security::remove_XSS(urlencode($my_search)),"name" => prepare4display($current_forum_category['cat_title'])); + $interbreadcrumb[]=array("url" => "#","name" => prepare4display($current_forum['forum_title'])); + //viewforum.php?forum=".Security::remove_XSS($my_forum)."&origin=".$origin."&search=".Security::remove_XSS(urlencode($my_search)) +} + +if ($origin=='learnpath') { + include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php'); +} else { + // the last element of the breadcrumb navigation is already set in interbreadcrumb, so give empty string + Display :: display_header(''); + //api_display_tool_title($nameTools); +} + +/* +----------------------------------------------------------- + Actions +----------------------------------------------------------- +*/ +$table_link = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); +// Change visibility of a forum or a forum category +if (($my_action=='invisible' OR $my_action=='visible') AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit(false,true)) { + $message=change_visibility($_GET['content'], $_GET['id'],$_GET['action']);// note: this has to be cleaned first +} +// locking and unlocking +if (($my_action=='lock' OR $my_action=='unlock') AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit(false,true)) { + $message=change_lock_status($_GET['content'], $_GET['id'],$my_action);// note: this has to be cleaned first +} +// deleting +if ($my_action=='delete' AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit(false,true)) { + $message=delete_forum_forumcategory_thread($_GET['content'],$_GET['id']); // note: this has to be cleaned first + //delete link + $sql_link='DELETE FROM '.$table_link.' WHERE ref_id='.Security::remove_XSS($_GET['id']).' and type=5 and course_code="'.api_get_course_id().'";'; + api_sql_query($sql_link); +} +// moving +if ($my_action=='move' and isset($_GET['thread']) AND api_is_allowed_to_edit(false,true)) { + $message=move_thread_form(); +} +// notification +if ($my_action == 'notify' AND isset($_GET['content']) AND isset($_GET['id'])) { + $return_message = set_notification($_GET['content'],$_GET['id']); + Display :: display_confirmation_message($return_message,false); +} + +// student list + +if ($my_action == 'liststd' AND isset($_GET['content']) AND isset($_GET['id']) AND api_is_allowed_to_edit()) { + + switch($_GET['list']) { + case "qualify": + $student_list=get_thread_users_qualify($_GET['id']); + $nrorow3 =-2; + break; + case "notqualify": + $student_list=get_thread_users_not_qualify($_GET['id']); + $nrorow3 =-2; + break; + default: + $student_list=get_thread_users_details($_GET['id']); + $nrorow3 = Database::num_rows($student_list); + break; + } + $table_list = '


'.get_lang('ThreadUsersList').' :'.get_name_thread_by_id($_GET['id']).'

'; + if ($nrorow3>0 || $nrorow3==-2) { + $url = 'cidReq='.Security::remove_XSS($_GET['cidReq']).'&forum='.Security::remove_XSS($my_forum).'&action='.Security::remove_XSS($_GET['action']).'&content='.Security::remove_XSS($_GET['content']).'&id='.Security::remove_XSS($_GET['id']); + $table_list.= '
+
+ + + + + + +
'.get_lang('AllStudents').''.get_lang('StudentsQualified').''.get_lang('StudentsNotQualified').'
+
+ '; + + $icon_qualify = 'blog_new.gif'; + $table_list.= '

'; + // The column headers (to do: make this sortable) + $table_list.= ''; + $table_list.= ''; + + if ($_GET['list']=='qualify') { + $table_list.= ''; + } + if (api_is_allowed_to_edit()) { + $table_list.= ''; + } + $table_list.= ''; + $max_qualify=show_qualify('2',$_GET['cidReq'],$my_forum,$userid,$_GET['id']); + $counter_stdlist=0; + + if (Database::num_rows($student_list)>0) { + while ($row_student_list=Database::fetch_array($student_list)) { + if ($counter_stdlist%2==0) { + $class_stdlist="row_odd"; + } else { + $class_stdlist="row_even"; + } + $name_user_theme = $row_student_list['firstname'].' '.$row_student_list['lastname']; + $table_list.= ''; + if ($_GET['list']=='qualify') { + $table_list.= ''; + } + 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.= ''; + } + $counter_stdlist++; + } + } else { + if ($_GET['list']=='qualify'){ + $table_list.=''; + } else { + $table_list.=''; + } + } + + $table_list.= '
'.get_lang('NamesAndLastNames').''.get_lang('Qualification').''.get_lang('Qualify').'
'.$name_user_theme.''.$row_student_list['qualify'].'/'.$max_qualify.''.icon('../img/'.$icon_qualify,get_lang('Qualify')).'
'.get_lang('ThereIsNotQualifiedLearners').'
'.get_lang('ThereIsNotUnqualifiedLearners').'
'; + $table_list .= '
'; + } else { + $table_list .= get_lang('NoParticipation'); + } +} + + +/* +----------------------------------------------------------- + Is the user allowed here? +----------------------------------------------------------- +*/ +// if the user is not a course administrator and the forum is hidden +// then the user is not allowed here. +if (!api_is_allowed_to_edit(false,true) AND ($current_forum_category['visibility']==0 OR $current_forum['visibility']==0)) { + forum_not_allowed_here(); +} + +if ($origin == 'learnpath') { + echo '
 
'; +} + +/* +----------------------------------------------------------- + Display the action messages +----------------------------------------------------------- +*/ +if (!empty($message)) { + Display :: display_confirmation_message($message); +} + + +/* +----------------------------------------------------------- + Action Links +----------------------------------------------------------- +*/ +if ($origin!='learnpath') { + echo '
'; + if (empty($_SESSION['toolgroup'])){ + echo ''.search_link().''; + } + echo ''.Display::return_icon('back.png',get_lang('BackToForumOverview')).' '.get_lang('BackToForumOverview').''; + // The link should appear when + // 1. the course admin is here + // 2. the course member is here and new threads are allowed + // 3. a visitor is here and new threads AND allowed AND anonymous posts are allowed + if (api_is_allowed_to_edit(false,true) OR ($current_forum['allow_new_threads']==1 AND isset($_user['user_id'])) OR ($current_forum['allow_new_threads']==1 AND !isset($_user['user_id']) AND $current_forum['allow_anonymous']==1)) { + if ($current_forum['locked'] <> 1 AND $current_forum['locked'] <> 1) { + echo ''.Display::return_icon('forumthread_new.gif',get_lang('NewTopic')).' '.get_lang('NewTopic').''; + } else { + echo get_lang('ForumLocked'); + } + } + echo '
'; +} + +/* +----------------------------------------------------------- + Display +----------------------------------------------------------- +*/ +echo "\n"; + +// the current forum +if ($origin != 'learnpath') { + echo "\t\n\t\t\n"; + echo "\t\n"; +} + +echo "\n"; +echo "\t\n"; + +// The column headers (to do: make this sortable) +echo "\t\n"; +echo "\t\t\n"; +echo "\t\t\n"; +echo "\t\t\n"; +echo "\t\t\n"; +echo "\t\t\n"; +echo "\t\t\n"; +echo "\t\t\n"; +echo "\t\n"; + +// getting al the threads +$threads=get_threads($my_forum); // note: this has to be cleaned first + +$whatsnew_post_info=isset($_SESSION['whatsnew_post_info'])?$_SESSION['whatsnew_post_info']:null; + +$counter=0; +if(is_array($threads)) { + foreach ($threads as $row) { + // thread who have no replies yet and the only post is invisible should not be displayed to students. + if (api_is_allowed_to_edit(false,true) OR !($row['thread_replies']=='0' AND $row['visible']=='0')) { + if($counter%2==0) { + $class="row_odd"; + } else { + $class="row_even"; + } + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + if ($row['user_id']=='0') { + $name=prepare4display($row['thread_poster_name']); + } else { + $name=$row['firstname'].' '.$row['lastname']; + } + echo "\t\t\n"; + if ($row['last_poster_user_id']=='0') { + $name=$row['poster_name']; + } else { + $name=$row['last_poster_firstname'].' '.$row['last_poster_lastname']; + } + + if($origin != 'learnpath') { + echo "\t\t\n"; + } else { + echo "\t\t\n"; + } + + // if the last post is invisible and it is not the teacher who is looking then we have to find the last visible post of the thread + if (($row['visible']=='1' OR api_is_allowed_to_edit(false,true)) && $origin!='learnpath') { + $last_post=$row['thread_date']." ".get_lang('By').' '.display_user_link($row['last_poster_user_id'], $name); + } elseif ($origin!='learnpath') { + $last_post_sql="SELECT post.*, user.firstname, user.lastname FROM $table_posts post, $table_users user WHERE post.poster_id=user.user_id AND visible='1' AND thread_id='".$row['thread_id']."' ORDER BY post_id DESC"; + $last_post_result=api_sql_query($last_post_sql, __FILE__, __LINE__); + $last_post_row=Database::fetch_array($last_post_result); + $name=$last_post_row['firstname'].' '.$last_post_row['lastname']; + $last_post=$last_post_row['post_date']." ".get_lang('By').' '.display_user_link($last_post_row['poster_id'], $name); + } else { + $last_post_sql="SELECT post.*, user.firstname, user.lastname FROM $table_posts post, $table_users user WHERE post.poster_id=user.user_id AND visible='1' AND thread_id='".$row['thread_id']."' ORDER BY post_id DESC"; + $last_post_result=api_sql_query($last_post_sql, __FILE__, __LINE__); + $last_post_row=Database::fetch_array($last_post_result); + $name=$last_post_row['firstname'].' '.$last_post_row['lastname']; + $last_post=$last_post_row['post_date']." ".get_lang('By').' '.$name; + } + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + } + $counter++; + + + } +} +echo "
"; + echo ''.prepare4display($current_forum['forum_title']).''; + + if (!empty ($current_forum['forum_comment'])) { + echo '
'.prepare4display($current_forum['forum_comment']).''; + } + + if (!empty ($current_forum_category['cat_title'])) { + echo '
'.prepare4display($current_forum_category['cat_title'])."
"; + } + echo "
".get_lang('Title')."".get_lang('Replies')."".get_lang('Views')."".get_lang('Author')."".get_lang('LastPost')."".get_lang('Actions')."
"; + $my_whatsnew_post_info=isset($whatsnew_post_info[$my_forum][$row['thread_id']])?$whatsnew_post_info[$my_forum][$row['thread_id']]:null; + if (is_array($my_whatsnew_post_info) and !empty($my_whatsnew_post_info)) { + echo icon('../img/forumthread.gif'); + } else { + echo icon('../img/forumthread.gif'); + } + + if ($row['thread_sticky']==1) { + echo icon('../img/exclamation.gif'); + } + echo ""; + echo "".prepare4display($row['thread_title'])."".$row['thread_replies']."".$row['thread_views']."".display_user_link($row['user_id'], $row['firstname'].' '.$row['lastname'])."".$row['firstname'].' '.$row['lastname']."".$last_post.""; + // get attach id + $attachment_list=get_attachment($row['post_id']); + $id_attach = !empty($attachment_list)?$attachment_list['id']:''; + + if ($origin != 'learnpath') { + if (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])) { + echo "".icon('../img/edit.gif',get_lang('Edit'))."\n"; + echo "".icon('../img/delete.gif',get_lang('Delete')).""; + display_visible_invisible_icon('thread', $row['thread_id'], $row['visibility'], array("forum"=>$my_forum,'origin'=>$origin,"gidReq"=>$_SESSION['toolgroup'])); + display_lock_unlock_icon('thread',$row['thread_id'], $row['locked'], array("forum"=>$my_forum,'origin'=>$origin,"gidReq"=>$_SESSION['toolgroup'])); + echo "".icon('../img/deplacer_fichier.gif',get_lang('MoveThread')).""; + } + } + $iconnotify = 'send_mail.gif'; + if (is_array(isset($_SESSION['forum_notification']['thread'])?$_SESSION['forum_notification']['thread']:null)) { + if (in_array($row['thread_id'],$_SESSION['forum_notification']['thread'])) { + $iconnotify = 'send_mail_checked.gif'; + } + } + $icon_liststd = 'group.gif'; + echo "".icon('../img/'.$iconnotify,get_lang('NotifyMe')).""; + if (api_is_allowed_to_edit() && $origin != 'learnpath') { + echo ''.icon('../img/'.$icon_liststd,get_lang('StudentList')).''; + } + echo "
"; +echo isset($table_list)?$table_list:''; +/* +============================================================================== + FOOTER +============================================================================== +*/ +if ($origin != 'learnpath') { + Display :: display_footer(); } \ No newline at end of file diff --git a/main/forum/viewforumcategory.php b/main/forum/viewforumcategory.php index 60b0c8c541..bd546b8f61 100644 --- a/main/forum/viewforumcategory.php +++ b/main/forum/viewforumcategory.php @@ -176,7 +176,7 @@ if (!api_is_allowed_to_edit(false,true) AND $current_forum_category['visibility' */ echo '
'; echo ''.search_link().''; -echo ''.Display::return_icon('back.png').' '.get_lang('BackToForumOverview').''; +echo ''.Display::return_icon('back.png',get_lang('BackToForumOverview')).' '.get_lang('BackToForumOverview').''; if (api_is_allowed_to_edit(false,true)) { //echo ''.get_lang('AddForumCategory').' | '; echo ' '.Display::return_icon('forum_new.gif', get_lang('AddForum')).' '.get_lang('AddForum').''; diff --git a/main/forum/viewthread.php b/main/forum/viewthread.php index ddddf956c0..6d19c5e648 100644 --- a/main/forum/viewthread.php +++ b/main/forum/viewthread.php @@ -122,12 +122,12 @@ if (!empty($_SESSION['toolgroup'])) { Display :: display_header(''); api_display_tool_title($nameTools); -} else { +} else { $my_search=isset($_GET['search']) ? $_GET['search'] : ''; - if ($origin=='learnpath') { + if ($origin=='learnpath') { include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php'); } else { @@ -192,8 +192,8 @@ if ($my_message<>'PostDeletedSpecial') { echo '
'; echo ''.search_link().''; if ($origin != 'learnpath') { - echo ''.Display::return_icon('back.png').' '.get_lang('BackToForumOverview').''; - echo ''.Display::return_icon('forum.gif').' '.get_lang('BackToForum').''; + echo ''.Display::return_icon('back.png',get_lang('BackToForumOverview')).' '.get_lang('BackToForumOverview').''; + echo ''.Display::return_icon('forum.gif',get_lang('BackToForum')).' '.get_lang('BackToForum').''; } // the reply to thread link should only appear when the forum_category is not locked AND the forum is not locked AND the thread is not locked. // if one of the three levels is locked then the link should not be displayed @@ -201,18 +201,18 @@ if ($my_message<>'PostDeletedSpecial') { // The link should only appear when the user is logged in or when anonymous posts are allowed. if ($_user['user_id'] OR ($current_forum['allow_anonymous']==1 AND !$_user['user_id'])) { //reply link - echo ''.Display::return_icon('forumthread_new.gif').get_lang('ReplyToThread').''; + echo ''.Display::return_icon('forumthread_new.gif',get_lang('ReplyToThread')).get_lang('ReplyToThread').''; //new thread link if ((api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])) OR ($current_forum['allow_new_threads']==1 AND isset($_user['user_id'])) OR ($current_forum['allow_new_threads']==1 AND !isset($_user['user_id']) AND $current_forum['allow_anonymous']==1)) { if ($current_forum['locked'] <> 1 AND $current_forum['locked'] <> 1) { - echo '  '; + echo '  '; /* if ( isset($_GET['gradebook']) && $_GET['gradebook']!=""){ $info_thread=get_thread_information($_GET['thread']); echo ''.Display::return_icon('forumthread_new.gif', get_lang('NewTopic')).' '.get_lang('NewTopic').''; } else { echo ''.Display::return_icon('forumthread_new.gif', get_lang('NewTopic')).' '.get_lang('NewTopic').''; - } */ + } */ } else { echo get_lang('ForumLocked'); } @@ -222,10 +222,10 @@ if ($my_message<>'PostDeletedSpecial') { // the different views of the thread if ($origin != 'learnpath') { - $my_url = ''.Display::return_icon('forum_listview.gif').get_lang('FlatView').''; - echo $my_url.'&view=threaded&origin='.$origin.'"&gradebook='.$gradebook.'">'.Display::return_icon('forum_threadedview.gif').get_lang('ThreadedView').''; - echo $my_url.'&view=nested&origin='.$origin.'"&gradebook='.$gradebook.'">'.Display::return_icon('forum_nestedview.gif').get_lang('NestedView').''; + $my_url = ''.Display::return_icon('forum_listview.gif',get_lang('FlatView')).get_lang('FlatView').''; + echo $my_url.'&view=threaded&origin='.$origin.'&gradebook='.$gradebook.'">'.Display::return_icon('forum_threadedview.gif',get_lang('ThreadedView')).get_lang('ThreadedView').''; + echo $my_url.'&view=nested&origin='.$origin.'&gradebook='.$gradebook.'">'.Display::return_icon('forum_nestedview.gif',get_lang('NestedView')).get_lang('NestedView').''; } $my_url = null; @@ -299,5 +299,5 @@ if ($my_message<>'PostDeletedSpecial') { ============================================================================== */ if ($origin!='learnpath') { - Display :: display_footer(); + Display :: display_footer(); } \ No newline at end of file