Fix for incorrect folding of header lines. This fix the error message

[squirrelmail.git] / src / signout.php

diff --git a/src/signout.php b/src/signout.php
index 151a5d7f0aeab5781defb59fa331abfe159abc5e..109053101140b3a122a6ce9c6583aaadbb6f5fd3 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -15,7 +15,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'src/validate.php');
+require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/prefs.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/strings.php');
@@ -39,17 +39,16 @@ if (!isset($frame_top)) {
 
 /* If a user hits reload on the last page, $base_uri isn't set
  * because it was deleted with the session. */
-if (!isset($base_uri)) {
+if (!isset($_SESSION['base_uri'])) {
     if (!function_exists('sqm_baseuri')){
         require_once(SM_PATH . 'functions/display_messages.php');
     }
     $base_uri = sqm_baseuri();
+} else {
+    $base_uri = $_SESSION['base_uri'];
 }
-
+sqsession_destroy();
 do_hook('logout');
-setcookie('username', '', 0, $base_uri);
-setcookie('key', '', 0, $base_uri);
-session_destroy();
 
 if ($signout_page) {
     header('Status: 303 See Other');