Simplify login page template

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index a758525c02f9183d10576e1a4fddfc9733eb6c71..807b40676bf766abf4d9e2266acdfabb5bd82a23 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -31,23 +31,32 @@ require_once(SM_PATH . 'functions/forms.php');
  */
 set_up_language($squirrelmail_language, TRUE, TRUE);
 
-/*
+/**
  * In case the last session was not terminated properly, make sure
- * we get a new one.
+ * we get a new one, but make sure we preserve session_expired_*
  */
-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
  */
+if ( !empty($_SESSION['session_expired_post']) && !empty($_SESSION['session_expired_location']) ) {
+    $sep = $_SESSION['session_expired_post'];
+    $sel = $_SESSION['session_expired_location'];
+
+    sqsession_destroy();
+  
+    sqsession_is_active();
+    $_SESSION=array();
+    sqsession_register($sep, 'session_expired_post');
+    sqsession_register($sel, 'session_expired_location');
+} else {
+    sqsession_destroy();
+    @sqsession_is_active();
+    $_SESSION=array();
+}
 
-//exit;
 /**
  * This detects if the IMAP server has logins disabled, and if so,
  * squelches the display of the login form and puts up a message
@@ -69,7 +78,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;
         }
     }
@@ -125,18 +136,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 = '';
@@ -154,20 +164,32 @@ if(sqgetGlobalVar('mailto', $mailto)) {
     $rcptaddress = '';
 }
 
-$password_field = addPwField($password_form_name).
-                  addHidden('js_autodetect_results', SMPREF_JS_OFF).
-                  $rcptaddress .
-                  addHidden('just_logged_in', '1');
+$password_field = addPwField($password_form_name);
+$login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
+               $rcptaddress .
+               addHidden('just_logged_in', '1') .
+               concat_hook_function('login_form');
 
 session_write_close();
 
-$oTemplate->assign('color', $color);
 $oTemplate->assign('logo_str', $logo_str);
 $oTemplate->assign('sm_attribute_str', $sm_attribute_str);
 $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name));
-$oTemplate->assign('login_field', addInput($username_form_name, $loginname_value));
-$oTemplate->assign('password_field', $password_field);
-$oTemplate->assign('submit_field', addSubmit(_("Login")));
+$oTemplate->assign('login_field_value', $loginname_value);
+$oTemplate->assign('login_extra', $login_extra);
+
+echo '<body onLoad="squirrelmail_loginpage_onload()" style="text-align:center">'."\n";
+echo '<form action="redirect.php" method="post" onSubmit="document.forms[0].js_autodetect_results.value='. SMPREF_JS_ON .'">'."\n";
+do_hook('login_top');
 
 $oTemplate->display('login.tpl');
-?>
\ No newline at end of file
+
+echo "</form>\n";
+do_hook('login_bottom');
+
+// Turn off delayed error handling to make sure all errors are dumped.
+#$oErrorHandler->delayedErrors(false);
+
+#trigger_error('login');
+$oTemplate->display('footer.tpl');
+?>