| ";
-echo ''.prepare4display($current_forum_category['cat_title']).' '; -echo ''.prepare4display($current_forum_category['cat_comment']).''; -echo " | \n";
-echo "\t
| "; +// the forum category +echo "\t |
| ";
echo ''.prepare4display($current_forum['forum_title']).' '; -echo ''.prepare4display($current_forum['forum_comment']).''; -echo "\n"; +echo ''.prepare4display($current_forum['forum_comment']).'';echo " | \n";
+echo "\n";
echo "\t
|---|
';
+ $return_value='';
}
+ else
+ {
+ $return_value='
';
+ }
+
if ($position<$total_items)
{
- $return_value.='
';
+ $return_value.='';
+ }
+ else
+ {
+
+ $return_value.='
';
}
echo $return_value;
@@ -1975,15 +1985,10 @@ function display_user_image($user_id,$name)
if ($user_id<>0)
{
- $image_path = UserManager::get_user_picture_path_by_id($user_id,'web');
+ $image_path = UserManager::get_user_picture_path_by_id($user_id,'web',false, true);
$image_repository = $image_path['dir'];
$existing_image = $image_path['file'];
- if (is_array($image_path) && $existing_image!='') {
- return $link.'| ";
- echo ''.prepare4display($forum_category['cat_title']).' '; - if ($forum_category['cat_comment']<>'' AND trim($forum_category['cat_comment'])<>' ') - { - echo ''.prepare4display($forum_category['cat_comment']).''; - } - echo " | \n";
- if (api_is_allowed_to_edit())
+ foreach ($all_groups as $group)
{
- echo "\t\t"; - echo "".icon('../img/edit.gif',get_lang('Edit')).""; - echo "".icon('../img/delete.gif',get_lang('Delete')).""; - display_visible_invisible_icon('forumcategory', prepare4display($forum_category['cat_id']), prepare4display($forum_category['visibility'])); - display_lock_unlock_icon('forumcategory',prepare4display($forum_category['cat_id']), prepare4display($forum_category['locked'])); - display_up_down_icon('forumcategory',prepare4display($forum_category['cat_id']), $forum_categories_list); - echo " | \n"; + $all_groups[$group['id']]=$group; } - echo "\t|||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| ".get_lang('Forum')." | \n"; - echo "\t\t".get_lang('Topics')." | \n"; - echo "\t\t".get_lang('Posts')." | \n"; - echo "\t\t".get_lang('LastPosts')." | \n"; - if (api_is_allowed_to_edit()) + /* + ------------------------------------------------------------------------------------------------------ + ACTION LINKS + ------------------------------------------------------------------------------------------------------ + */ + //if (api_is_allowed_to_edit() and !$_GET['action']) + echo ' '.Display::return_icon('search.gif').' '.get_lang('Search').''; + if (api_is_allowed_to_edit()) + { + echo ' '.Display::return_icon('forum_category_new.gif').' '.get_lang('AddForumCategory').' '; + if (is_array($forum_categories_list)) { - echo "\t\t".get_lang('Actions')." | \n"; + echo ' '.Display::return_icon('forum_new.gif').' '.get_lang('AddForum').''; } - echo "\t||||||
| ";
+ echo ''.prepare4display($forum_category['cat_title']).' '; + + if ($forum_category['cat_comment']<>'' AND trim($forum_category['cat_comment'])<>' ') + { + echo ''.prepare4display($forum_category['cat_comment']).''; + } + echo " | \n";
+
+ if (api_is_allowed_to_edit())
{
- foreach ($whatsnew_post_info[$forum['forum_id']] as $key_thread_id => $new_post_array)
- {
- if (empty($whatsnew_post_info[$forum['forum_id']][$key_thread_id]))
- {
- unset($whatsnew_post_info[$forum['forum_id']][$key_thread_id]);
- unset($_SESSION['whatsnew_post_info'][$forum['forum_id']][$key_thread_id]);
- }
- }
+ echo ''; + echo "".icon('../img/edit.gif',get_lang('Edit')).""; + echo "".icon('../img/delete.gif',get_lang('Delete')).""; + display_visible_invisible_icon('forumcategory', prepare4display($forum_category['cat_id']), prepare4display($forum_category['visibility'])); + display_lock_unlock_icon('forumcategory',prepare4display($forum_category['cat_id']), prepare4display($forum_category['locked'])); + display_up_down_icon('forumcategory',prepare4display($forum_category['cat_id']), $forum_categories_list); + echo ' | '; } - // note: this can be speeded up if we transform the $forum_list to an array that uses the forum_category as the key. - if (prepare4display($forum['forum_category'])==prepare4display($forum_category['cat_id'])) + echo "\t|||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| ".get_lang('Forum')." | \n"; + echo "\t\t".get_lang('Topics')." | \n"; + echo "\t\t".get_lang('Posts')." | \n"; + echo "\t\t".get_lang('LastPosts')." | \n"; + if (api_is_allowed_to_edit()) { - // the forum has to be showed if - // 1.v it is a not a group forum (teacher and student) - // 2.v it is a group forum and it is public (teacher and student) - // 3. it is a group forum and it is private (always for teachers only if the user is member of the forum - // if the forum is private and it is a group forum and the user is not a member of the group forum then it cannot be displayed - //if (!($forum['forum_group_public_private']=='private' AND !is_null($forum['forum_of_group']) AND !in_array($forum['forum_of_group'], $groups_of_user))) - //{ - $show_forum=false; - - // SHOULD WE SHOW THIS PARTICULAR FORUM - // you are teacher => show forum - - if (api_is_allowed_to_edit()) + echo "\t\t".get_lang('Actions')." | \n"; + } + echo "\t||||||
| ";
- if ($forum['forum_of_group']!=='0')
+
+
+ //echo ' '; + + if ($show_forum) { - if (is_array($whatsnew_post_info[$forum['forum_id']]) and !empty($whatsnew_post_info[$forum['forum_id']])) + $form_count++; + echo "\t | ||||||||||
| "; + if ($forum['forum_of_group']!=='0') { - echo icon('../img/forumgroupnew.gif'); + if (is_array($whatsnew_post_info[$forum['forum_id']]) and !empty($whatsnew_post_info[$forum['forum_id']])) + { + echo icon('../img/forumgroupnew.gif'); + } + else + { + echo icon('../img/forumgroup.gif'); + } } else { - echo icon('../img/forumgroup.gif'); + if (is_array($whatsnew_post_info[$forum['forum_id']]) and !empty($whatsnew_post_info[$forum['forum_id']])) + { + echo icon('../img/forum.gif'); + } + else + { + echo icon('../img/forum.gif'); + } + } - } - else - { - if (is_array($whatsnew_post_info[$forum['forum_id']]) and !empty($whatsnew_post_info[$forum['forum_id']])) + echo " | \n"; + if ($forum['forum_of_group']<>'0') { - echo icon('../img/forum.gif'); + $group_title=substr($all_groups[$forum['forum_of_group']]['name'],0,30); + $forum_title_group_addition=' ('.$group_title.')'; } else { - echo icon('../img/forum.gif'); + $forum_title_group_addition=''; + } + + echo "\t\t".prepare4display($forum['forum_title']).''.$forum_title_group_addition.' '.prepare4display($forum['forum_comment'])." | \n";
+ //$number_forum_topics_and_posts=get_post_topics_of_forum($forum['forum_id']); // deprecated
+ // the number of topics and posts
+ echo "\t\t".$forum['number_of_threads']." | \n"; + echo "\t\t".$forum['number_of_posts']." | \n"; + // the last post in the forum + if ($forum['last_poster_name']<>'') + { + $name=$forum['last_poster_name']; + $poster_id=0; + } + else + { + $name=$forum['last_poster_firstname'].' '.$forum['last_poster_lastname']; + $poster_id=$forum['last_poster_id']; + } + echo "\t\t";
+
+ if (!empty($forum['last_post_id']))
+ {
+ echo $forum['last_post_date']." ".get_lang('By').' '.display_user_link($poster_id, $name); } - - } - echo " | \n";
- if ($forum['forum_of_group']<>'0')
- {
- $group_title=substr($all_groups[$forum['forum_of_group']]['name'],0,30);
- $forum_title_group_addition=' ('.$group_title.')';
- }
- else
- {
- $forum_title_group_addition='';
- }
-
- echo "\t\t".prepare4display($forum['forum_title']).''.$forum_title_group_addition.' '.prepare4display($forum['forum_comment'])." | \n";
- //$number_forum_topics_and_posts=get_post_topics_of_forum($forum['forum_id']); // deprecated
- // the number of topics and posts
- echo "\t\t".$forum['number_of_threads']." | \n"; - echo "\t\t".$forum['number_of_posts']." | \n"; - // the last post in the forum - if ($forum['last_poster_name']<>'') - { - $name=$forum['last_poster_name']; - $poster_id=0; - } - else - { - $name=$forum['last_poster_firstname'].' '.$forum['last_poster_lastname']; - $poster_id=$forum['last_poster_id']; - } - echo "\t\t";
- if (!empty($forum['last_post_id']))
- {
- echo $forum['last_post_date']." ".get_lang('By').' '.display_user_link($poster_id, $name); - } - echo " | \n";
-
-
- if (api_is_allowed_to_edit())
- {
- echo "\t\t"; - echo "".icon('../img/edit.gif',get_lang('Edit')).""; - echo "".icon('../img/delete.gif',get_lang('Delete')).""; - display_visible_invisible_icon('forum',$forum['forum_id'], $forum['visibility']); - display_lock_unlock_icon('forum',$forum['forum_id'], $forum['locked']); - display_up_down_icon('forum',$forum['forum_id'], $forums_in_category); echo " | \n"; + + + if (api_is_allowed_to_edit()) + { + echo "\t\t"; + echo "".icon('../img/edit.gif',get_lang('Edit')).""; + echo "".icon('../img/delete.gif',get_lang('Delete')).""; + display_visible_invisible_icon('forum',$forum['forum_id'], $forum['visibility']); + display_lock_unlock_icon('forum',$forum['forum_id'], $forum['locked']); + display_up_down_icon('forum',$forum['forum_id'], $forums_in_category); + echo " | \n"; + } + echo "\t
| ".get_lang('NoForumInThisCategory')." | ".(api_is_allowed_to_edit()?'':' | ')." | ||||||||
| ".get_lang('NoForumInThisCategory')." | ".(api_is_allowed_to_edit()?'':' | ')." | ||||||||
| ";
- echo ''.$current_forum_category['cat_title'].' '; - echo ''.$current_forum_category['cat_comment'].''; + + 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 " | \n";
echo "\t
|---|
| ".$current_forum['forum_title']." "; -echo ''.$current_forum['forum_comment'].''; -echo " | \n";
-echo "\t
| ";
-echo ''.$current_forum_category['cat_title'].' '; -echo ''.$current_forum_category['cat_comment'].''; -echo " | \n";
-echo "\t
|---|
| ";
-echo ''.$current_forum['forum_title'].' '; -echo ''.$current_forum['forum_comment'].''; -echo " | \n";
-echo "\t
| ";
- echo ''.prepare4display($current_forum_category['cat_title']).' '; - echo ''.prepare4display($current_forum_category['cat_comment']).''; + echo "\t | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ";
+ 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 " | \n";
echo "\t||||||||||||
| ".prepare4display($current_forum['forum_title'])." "; -echo ''.prepare4display($current_forum['forum_comment']).''; echo "\n"; echo "\t | ||||||||||||
| \n"; echo "\t\t | ".get_lang('Title')." | \n"; echo "\t\t".get_lang('Replies')." | \n"; -echo "\t\t".get_lang('Author')." | \n"; echo "\t\t".get_lang('Views')." | \n"; +echo "\t\t".get_lang('Author')." | \n"; echo "\t\t".get_lang('LastPost')." | \n"; if (api_is_allowed_to_edit()) { @@ -271,24 +277,27 @@ if(is_array($threads)) else { $name=$row['firstname'].' '.$row['lastname']; - } - if($origin != 'learnpath') + } + echo "\t\t".$row['thread_views']." | \n"; + + if ($row['last_poster_user_id']=='0') { - echo "\t\t".display_user_link($row['user_id'], $name)." | \n"; + $name=$row['poster_name']; } else { - echo "\t\t".$name." | \n"; + $name=$row['last_poster_firstname'].' '.$row['last_poster_lastname']; } - echo "\t\t".$row['thread_views']." | \n"; - if ($row['last_poster_user_id']=='0') + + if($origin != 'learnpath') { - $name=$row['poster_name']; + echo "\t\t".display_user_link($row['user_id'], $name)." | \n"; } else { - $name=$row['last_poster_firstname'].' '.$row['last_poster_lastname']; + echo "\t\t".$name." | \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()) && $origin!='learnpath') { @@ -323,6 +332,8 @@ if(is_array($threads)) echo "\t
| ";
-echo ''.prepare4display($forum_category['cat_title']).' '; -echo ''.prepare4display($forum_category['cat_comment']).''; -echo " | \n";
-if (api_is_allowed_to_edit())
-{
- echo "\t\t";
- echo "".icon('../img/edit.gif',get_lang('Edit'))."";
- echo "".icon('../img/delete.gif',get_lang('Delete'))."";
- display_visible_invisible_icon('forumcategory', $forum_category['cat_id'], $forum_category['visibility'], array("forumcategory"=>$_GET['forumcategory']));
- display_lock_unlock_icon('forumcategory',$forum_category['cat_id'], $forum_category['locked'], array("forumcategory"=>$_GET['forumcategory']));
- display_up_down_icon('forumcategory',$forum_category['cat_id'], $forum_categories_list);
+ -----------------------------------------------------------
+ Display Forum Categories and the Forums in it
+ -----------------------------------------------------------
+ */
+ echo "
'; - + switch ($viewmode) { case 'flat': @@ -286,6 +293,7 @@ if ($message<>'PostDeletedSpecial') // in this case the first and only post of t } } // if ($message<>'PostDeletedSpecial') // in this case the first and only post of the thread is removed + /* diff --git a/main/forum/viewthread_flat.inc.php b/main/forum/viewthread_flat.inc.php index 0244ffc4b4..b310e92aaf 100644 --- a/main/forum/viewthread_flat.inc.php +++ b/main/forum/viewthread_flat.inc.php @@ -109,7 +109,7 @@ foreach ($rows as $row) echo "".icon('../img/delete.gif',get_lang('Delete'))."\n"; display_visible_invisible_icon('post', $row['post_id'], $row['visible'],array('forum'=>Security::remove_XSS($_GET['forum']),'thread'=>Security::remove_XSS($_GET['thread']), 'origin'=>$origin )); echo "\n"; - echo "".icon('../img/deplacer_fichier.gif',get_lang('Edit')).""; + echo "".icon('../img/deplacer_fichier.gif',get_lang('MovePost')).""; } echo ' '; //if (($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0) OR api_is_allowed_to_edit()) diff --git a/main/forum/viewthread_nested.inc.php b/main/forum/viewthread_nested.inc.php index 63ec9ef608..60ebae181b 100644 --- a/main/forum/viewthread_nested.inc.php +++ b/main/forum/viewthread_nested.inc.php @@ -89,7 +89,7 @@ foreach ($rows as $post) { $name=$post['firstname'].' '.$post['lastname']; } - if (api_get_course_setting('allow_user_image_forum')) {echo ' '.display_user_image($post['user_id']).' '; } + if (api_get_course_setting('allow_user_image_forum')) {echo ' '.display_user_image($post['user_id'],$name,false,true).' '; } echo display_user_link($post['user_id'], $name).' '; echo $post['post_date'].' '; // The user who posted it can edit his thread only if the course admin allowed this in the properties of the forum @@ -103,7 +103,7 @@ foreach ($rows as $post) echo "".icon('../img/delete.gif',get_lang('Delete'))."\n"; display_visible_invisible_icon('post', $post['post_id'], $post['visible'],array('forum'=>Security::remove_XSS($_GET['forum']),'thread'=>Security::remove_XSS($_GET['thread']) )); echo "\n"; - echo "".icon('../img/deplacer_fichier.gif',get_lang('Edit')).""; + echo "".icon('../img/deplacer_fichier.gif',get_lang('MovePost')).""; } echo ' '; //if (($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0) OR api_is_allowed_to_edit()) diff --git a/main/forum/viewthread_threaded.inc.php b/main/forum/viewthread_threaded.inc.php index 22ba01cf32..867dc43483 100644 --- a/main/forum/viewthread_threaded.inc.php +++ b/main/forum/viewthread_threaded.inc.php @@ -3,7 +3,7 @@ ============================================================================== Dokeos - elearning and course management software - Copyright (c) 2006 Dokeos S.A. + Copyright (c) 2006-2008 Dokeos S.A. Copyright (c) 2006 Ghent University (UGent) For a full list of contributors, see "credits.txt". @@ -68,6 +68,123 @@ else $display_post_id=$current['post_id']; } +// -------------------------------------- +// Displaying the thread (structure) +// -------------------------------------- +$thread_structure=" ".get_lang('Structure')." ";
+$counter=0;
+$prev_next_array=array();
+foreach ($rows as $post)
+{
+ $counter++;
+ $indent=$post['indent_cnt']*'20';
+ $thread_structure.= "";
+
+ 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']]))
+ {
+ $post_image=icon('../img/forumpostnew.gif');
+ }
+ else
+ {
+ $post_image=icon('../img/forumpost.gif');
+ }
+ $thread_structure.= $post_image;
+ if ($_GET['post']==$post['post_id'] OR ($counter==1 AND !isset($_GET['post'])))
+ {
+ $thread_structure.=''.prepare4display($post['post_title']).' ';
+ $prev_next_array[]=$post['post_id'];
+ }
+ else
+ {
+ if ($post['visible']=='0')
+ {
+ $class=' class="invisible"';
+ }
+ else
+ {
+ $class='';
+ }
+ $thread_structure.= "".prepare4display($post['post_title'])."\n";
+ $prev_next_array[]=$post['post_id'];
+ }
+}
+
+/*--------------------------------------------------
+ NAVIGATION CONTROLS
+----------------------------------------------------
+*/
+
+$current_id=array_search($display_post_id,$prev_next_array);
+$max=count($prev_next_array);
+$next_id=$current_id+1;
+$prev_id=$current_id-1;
+
+$firs_message=get_lang('FirstMessage');
+$prev_message=get_lang('PrevMessage');
+
+$next_message=get_lang('NextMessage');
+$prev_message=get_lang('PrevMessage');
+
+$prev_img = '.'img/prev.png) ';
+$next_img = '.'img/next.png) ';
+
+$first_page_text = '.'img/first.png) ';
+$last_page_text = '.'img/last.png) ';
+
+$href_prev='"viewthread.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&thread='.Security::remove_XSS($_GET['thread']).'&post='.$prev_next_array[$prev_id].'"';
+$href_next='"viewthread.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&thread='.Security::remove_XSS($_GET['thread']).'&post='.$prev_next_array[$next_id].'"';
+
+// the last message
+if ($next_id>=$max)
+{
+ $next_id=0;
+ $class_next=' class="invisible"';
+ $href_next=1;
+}
+
+// the first message
+if ($next_id==1) {
+ $class_prev=' class="invisible"';
+ $href_prev=1;
+}
+
+echo ''.display_user_image($rows[$display_post_id]['user_id']).' '; } +if (api_get_course_setting('allow_user_image_forum')) {echo ' '.display_user_image($rows[$display_post_id]['user_id'],$name,false,true).' '; } echo display_user_link($rows[$display_post_id]['user_id'], $name).' '; echo $rows[$display_post_id]['post_date'].' '; // The user who posted it can edit his thread only if the course admin allowed this in the properties of the forum @@ -114,7 +231,7 @@ if (api_is_allowed_to_edit()) echo "".icon('../img/delete.gif',get_lang('Delete'))."\n"; display_visible_invisible_icon('post', $rows[$display_post_id]['post_id'], $rows[$display_post_id]['visible'],array('forum'=>Security::remove_XSS($_GET['forum']),'thread'=>Security::remove_XSS($_GET['thread']), 'post'=>Security::remove_XSS($_GET['post']) )); echo "\n"; - echo "".icon('../img/deplacer_fichier.gif',get_lang('Edit'))."\n"; + echo "".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."\n"; } echo ' '; //if (($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0) OR api_is_allowed_to_edit()) @@ -164,23 +281,6 @@ echo "\t | ||||||
|---|---|---|---|---|---|---|---|
| ";
-if (check_added_resources("forum_post", $rows[$display_post_id]["post_id"]))
-{
-
- echo "".get_lang("AddedResources")." "; - if ($rows[$display_post_id]['visible']=='0') - { - $addedresource_style="invisible"; - } - display_added_resources("forum_post", $rows[$display_post_id]["post_id"], $addedresource_style); -} -echo " |
".get_lang('Structure')."
";
-$counter=0;
-foreach ($rows as $post)
-{
- $counter++;
- $indent=$post['indent_cnt']*'20';
- echo "";
- 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']]))
- {
- $post_image=icon('../img/forumpostnew.gif');
- }
- else
- {
- $post_image=icon('../img/forumpost.gif');
- }
- echo $post_image;
- if ($_GET['post']==$post['post_id'] OR ($counter==1 AND !isset($_GET['post'])))
- {
- echo ''.prepare4display($post['post_title']).'
';
- }
- else
- {
- if ($post['visible']=='0')
- {
- $class=' class="invisible"';
- }
- else
- {
- $class='';
- }
- echo "".prepare4display($post['post_title'])."\n";
- }
-}
-
+echo $thread_structure;
/**
@@ -263,5 +330,4 @@ function _phorum_recursive_sort($rows, &$threads, $seed=0, $indent=0)
}
}
}
-
?>
\ No newline at end of file