IMAP server error intercepted before PHP error.

[squirrelmail.git] / functions / display_messages.php

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 54e9b24329ab3b81675c606c5dfb4c899b05ed8a..62d31e3a82a235e9845e6a26beb1ea41e5805506 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -1,26 +1,48 @@
 <?php
-   /**
-    **  display_messages.php
-    **
-    **  This contains all messages, including information, error, and just
-    **  about any other message you can think of.
-    **
-    ** $Id$
-    **/
 
-    $display_messages_php = true;
+/**
+ * display_messages.php
+ *
+ * Copyright (c) 1999-2001 The SquirrelMail Development Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This contains all messages, including information, error, and just
+ * about any other message you can think of.
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the first line of the function definition below.     ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+function error_username_password_incorrect($color) {
+    echo '<BR>'.
+                "<TABLE COLS=1 WIDTH=75% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
+                '<TR>'.
+                    "<TD BGCOLOR=\"$color[0]\">".
+                        '<B><CENTER>ERROR</CENTER></B>'.
+                    '</TD></TR><TR><TD>'.
+                        '<CENTER><BR>' . _("Unknown user or password incorrect.") .
+                        '<BR><A HREF="login.php" TARGET=_top>' .
+                        _("Click here to try again") .
+                        '</A>.</CENTER>'.
+                    '</TD></TR>'.
+                '</TABLE>'.
+            '</BODY></HTML>';
 
-    function error_username_password_incorrect($color) {
-      echo '<BR>';
-      echo " <TABLE COLS=1 WIDTH=75% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
-      echo '   <TR>';
-      echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo '         <B><CENTER>ERROR</CENTER></B>';
-      echo '   </TD></TR><TR><TD>';
-      echo '      <CENTER><BR>' . _("Unknown user or password incorrect.") . '<BR><A HREF="login.php" TARGET=_top>' . _("Click here to try again") . '</A>.</CENTER>';
-      echo '   </TD></TR>';
-      echo '</TABLE>';
-      echo '</BODY></HTML>';
     }
 
     function general_info($motd, $org_logo, $version, $org_name, $color) {