Whitespace in wrong place. Spotted by Robert L Mathews.

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index e5efc68a6091f3f2f6dfa44085b492dad881bc12..e21cc3e67fc7df33bd2a6d9dc8f854f00193a974 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -36,16 +36,15 @@ set_up_language($squirrelmail_language, TRUE, TRUE);
  * we get a new one.
  */
 sqsession_destroy();
-sqsession_is_active();
-$_SESSION=array();
-
-
 /**
  * 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_is_active();
+$_SESSION=array();
+
 
 /**
  * This detects if the IMAP server has logins disabled, and if so,
@@ -68,7 +67,9 @@ if($imap_auth_mech == 'login') {
                 $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);
+            error_box($string);
+            // display footer (closes html tags) and stop script execution
+            $oTemplate->display('footer.tpl');
             exit;
         }
     }
@@ -124,18 +125,17 @@ if (isset($org_logo) && $org_logo) {
     $width_and_height = '';
     if (isset($org_logo_width) && is_numeric($org_logo_width) &&
      $org_logo_width>0) {
-        $width_and_height = " width=\"$org_logo_width\"";
+        $width_and_height = "width=\"$org_logo_width\" ";
     }
     if (isset($org_logo_height) && is_numeric($org_logo_height) &&
      $org_logo_height>0) {
-        $width_and_height .= " height=\"$org_logo_height\"";
+        $width_and_height .= "height=\"$org_logo_height\" ";
     }
     
     $logo_str = '<img src="'.$org_logo.'" ' .
-                       'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
-                       $width_and_height .
-                'class="sqm_loginImage" ' .
-                       ' /><br />'."\n";
+                'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
+                $width_and_height .
+                'class="sqm_loginImage" /><br />'."\n";
 }
 
 $sm_attribute_str = '';
@@ -170,8 +170,8 @@ $oTemplate->assign('submit_field', addSubmit(_("Login")));
 $oTemplate->display('login.tpl');
 
 // Turn off delayed error handling to make sure all errors are dumped.
-$oErrorHandler->delayedErrors(false);
+#$oErrorHandler->delayedErrors(false);
 
-trigger_error('login');
+#trigger_error('login');
 $oTemplate->display('footer.tpl');
 ?>
\ No newline at end of file