Fixed login crash

[squirrelmail.git] / functions / imap_general.php

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 1826d9124a4a69a5fb2881d82acfcb83bac65b21..8bd2485aee551001430052b15421889c12bb489e 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -20,15 +20,12 @@
     */
     function sqimap_session_id() {
 
-        if (session_id() == '')
-            global $RememberedSessionID;
-
-            if (! isset($RememberedSessionID))
-                $RememberedSessionID = GenerateRandomString(4, '', 7);
-        else
-            $RememberedSessionID = substr(session_id(), -4);
+        $IMAPSessionID = substr(session_id(), -4);
+        if( $IMAPSessionID == '' ) {
+            $IMAPSessionID = GenerateRandomString(4, '', 7);
+        }
 
-        return( $RememberedSessionID );
+        return( $IMAPSessionID );
    }
 
 
@@ -142,12 +139,13 @@
     **  will be displayed.  This function returns the imap connection handle.
     ******************************************************************************/
    function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
+      
       global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
 
-      $imap_stream = fsockopen ($imap_server_address, $imap_port,
-         $error_number, $error_string, 15);
+      $imap_stream = fsockopen ( $imap_server_address, $imap_port,
+                                 $error_number, $error_string, 15);
       $server_info = fgets ($imap_stream, 1024);
-
+        
       // Decrypt the password
       $password = OneTimePadDecrypt($password, $onetimepad);