[svn r14633] Improvements of user usability in Forum tool (see FS#2335, FS#2323,FS#2365 )

skala
Julio Montoya 18 years ago
parent 432856afe2
commit b5c58ae99a
  1. 26
      main/css/academica/default.css
  2. 24
      main/css/baby/default.css
  3. 23
      main/css/corporativa/default.css
  4. 20
      main/css/default/default.css
  5. 17
      main/css/default_with_tabs/default.css
  6. 21
      main/css/dokeosgrey/default.css
  7. 27
      main/forum/editpost.php
  8. 23
      main/forum/forumfunction.inc.php
  9. 468
      main/forum/index.php
  10. 32
      main/forum/newthread.php
  11. 22
      main/forum/reply.php
  12. 47
      main/forum/viewforum.php
  13. 57
      main/forum/viewforumcategory.php
  14. 56
      main/forum/viewthread.php
  15. 2
      main/forum/viewthread_flat.inc.php
  16. 4
      main/forum/viewthread_nested.inc.php
  17. 176
      main/forum/viewthread_threaded.inc.php

@ -1272,6 +1272,32 @@ a.specialLink:hover,a.specialLink:focus {
background-color: #EFEFEF;
}
.forum_description {
color: #000;
font-weight: normal;
font-family:Arial,sans,sans-serif;
}
.forum_title{
color: #fff;
font-size: 14px;
font-family:Arial,sans,sans-serif;
}
.forum_low_description{
color: #fff;
font-style: italic ;
font-weight: normal;
font-size: 11px;
font-family:Arial,sans,sans-serif;
}
/*
==============================================================================
DISPLAY MESSAGES

@ -1214,6 +1214,30 @@ th span {
vertical-align: top;
}
.forum_description {
color: #000;
font-weight: normal;
font-family:Arial,sans,sans-serif;
}
.forum_title{
color: #317100;
font-size: 14px;
font-family:Arial,sans,sans-serif;
}
.forum_low_description{
color: #000;
font-style: italic ;
font-weight: normal;
font-size: 11px;
font-family:Arial,sans,sans-serif;
}
/*
==============================================================================
DISPLAY MESSAGES

@ -1178,6 +1178,29 @@ a.specialLink:hover,a.specialLink:focus {
background-color: #EFEFEF;
}
.forum_description {
color: #000;
font-weight: normal;
font-family:Arial,sans,sans-serif;
}
.forum_title{
color: #000;
font-size: 14px;
font-family:Arial,sans,sans-serif;
}
.forum_low_description{
color: #737780;
font-style: italic ;
font-weight: normal;
font-family:Arial,sans,sans-serif;
}
/*
==============================================================================
DISPLAY MESSAGES

@ -1598,6 +1598,26 @@ a.forum_group_link {
font-weight: lighter;
}
.forum_description {
color: #000;
font-weight: normal;
font-family:Arial,sans,sans-serif;
}
.forum_title{
color: #000;
font-size: 14px;
font-family:Arial,sans,sans-serif;
}
.forum_low_description{
color: #737780;
font-style: italic ;
font-weight: normal;
font-family:Arial,sans,sans-serif;
}
/*
------------------------------------------------------------------------------
BLOG

@ -1090,6 +1090,23 @@ a.forum_group_link {
display:inline;
}
.forum_description {
color: #000;
font-weight: normal;
}
.forum_title{
color: #000;
font-size: 14px;
}
.forum_low_description{
color: #737780;
font-style: italic ;
font-weight: normal;
}
/* **** BLOG **** */
span.blog_title {
font-size: 20px;

@ -1018,6 +1018,27 @@ a.forum_group_link {
display:inline;
}
.forum_description {
color: #000;
font-weight: normal;
font-family:Arial,sans,sans-serif;
}
.forum_title{
color: #000;
font-size: 14px;
font-family:Arial,sans,sans-serif;
}
.forum_low_description{
color: #737780;
font-style: italic ;
font-weight: normal;
font-family:Arial,sans,sans-serif;
}
/* **** BLOG **** */
span.blog_title {
font-size: 20px;

@ -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".
@ -142,7 +142,7 @@ if (isset($_POST['add_resources']) AND $_POST['add_resources']==get_lang('Resour
Header
-----------------------------------------------------------
*/
Display :: display_header();
Display :: display_header(null);
api_display_tool_title($nameTools);
////echo '<link href="forumstyles.css" rel="stylesheet" type="text/css" />';
/*
@ -181,23 +181,15 @@ if (!api_is_allowed_to_edit() AND $current_forum['allow_edit']==0)
Display Forum Category and the Forum information
-----------------------------------------------------------
*/
echo "<table width='100%'>\n";
echo "<table class=\"data_table\" width='100%'>\n";
// the forum category
echo "\t<tr class=\"forum_category_header\">\n\t\t<td colspan=\"2\">";
echo '<a href="index.php" '.class_visible_invisible($current_forum_category['visibility']).'>'.prepare4display($current_forum_category['cat_title']).'</a><br />';
echo '<span>'.prepare4display($current_forum_category['cat_comment']).'</span>';
echo "</td>\n";
echo "\t</tr>\n";
// the forum
echo "\t<tr class=\"forum_header\">\n";
echo "\t\t<td colspan=\"2\">";
// the forum category
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"2\">";
echo '<a href="viewforum.php?forum='.$current_forum['forum_id'].'" '.class_visible_invisible($current_forum['visibility']).'>'.prepare4display($current_forum['forum_title']).'</a><br />';
echo '<span>'.prepare4display($current_forum['forum_comment']).'</span>';
echo "</td>\n";
echo '<span class="forum_description">'.prepare4display($current_forum['forum_comment']).'</span>';echo "</th>\n";
echo "</th>\n";
echo "\t</tr>\n";
echo '</table>';
// the form for the reply
@ -214,7 +206,4 @@ if (!empty($values) and $_POST['SubmitPost'])
*/
Display :: display_footer();
?>
?>

@ -721,11 +721,21 @@ function display_up_down_icon($content, $id, $list)
}
if ($position>1)
{
$return_value='<a href="'.api_get_self().'?'.api_get_cidreq().'&action=move&amp;direction=up&amp;content='.$content.'&amp;id='.$id.'"><img src="../img/up.gif" /></a>';
$return_value='<a href="'.api_get_self().'?'.api_get_cidreq().'&action=move&amp;direction=up&amp;content='.$content.'&amp;id='.$id.'" title="'.get_lang('MoveUp').'"><img src="../img/up.gif" /></a>';
}
else
{
$return_value='<img src="../img/up_na.gif" />';
}
if ($position<$total_items)
{
$return_value.='<a href="'.api_get_self().'?'.api_get_cidreq().'&action=move&amp;direction=down&amp;content='.$content.'&amp;id='.$id.'"><img src="../img/down.gif" /></a>';
$return_value.='<a href="'.api_get_self().'?'.api_get_cidreq().'&action=move&amp;direction=down&amp;content='.$content.'&amp;id='.$id.'" title="'.get_lang('MoveDown').'" ><img src="../img/down.gif" /></a>';
}
else
{
$return_value.='<img src="../img/down_na.gif" />';
}
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.'<img src="'.$image_repository.$existing_image.'" alt="'.$name.'" title="'.$name.'" /></a>';
}
else
return $link.'<img src="'.api_get_path(WEB_CODE_PATH)."img/unknown.jpg".'" alt="'.$name.'" title="'.$name.'" /></a>';
return $link.'<img src="'.$image_repository.$existing_image.'" alt="'.$name.'" title="'.$name.'" /></a>';
}
else

@ -85,7 +85,19 @@ if(!api_is_allowed_to_edit()) $fck_attribute['Config']['UserStatus'] = 'student'
Header
-----------------------------------------------------------
*/
Display :: display_header($nameTools);
$interbreadcrumb[]=array("url" => "index.php","name" => $nameTools);
if ($_GET['action']=='add' ) {
switch ($_GET['content']){
case 'forum': $interbreadcrumb[] = array ("url" => api_get_self().'?'.api_get_cidreq().'&action=add&amp;content=forum', 'name' => get_lang('AddForum')); break;
case 'forumcategory':$interbreadcrumb[] = array ("url" => api_get_self().'?'.api_get_cidreq().'&action=add&amp;content=forumcategory', 'name' => get_lang('AddForumCategory'));break;
default: break;
}
}
Display :: display_header(null);
api_display_tool_title($nameTools);
//echo '<link href="forumstyles.css" rel="stylesheet" type="text/css" />';
@ -102,277 +114,289 @@ if (api_is_allowed_to_edit())
$fck_attribute['ToolbarSet'] = 'ForumLight';
handle_forum_and_forumcategories();
}
get_whats_new();
$whatsnew_post_info = array();
$whatsnew_post_info = $_SESSION['whatsnew_post_info'];
/*
-----------------------------------------------------------
TRACKING
-----------------------------------------------------------
*/
include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
event_access_tool(TOOL_FORUM);
/*
------------------------------------------------------------------------------------------------------
RETRIEVING ALL THE FORUM CATEGORIES AND FORUMS
------------------------------------------------------------------------------------------------------
note: we do this here just after het handling of the actions to be sure that we already incorporate the
latest changes
*/
// Step 1: We store all the forum categories in an array $forum_categories
$forum_categories=array();
$forum_categories_list=get_forum_categories();
// step 2: we find all the forums (only the visible ones if it is a student)
$forum_list=array();
$forum_list=get_forums();
/*
------------------------------------------------------------------------------------------------------
RETRIEVING ALL GROUPS AND THOSE OF THE USER
------------------------------------------------------------------------------------------------------
*/
// the groups of the user
$groups_of_user=array();
$groups_of_user=GroupManager::get_group_ids($_course['dbName'], $_user['user_id']);
// all groups in the course (and sorting them as the id of the group = the key of the array
$all_groups=GroupManager::get_group_list();
if(is_array($all_groups))
{
foreach ($all_groups as $group)
{
$all_groups[$group['id']]=$group;
}
}
/*
------------------------------------------------------------------------------------------------------
ACTION LINKS
------------------------------------------------------------------------------------------------------
*/
//if (api_is_allowed_to_edit() and !$_GET['action'])
echo '<span style="float:right;"><a href="forumsearch.php?'.api_get_cidreq().'&action=search"> '.Display::return_icon('search.gif').' '.get_lang('Search').'</a></span>';
if (api_is_allowed_to_edit())
{
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add&amp;content=forumcategory"> '.Display::return_icon('forum_category_new.gif').' '.get_lang('AddForumCategory').'</a> ';
if (is_array($forum_categories_list))
{
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add&amp;content=forum"> '.Display::return_icon('forum_new.gif').' '.get_lang('AddForum').'</a>';
}
//echo ' | <a href="forum_migration.php">'.get_lang('MigrateForum').'</a>';
}
/*
------------------------------------------------------------------------------------------------------
Display Forum Categories and the Forums in it
------------------------------------------------------------------------------------------------------
*/
echo '<table class="data_table" width="100%">'."\n";
// Step 3: we display the forum_categories first
if(is_array($forum_categories_list))
if ($_GET['action']!='add' && $_GET['action']!='edit' )
{
foreach ($forum_categories_list as $forum_category_key => $forum_category)
get_whats_new();
$whatsnew_post_info = array();
$whatsnew_post_info = $_SESSION['whatsnew_post_info'];
/*
-----------------------------------------------------------
TRACKING
-----------------------------------------------------------
*/
include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
event_access_tool(TOOL_FORUM);
/*
------------------------------------------------------------------------------------------------------
RETRIEVING ALL THE FORUM CATEGORIES AND FORUMS
------------------------------------------------------------------------------------------------------
note: we do this here just after het handling of the actions to be sure that we already incorporate the
latest changes
*/
// Step 1: We store all the forum categories in an array $forum_categories
$forum_categories=array();
$forum_categories_list=get_forum_categories();
// step 2: we find all the forums (only the visible ones if it is a student)
$forum_list=array();
$forum_list=get_forums();
/*
------------------------------------------------------------------------------------------------------
RETRIEVING ALL GROUPS AND THOSE OF THE USER
------------------------------------------------------------------------------------------------------
*/
// the groups of the user
$groups_of_user=array();
$groups_of_user=GroupManager::get_group_ids($_course['dbName'], $_user['user_id']);
// all groups in the course (and sorting them as the id of the group = the key of the array
$all_groups=GroupManager::get_group_list();
if(is_array($all_groups))
{
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"5\">";
echo '<a href="viewforumcategory.php?'.api_get_cidreq().'&forumcategory='.prepare4display($forum_category['cat_id']).'" '.class_visible_invisible(prepare4display($forum_category['visibility'])).'>'.prepare4display($forum_category['cat_title']).'</a><br />';
if ($forum_category['cat_comment']<>'' AND trim($forum_category['cat_comment'])<>'&nbsp;')
{
echo '<span>'.prepare4display($forum_category['cat_comment']).'</span>';
}
echo "</th>\n";
if (api_is_allowed_to_edit())
foreach ($all_groups as $group)
{
echo "\t\t<th>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=edit&amp;content=forumcategory&amp;id=".prepare4display($forum_category['cat_id'])."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&amp;content=forumcategory&amp;id=".prepare4display($forum_category['cat_id'])."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeleteForumCategory"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
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 "</th>\n";
$all_groups[$group['id']]=$group;
}
echo "\t</tr>\n";
}
// step 4: the interim headers (for the forum)
echo "\t<tr class=\"forum_header\">\n";
echo "\t\t<td colspan='2'>".get_lang('Forum')."</td>\n";
echo "\t\t<td>".get_lang('Topics')."</td>\n";
echo "\t\t<td>".get_lang('Posts')."</td>\n";
echo "\t\t<td>".get_lang('LastPosts')."</td>\n";
if (api_is_allowed_to_edit())
/*
------------------------------------------------------------------------------------------------------
ACTION LINKS
------------------------------------------------------------------------------------------------------
*/
//if (api_is_allowed_to_edit() and !$_GET['action'])
echo '<span style="float:right;"><a href="forumsearch.php?'.api_get_cidreq().'&action=search"> '.Display::return_icon('search.gif').' '.get_lang('Search').'</a></span>';
if (api_is_allowed_to_edit())
{
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add&amp;content=forumcategory"> '.Display::return_icon('forum_category_new.gif').' '.get_lang('AddForumCategory').'</a> ';
if (is_array($forum_categories_list))
{
echo "\t\t<td>".get_lang('Actions')."</td>\n";
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add&amp;content=forum"> '.Display::return_icon('forum_new.gif').' '.get_lang('AddForum').'</a>';
}
echo "\t</tr>\n";
// the forums in this category
$forums_in_category=get_forums_in_category($forum_category['cat_id']);
//echo ' | <a href="forum_migration.php">'.get_lang('MigrateForum').'</a>';
}
// step 5: we display all the forums in this category.
$forum_count=0;
foreach ($forum_list as $key=>$forum)
/*
------------------------------------------------------------------------------------------------------
Display Forum Categories and the Forums in it
------------------------------------------------------------------------------------------------------
*/
echo '<table class="data_table" width="100%">'."\n";
// Step 3: we display the forum_categories first
if(is_array($forum_categories_list))
{
foreach ($forum_categories_list as $forum_category_key => $forum_category)
{
// Here we clean the whatnew_post_info array a little bit because to display the icon we
// test if $whatsnew_post_info[$forum['forum_id']] is empty or not.
if(is_array($whatsnew_post_info[$forum['forum_id']]))
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"5\">";
echo '<a href="viewforumcategory.php?'.api_get_cidreq().'&forumcategory='.prepare4display($forum_category['cat_id']).'" '.class_visible_invisible(prepare4display($forum_category['visibility'])).'>'.prepare4display($forum_category['cat_title']).'</a><br />';
if ($forum_category['cat_comment']<>'' AND trim($forum_category['cat_comment'])<>'&nbsp;')
{
echo '<span class="forum_description">'.prepare4display($forum_category['cat_comment']).'</span>';
}
echo "</th>\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 '<th style="padding: 5px; vertical-align: top;" align="center" >';
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=edit&amp;content=forumcategory&amp;id=".prepare4display($forum_category['cat_id'])."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&amp;content=forumcategory&amp;id=".prepare4display($forum_category['cat_id'])."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeleteForumCategory"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
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 '</th>';
}
// 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</tr>\n";
// step 4: the interim headers (for the forum)
echo "\t<tr class=\"forum_header\">\n";
echo "\t\t<td colspan='2'>".get_lang('Forum')."</td>\n";
echo "\t\t<td>".get_lang('Topics')."</td>\n";
echo "\t\t<td>".get_lang('Posts')."</td>\n";
echo "\t\t<td>".get_lang('LastPosts')."</td>\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<td>".get_lang('Actions')."</td>\n";
}
echo "\t</tr>\n";
// the forums in this category
$forums_in_category=get_forums_in_category($forum_category['cat_id']);
// step 5: we display all the forums in this category.
$forum_count=0;
foreach ($forum_list as $key=>$forum)
{
// Here we clean the whatnew_post_info array a little bit because to display the icon we
// test if $whatsnew_post_info[$forum['forum_id']] is empty or not.
if(is_array($whatsnew_post_info[$forum['forum_id']]))
{
//echo 'teacher';
$show_forum=true;
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]);
}
}
}
// you are not a teacher
else
{
//echo 'student';
// it is not a group forum => show forum (invisible forums are already left out see get_forums function)
if ($forum['forum_of_group']=='0')
// 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']))
{
// 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 '-gewoon forum';
//echo 'teacher';
$show_forum=true;
}
// it is a group forum
// you are not a teacher
else
{
//echo '-groepsforum';
// it is a group forum but it is public => show
if ($forum['forum_group_public_private']=='public')
//echo 'student';
// it is not a group forum => show forum (invisible forums are already left out see get_forums function)
if ($forum['forum_of_group']=='0')
{
//echo '-gewoon forum';
$show_forum=true;
//echo '-publiek';
}
// it is a group forum and it is private
// it is a group forum
else
{
//echo '-prive';
// it is a group forum and it is private but the user is member of the group
if (in_array($forum['forum_of_group'],$groups_of_user))
//echo '-groepsforum';
// it is a group forum but it is public => show
if ($forum['forum_group_public_private']=='public')
{
//echo '-is lid';
$show_forum=true;
//echo '-publiek';
}
// it is a group forum and it is private
else
{
//echo '-is GEEN lid';
$show_forum=false;
//echo '-prive';
// it is a group forum and it is private but the user is member of the group
if (in_array($forum['forum_of_group'],$groups_of_user))
{
//echo '-is lid';
$show_forum=true;
}
else
{
//echo '-is GEEN lid';
$show_forum=false;
}
}
}
}
}
//echo '<hr>';
if ($show_forum)
{
$form_count++;
echo "\t<tr class=\"forum\">\n";
echo "\t\t<td width=\"20\">";
if ($forum['forum_of_group']!=='0')
//echo '<hr>';
if ($show_forum)
{
if (is_array($whatsnew_post_info[$forum['forum_id']]) and !empty($whatsnew_post_info[$forum['forum_id']]))
$form_count++;
echo "\t<tr class=\"forum\">\n";
echo "\t\t<td width=\"20\">";
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 "</td>\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=' (<a href="../group/group_space.php?'.api_get_cidreq().'&gidReq='.$all_groups[$forum['forum_of_group']]['id'].'" class="forum_group_link">'.$group_title.'</a>)';
}
else
{
echo icon('../img/forum.gif');
$forum_title_group_addition='';
}
echo "\t\t<td><a href=\"viewforum.php?".api_get_cidreq()."&forum=".prepare4display($forum['forum_id'])."\" ".class_visible_invisible(prepare4display($forum['visibility'])).">".prepare4display($forum['forum_title']).'</a>'.$forum_title_group_addition.'<br />'.prepare4display($forum['forum_comment'])."</td>\n";
//$number_forum_topics_and_posts=get_post_topics_of_forum($forum['forum_id']); // deprecated
// the number of topics and posts
echo "\t\t<td>".$forum['number_of_threads']."</td>\n";
echo "\t\t<td>".$forum['number_of_posts']."</td>\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<td NOWRAP>";
if (!empty($forum['last_post_id']))
{
echo $forum['last_post_date']."<br /> ".get_lang('By').' '.display_user_link($poster_id, $name);
}
}
echo "</td>\n";
if ($forum['forum_of_group']<>'0')
{
$group_title=substr($all_groups[$forum['forum_of_group']]['name'],0,30);
$forum_title_group_addition=' (<a href="../group/group_space.php?'.api_get_cidreq().'&gidReq='.$all_groups[$forum['forum_of_group']]['id'].'" class="forum_group_link">'.$group_title.'</a>)';
}
else
{
$forum_title_group_addition='';
}
echo "\t\t<td><a href=\"viewforum.php?".api_get_cidreq()."&forum=".prepare4display($forum['forum_id'])."\" ".class_visible_invisible(prepare4display($forum['visibility'])).">".prepare4display($forum['forum_title']).'</a>'.$forum_title_group_addition.'<br />'.prepare4display($forum['forum_comment'])."</td>\n";
//$number_forum_topics_and_posts=get_post_topics_of_forum($forum['forum_id']); // deprecated
// the number of topics and posts
echo "\t\t<td>".$forum['number_of_threads']."</td>\n";
echo "\t\t<td>".$forum['number_of_posts']."</td>\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<td NOWRAP>";
if (!empty($forum['last_post_id']))
{
echo $forum['last_post_date']."<br /> ".get_lang('By').' '.display_user_link($poster_id, $name);
}
echo "</td>\n";
if (api_is_allowed_to_edit())
{
echo "\t\t<td NOWRAP align='center'>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=edit&amp;content=forum&amp;id=".$forum['forum_id']."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&amp;content=forum&amp;id=".$forum['forum_id']."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeleteForum"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
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 "</td>\n";
if (api_is_allowed_to_edit())
{
echo "\t\t<td NOWRAP align='center'>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=edit&amp;content=forum&amp;id=".$forum['forum_id']."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&amp;content=forum&amp;id=".$forum['forum_id']."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeleteForum"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
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 "</td>\n";
}
echo "\t</tr>";
}
echo "\t</tr>";
}
}
}
if (count($forum_list)==0)
{
echo "\t<tr><td>".get_lang('NoForumInThisCategory')."</td>".(api_is_allowed_to_edit()?'<td colspan="5"></td>':'<td colspan="4"></td>')."</tr>\n";
}
}
if (count($forum_list)==0)
{
echo "\t<tr><td>".get_lang('NoForumInThisCategory')."</td>".(api_is_allowed_to_edit()?'<td colspan="5"></td>':'<td colspan="4"></td>')."</tr>\n";
}
}
echo "</table>\n";
}
echo "</table>\n";
/*
==============================================================================
FOOTER

@ -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".
@ -132,7 +132,7 @@ if($origin=='learnpath')
include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php');
} else
{
Display :: display_header();
Display :: display_header(null);
api_display_tool_title($nameTools);
}
//echo '<link href="forumstyles.css" rel="stylesheet" type="text/css" />';
@ -182,23 +182,24 @@ handle_forum_and_forumcategories();
*/
echo "<table class=\"data_table\" width='100%'>\n";
// the forum category
if($origin != 'learnpath')
{
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"2\">";
echo '<a href="index.php?'.api_get_cidreq().'&origin='.$origin.'" '.class_visible_invisible($current_forum_category['visibility']).'>'.$current_forum_category['cat_title'].'</a><br />';
echo '<span>'.$current_forum_category['cat_comment'].'</span>';
echo '<span class="forum_title">'.prepare4display($current_forum['forum_title']).'</span>';
if (!empty ($current_forum['forum_comment']))
{
echo '<br><span class="forum_description">'.prepare4display($current_forum['forum_comment']).'</span>';
}
if (!empty ($current_forum_category['cat_title']))
{
echo '<br /><span class="forum_low_description">'.prepare4display($current_forum_category['cat_title'])."</span><br />";
}
echo "</th>\n";
echo "\t</tr>\n";
}
// the forum
echo "\t<tr class=\"forum_header\">\n";
echo "\t\t<td colspan=\"2\">".$current_forum['forum_title']."<br />";
echo '<span>'.$current_forum['forum_comment'].'</span>';
echo "</td>\n";
echo "\t</tr>\n";
echo '</table>';
$values=show_add_post_form('newthread','', $_SESSION['formelements']);
@ -214,7 +215,4 @@ if (!empty($values) and isset($values['SubmitPost']))
*/
Display :: display_footer();
?>
?>

