X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=62d31e3a82a235e9845e6a26beb1ea41e5805506;hb=be8bb7f0a8ad7f1255c2dd40ae22fed61299d416;hp=661cd27f3335830efb2bc136cfd8d6be9279f09e;hpb=a0c694f087dac7cba8e4d291eaf9aef377bd3cca;p=squirrelmail.git

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 661cd27f..62d31e3a 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -1,113 +1,109 @@
-<?
-   /**
-    **  display_messages.php
-    **
-    **  This contains all messages, including information, error, and just
-    **  about any other message you can think of.
-    **
-    **/
+<?php
+
+/**
+ * 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() {
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=FFFFFF ALIGN=CENTER>";
-      echo "   <TR>";
-      echo "      <TD BGCOLOR=DCDCDC>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>ERROR</CENTER></B></FONT>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>Unknown user or password incorrect.<BR><A HREF=\"login.php\" TARGET=_top>Click here to try again</A>.</FONT></CENTER>";
-      echo "   </TD></TR>";
-      echo "</TABLE>";
-      echo "</BODY></HTML>";
     }
 
-    function general_info($motd, $org_logo, $version, $org_name) {
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=FFFFFF ALIGN=CENTER>";
-      echo "   <TR>";
-      echo "      <TD BGCOLOR=DCDCDC>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>Welcome to $org_name's WebMail system</CENTER></B></FONT>";
-      echo "   </TD></TR><TR><TD>";
-      echo "   <TR><TD BGCOLOR=FFFFFF>";
-      echo "         <FONT FACE=\"Arial,Helvetica\" SIZE=-1><CENTER>Running SquirrelMail version $version (c) 1999 by Nathan and Luke Ehresman.</CENTER></FONT>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <TABLE COLS=2 WIDTH=75% NOBORDER align=\"center\">";
-      echo "         <TR>";
-      echo "            <TD BGCOLOR=FFFFFF><CENTER>";
+    function general_info($motd, $org_logo, $version, $org_name, $color) {
+      echo '<BR>';
+      echo "<TABLE COLS=1 WIDTH=80% CELLSPACING=0 CELLPADDING=2 NOBORDER ALIGN=CENTER><TR><TD BGCOLOR=\"$color[9]\">";
+      echo '<TABLE COLS=1 WIDTH=100% CELLSPACING=0 CELLPADDING=3 NOBORDER BGCOLOR="#FFFFFF" ALIGN=CENTER>';
+      echo '   <TR>';
+      echo "      <TD BGCOLOR=\"$color[0]\">";
+      echo '         <B><CENTER>';
+      printf (_("Welcome to %s's WebMail system"), $org_name);
+      echo '         </CENTER></B>';
+      echo '   <TR><TD BGCOLOR="#FFFFFF">';
+      echo '      <TABLE COLS=2 WIDTH=90% CELLSPACING=0 CELLPADDING=3 NOBORDER align="center">';
+      echo '         <TR>';
+      echo '            <TD BGCOLOR="#FFFFFF"><CENTER>';
       if (strlen($org_logo) > 3)
          echo "               <IMG SRC=\"$org_logo\">";
       else
-         echo "               <B><FONT FACE=\"Arial,Helvetica\">$org_name</FONT></B>";
-      echo "            </CENTER></TD></TR><TR>";
-      echo "            <TD BGCOLOR=FFFFFF>";
-      echo "               <FONT FACE=\"Arial,Helvetica\">$motd</FONT>";
-      echo "            </TD>";
-      echo "         </TR>";
-      echo "      </TABLE>";
-      echo "   </TD></TR>";
-      echo "</TABLE>";
+         echo "               <B>$org_name</B>";
+      echo '         <BR><CENTER>';
+      printf (_("Running SquirrelMail version %s (c) 1999-2000."), $version);
+      echo '            </CENTER><BR>';
+      echo '            </CENTER></TD></TR><TR>';
+      echo '            <TD BGCOLOR="#FFFFFF">';
+      echo "               $motd";
+      echo '            </TD>';
+      echo '         </TR>';
+      echo '      </TABLE>';
+      echo '   </TD></TR>';
+      echo '</TABLE>';
+      echo '</TD></TR></TABLE>';
    }
 
-    function messages_deleted_message($mailbox, $sort, $startMessage) {
-      $urlMailbox = urlencode($mailbox);
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=FFFFFF ALIGN=CENTER>";
-      echo "   <TR>";
-      echo "      <TD BGCOLOR=DCDCDC>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>Messages Deleted</CENTER></B></FONT>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>The selected messages were deleted successfully.<BR>\n";
-      echo "      <BR>";
-      echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              Click here to return to $mailbox</A>.";
-      echo "      </FONT></CENTER>";
-      echo "   </TD></TR>";
-      echo "</TABLE>";
-    }
-
-    function messages_moved_message($mailbox, $sort, $startMessage) {
+    function error_message($message, $mailbox, $sort, $startMessage, $color) {
       $urlMailbox = urlencode($mailbox);
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=FFFFFF ALIGN=CENTER>";
-      echo "   <TR>";
-      echo "      <TD BGCOLOR=DCDCDC>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>Messages Moved</CENTER></B></FONT>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>The selected messages were moved successfully.<BR>\n";
-      echo "      <BR>";
-      echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              Click here to return to $mailbox</A>.";
-      echo "      </FONT></CENTER>";
-      echo "   </TD></TR>";
-      echo "</TABLE>";
-    }
 
-    function error_message($message, $mailbox, $sort, $startMessage) {
-      $urlMailbox = urlencode($mailbox);
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=FFFFFF ALIGN=CENTER>";
-      echo "   <TR>";
-      echo "      <TD BGCOLOR=DCDCDC>";
-      echo "         <FONT FACE=\"Arial,Helvetica\" COLOR=CC0000><B><CENTER>ERROR</CENTER></B></FONT>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>$message<BR>\n";
-      echo "      <BR>";
-      echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              Click here to return to $mailbox</A>.";
-      echo "      </FONT></CENTER>";
-      echo "   </TD></TR>";
-      echo "</TABLE>";
+      echo '<BR>';
+      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+      echo '   <TR>';
+      echo "      <TD BGCOLOR=\"$color[0]\">";
+      echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . '</CENTER></B></FONT>';
+      echo '   </TD></TR><TR><TD>';
+      echo "      <CENTER><BR>$message<BR>\n";
+      echo '      <BR>';
+      echo "         <A HREF=\"right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
+      printf (_("Click here to return to %s"), $mailbox);
+      echo '</A>.';
+      echo '   </TD></TR>';
+      echo '</TABLE>';
     }
 
-    function plain_error_message($message) {
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=FFFFFF ALIGN=CENTER>";
-      echo "   <TR>";
-      echo "      <TD BGCOLOR=DCDCDC>";
-      echo "         <FONT FACE=\"Arial,Helvetica\" COLOR=CC0000><B><CENTER>ERROR</CENTER></B></FONT>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>$message";
-      echo "      </FONT></CENTER>";
-      echo "   </TD></TR>";
-      echo "</TABLE>";
+    function plain_error_message($message, $color) {
+      echo '<BR>';
+      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+      echo '   <TR>';
+      echo "      <TD BGCOLOR=\"$color[0]\">";
+      echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . '</CENTER></B></FONT>';
+      echo '   </TD></TR><TR><TD>';
+      echo "      <CENTER><BR>$message";
+      echo '      </CENTER>';
+      echo '   </TD></TR>';
+      echo '</TABLE>';
     }
 ?>