|
@@ -2909,6 +2909,7 @@ function api_not_allowed($print_headers = false, $message = null) {
|
|
|
$origin = isset($_GET['origin']) ? $_GET['origin'] : '';
|
|
|
|
|
|
$msg = null;
|
|
|
+
|
|
|
if (isset($message)) {
|
|
|
$msg = $message;
|
|
|
} else {
|
|
@@ -2976,8 +2977,10 @@ function api_not_allowed($print_headers = false, $message = null) {
|
|
|
// Check if the cookies are enabled. If are enabled and if no course ID was included in the requested URL, then the user has either lost his session or is anonymous, so redirect to homepage
|
|
|
if( !isset($_COOKIE['TestCookie']) && empty($_COOKIE['TestCookie']) ) {
|
|
|
$msg = Display::return_message(get_lang('NoCookies').'<br /><br /><a href="'.$home_url.'">'.get_lang('BackTo').' '.get_lang('CampusHomepage').'</a><br />', 'error', false);
|
|
|
- } else {
|
|
|
+ } elseif ($message == null){
|
|
|
$msg = Display::return_message(get_lang('NotAllowed').'<br /><br /><a href="'.$home_url.'">'.get_lang('PleaseLoginAgainFromHomepage').'</a><br />', 'error', false);
|
|
|
+ } else {
|
|
|
+ $msg = Display::return_message($message.' <a href="'.$home_url.'">'.get_lang('PleaseLoginAgainFromHomepage').'</a><br />', 'error', false);
|
|
|
}
|
|
|
$msg = Display::div($msg, array('align'=>'center'));
|
|
|
$tpl->assign('content', $msg);
|
|
@@ -6711,4 +6714,4 @@ function api_can_login_as($loginAsUserId, $userId = null)
|
|
|
};
|
|
|
|
|
|
return (api_is_platform_admin() OR (api_is_session_admin() && $user_info['status'] == 5) OR $isDrh());
|
|
|
-}
|
|
|
+}
|