@ -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".
@ -187,19 +187,17 @@ echo "<table class=\"data_table\" width='100%'>\n";
// the forum category
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"2\">";
echo '<a href="index.php" '.class_visible_invisible($current_forum_category['visibility']).'>'.$current_forum_category['cat_title'].'</a><br />';
echo '<span>'.$current_forum_category['cat_comment'].'</span>';
echo "</th>\n";
echo "\t</tr>\n";
// the forum
echo "\t<tr class=\"forum_header\">\n";
echo "\t\t<td colspan=\"2\">";
echo '<a href="viewforum.php?forum='.$current_forum['forum_id'].'" '.class_visible_invisible($current_forum['visibility']).'>'.$current_forum['forum_title'].'</a><br />';
echo '<span>'.$current_forum['forum_comment'].'</span>';
echo "</td>\n";
echo "\t</tr>\n";
echo '<span class="forum_title">'.prepare4display($current_thread['thread_title']).'</span><br />';
if (!empty ($current_forum_category['cat_title']))
{
echo '<span class="forum_low_description">'.prepare4display($current_forum_category['cat_title'])." - </span>";
}
echo '<span class="forum_low_description">'.prepare4display($current_forum['forum_title']).'</span>';
echo "</th>\n";
echo "\t</tr>\n";
echo '</table>';
// the form for the reply

