[svn r11334] coding guidelines

using correct return messages
removing resourcelinker (has been removed everywhere)
removing direct post/ approval (too complex)
skala
Patrick Cool 18 years ago
parent 50dcf173da
commit 1e7c44219a
  1. 5
      main/forum/editpost.php
  2. 1378
      main/forum/forumfunction.inc.php
  3. 5
      main/forum/reply.php
  4. 119
      main/forum/viewforum.php
  5. 5
      main/forum/viewforumcategory.php
  6. 116
      main/forum/viewthread.php

@ -76,7 +76,10 @@ require ('../inc/global.inc.php');
require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
if(!api_is_allowed_to_edit()) $fck_attribute['Config']['UserStatus'] = 'student';
if(!api_is_allowed_to_edit())
{
$fck_attribute['Config']['UserStatus'] = 'student';
}
$nameTools=get_lang('Forum');

File diff suppressed because it is too large Load Diff

@ -147,7 +147,8 @@ if (isset($_POST['add_resources']) AND $_POST['add_resources']==get_lang('Resour
if($origin=='learnpath')
{
include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php');
} else
}
else
{
Display :: display_header();
api_display_tool_title($nameTools);
@ -224,7 +225,9 @@ if (!empty($values) AND $_POST['SubmitPost'])
==============================================================================
*/
if($origin!='learnpath')
{
Display :: display_footer();
}
?>

@ -22,23 +22,23 @@
*/
/**
* These files are a complete rework of the forum. The database structure is
* These files are a complete rework of the forum. The database structure is
* based on phpBB but all the code is rewritten. A lot of new functionalities
* are added:
* - forum categories and forums can be sorted up or down, locked or made invisible
* - consistent and integrated forum administration
* - forum options: are students allowed to edit their post?
* - forum options: are students allowed to edit their post?
* moderation of posts (approval)
* reply only forums (students cannot create new threads)
* multiple forums per group
* - sticky messages
* - new view option: nested view
* - quoting a message
*
*
* @Author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @Copyright Ghent University
* @Copyright Patrick Cool
*
*
* @package dokeos.forum
*/
@ -50,7 +50,7 @@
* merge files and test it all over again. So for the moment, please do not
* touch the code
* -- Patrick Cool <patrick.cool@UGent.be>
**************************************************************************
**************************************************************************
*/
/*
@ -63,20 +63,20 @@
Language Initialisation
-----------------------------------------------------------
*/
// name of the language file that needs to be included
// name of the language file that needs to be included
$language_file = 'forum';
require ('../inc/global.inc.php');
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 = '';
if(isset($_GET['origin']))
{
$origin = $_GET['origin'];
$origin_string = '&origin='.$origin;
$nameTools=get_lang('Forum');
//are we in a lp ?
$origin = '';
if(isset($_GET['origin']))
{
$origin = $_GET['origin'];
$origin_string = '&origin='.$origin;
}
/*
@ -100,10 +100,10 @@ include('forumfunction.inc.php');
Retrieving forum and forum categorie information
-----------------------------------------------------------
*/
// we are getting all the information about the current forum and forum category.
// 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
$current_forum=get_forum_information($_GET['forum']); // note: this has to be validated that it is an existing forum.
$current_forum=get_forum_information($_GET['forum']); // note: this has to be validated that it is an existing forum.
$current_forum_category=get_forumcategory_information($current_forum['forum_category']);
@ -116,13 +116,13 @@ $current_forum_category=get_forumcategory_information($current_forum['forum_cate
$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']));
$interbreadcrumb[]=array("url" => "viewforum.php?forum=".$_GET['forum'],"name" => prepare4display($current_forum['forum_title']));
if($origin=='learnpath')
{
include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php');
} else
{
Display :: display_header();
api_display_tool_title($nameTools);
if($origin=='learnpath')
{
include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php');
} else
{
Display :: display_header();
api_display_tool_title($nameTools);
}
//echo '<link href="forumstyles.css" rel="stylesheet" type="text/css" />';
@ -153,11 +153,11 @@ if ($_GET['action']=='move' and isset($_GET['thread']))
/*
-----------------------------------------------------------
Is the user allowed here?
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.
// then the user is not allowed here.
if (!api_is_allowed_to_edit() AND ($current_forum_category['visibility']==0 OR $current_forum['visibility']==0))
{
forum_not_allowed_here();
@ -171,7 +171,7 @@ if (!api_is_allowed_to_edit() AND ($current_forum_category['visibility']==0 OR $
*/
if (isset($message))
{
Display :: display_normal_message($message);
Display :: display_confirmation_message($message);
}
@ -191,22 +191,22 @@ if (api_is_allowed_to_edit() OR ($current_forum['allow_new_threads']==1 AND isse
/*
-----------------------------------------------------------
Display
Display
-----------------------------------------------------------
*/
echo "<table class=\"data_table\" width='100%'>\n";
// the forum category
if($origin != 'learnpath')
// the forum category
if($origin != 'learnpath')
{
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"7\">";
echo '<a href="index.php" '.class_visible_invisible($current_forum_category['visibility']).'>'.prepare4display($current_forum_category['cat_title']).'</a><br />';
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 "</th>\n";
echo "\t</tr>\n";
echo "\t</tr>\n";
}
// the forum
// 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>';
@ -235,21 +235,24 @@ $whatsnew_post_info=$_SESSION['whatsnew_post_info'];
$counter=0;
foreach ($threads as $row)
{
// thread who have no replies yet and the only post is invisible should not be displayed to students.
// thread who have no replies yet and the only post is invisible should not be displayed to students.
if (api_is_allowed_to_edit() OR !($row['thread_replies']=='0' AND $row['visible']=='0'))
{
if($counter%2==0) $class="row_odd"; else $class="row_even";
{
if($counter%2==0)
{
$class="row_odd"; else $class="row_even";
}
echo "\t<tr class=\"$class\">\n";
echo "\t\t<td>";
if (is_array($whatsnew_post_info[$_GET['forum']][$row['thread_id']]) and !empty($whatsnew_post_info[$_GET['forum']][$row['thread_id']]))
{
echo icon('../img/forumthreadnew.gif');
echo icon('../img/forumthreadnew.gif');
}
else
else
{
echo icon('../img/forumthread.gif');
echo icon('../img/forumthread.gif');
}
if ($row['thread_sticky']==1)
{
echo icon('../img/exclamation.gif');
@ -261,24 +264,24 @@ foreach ($threads as $row)
{
$name=prepare4display($row['thread_poster_name']);
}
else
else
{
$name=$row['firstname'].' '.$row['lastname'];
}
if($origin != 'learnpath')
}
if($origin != 'learnpath')
{
echo "\t\t<td>".display_user_link($row['user_id'], $name)."</td>\n";
}
else
{
echo "\t\t<td>".$name."</td>\n";
echo "\t\t<td>".display_user_link($row['user_id'], $name)."</td>\n";
}
else
{
echo "\t\t<td>".$name."</td>\n";
}
echo "\t\t<td>".$row['thread_views']."</td>\n";
if ($row['last_poster_user_id']=='0')
{
$name=$row['poster_name'];
}
else
else
{
$name=$row['last_poster_firstname'].' '.$row['last_poster_lastname'];
}
@ -294,14 +297,14 @@ foreach ($threads as $row)
$last_post_row=mysql_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, __LINE__, __FILE__);
$last_post_row=mysql_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;
}
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, __LINE__, __FILE__);
$last_post_row=mysql_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<td>".$last_post."</td>\n";
if (api_is_allowed_to_edit())
@ -326,7 +329,9 @@ echo "</table>";
==============================================================================
*/
if($origin != 'learnpath')
{
Display :: display_footer();
}
?>

@ -91,7 +91,10 @@ $fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Middle';
$fck_attribute['Config']['IMUploadPath'] = 'upload/forum/';
$fck_attribute['Config']['FlashUploadPath'] = 'upload/forum/';
if(!api_is_allowed_to_edit()) $fck_attribute['Config']['UserStatus'] = 'student';
if(!api_is_allowed_to_edit())
{
$fck_attribute['Config']['UserStatus'] = 'student';
}
/*
-----------------------------------------------------------

@ -22,23 +22,23 @@
*/
/**
* These files are a complete rework of the forum. The database structure is
* These files are a complete rework of the forum. The database structure is
* based on phpBB but all the code is rewritten. A lot of new functionalities
* are added:
* - forum categories and forums can be sorted up or down, locked or made invisible
* - consistent and integrated forum administration
* - forum options: are students allowed to edit their post?
* - forum options: are students allowed to edit their post?
* moderation of posts (approval)
* reply only forums (students cannot create new threads)
* multiple forums per group
* - sticky messages
* - new view option: nested view
* - quoting a message
*
*
* @Author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @Copyright Ghent University
* @Copyright Patrick Cool
*
*
* @package dokeos.forum
*/
@ -50,7 +50,7 @@
* merge files and test it all over again. So for the moment, please do not
* touch the code
* -- Patrick Cool <patrick.cool@UGent.be>
**************************************************************************
**************************************************************************
*/
/*
@ -63,7 +63,7 @@
Language Initialisation
-----------------------------------------------------------
*/
// name of the language file that needs to be included
// name of the language file that needs to be included
$language_file = 'forum';
require ('../inc/global.inc.php');
require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
@ -77,14 +77,14 @@ $nameTools=get_lang('Forum');
-----------------------------------------------------------
*/
include('forumconfig.inc.php');
include('forumfunction.inc.php');
//are we in a lp ?
$origin = '';
if(isset($_GET['origin']))
{
$origin = $_GET['origin'];
include('forumfunction.inc.php');
//are we in a lp ?
$origin = '';
if(isset($_GET['origin']))
{
$origin = $_GET['origin'];
}
@ -98,11 +98,11 @@ if(isset($_GET['origin']))
Retrieving forum and forum categorie information
-----------------------------------------------------------
*/
// we are getting all the information about the current forum and forum category.
// 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
$current_thread=get_thread_information($_GET['thread']); // note: this has to be validated that it is an existing thread
$current_forum=get_forum_information($current_thread['forum_id']); // note: this has to be validated that it is an existing forum.
$current_forum=get_forum_information($current_thread['forum_id']); // note: this has to be validated that it is an existing forum.
$current_forum_category=get_forumcategory_information($current_forum['forum_category']);
$whatsnew_post_info=$_SESSION['whatsnew_post_info'];
@ -111,33 +111,33 @@ $whatsnew_post_info=$_SESSION['whatsnew_post_info'];
-----------------------------------------------------------
Header and Breadcrumbs
-----------------------------------------------------------
*/
if($origin=='learnpath')
{
include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php');
} else
{
*/
if($origin=='learnpath')
{
include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php');
} else
{
$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']));
$interbreadcrumb[]=array("url" => "viewforum.php?forum=".$_GET['forum'],"name" => prepare4display($current_forum['forum_title']));
if ($message<>'PostDeletedSpecial')
{
$interbreadcrumb[]=array("url" => "viewthread.php?forum=".$_GET['forum']."&amp;thread=".$_GET['thread'],"name" => prepare4display($current_thread['thread_title']));
}
Display :: display_header();
api_display_tool_title($nameTools);
}
Display :: display_header();
api_display_tool_title($nameTools);
}
//echo '<link href="forumstyles.css" rel="stylesheet" type="text/css" />';
/*
-----------------------------------------------------------
Is the user allowed here?
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.
// then the user is not allowed here.
if (!api_is_allowed_to_edit() AND ($current_forum['visibility']==0 OR $current_thread['visibility']==0))
{
forum_not_allowed_here();
@ -168,18 +168,18 @@ if ($_GET['action']=='move' and isset($_GET['post']))
*/
if (isset($message))
{
Display :: display_normal_message(get_lang($message));
Display :: display_confirmation_message(get_lang($message));
}
if ($message<>'PostDeletedSpecial') // in this case the first and only post of the thread is removed
{
// this increases the number of times the thread has been viewed
increase_thread_view($_GET['thread']);
/*
-----------------------------------------------------------
Action Links
@ -194,7 +194,7 @@ if ($message<>'PostDeletedSpecial') // in this case the first and only post of t
// if one of the three levels is locked then the link should not be displayed
if ($current_forum_category['locked']==0 AND $current_forum['locked']==0 AND $current_thread['locked']==0 OR api_is_allowed_to_edit())
{
// The link should only appear when the user is logged in or when anonymous posts are allowed.
// 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']))
{
echo '<a href="reply.php?forum='.$_GET['forum'].'&amp;thread='.$_GET['thread'].'&amp;action=replythread&origin='.$origin.'">'.get_lang('ReplyToThread').'</a>';
@ -202,67 +202,67 @@ if ($message<>'PostDeletedSpecial') // in this case the first and only post of t
}
// note: this is to prevent that some browsers display the links over the table (FF does it but Opera doesn't)
echo '&nbsp;';
/*
-----------------------------------------------------------
Display Forum Category and the Forum information
-----------------------------------------------------------
*/
if (!$_SESSION['view'])
{
$viewmode=$current_forum['default_view'];
$viewmode=$current_forum['default_view'];
}
else
else
{
$viewmode=$_SESSION['view'];
$viewmode=$_SESSION['view'];
}
$viewmode_whitelist=array('flat', 'threaded', 'nested');
if (isset($_GET['view']) and in_array($_GET['view'],$viewmode_whitelist))
{
$viewmode=$_GET['view'];
$_SESSION['view']=$viewmode;
$_SESSION['view']=$viewmode;
}
/*
-----------------------------------------------------------
Display Forum Category and the Forum information
-----------------------------------------------------------
*/
// we are getting all the information about the current forum and forum category.
// 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
echo "<table class=\"data_table\" width='100%'>\n";
// the forum category
if($origin!='learnpath')
// the forum category
if($origin!='learnpath')
{
echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"6\">";
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 "</th>\n";
echo "\t</tr>\n";
echo "\t</tr>\n";
}
// the forum
// the forum
echo "\t<tr class=\"forum_header\">\n";
echo "\t\t<td><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 "\t</tr>\n";
// the thread
// 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 "</table>";
echo '<br />';
switch ($viewmode)
{
case 'flat':
@ -270,10 +270,10 @@ if ($message<>'PostDeletedSpecial') // in this case the first and only post of t
break;
case 'threaded':
include_once('viewthread_threaded.inc.php');
break;
break;
case 'nested':
include_once('viewthread_nested.inc.php');
break;
break;
}
} // if ($message<>'PostDeletedSpecial') // in this case the first and only post of the thread is removed

Loading…
Cancel
Save