Fixed login crash
authorphilippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 27 Nov 2001 19:10:28 +0000 (19:10 +0000)
committerphilippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 27 Nov 2001 19:10:28 +0000 (19:10 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1812 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/imap_general.php
src/login.php
src/redirect.php

index 1826d91..8bd2485 100755 (executable)
     */
     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 );
    }
 
 
     **  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);
 
index 11537e7..dc1d666 100644 (file)
         $rcptaddress = urlencode($rcptaddress);
     }
 
-    /* Check if system has been configured */
-    if ( !file_exists( '../config/config.php' ) ) {
-        echo "<html>\n".
-             "<head>\n".
-             '<title>' . _("Configuration Error") . "</title>\n".
-             "</head>\n".
-             "<body>\n" .
-             '<center><h1>' . 
-             _("This system has not been configured yet.") .
-             '<br>' .
-             _("Please contact system administrator.") .
-             '</h1></center>'.
-             "</body></html>\n";
-        exit;
-    }
+
 
     require_once('../functions/strings.php');
     require_once('../config/config.php');
index 3880210..f409105 100644 (file)
     require_once('../functions/i18n.php');
     require_once('../functions/strings.php');
     require_once('../config/config.php');
+    require_once('../functions/prefs.php');
+    require_once('../functions/imap.php');
+    require_once('../functions/plugin.php');
+    require_once('../functions/constants.php');
+
+    function attachment_common_parse($str, $debug) {
+        global $attachment_common_types, $attachment_common_types_parsed;
+
+        $attachment_common_types_parsed[$str] = true;
+        $types = explode(', ', $str);
+
+        foreach ($types as $val)
+        {
+            // Ignore the ";q=1.0" stuff
+            if (strpos($val, ';') !== false)
+                $val = substr($val, 0, strpos($val, ';'));
+
+            if (! isset($attachment_common_types[$val])) {
+                $attachment_common_types[$val] = true;
+            }
+        }
+    }
+
 
     /* Before starting the session, the base URI must be known. Assuming */
     /* that this file is in the src/ subdirectory (or something).        */
     session_unregister ('user_is_logged_in');
     session_register ('base_uri');
 
-    if (! isset($squirrelmail_language)) {
-        $squirrelmail_language = '';
+    if (! isset($squirrelmail_language) ||
+          $squirrelmail_language == '' ) {
+        $squirrelmail_language = $squirrelmail_default_language;
     }
     set_up_language($squirrelmail_language, true);
+    /* Refresh the language cookie. */
+    setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000,$base_uri);
 
     if (!isset($login_username)) {
-        echo "<HTML><BODY BGCOLOR=\"#ffffff\">\n";
-        echo "<BR><BR>\n";
-        echo "<CENTER>\n";
-        echo '  <B>' . _("You must be logged in to access this page.") . "</B><BR>";
-        echo '  <A HREF="../src/login.php">'  . _("Go to the login page") . "</A>\n";
-        echo "</CENTER>\n";
-        echo "</BODY></HTML>\n";
+        echo "<HTML><BODY BGCOLOR=\"#ffffff\">\n" .
+             "<BR>&nbsp;<BR>\n" .
+             "<CENTER>\n" .
+             '<B>' . _("You must be logged in to access this page.") . "</B><BR>" .
+             '<A HREF="../src/login.php">'  . _("Go to the login page") . "</A>\n" .
+             "</CENTER>\n" .
+             "</BODY></HTML>\n";
         exit;
     }
 
-    /* Refresh the language cookie. */
-    if (isset($squirrelmail_language)) {
-        setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000,$base_uri);
-    }
-
-    require_once('../functions/prefs.php');
-    require_once('../functions/imap.php');
-    require_once('../functions/plugin.php');
-    require_once('../functions/constants.php');
-
     if (!session_is_registered('user_is_logged_in')) {
         do_hook ('login_before');
 
         if ($force_username_lowercase) {
             $login_username = strtolower($login_username);
         }
-
+        
         $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
         if (!$imapConnection) {
-            echo "<html><body bgcolor=\"#ffffff\">\n";
-            echo "<br><br>";
-            echo "<center>";
-            echo "<b>"._("There was an error contacting the mail server.")."</b><br>";
-            echo _("Contact your administrator for help.")."\n";
-            echo "</center>";
-            echo "</body></html>\n";
+            echo "<html><body bgcolor=\"#ffffff\">\n".
+                 "<br> <br>\n".
+                 "<center>\n".
+                 '<b>' . _("There was an error contacting the mail server.") . "</b><br>\n".
+                 _("Contact your administrator for help.") . "\n".
+                 "</center>\n".
+                 "</body></html>\n";
             exit;
         } else {
             $delimiter = sqimap_get_delimiter ($imapConnection);
     /* Send them off to the appropriate page. */
     header("Location: $redirect_url");
 
-
-function attachment_common_parse($str, $debug)
-{
-   global $attachment_common_types, $attachment_common_types_parsed;
-   
-   $attachment_common_types_parsed[$str] = true;
-   $types = explode(', ', $str);
-
-   foreach ($types as $val)
-   {
-      // Ignore the ";q=1.0" stuff
-      if (strpos($val, ';') !== false)
-         $val = substr($val, 0, strpos($val, ';'));
-      
-      if (! isset($attachment_common_types[$val])) {
-        $attachment_common_types[$val] = true;
-      }
-   }
-}
-
 ?>