chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r17212] minor - style changes - defined variable

Browse Source
skala
Isaac Flores 17 years ago
parent 202abc0069
commit db683e961a
2 changed files with 26 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 32
      main/forum/forumfunction.inc.php
  2. 15
      main/forum/viewforumcategory.php

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

@ -92,7 +92,7 @@ function handle_forum_and_forumcategories() {
$post_submit_forum= isset($_POST['SubmitForum']) ? $_POST['SubmitForum'] : false; $post_submit_forum= isset($_POST['SubmitForum']) ? $_POST['SubmitForum'] : false;
$get_id=isset($_GET['id']) ? $_GET['id'] : false; $get_id=isset($_GET['id']) ? $_GET['id'] : false;
// Adding a forum category // Adding a forum category
if (($action_forum_cat=='add' && $_GET['content']=='forumcategory') || $post_submit_cat ) { if ($action_forum_cat=='add' && $_GET['content']=='forumcategory') {
show_add_forumcategory_form(); show_add_forumcategory_form();
} }
// Adding a forum // Adding a forum
@ -100,7 +100,7 @@ function handle_forum_and_forumcategories() {
if ($action_forum_cat=='edit' && $get_id || $post_submit_forum ) { if ($action_forum_cat=='edit' && $get_id || $post_submit_forum ) {
$inputvalues=get_forums(strval(intval($get_id))); // note: this has to be cleaned first $inputvalues=get_forums(strval(intval($get_id))); // note: this has to be cleaned first
} else { } else {
$inputvalues=null; $inputvalues='';
} }
show_add_forum_form($inputvalues); show_add_forum_form($inputvalues);
} }
@ -196,8 +196,9 @@ function show_add_forum_form($inputvalues=array()) {
$form->addElement('header', '', get_lang('AddForum').$session_header); $form->addElement('header', '', get_lang('AddForum').$session_header);
// we have a hidden field if we are editing // we have a hidden field if we are editing
if (is_array($inputvalues) && isset($inputvalues['forum_id'])) { if (is_array($inputvalues)) {
$form->addElement('hidden', 'forum_id', $inputvalues['forum_id']); $my_forum_id=isset($inputvalues['forum_id']) ? $inputvalues['forum_id'] : null;
$form->addElement('hidden', 'forum_id', $my_forum_id);
} }
// The title of the forum // The title of the forum
$form->addElement('text', 'forum_title', get_lang('Title'),'class="input_titles"'); $form->addElement('text', 'forum_title', get_lang('Title'),'class="input_titles"');
@ -403,10 +404,10 @@ function show_edit_forumcategory_form($inputvalues=array()) {
$form->addElement('submit', 'SubmitEditForumCategory',get_lang('OK')); $form->addElement('submit', 'SubmitEditForumCategory',get_lang('OK'));
global $charset; global $charset;
// setting the default values // setting the default values
$defaultvalues['forum_category_id']=$inputvalues['cat_id']; $defaultvalues['forum_category_id']=isset($inputvalues['cat_id'])?$inputvalues['cat_id']:null;
$defaultvalues['forum_category_title']=prepare4display(html_entity_decode($inputvalues['cat_title'],ENT_QUOTES,$charset)); $defaultvalues['forum_category_title']=prepare4display(html_entity_decode(isset($inputvalues['cat_title'])?$inputvalues['cat_title']:null,ENT_QUOTES,$charset));
$defaultvalues['forum_category_comment']=prepare4display($inputvalues['cat_comment']); $defaultvalues['forum_category_comment']=prepare4display(isset($inputvalues['cat_comment'])?$inputvalues['cat_comment']:null);
$form->setDefaults($defaultvalues); $form->setDefaults($defaultvalues);
// setting the rules // setting the rules
@ -529,7 +530,8 @@ function store_forum($values) {
} }
if (isset($values['forum_id'])) { if (isset($values['forum_id'])) {
$sql_image=''; $sql_image=isset($sql_image)?$sql_image:'';
$new_file_name=isset($new_file_name) ? $new_file_name:'';
if ($image_moved) { if ($image_moved) {
$sql_image=" forum_image='".Database::escape_string($new_file_name)."', "; $sql_image=" forum_image='".Database::escape_string($new_file_name)."', ";
delete_forum_image($values['forum_id']); delete_forum_image($values['forum_id']);
@ -541,10 +543,10 @@ function store_forum($values) {
".$sql_image." ".$sql_image."
forum_comment='".Database::escape_string($values['forum_comment'])."', forum_comment='".Database::escape_string($values['forum_comment'])."',
forum_category='".Database::escape_string($values['forum_category'])."', forum_category='".Database::escape_string($values['forum_category'])."',
allow_anonymous='".Database::escape_string($values['allow_anonymous_group']['allow_anonymous'])."', allow_anonymous='".Database::escape_string(isset($values['allow_anonymous_group']['allow_anonymous'])?$values['allow_anonymous_group']['allow_anonymous']:null)."',
allow_edit='".Database::escape_string($values['students_can_edit_group']['students_can_edit'])."', allow_edit='".Database::escape_string($values['students_can_edit_group']['students_can_edit'])."',
approval_direct_post='".Database::escape_string($values['approval_direct_group']['approval_direct'])."', approval_direct_post='".Database::escape_string(isset($values['approval_direct_group']['approval_direct'])?$values['approval_direct_group']['approval_direct']:null)."',
allow_attachments='".Database::escape_string($values['allow_attachments_group']['allow_attachments'])."', allow_attachments='".Database::escape_string(isset($values['allow_attachments_group']['allow_attachments'])?$values['allow_attachments_group']['allow_attachments']:null)."',
allow_new_threads='".Database::escape_string($values['allow_new_threads_group']['allow_new_threads'])."', allow_new_threads='".Database::escape_string($values['allow_new_threads_group']['allow_new_threads'])."',
forum_group_public_private='".Database::escape_string($values['public_private_group_forum_group']['public_private_group_forum'])."', forum_group_public_private='".Database::escape_string($values['public_private_group_forum_group']['public_private_group_forum'])."',
default_view='".Database::escape_string($values['default_view_type_group']['default_view_type'])."', default_view='".Database::escape_string($values['default_view_type_group']['default_view_type'])."',
@ -1000,7 +1002,7 @@ function class_visible_invisible($current_visibility_status) {
function get_forum_categories($id='') { function get_forum_categories($id='') {
$table_categories = Database :: get_course_table(TABLE_FORUM_CATEGORY); $table_categories = Database :: get_course_table(TABLE_FORUM_CATEGORY);
$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
$forum_categories_list=array();
if ($id=='') { if ($id=='') {
$sql="SELECT * FROM".$table_categories." forum_categories, ".$table_item_property." item_properties $sql="SELECT * FROM".$table_categories." forum_categories, ".$table_item_property." item_properties
WHERE forum_categories.cat_id=item_properties.ref WHERE forum_categories.cat_id=item_properties.ref
@ -1045,7 +1047,7 @@ function get_forums_in_category($cat_id)
{ {
global $table_forums; global $table_forums;
global $table_item_property; global $table_item_property;
$forum_list=array();
$sql="SELECT * FROM ".$table_forums." forum , ".$table_item_property." item_properties $sql="SELECT * FROM ".$table_forums." forum , ".$table_item_property." item_properties
WHERE forum.forum_category='".Database::escape_string($cat_id)."' WHERE forum.forum_category='".Database::escape_string($cat_id)."'
AND forum.forum_id=item_properties.ref AND forum.forum_id=item_properties.ref
@ -1284,7 +1286,7 @@ function get_threads($forum_id) {
global $table_threads; global $table_threads;
global $table_posts; global $table_posts;
global $table_users; global $table_users;
$thread_list=array();
// important note: it might seem a little bit awkward that we have 'thread.locked as locked' in the sql statement // important note: it might seem a little bit awkward that we have 'thread.locked as locked' in the sql statement
// because we also have thread.* in it. This is because thread has a field locked and post also has the same field // because we also have thread.* in it. This is because thread has a field locked and post also has the same field
// since we are merging these we would have the post.locked value but in fact we want the thread.locked value // since we are merging these we would have the post.locked value but in fact we want the thread.locked value
@ -3373,7 +3375,7 @@ function get_notifications_of_user($user_id = 0, $force = false) {
// database table definition // database table definition
$table_notification = Database::get_course_table('forum_notification'); $table_notification = Database::get_course_table('forum_notification');
$my_code = isset($_course['code']) ? $_course['code'] : ''; $my_code = isset($_course['code']) ? $_course['code'] : '';
if (!$_SESSION['forum_notification'] OR $_SESSION['forum_notification']['course'] <> $my_code OR $force=true) { if (!isset($_SESSION['forum_notification']) OR $_SESSION['forum_notification']['course'] <> $my_code OR $force=true) {
$_SESSION['forum_notification']['course'] = $my_code; $_SESSION['forum_notification']['course'] = $my_code;
$sql = "SELECT * FROM $table_notification WHERE user_id='".Database::escape_string($user_id)."'"; $sql = "SELECT * FROM $table_notification WHERE user_id='".Database::escape_string($user_id)."'";

15
main/forum/viewforumcategory.php
Unescape View File

@ -92,8 +92,8 @@ if(!api_is_allowed_to_edit(false,true)) {
----------------------------------------------------------- -----------------------------------------------------------
*/ */
$current_forum_category=get_forum_categories($_GET['forumcategory']); $current_forum_category=get_forum_categories($_GET['forumcategory']);
$interbreadcrumb[]=array("url" => "index.php?search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => $nameTools); $interbreadcrumb[]=array("url" => "index.php?search=".Security::remove_XSS(urlencode(isset($_GET['search'])?$_GET['search']:'')),"name" => $nameTools);
$interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&amp;search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum_category['cat_title'])); $interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&amp;search=".Security::remove_XSS(urlencode(isset($_GET['search'])?$_GET['search']:'')),"name" => prepare4display($current_forum_category['cat_title']));
if (!empty($_GET['action']) && !empty($_GET['content'])) { if (!empty($_GET['action']) && !empty($_GET['content'])) {
@ -128,16 +128,18 @@ if (!api_is_allowed_to_edit(false,true) AND $current_forum_category['visibility'
ACTIONS ACTIONS
------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------
*/ */
$action_forums=isset($_GET['action']) ? $_GET['action'] : '';
if (api_is_allowed_to_edit(false,true)) { if (api_is_allowed_to_edit(false,true)) {
handle_forum_and_forumcategories(); handle_forum_and_forumcategories();
} }
// notification // notification
if ($_GET['action'] == 'notify' AND isset($_GET['content']) AND isset($_GET['id'])) { if ($action_forums == 'notify' AND isset($_GET['content']) AND isset($_GET['id'])) {
$return_message = set_notification($_GET['content'],$_GET['id']); $return_message = set_notification($_GET['content'],$_GET['id']);
Display :: display_confirmation_message($return_message,false); Display :: display_confirmation_message($return_message,false);
} }
if ($_GET['action']!='add') {
if ($action_forums!='add') {
/* /*
------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------
RETRIEVING ALL THE FORUM CATEGORIES AND FORUMS RETRIEVING ALL THE FORUM CATEGORIES AND FORUMS
@ -179,12 +181,13 @@ if ($_GET['action']!='add') {
----------------------------------------------------------- -----------------------------------------------------------
*/ */
echo "<table class=\"data_table\" width='100%'>\n"; echo "<table class=\"data_table\" width='100%'>\n";
$my_session=isset($_SESSION['id_session']) ? $_SESSION['id_session'] : null;
$forum_categories_list='';
echo "\t<tr>\n\t\t<th align=\"left\" colspan=\"5\">"; echo "\t<tr>\n\t\t<th align=\"left\" colspan=\"5\">";
echo '<span class="forum_title">'.prepare4display($forum_category['cat_title']).'</span><br />'; echo '<span class="forum_title">'.prepare4display($forum_category['cat_title']).'</span><br />';
echo '<span class="forum_description">'.prepare4display($forum_category['cat_comment']).'</span>'; echo '<span class="forum_description">'.prepare4display($forum_category['cat_comment']).'</span>';
echo "</th>\n"; echo "</th>\n";
if (api_is_allowed_to_edit(false,true) && !($forum_category['session_id']==0 && intval($_SESSION['id_session'])!=0)) { if (api_is_allowed_to_edit(false,true) && !($forum_category['session_id']==0 && intval($my_session)!=0)) {
echo '<th style="vertical-align: top;" align="center" >'; echo '<th style="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=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>"; 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>";

Write Preview
Loading…
Cancel
Save