@ -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".
@ -194,20 +194,26 @@ if (api_is_allowed_to_edit() OR ($current_forum['allow_new_threads']==1 AND isse
*/
echo "<table class=\"data_table\" width='100%'>\n";
// the forum category
// the current forum
if($origin != 'learnpath')
{
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"7\">";
echo '<a href="index.php?'.api_get_cidreq().'" '.class_visible_invisible($current_forum_category['visibility']).'>'.prepare4display($current_forum_category['cat_title']).'</a><br />';
echo '<span>'.prepare4display($current_forum_category['cat_comment']).'</span>';
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"7\">";
echo '<span class="forum_title">'.prepare4display($current_forum['forum_title']).'</span>';
if (!empty ($current_forum['forum_comment']))
{
echo '<br><span class="forum_description">'.prepare4display($current_forum['forum_comment']).'</span>';
}
if (!empty ($current_forum_category['cat_title']))
{
echo '<br /><span class="forum_low_description">'.prepare4display($current_forum_category['cat_title'])."</span><br />";
}
echo "</th>\n";
echo "\t</tr>\n";
}
// the forum
echo "\t<tr class=\"forum_header\">\n";
echo "\t\t<td colspan=\"7\">".prepare4display($current_forum['forum_title'])."<br />";
echo '<span>'.prepare4display($current_forum['forum_comment']).'</span>';
echo "</th>\n";
echo "\t</tr>\n";
@ -216,8 +222,8 @@ echo "\t<tr class=\"forum_threadheader\">\n";
echo "\t\t<td></td>\n";
echo "\t\t<td>".get_lang('Title')."</td>\n";
echo "\t\t<td>".get_lang('Replies')."</td>\n";
echo "\t\t<td>".get_lang('Author')."</td>\n";
echo "\t\t<td>".get_lang('Views')."</td>\n";
echo "\t\t<td>".get_lang('Author')."</td>\n";
echo "\t\t<td>".get_lang('LastPost')."</td>\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<td>".$row['thread_views']."</td>\n";
if ($row['last_poster_user_id']=='0')
{
echo "\t\t<td>".display_user_link($row['user_id'], $name)."</td>\n";
$name=$row['poster_name'];
}
else
{
echo "\t\t<td>".$name."</td>\n";
$name=$row['last_poster_firstname'].' '.$row['last_poster_lastname'];
}
echo "\t\t<td>".$row['thread_views']."</td>\n";
if ($row['last_poster_user_id']=='0')
if($origin != 'learnpath')
{
$name=$row['poster_name'];
echo "\t\t<td>".display_user_link($row['user_id'], $name)."</td>\n";
}
else
{
$name=$row['last_poster_firstname'].' '.$row['last_poster_lastname'];
echo "\t\t<td>".$name."</td>\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</tr>\n";
}
$counter++;
}
}

