From eb85959b5cd510c73b9028eee103c03184805da7 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Fri, 2 Jan 2009 21:20:00 +0000
Subject: [PATCH] MDL-16613 sesskey initialisation refactored

---
 lib/moodlelib.php  |  1 -
 lib/sessionlib.php | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 8cca170673..69331c4d31 100644
--- 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 774e54d063..82a5b5595d 100644
--- 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
 }
 
 /**
-- 
2.39.5