Added displaying of error messages to login page.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11038 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/login.php b/src/login.php
index a758525c02f9183d10576e1a4fddfc9733eb6c71..e5efc68a6091f3f2f6dfa44085b492dad881bc12 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -47,7 +47,6 @@ $_SESSION=array();
  * versions. Produces warning on login page. Bug should be fixed only in 4.3.0
  */
 
-//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
@@ -131,7 +130,7 @@ if (isset($org_logo) && $org_logo) {
      $org_logo_height>0) {
         $width_and_height .= " height=\"$org_logo_height\"";
     }
-
+    
     $logo_str = '<img src="'.$org_logo.'" ' .
                        'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
                        $width_and_height .
@@ -161,7 +160,6 @@ $password_field = addPwField($password_form_name).
 
 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));
@@ -170,4 +168,10 @@ $oTemplate->assign('password_field', $password_field);
 $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);
+
+trigger_error('login');
+$oTemplate->display('footer.tpl');
 ?>
\ No newline at end of file

diff --git a/templates/default/login.tpl b/templates/default/login.tpl
index 8da056c224cc3d27ca95090e43895ba74c8a0037..d68c38fc6ba0c38fedb1ca20009e3f3ce4d1b3bd 100644 (file)
--- a/templates/default/login.tpl
+++ b/templates/default/login.tpl
@@ -60,6 +60,4 @@ extract($t);
 </table>
 </form>
 <?php do_hook('login_bottom'); ?>
-</div>
-</body>
-</html>
+</div>
\ No newline at end of file