api_not_allowed redirect now to cusompages when setting is on

main/inc/lib/loginredirection.lib.php

@@ -12,6 +12,14 @@ Class LoginRedirection {
     $param = isset($param) ? $param : '';
     $redirect_url = '';
 
+    //If session request url is setted, we go there
+    if (!empty($_SESSION['request_uri'])) {
+      $req = $_SESSION['request_uri'];
+      unset($_SESSION['request_uri']);
+      header('location: '.$req);
+      exit();
+    }
+
     if ( api_is_student() && !api_get_setting('student_page_after_login') == '' ){
       $redirect_url = html_entity_decode(api_get_setting('student_page_after_login'));
       if ($redirect_url[0] == "/") {
@@ -38,7 +46,6 @@ Class LoginRedirection {
     }
 
     if (!empty($redirect_url)){
-      die("redirect : $redirect_url");
       header('Location: '.$redirect_url.$param);
       exit();
     }
@@ -48,15 +55,8 @@ Class LoginRedirection {
       require_once api_get_path(LIBRARY_PATH).'custompages.lib.php';
       CustomPages::displayPage('index-logged');
     }
-    if (!empty($_SESSION['request_uri'])) {
-      $req = $_SESSION['request_uri'];
-      unset($_SESSION['request_uri']);
-      header('location: '.$req);
-      exit();
-    } else {
-      header('location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login').$param);
-      exit();
-    }
+    header('location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login').$param);
+    exit();
   }
 }
 ?>

main/inc/lib/main_api.lib.php

@@ -2264,6 +2264,12 @@ function api_not_allowed($print_headers = false) {
     $course     = api_get_course_id();
 
     global $this_section;
+    if (api_get_setting('use_custom_pages') == 'true') {
+        $_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];
+        require_once api_get_path(LIBRARY_PATH).'custompages.lib.php';
+        CustomPages::displayPage('index-unlogged');
+        exit;
+    }
 
     $origin = isset($_GET['origin']) ? $_GET['origin'] : '';
 

main/inc/local.inc.php

@@ -653,8 +653,11 @@ if (isset($uidReset) && $uidReset) {    // session data refresh requested
 			api_session_register('is_platformAdmin');
 			api_session_register('is_allowedCreateCourse');
 
-			require_once api_get_path(LIBRARY_PATH).'loginredirection.lib.php';
-			LoginRedirection::redirect();
+      // If request_uri is settd we have to go further to have course permissions
+      if (empty($_SESSION['request_uri']) || !isset($_SESSION['request_uri'])) {
+        require_once api_get_path(LIBRARY_PATH).'loginredirection.lib.php';
+        LoginRedirection::redirect();
+      }
 
 		} else {
 			header('location:'.api_get_path(WEB_PATH));
@@ -1096,3 +1099,8 @@ if (isset($_cid)) {
 	$sql="UPDATE $tbl_course SET last_visit= '$time' WHERE code='$_cid'";
 	Database::query($sql);
 }
+if (!empty($_SESSION['request_uri'])){
+  $req= $_SESSION['request_uri'];
+  unset($_SESSION['request_uri']);
+  header('Location: '.$req);
+}