MDL-16613 sesskey initialisation refactored

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 8cca170673648e16432c35abdc2bddd9bc998404..69331c4d319ac1b59208bf8fd30f55804570f605 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3358,7 +3358,6 @@ function get_complete_user_data($field, $value, $mnethostid=null) {
     }
 
     if (isset($_SERVER['REMOTE_ADDR'])) {
-        $user->sesskey  = random_string(10);
         $user->sessionIP = md5(getremoteaddr());   // Store the current IP in the session
     }
 

diff --git a/lib/sessionlib.php b/lib/sessionlib.php
index 774e54d063b1130091ffd513c828351736a4eddc..82a5b5595d954168d67750deb7e3438e4d306c5e 100644 (file)
--- a/lib/sessionlib.php
+++ b/lib/sessionlib.php
@@ -215,10 +215,6 @@ class moodle_session {
 function sesskey() {
     global $USER;
 
-    if(!isset($USER)) {
-        return false;
-    }
-
     if (empty($USER->sesskey)) {
         $USER->sesskey = random_string(10);
     }
@@ -238,7 +234,7 @@ function sesskey() {
 function confirm_sesskey($sesskey=NULL) {
     global $USER;
 
-    if (!empty($USER->ignoresesskey) || !empty($CFG->ignoresesskey)) {
+    if (!empty($USER->ignoresesskey)) {
         return true;
     }
 
@@ -246,11 +242,7 @@ function confirm_sesskey($sesskey=NULL) {
         $sesskey = required_param('sesskey', PARAM_RAW);  // Check script parameters
     }
 
-    if (!isset($USER->sesskey)) {
-        return false;
-    }
-
-    return ($USER->sesskey === $sesskey);
+    return (sesskey() === $sesskey);
 }
 
 /**
@@ -308,6 +300,7 @@ function session_set_user($user) {
     $_SESSION['USER'] = $user;
     check_enrolment_plugins($_SESSION['USER']);
     load_all_capabilities();
+    sesskey(); // init session key
 }
 
 /**