Fixing anonymous link + lp view error see #6768 and 7111

1.9.x
Julio Montoya 12 years ago
parent 48d917cc2b
commit a813640077
  1. 3
      main/inc/lib/template.lib.php
  2. 21
      main/inc/local.inc.php

@ -356,7 +356,8 @@ class Template
'user_is_teacher' => api_is_course_admin(), 'user_is_teacher' => api_is_course_admin(),
'student_view' => (!empty($_GET['isStudentView']) && $_GET['isStudentView'] == 'true'), 'student_view' => (!empty($_GET['isStudentView']) && $_GET['isStudentView'] == 'true'),
); );
$this->assign('_c',$_c); $this->assign('course_code', $course['code']);
$this->assign('_c', $_c);
} }
/** Set user parameters */ /** Set user parameters */

@ -624,7 +624,7 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
} }
} elseif (KeyAuth::is_enabled()) { } elseif (KeyAuth::is_enabled()) {
$success = KeyAuth::instance()->login(); $success = KeyAuth::instance()->login();
if($success) { if ($success) {
$use_anonymous = false; $use_anonymous = false;
} }
} }
@ -633,7 +633,7 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
// $gidReset = true; // $gidReset = true;
} // end else } // end else
//Now check for anonymous user mode // Now check for anonymous user mode
if (isset($use_anonymous) && $use_anonymous) { if (isset($use_anonymous) && $use_anonymous) {
//if anonymous mode is set, then try to set the current user as anonymous //if anonymous mode is set, then try to set the current user as anonymous
//if he doesn't have a login yet //if he doesn't have a login yet
@ -658,14 +658,13 @@ if (!empty($cidReq) && (!isset($_SESSION['_cid']) or (isset($_SESSION['_cid']) &
} }
/* USER INIT */ /* USER INIT */
if (isset($uidReset) && $uidReset) { if (isset($uidReset) && $uidReset) {
// session data refresh requested // session data refresh requested
unset($_SESSION['_user']['uidReset']); unset($_SESSION['_user']['uidReset']);
$is_platformAdmin = false; $is_platformAdmin = false;
$is_allowedCreateCourse = false; $is_allowedCreateCourse = false;
if (isset($_user['user_id']) && $_user['user_id'] && !api_is_anonymous()) {
if (isset($_user['user_id']) && $_user['user_id']) { //if (isset($_user['user_id']) && $_user['user_id']) {
// a uid is given (log in succeeded) // a uid is given (log in succeeded)
$_SESSION['loginFailed'] = false; $_SESSION['loginFailed'] = false;
@ -708,12 +707,14 @@ if (isset($uidReset) && $uidReset) {
//exit("WARNING UNDEFINED UID !! "); //exit("WARNING UNDEFINED UID !! ");
} }
} else { } else {
// no uid => logout or Anonymous if (!api_is_anonymous()) {
Session::erase('_user'); // no uid => logout or Anonymous
Session::erase('_uid'); Session::erase('_user');
Session::erase('_uid');
}
} }
Session::write('is_platformAdmin',$is_platformAdmin); Session::write('is_platformAdmin', $is_platformAdmin);
Session::write('is_allowedCreateCourse',$is_allowedCreateCourse); Session::write('is_allowedCreateCourse', $is_allowedCreateCourse);
} else { // continue with the previous values } else { // continue with the previous values
$_user = $_SESSION['_user']; $_user = $_SESSION['_user'];
$is_platformAdmin = isset($_SESSION['is_platformAdmin']) ? $_SESSION['is_platformAdmin'] : false; $is_platformAdmin = isset($_SESSION['is_platformAdmin']) ? $_SESSION['is_platformAdmin'] : false;

Loading…
Cancel
Save