L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2013-09-23 15:02:49 +12:00
parent aaee690b89 d79d5ac276
commit d99847a338
78 changed files with 2282 additions and 1363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/setup.php
+9 -6
View File
@@ -728,7 +728,7 @@ if (!defined('SYSCONTEXTID')) {
// Defining the site - aka frontpage course
try {
$SITE = get_site();
} catch (dml_exception $e) {
} catch (moodle_exception $e) {
$SITE = null;
if (empty($CFG->version)) {
$SITE = new stdClass();
@@ -760,8 +760,11 @@ if (CLI_SCRIPT) {
}
}
// start session and prepare global $SESSION, $USER
session_get_instance();
// Start session and prepare global $SESSION, $USER.
if (empty($CFG->sessiontimeout)) {
$CFG->sessiontimeout = 7200;
}
\core\session\manager::start();
$SESSION = &$_SESSION['SESSION'];
$USER = &$_SESSION['USER'];
@@ -848,7 +851,7 @@ if (!empty($CFG->debugvalidators) and !empty($CFG->guestloginbutton)) {
} else {
$user = guest_user();
}
session_set_user($user);
\core\session\manager::set_user($user);
}
}
}
@@ -867,8 +870,8 @@ if ($USER && function_exists('apache_note')
$apachelog_name = clean_filename($USER->firstname . " " .
$USER->lastname);
}
if (session_is_loggedinas()) {
$realuser = session_get_realuser();
if (\core\session\manager::is_loggedinas()) {
$realuser = \core\session\manager::get_realuser();
$apachelog_username = clean_filename($realuser->username." as ".$apachelog_username);
$apachelog_name = clean_filename($realuser->firstname." ".$realuser->lastname ." as ".$apachelog_name);
$apachelog_userid = clean_filename($realuser->id." as ".$apachelog_userid);