Browse Source

Fixing session names for 1.10 compatibility

Julio Montoya 12 years ago
parent
commit
615f611ae5

+ 1 - 1
main/inc/lib/attendance.lib.php

@@ -435,7 +435,7 @@ class Attendance
 			$user_status_in_course  = null;
 			
 			if (api_get_session_id()) {
-                $user_status_in_session = SessionManager::get_user_status_in_session($uid, $current_course_id, $current_session_id);                
+                $user_status_in_session = SessionManager::get_user_status_in_course_session($uid, $current_course_id, $current_session_id);                
 			} else {
 			    $user_status_in_course = CourseManager::get_user_in_course_status($uid, $current_course_id);
 			}

+ 2 - 2
main/inc/lib/document.lib.php

@@ -1246,7 +1246,7 @@ class DocumentManager {
     			$user_in_course = true;
     		}
     	} else {
-    		$user_status = SessionManager::get_user_status_in_session($user_id, $course_info['code'], $session_id);
+    		$user_status = SessionManager::get_user_status_in_course_session($user_id, $course_info['code'], $session_id);
     		if (in_array($user_status, array('0', '2', '6'))) {
     			//is true if is an student, course session teacher or coach
     			$user_in_course = true;
@@ -2633,7 +2633,7 @@ class DocumentManager {
         			$user_in_course = true;
         		}
         	} else {
-        		$user_status = SessionManager::get_user_status_in_session($user_id, $course_info['code'], $session_id);
+        		$user_status = SessionManager::get_user_status_in_course_session($user_id, $course_info['code'], $session_id);
                 //is true if is an student, course session teacher or coach
         		if (in_array($user_status, array('0', '2', '6'))) {
         			$user_in_course = true;

+ 1 - 1
main/inc/lib/main_api.lib.php

@@ -2206,7 +2206,7 @@ function api_get_user_platform_status($user_id = false) {
 	if ($session_id && $course_id) {
         $session_status = array();
         $session_status = array('id' => $session_id, 'course_id' => $course_id);
-        $session_user_status = SessionManager::get_user_status_in_session($user_id, $course_code, $session_id);
+        $session_user_status = SessionManager::get_user_status_in_course_session($user_id, $course_code, $session_id);
         switch ($session_user_status) {
             case 0:
                 $session_status['status'] = 'student';

+ 11 - 10
main/inc/lib/sessionmanager.lib.php

@@ -1546,23 +1546,24 @@ class SessionManager {
         return Database::select('*', $session_table, array('where'=>array('id_coach = ?'=>$user_id)));    	
     }
     
-    /*
-    public static function get_coaches_by_session($session_id, $course_code) {
+   public static function get_user_status_in_course_session($user_id, $course_code, $session_id) {
         $tbl_session_rel_course_rel_user    = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-        $tbl_user                           = Database::get_main_table(TABLE_MAIN_USER);
-        
-        $sql = "SELECT user.user_id
+        $tbl_user                           = Database::get_main_table(TABLE_MAIN_USER);        
+        $sql = "SELECT session_rcru.status
                 FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
                 WHERE session_rcru.id_user = user.user_id AND 
                 session_rcru.id_session = '".intval($session_id)."' AND 
                 session_rcru.course_code ='".Database::escape_string($course_code)."' AND 
-                session_rcru.status = 2 ";
+                user.user_id = ".intval($user_id);    
+        
         $result = Database::query($sql);
-        while ($row = Database::fetch_array($result,'ASSOC')) {
-            $return_array[] = $row;
+        $status = false;
+        if (Database::num_rows($result)) {
+            $status = Database::fetch_row($result);
+            $status = $status['0'];
         }
-        return $return_array;
-    }*/
+        return $status;
+    }
     
     /**
      * Gets user status within a session