Support for $CFG->sessioncookiepath

moodle · Mar 28, 2006 · 1ae655b · 1ae655b
1 parent 9869134
commit 1ae655b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/defaults.php b/lib/defaults.php
@@ -87,6 +87,7 @@
        'runclamonupload'          =>  0,
        'secureforms'              =>  false,
        'sessioncookie'            => '',
+       'sessioncookiepath'        => '/',
        'sessiontimeout'           =>  7200,
        'showsiteparticipantslist' =>  0,
        'showblocksonmodpages'     =>  0,

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -1467,7 +1467,7 @@ function require_logout() {
         session_unregister("SESSION");
     }
 
-    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');
+    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, $CFG->sessioncookiepath);
     unset($_SESSION['USER']);
     unset($_SESSION['SESSION']);
 
@@ -6940,8 +6940,8 @@ function report_session_error() {
     }
     moodle_setlocale();
     //clear session cookies
-    setcookie('MoodleSession'.$CFG->sessioncookie, '', time() - 3600, '/');
-    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');
+    setcookie('MoodleSession'.$CFG->sessioncookie, '', time() - 3600, $CFG->sessioncookiepath);
+    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, $CFG->sessioncookiepath);
     //increment database error counters
     if (isset($CFG->session_error_counter)) {
         set_config('session_error_counter', 1 + $CFG->session_error_counter);

diff --git a/version.php b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006032200;  // YYYYMMDD = date
+   $version = 2006032800;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.6 development';    // Human-friendly version name