sqsession_destroy

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3778 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index c58f0907cffe6df997395aa357e2267fff3e568f..9b8b9d6e9df4e8751c8133eb887db53053994450 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -235,8 +235,8 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
                 
                 set_up_language($squirrelmail_language, true);
                 include_once(SM_PATH . 'functions/display_messages.php' );
+               sqsession_destroy();
                 logout_error( _("Unknown user or password incorrect.") );
-                session_destroy();
                 exit;
             }
         } else {
@@ -420,6 +420,15 @@ function sqimap_append ($imap_stream, $sent_folder, $length) {
 function sqimap_append_done ($imap_stream) {
     fputs ($imap_stream, "\r\n");
     $tmp = fgets ($imap_stream, 1024);
+    if (preg_match("/(.*)(BAD|NO)(.*)$/", $tmp, $regs)) {
+        set_up_language($squirrelmail_language);
+        echo "<br><b><font color=$color[2]>\n" .
+            _("ERROR : Bad or malformed request.") .
+            "</b><br>\n" .
+            _("Server responded: ") .
+            $message . "</font><br>\n";
+        exit;
+    }
 }
 
 function sqimap_get_user_server ($imap_server, $username) {

diff --git a/src/login.php b/src/login.php
index 6da41967ba10826e8f1e66a6c289492b4d15e8fa..89d839305377d92854261b2b8156ded8f9e59983 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -38,17 +38,14 @@ if (!function_exists('sqm_baseuri')){
     require_once(SM_PATH . 'functions/display_messages.php');
 }
 $base_uri = sqm_baseuri();
-@session_destroy();
 
 /*
  * In case the last session was not terminated properly, make sure
  * we get a new one.
  */
-$cookie_params = session_get_cookie_params();
-setcookie(session_name(), '', 0, $cookie_params['path'], 
-          $cookie_params['domain']);
-setcookie('username', '', 0, $base_uri);
-setcookie('key', '', 0, $base_uri);
+ 
+sqsession_destroy();
+ 
 header('Pragma: no-cache');
 
 do_hook('login_cookie');

diff --git a/src/signout.php b/src/signout.php
index ce7eda8eba6051282285296a3dcd208a23126a7e..109053101140b3a122a6ce9c6583aaadbb6f5fd3 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -47,11 +47,8 @@ if (!isset($_SESSION['base_uri'])) {
 } 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');