From 77b42004d8cc467a10b38ecd8657f43676bf165b Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 28 May 2012 11:58:28 +0200 Subject: [PATCH] Minor - LP (forum thread form) UI improvements --- main/forum/forumfunction.inc.php | 28 ++++----- main/newscorm/learnpath.class.php | 97 ++++++++++++++----------------- 2 files changed, 55 insertions(+), 70 deletions(-) diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php index 961102fd24..a6efac3a39 100644 --- a/main/forum/forumfunction.inc.php +++ b/main/forum/forumfunction.inc.php @@ -3988,28 +3988,22 @@ function send_notifications($forum_id = 0, $thread_id = 0, $post_id = 0) { * @version May 2008, dokeos 1.8.5 * @since May 2008, dokeos 1.8.5 */ -function get_notifications_of_user($user_id = 0, $force = false) { - global $_course; - +function get_notifications_of_user($user_id = 0, $force = false) { // Database table definition - $table_notification = Database::get_course_table(TABLE_FORUM_NOTIFICATION); - $course = api_get_course_id(); + $table_notification = Database::get_course_table(TABLE_FORUM_NOTIFICATION); $course_id = api_get_course_int_id(); - if (empty($course) || $course == -1) { + if (empty($course_id) || $course_id == -1) { return null; } - if ($user_id == 0) { - global $_user; - $user_id = $_user['user_id']; + if ($user_id == 0) { + $user_id = api_get_user_id(); } - $my_code = isset($_course['code']) ? $_course['code'] : ''; - - if (!isset($_SESSION['forum_notification']) || $_SESSION['forum_notification']['course'] != $my_code || $force = true) { - $_SESSION['forum_notification']['course'] = $my_code; + if (!isset($_SESSION['forum_notification']) || $_SESSION['forum_notification']['course'] != $course_id || $force = true) { + $_SESSION['forum_notification']['course'] = $course_id; $sql = "SELECT * FROM $table_notification WHERE c_id = $course_id AND user_id='".Database::escape_string($user_id)."'"; - $result = Database::query($sql); + $result = Database::query($sql); while ($row = Database::fetch_array($result)) { if (!is_null($row['forum_id'])) { $_SESSION['forum_notification']['forum'][] = $row['forum_id']; @@ -4030,8 +4024,10 @@ function get_notifications_of_user($user_id = 0, $force = false) { */ function count_number_of_post_in_thread($thread_id) { $table_posts = Database :: get_course_table(TABLE_FORUM_POST); - $course_id = api_get_course_int_id(); - + $course_id = api_get_course_int_id(); + if (empty($course_id)) { + return 0; + } $sql = "SELECT * FROM $table_posts WHERE c_id = $course_id AND thread_id='".Database::escape_string($thread_id)."' "; $result = Database::query($sql); return count(Database::store_result($result)); diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index 96bfd875f5..03d00ba743 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -5311,8 +5311,7 @@ class learnpath { * @return string */ public function display_item($item_id, $iframe = true, $msg = '') { - $course_id = api_get_course_int_id(); - global $_course; // It will disappear. + $course_id = api_get_course_int_id(); $return = ''; if (is_numeric($item_id)) { $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM); @@ -5545,8 +5544,7 @@ class learnpath { * @return string HTML form */ public function display_quiz_form($action = 'add', $id = 0, $extra_info = '') { - $course_id = api_get_course_int_id(); - global $charset; + $course_id = api_get_course_int_id(); $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM); $tbl_quiz = Database :: get_course_table(TABLE_QUIZ_TEST); @@ -5823,7 +5821,7 @@ class learnpath { 'prerequisite' => $row['prerequisite'], 'max_time_allowed' => $row['max_time_allowed'] ); - } + } $legend = ''; if ($action == 'add') @@ -5852,13 +5850,13 @@ class learnpath { for ($i = 0; $i < count($arrLP); $i++) { if ($action != 'add') { if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) { - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } else { $arrHide[] = $arrLP[$i]['id']; } } else { if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } } @@ -5872,7 +5870,7 @@ class learnpath { $return .= ''; $return .= ''; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t\t\t" . ''; + $return .= ''; for ($i = 0; $i < count($arrLP); $i++) { if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) { @@ -6094,7 +6092,7 @@ class learnpath { else $selected = ''; - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } } @@ -6162,26 +6160,17 @@ class learnpath { */ public function display_thread_form($action = 'add', $id = 0, $extra_info = '') { $course_id = api_get_course_int_id(); - global $charset; - echo ''; - + if (empty($course_id)) { + return null; + } $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM); $tbl_forum = Database :: get_course_table(TABLE_FORUM_THREAD); if ($id != 0 && is_array($extra_info)) { $item_title = stripslashes($extra_info['title']); - } - elseif (is_numeric($extra_info)) { - $sql_forum = "SELECT thread_title as title - FROM " . $tbl_forum . " - WHERE c_id = ".$course_id." AND thread_id = " . $extra_info; + } elseif (is_numeric($extra_info)) { + $sql_forum = "SELECT thread_title as title FROM $tbl_forum + WHERE c_id = $course_id AND thread_id = " . $extra_info; $result = Database::query($sql_forum); $row = Database :: fetch_array($result); @@ -6193,7 +6182,7 @@ class learnpath { $item_description = ''; } - $return = '
'; + $return = null; if ($id != 0 && is_array($extra_info)) $parent = $extra_info['parent_item_id']; @@ -6231,19 +6220,20 @@ class learnpath { unset ($this->arrMenu); + $return .= '
'; if ($action == 'add') - $return .= '

' . get_lang('CreateTheForum') . ' :

'; + $return .= '' . get_lang('CreateTheForum') . ''; elseif ($action == 'move') $return .= '

' . get_lang('MoveTheCurrentForum') . ' :

'; else - $return .= '

' . get_lang('EditCurrentForum') . ' :

'; - - $return .= ''; + $return .= '' . get_lang('EditCurrentForum') . ''; + + $return .= ''; $return .= ''; - $return .= ''; + $return .= ''; $return .= ''; $return .= ''; $return .= ''; - $return .= ''; + $return .= ''; $return .= ''; if ($action != 'move') { $return .= ''; - $return .= ''; + $return .= ''; $return .= ''; $return .= ''; $return .= ''; @@ -6316,7 +6306,7 @@ class learnpath { } $return .= ''; - $return .= ''; + $return .= ''; $return .= '"; $return .= ''; } $return .= ''; - $return .= ''; $return .= ''; $return .= '
'; - $return .= "\t\t\t\t" . ''; + $return .= ''; $arrHide = array ( $id ); @@ -6251,27 +6241,27 @@ class learnpath { for ($i = 0; $i < count($arrLP); $i++) { if ($action != 'add') { if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) { - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } else { $arrHide[] = $arrLP[$i]['id']; } } else { if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } } if ($arrLP != null) { reset($arrLP); } - $return .= "\t\t\t\t" . ''; + $return .= ''; $return .= '
'; $return .= "\t\t\t\t" . ''; @@ -6288,7 +6278,7 @@ class learnpath { $return .= '
+ $return .= '
'; @@ -6985,13 +6974,13 @@ class learnpath { for ($i = 0; $i < count($arrLP); $i++) { if ($action != 'add') { if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) { - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } else { $arrHide[] = $arrLP[$i]['id']; } } else { if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } } @@ -7007,7 +6996,7 @@ class learnpath { $return .= ''; $return .= "\t\t\t\t" . ''; //$parent_item_id = $_SESSION['parent_item_id']; - $return .= "\t\t\t\t\t" . ''; + $return .= ''; $arrHide = array ( $id ); @@ -7195,13 +7184,13 @@ class learnpath { for ($i = 0; $i < count($arrLP); $i++) { if ($action != 'add') { if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) { - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } else { $arrHide[] = $arrLP[$i]['id']; } } else { if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') - $return .= "\t\t\t\t\t" . ''; + $return .= ''; } } @@ -7215,7 +7204,7 @@ class learnpath { $return .= ''; $return .= ''; $return .= "\t\t\t\t" . '';