Browse Source

Fixing userportal see BT#4982

Julio Montoya 12 years ago
parent
commit
870db80b6d
3 changed files with 10 additions and 10 deletions
  1. 1 1
      main/inc/lib/login.lib.php
  2. 4 4
      main/inc/lib/main_api.lib.php
  3. 5 5
      main/inc/lib/usermanager.lib.php

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

@@ -259,7 +259,7 @@ class Login
                     $_user['status'] = $uData['status'];
 
                     $is_platformAdmin = (bool) (!is_null($uData['is_admin']));
-                    $is_allowedCreateCourse = (bool) (($uData ['status'] == 1) or (api_get_setting('drhCourseManagerRights') and $uData['status'] == 4));
+                    $is_allowedCreateCourse = (bool) (($uData['status'] == COURSEMANAGER) or (api_get_setting('drhCourseManagerRights') and $uData['status'] == DRH));
                     ConditionalLogin::check_conditions($uData);
 
                     Session::write('_user', $_user);

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

@@ -2241,17 +2241,17 @@ function api_get_user_platform_status($user_id = false) {
             if ($user_course_status) {
                 $course_status = array('id'=> $course_id);
                 switch($user_course_status) {
-                    case 1;
+                    case COURSEMANAGER;
                         $course_status['status'] = 'teacher';
-                    break;
-                    case 5;
+                        break;
+                    case STUDENT;
                         $course_status['status'] = 'student';
                         //check if tutor
                         $tutor_course_status = CourseManager::get_tutor_in_course_status($user_id, $course_code);
                         if ($tutor_course_status) {
                             $course_status['status'] = 'tutor';
                         }
-                    break;
+                        break;
                 }
             }
 	    }

+ 5 - 5
main/inc/lib/usermanager.lib.php

@@ -2018,11 +2018,11 @@ class UserManager {
 		$condition_date_end = null;
         
 		if ($is_time_over) {
-			$condition_date_end = " AND ((session.access_end_date < '$now' AND session.access_end_date != '0000-00-00 00:00:00') OR moved_to <> 0) ";
-		} else {
-            if (api_is_allowed_to_edit()) {
-                $condition_date_end = null;
+			$condition_date_end = " AND ((session.access_end_date < '$now' AND session.access_end_date != '0000-00-00 00:00:00') OR moved_to <> 0) ";            
+		} else {            
+            if (api_is_allowed_to_create_course()) {
                 //Teachers can access the session depending in the access_coach date
+                $condition_date_end = null;                
             } else {
                 //Student can't access before this dates
                 $condition_date_end = " AND (session.access_end_date >= '$now' OR session.access_end_date = '0000-00-00 00:00:00') AND moved_to = 0 ";
@@ -2030,7 +2030,7 @@ class UserManager {
 		}
 
         $sql = "SELECT DISTINCT session.id, 
-                                session.name, 
+                                session.name,
                                 
                                 access_start_date, 
                                 access_end_date,