X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flogin.php;h=5cbe981e2f2012383216952cf4a7c9c59ad988b2;hb=3d806bf24c070fddf00bee07368c168b1c8543b6;hp=90f16c3f9f86ce16977599606102db5a4acbf2ab;hpb=8bc594ba755f1d42842f03a9b3b5ec551309e799;p=squirrelmail.git

diff --git a/src/login.php b/src/login.php
index 90f16c3f..5cbe981e 100644
--- a/src/login.php
+++ b/src/login.php
@@ -3,12 +3,11 @@
 /**
  * login.php -- simple login screen
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This a simple login screen. Some housekeeping is done to clean
  * cookies and find language.
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -51,7 +50,13 @@ $base_uri = sqm_baseuri();
  */
 
 sqsession_destroy();
-
+/**
+ * PHP bug. http://bugs.php.net/11643 (warning, spammed bug tracker) and
+ * http://bugs.php.net/13834
+ * SID constant is not destroyed in PHP 4.1.2, 4.2.3 and maybe other 
+ * versions. Produces warning on login page. Bug should be fixed only in 4.3.0
+ */
+@sqsession_start();
 header('Pragma: no-cache');
 
 /**
@@ -60,26 +65,34 @@ header('Pragma: no-cache');
  * explaining the situation.
  */
 if($imap_auth_mech == 'login') {
-    $imap = sqimap_create_stream($imapServerAddress, $imapPort, $use_imap_tls);
-    $logindisabled = sqimap_capability($imap,'LOGINDISABLED');
-    sqimap_logout($imap);
-    if ($logindisabled) {
-        $string = _("The IMAP server is reporting that plain text logins are disabled.").'<br />'.
-            _("Using CRAM-MD5 or DIGEST-MD5 authentication instead may work.").'<br />';
-        if (!$use_imap_tls) {
-            $string .= _("Also, the use of TLS may allow SquirrelMail to login.").'<br />';
+    /**
+     * detect disabled login, only when imapServerAddress contains
+     * server address and not mapping. See sqimap_get_user_server()
+     */
+    if (substr($imapServerAddress, 0, 4) != "map:") {
+        $imap = sqimap_create_stream($imapServerAddress, $imapPort, $use_imap_tls);
+        $logindisabled = sqimap_capability($imap,'LOGINDISABLED');
+        sqimap_logout($imap);
+        if ($logindisabled) {
+            $string = _("The IMAP server is reporting that plain text logins are disabled.").'<br />'.
+                _("Using CRAM-MD5 or DIGEST-MD5 authentication instead may work.").'<br />';
+            if (!$use_imap_tls) {
+                $string .= _("Also, the use of TLS may allow SquirrelMail to login.").'<br />';
+            }
+            $string .= _("Please contact your system administrator and report this error.");
+            error_box($string,$color);
+            exit;
         }
-        $string .= _("Please contact your system administrator and report this error.");
-        error_box($string,$color);
-        exit;
     }
 }
 
 do_hook('login_cookie');
 
+$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
+
 /* Output the javascript onload function. */
 
-$header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
+$header = "<script type=\"text/javascript\">\n" .
           "<!--\n".
           "  function squirrelmail_loginpage_onload() {\n".
           "    var textElements = 0;\n".
@@ -99,7 +112,18 @@ $header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
 if (@file_exists($theme[$theme_default]['PATH']))
    @include ($theme[$theme_default]['PATH']);
 
-displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
+if (! isset($color) || ! is_array($color)) {
+    // Add default color theme, if theme loading fails
+    $color = array();
+    $color[0]  = '#dcdcdc';  /* light gray    TitleBar               */
+    $color[1]  = '#800000';  /* red                                  */
+    $color[2]  = '#cc0000';  /* light red     Warning/Error Messages */
+    $color[4]  = '#ffffff';  /* white         Normal Background      */
+    $color[7]  = '#0000cc';  /* blue          Links                  */
+    $color[8]  = '#000000';  /* black         Normal text            */
+}
+
+displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE, FALSE, FALSE );
 
 echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" onLoad=\"squirrelmail_loginpage_onload()\">" .
      "\n" . '<form action="redirect.php" method="post" onSubmit="document.forms[0].js_autodetect_results.value=\'' . SMPREF_JS_ON .'\';">' . "\n";
@@ -108,8 +132,6 @@ $username_form_name = 'login_username';
 $password_form_name = 'secretkey';
 do_hook('login_top');
 
-$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
-
 /* If they don't have a logo, don't bother.. */
 if (isset($org_logo) && $org_logo) {
     /* Display width and height like good little people */
@@ -132,7 +154,7 @@ if(sqgetGlobalVar('mailto', $mailto)) {
 echo html_tag( 'table',
     html_tag( 'tr',
         html_tag( 'td',
-            '<center>'.
+            '<div style="text-align: center;">'.
             ( isset($org_logo) && $org_logo
               ? '<img src="' . $org_logo . '" alt="' .
                 sprintf(_("%s Logo"), $org_name) .'"' . $width_and_height .
@@ -167,23 +189,24 @@ echo html_tag( 'table',
                                     addHidden('js_autodetect_results', SMPREF_JS_OFF).
                                     $rcptaddress .
                                     addHidden('just_logged_in', '1'),
-                                'left', '', 'width="*"' )
-                            ) ,
-                        'center', $color[4], 'border="0" width="100%"' ) ,
-                    'left', $color[4] )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        '<center>'. addSubmit(_("Login")) .'</center>',
-                    'left' )
-                ),
-            '', $color[4], 'border="0" width="350"' ) . '</center>',
-        'center' )
-    ) ,
-'', $color[4], 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
-do_hook('login_form');
+                                    'left', '', 'width="*"' )
+                                ) .
+                                concat_hook_function('login_form') ,
+                            'center', $color[4], 'border="0" width="100%"' ) ,
+                        'left', $color[4] )
+                        ) .
+                        html_tag( 'tr',
+                                html_tag( 'td',
+                                    '<div style="text-align: center;">'. addSubmit(_("Login")) .'</div>',
+                                    'left' )
+                                ),
+                        '', $color[4], 'border="0" width="350" align="center"' ) . '</div>',
+                        'center' )
+                        ) ,
+                        '', $color[4], 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
 echo '</form>' . "\n";
 
 do_hook('login_bottom');
+
 ?>
 </body></html>