Fixing - queries due the new changes in the DB (single database) #3910

main/chat/chat_message.php

@@ -247,12 +247,11 @@ if (!empty($course) && !empty($_user['user_id'])) {
 	<table border="0" cellpadding="5" cellspacing="0" width="100%">
 	<tr>
         <td width="320" valign="middle">
-
 		<?php $talkboxsize=(api_get_course_setting('allow_open_chat_window')) ? 'width: 350px; height: 35px' : 'width: 450px; height: 35px'; ?>
         <textarea name="message" style=" <?php echo $talkboxsize; ?>" onkeydown="send_message(event);" onclick="javascript: insert_smile(this);"></textarea>
         </td>
         <td>
-        <button type="submit" value="<?php echo get_lang('Send'); ?>" class="background_submit"><?php echo get_lang('Send'); ?></button>
+            <button type="submit" value="<?php echo get_lang('Send'); ?>" class="background_submit"><?php echo get_lang('Send'); ?></button>
         </td>
 	</tr>
     <tr>

main/chat/chat_whoisonline.php

@@ -13,8 +13,6 @@ define('FRAME', 'online');
 $language_file = array('chat');
 
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
 $course = api_get_course_id();
 $group_id = intval($_SESSION['_gid']);
@@ -29,6 +27,8 @@ if (!empty($group_id)) {
 	$extra_condition = $session_condition;
 }
 
+$user_id = api_get_user_id();
+
 if (!empty($course)) {
 	$showPic = intval($_GET['showPic']);
 	$tbl_course_user			= Database::get_main_table(TABLE_MAIN_COURSE_USER);
@@ -38,7 +38,7 @@ if (!empty($course)) {
 	$tbl_user					= Database::get_main_table(TABLE_MAIN_USER);
 	$tbl_chat_connected			= Database::get_course_table(CHAT_CONNECTED_TABLE);
 
-	$query = "SELECT username FROM $tbl_user WHERE user_id='".$_user['user_id']."'";
+	$query = "SELECT username FROM $tbl_user WHERE user_id='".$user_id."'";
 	$result = Database::query($query);
 
 	list($pseudo_user) = Database::fetch_array($result);
@@ -53,8 +53,8 @@ if (!empty($course)) {
 	
 	if (empty($session_id)) {
 		$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,t3.status 
-				  FROM $tbl_user t1,$tbl_chat_connected t2, $tbl_course_user t3 
-				  WHERE t2.c_id = $course_id, 
+				  FROM $tbl_user t1, $tbl_chat_connected t2, $tbl_course_user t3 
+				  WHERE t2.c_id = $course_id AND
 				  		t1.user_id=t2.user_id AND 
 				  		t3.user_id=t2.user_id AND 
 						t3.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND 
@@ -65,14 +65,21 @@ if (!empty($course)) {
 		$users = Database::store_result($result);
 	} else {
 		// select learners
-		$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session_course_user t3 WHERE t1.user_id=t2.user_id AND t3.id_user=t2.user_id AND t3.id_session = '".$session_id."' AND t3.course_code = '".$_course['sysCode']."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
+		$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri FROM $tbl_user t1, $tbl_chat_connected t2, $tbl_session_course_user t3 
+		          WHERE
+		          t2.c_id = $course_id AND 
+		          t1.user_id=t2.user_id AND t3.id_user=t2.user_id AND 
+		          t3.id_session = '".$session_id."' AND 
+		          t3.course_code = '".$_course['sysCode']."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
 		$result = Database::query($query);
 		while ($learner = Database::fetch_array($result)) {
 			$users[$learner['user_id']] = $learner;
 		}
 
 		// select session coach
-		$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session t3 WHERE t1.user_id=t2.user_id AND t3.id_coach=t2.user_id AND t3.id = '".$session_id."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
+		$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session t3 
+		          WHERE t2.c_id = $course_id AND 
+		             t1.user_id=t2.user_id AND t3.id_coach=t2.user_id AND t3.id = '".$session_id."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
 		$result = Database::query($query);
 		if ($coach = Database::fetch_array($result)) {
 			$users[$coach['user_id']] = $coach;
@@ -81,7 +88,9 @@ if (!empty($course)) {
 		// select session course coach
 		$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri
 				FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session_course_user t3
-				WHERE t1.user_id=t2.user_id
+				WHERE
+				t2.c_id = $course_id AND  
+				t1.user_id=t2.user_id
 				AND t3.id_user=t2.user_id AND t3.status=2
 				AND t3.id_session = '".$session_id."'
 				AND t3.course_code = '".$_course['sysCode']."'
@@ -111,7 +120,6 @@ if (!empty($course)) {
 		} else {
 			$status = CourseManager::is_course_teacher($user['user_id'], $_SESSION['_course']['id']) ? 1 : 5;
 		}
-
 		$user_image = UserManager::get_user_picture_path_by_id($user['user_id'], 'web', false, true);
 		$file_url = $user_image['dir'].$user_image['file'];
 
@@ -134,5 +142,4 @@ if (!empty($course)) {
 	</table>
 	<?php
 }
-
-require 'footer_frame.inc.php';
+require 'footer_frame.inc.php';

main/forum/forumfunction.inc.php

@@ -3724,8 +3724,9 @@ function get_forums_of_group($group_id) {
     $table_users 			= Database :: get_main_table(TABLE_MAIN_USER);
     $course_id              = api_get_course_int_id();
     
-    //-------------- Student -----------------//
+    // Student
     // Select all the forum information of all forums (that are visible to students).
+    
     $sql = "SELECT * FROM ".$table_forums." forum , ".$table_item_property." item_properties
                 WHERE forum.forum_of_group = '".Database::escape_string($group_id)."' AND
                 forum.c_id = $course_id AND
@@ -3737,7 +3738,7 @@ function get_forums_of_group($group_id) {
     // Select the number of threads of the forums (only the threads that are visible).
     $sql2 = "SELECT count(thread_id) AS number_of_threads, threads.forum_id FROM $table_threads threads, ".$table_item_property." item_properties
                     WHERE threads.thread_id=item_properties.ref AND
-                    forum.c_id = $course_id AND
+                    threads.c_id = $course_id AND
                     item_properties.c_id = $course_id AND 
                     item_properties.visibility=1 AND
                     item_properties.tool='".TOOL_FORUM_THREAD."'

main/group/group_space.php

@@ -18,9 +18,7 @@ require_once '../inc/global.inc.php';
 
 /*	Libraries & config files */
 
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
 require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'forum/forumconfig.inc.php';