Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19

main/admin/session_course_edit.php

@@ -94,11 +94,11 @@ if ($_configuration['multiple_access_urls']) {
     $access_url_id = api_get_current_access_url_id();
     $sql="SELECT u.user_id,lastname,firstname,username
         FROM $tbl_user u LEFT JOIN $tbl_access_rel_user  a ON(u.user_id= a.user_id)
-        WHERE status='1' AND access_url_id = $access_url_id ".$order_clause;
+        WHERE status='1' AND active = 1 AND access_url_id = $access_url_id ".$order_clause;
 } else {
     $sql="SELECT user_id,lastname,firstname,username
     FROM $tbl_user
-    WHERE status='1'".$order_clause;
+    WHERE status='1' AND active = 1 ".$order_clause;
 }
 
 $result = Database::query($sql);

main/auth/inscription.php

@@ -544,13 +544,13 @@ if ($form->validate()) {
                     $form_data['button'] = Display::button('next', get_lang('GoToCourse', null, $_user['language']), array('class' => 'btn btn-primary btn-large'));
 
                     $exercise_redirect = intval(Session::read('exercise_redirect'));
-
-                    if (!empty($exercise_redirect)) {
+                    $objExercise = new Exercise();
+                    $result = $objExercise->read($exercise_id);
+                    if (!empty($exercise_redirect) && !empty($result)) {
                         $form_data['action'] = api_get_path(WEB_CODE_PATH).'exercice/overview.php?exerciseId='.intval($exercise_redirect).'&cidReq='.$course_info['code'];
                         $form_data['message'] .= '<br />'.get_lang('YouCanAccessTheExercise');
                         $form_data['button'] = Display::button('next', get_lang('Go', null, $_user['language']), array('class' => 'btn btn-primary btn-large'));
                     }
-
                     if (!empty($form_data['action'])) {
                         header('Location: '.$form_data['action']);
                         exit;

main/exercice/exercise.class.php

@@ -3445,7 +3445,7 @@ class Exercise {
         if (api_get_session_id()) {
             $teachers = CourseManager::get_coach_list_from_course_code($coursecode, api_get_session_id());
         } else {
-            $teachers = CourseManager::get_teacher_list_from_course_code($coursecode);
+            $teachers = CourseManager::get_teacher_list_from_course_code($courseInfo['code']);
         }
 
         if (!empty($teachers)) {