@ -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".
@ -93,7 +93,16 @@ $current_forum_category=get_forum_categories($_GET['forumcategory']);
$interbreadcrumb[]=array("url" => "index.php","name" => $nameTools);
$interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id'],"name" => prepare4display($current_forum_category['cat_title']));
Display :: display_header();
if (!empty($_GET['action']) && !empty($_GET['content']))
{
if ($_GET['action']=='add' && $_GET['content']=='forum' )
{
$interbreadcrumb[] = array ("url" => api_get_self().'?'.api_get_cidreq().'&action=add&amp;content=forum', 'name' => get_lang('AddForum'));
}
}
Display :: display_header(null);
api_display_tool_title($nameTools);
/*
@ -125,6 +134,8 @@ if (api_is_allowed_to_edit())
handle_forum_and_forumcategories();
}
if ($_GET['action']!='add')
{
/*
------------------------------------------------------------------------------------------------------
RETRIEVING ALL THE FORUM CATEGORIES AND FORUMS
@ -163,26 +174,28 @@ if (api_is_allowed_to_edit())
}
/*
-----------------------------------------------------------
Display Forum Categories and the Forums in it
-----------------------------------------------------------
*/
echo "<table class=\"data_table\" width='100%'>\n";
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"5\">";
echo '<a href="#" '.class_visible_invisible($forum_category['visibility']).'>'.prepare4display($forum_category['cat_title']).'</a><br />';
echo '<span>'.prepare4display($forum_category['cat_comment']).'</span>';
echo "</th>\n";
if (api_is_allowed_to_edit())
{
echo "\t\t<th>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forumcategory=".Security::remove_XSS($_GET['forumcategory'])."&amp;action=edit&amp;content=forumcategory&amp;id=".$forum_category['cat_id']."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forumcategory=".Security::remove_XSS($_GET['forumcategory'])."&amp;action=delete&amp;content=forumcategory&amp;amp;id=".$forum_category['cat_id']."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeleteForumCategory"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
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 "<table class=\"data_table\" width='100%'>\n";
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"5\">";
echo '<span class="forum_title">'.prepare4display($forum_category['cat_title']).'</span><br />';
echo '<span class="forum_description">'.prepare4display($forum_category['cat_comment']).'</span>';
echo "</th>\n";
}
echo "\t</tr>\n";
if (api_is_allowed_to_edit())
{
echo '<th style="padding: 5px; vertical-align: top;" align="center" >';
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forumcategory=".Security::remove_XSS($_GET['forumcategory'])."&amp;action=edit&amp;content=forumcategory&amp;id=".$forum_category['cat_id']."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forumcategory=".Security::remove_XSS($_GET['forumcategory'])."&amp;action=delete&amp;content=forumcategory&amp;amp;id=".$forum_category['cat_id']."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeleteForumCategory"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
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);
echo "</th>\n";
}
echo "\t</tr>\n";
// step 3: the interim headers (for the forum)
echo "\t<tr class=\"forum_header\">\n";
@ -332,7 +345,7 @@ if (count($forum_list)==0)
}
echo "</table>\n";
}
/*
==============================================================================
FOOTER

@ -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".
@ -200,7 +200,25 @@ if ($message<>'PostDeletedSpecial') // in this case the first and only post of t
// 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 '<a href="reply.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;action=replythread&origin='.$origin.'">'.get_lang('ReplyToThread').'</a>';
//new thread link
if (api_is_allowed_to_edit() 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 '&nbsp;&nbsp;';
echo '<a href="newthread.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).$origin_string.'">'.Display::return_icon('forumthread_new.gif').' '.get_lang('NewTopic').'</a>';
}
else
{
echo get_lang('ForumLocked');
}
}
}
}
// note: this is to prevent that some browsers display the links over the table (FF does it but Opera doesn't)
@ -243,32 +261,21 @@ if ($message<>'PostDeletedSpecial') // in this case the first and only post of t
// but the problem is that the visibility of the forum AND forum cateogory are stored in the item_property table
echo "<table class=\"data_table\" width='100%'>\n";
// the forum category
// the thread
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"6\">";
echo '<span class="forum_title">'.prepare4display($current_thread['thread_title']).'</span><br />';
if($origin!='learnpath')
{
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"6\">";
echo '<a href="index.php?'.api_get_cidreq().'" '.class_visible_invisible($current_forum_category['visibility']).'>'.prepare4display($current_forum_category['cat_title']).'</a><br />';
echo '<span>'.prepare4display($current_forum_category['cat_comment']).'</span>';
echo "</th>\n";
echo "\t</tr>\n";
{
echo '<span class="forum_low_description">'.prepare4display($current_forum_category['cat_title']).' - ';
}
// the forum
echo "\t<tr class=\"forum_header\">\n";
echo "\t\t<td><a href=\"viewforum.php?".api_get_cidreq()."&forum=".$current_forum['forum_id']."\" ".class_visible_invisible($current_forum['visibility']).">".prepare4display($current_forum['forum_title'])."</a><br />";
echo '<span>'.prepare4display($current_forum['forum_comment']).'</span>';
echo "</td>\n";
echo "\t</tr>\n";
// the thread
echo "\t<tr class=\"forum_thread\">\n";
echo "\t\t<td><span ".class_visible_invisible($current_thread['visibility']).">".prepare4display($current_thread['thread_title'])."</span><br />";
echo "</td>\n";
echo "\t</tr>\n";
echo prepare4display($current_forum['forum_title']).'<br />';
echo "</th>\n";
echo "\t</tr>\n";
echo '<span>'.prepare4display($current_thread['thread_comment']).'</span>';
echo "</table>";
echo '<br />';
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
/*

@ -109,7 +109,7 @@ foreach ($rows as $row)
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$row['post_id']."&origin=".$origin."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>\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 "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;post=".$row['post_id']."&origin=".$origin."\">".icon('../img/deplacer_fichier.gif',get_lang('Edit'))."</a>";
echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;post=".$row['post_id']."&origin=".$origin."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>";
}
echo '<br /><br />';
//if (($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0) OR api_is_allowed_to_edit())

@ -89,7 +89,7 @@ foreach ($rows as $post)
{
$name=$post['firstname'].' '.$post['lastname'];
}
if (api_get_course_setting('allow_user_image_forum')) {echo '<br />'.display_user_image($post['user_id']).'<br />'; }
if (api_get_course_setting('allow_user_image_forum')) {echo '<br />'.display_user_image($post['user_id'],$name,false,true).'<br />'; }
echo display_user_link($post['user_id'], $name).'<br />';
echo $post['post_date'].'<br /><br />';
// 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 "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$post['post_id']."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>\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 "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;post=".$post['post_id']."\">".icon('../img/deplacer_fichier.gif',get_lang('Edit'))."</a>";
echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;post=".$post['post_id']."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>";
}
echo '<br /><br />';
//if (($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0) OR api_is_allowed_to_edit())

@ -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="<div class=\"structure\">".get_lang('Structure')."</div>";
$counter=0;
$prev_next_array=array();
foreach ($rows as $post)
{
$counter++;
$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']]))
{
$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.='<strong>'.prepare4display($post['post_title']).'</strong></div>';
$prev_next_array[]=$post['post_id'];
}
else
{
if ($post['visible']=='0')
{
$class=' class="invisible"';
}
else
{
$class='';
}
$thread_structure.= "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;post=".$post['post_id']."\" $class>".prepare4display($post['post_title'])."</a></div>\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 src="'.api_get_path(WEB_CODE_PATH).'img/prev.png" style="vertical-align: middle;"/>';
$next_img = '<img src="'.api_get_path(WEB_CODE_PATH).'img/next.png" style="vertical-align: middle;"/>';
$first_page_text = '<img src="'.api_get_path(WEB_CODE_PATH).'img/first.png" style="vertical-align: middle;"/>';
$last_page_text = '<img src="'.api_get_path(WEB_CODE_PATH).'img/last.png" style="vertical-align: middle;"/>';
$href_prev='"viewthread.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;post='.$prev_next_array[$prev_id].'"';
$href_next='"viewthread.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;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 '<center>';
// for the loop
if ($prev_id<0)
{
$prev_id=$max-1;
}
//first message img
echo '<a title="'.get_lang('FirstMessage').'" href="viewthread.php?'.api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;post=".$prev_next_array[0]."\" $class>".$first_page_text."</a>";
// prev message link
if ($href_prev==1)
{
echo '<b><span '.$class_prev.' >'.$prev_message.'</b></span>';
}
else
echo '<a href='.$href_prev.' '.$class_prev.' >'.$prev_message.'</a>';
// current counter
echo ' [ '.($current_id+1).' / '.$max.' ] ';
// next message link
if ($href_next==1)
{
echo '<b><span '.$class_next.' >'.$next_message.'</span></b>';
}
else
echo '<a href='.$href_next.' '.$class_next.' >'.$next_message.'</a>';
//last message img
echo '<a title="'.get_lang('LastMessage').'" href="viewthread.php?'.api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;post=".$prev_next_array[$max-1]."\" $class>".$last_page_text."</a>";
echo '</center>';
//--------------------------------------------------------------------------------------------
// the style depends on the status of the message: approved or not
if ($rows[$display_post_id]['visible']=='0')
{
@ -100,7 +217,7 @@ else
{
$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']).'<br />'; }
if (api_get_course_setting('allow_user_image_forum')) {echo '<br />'.display_user_image($rows[$display_post_id]['user_id'],$name,false,true).'<br />'; }
echo display_user_link($rows[$display_post_id]['user_id'], $name).'<br />';
echo $rows[$display_post_id]['post_date'].'<br /><br />';
// 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 "<a href=\"".api_get_self()."?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=delete&amp;content=post&amp;id=".$rows[$display_post_id]['post_id']."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeletePost"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>\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 "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;post=".$rows[$display_post_id]['post_id']."\">".icon('../img/deplacer_fichier.gif',get_lang('Edit'))."</a>\n";
echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;action=move&amp;post=".$rows[$display_post_id]['post_id']."\">".icon('../img/deplacer_fichier.gif',get_lang('MovePost'))."</a>\n";
}
echo '<br /><br />';
//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<tr>\n";
echo "\t\t<td class=\"$messageclass\">".prepare4display($rows[$display_post_id]['post_text'])."</td>\n";
echo "\t</tr>\n";
/*
// The added resources
echo "<tr><td>";
if (check_added_resources("forum_post", $rows[$display_post_id]["post_id"]))
{
echo "<i>".get_lang("AddedResources")."</i><br/>";
if ($rows[$display_post_id]['visible']=='0')
{
$addedresource_style="invisible";
}
display_added_resources("forum_post", $rows[$display_post_id]["post_id"], $addedresource_style);
}
echo "</td></tr>";
*/
// The post has been displayed => it can be removed from the what's new array
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']]);
@ -190,40 +290,7 @@ echo "</table>";
// Displaying the thread (structure)
// --------------------------------------
echo "<div class=\"structure\">".get_lang('Structure')."</div>";
$counter=0;
foreach ($rows as $post)
{
$counter++;
$indent=$post['indent_cnt']*'20';
echo "<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']]))
{
$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 '<strong>'.prepare4display($post['post_title']).'</strong></div>';
}
else
{
if ($post['visible']=='0')
{
$class=' class="invisible"';
}
else
{
$class='';
}
echo "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread'])."&amp;post=".$post['post_id']."\" $class>".prepare4display($post['post_title'])."</a></div>\n";
}
}
echo $thread_structure;
/**
@ -263,5 +330,4 @@ function _phorum_recursive_sort($rows, &$threads, $seed=0, $indent=0)
}
}
}
?>
Loading…
Cancel
Save