Support for $CFG->sessioncookiepath

diff --git a/lib/defaults.php b/lib/defaults.php
index e7ae8edbfd900d38bc57c4231cc954796229296a..90105ef8adc49853d48b80823a66f1158da39b31 100644 (file)
--- 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
index e9ffdc1089db6a7c7966ce402ced55acacc0b4cb..8475993f827025b4390905ac792db3520f70d691 100644 (file)
--- 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
index 2fbd14efaa827699bf0a2c286257526c9ff0088f..4e2d8fc8bf718dcde7bd019a93a8f8de38459eff 100644 (file)
--- 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