X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=048594283a94b8f4b238b292706325e4581e2b6a;hp=639c7e9efece461e55e7b4bcdca94d178161558b;hb=26f277a6f9b3c816da010ef89cef45def1ccec29;hpb=2a32fc83f95eba42be0d1752ef685adf10e1edc9

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 639c7e9e..04859428 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -1,123 +1,95 @@
-<?
-   /**
-    **  display_messages.php
-    **
-    **  This contains all messages, including information, error, and just
-    **  about any other message you can think of.
-    **
-    **/
+<?php
 
-    $display_messages_php = true;
+/**
+ * display_messages.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project 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$
+ */
 
-    function error_username_password_incorrect($color) {
-      global $PHPSESSID;
+function error_username_password_incorrect() {
 
-      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?PHPSESSID=$PHPSESSID\" 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) {
-      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>". _("Welcome to $org_name's WebMail system") ."</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>$org_name</B>";
-      echo "         <BR><CENTER>". _("Running SquirrelMail version $version (c) 1999-2000.") ."</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, $color) {
-      global $PHPSESSID;
-      $urlMailbox = urlencode($mailbox);
+    echo '<BR>'.
+                '<TABLE COLS=1 WIDTH="75%" NOBORDER BGCOLOR="' . $color[4] . '" ALIGN=CENTER>'.
+                '<TR BGCOLOR="' . $color[0] . '">'.
+                    '<TH>' . _("ERROR") . '</TH>'.
+                '</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>';
+}
 
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
-      echo "   <TR>";
-      echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <B><CENTER>". _("Messages Deleted") ."</CENTER></B>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><BR>". _("The selected messages were deleted successfully.") ."<BR>\n";
-      echo "      <BR>";
-      echo "              <A HREF=\"webmail.php?PHPSESSID=$PHPSESSID&right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              ". _("Click here to return to ") ."$mailbox</A>.";
-      echo "      </CENTER>";
-      echo "   </TD></TR>";
-      echo "</TABLE>";
+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="' .  $color[4] . '" 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="' . $color[4] .  '">';
+    echo '      <TABLE COLS=2 WIDTH="90%" CELLSPACING=0 CELLPADDING=3 NOBORDER align="center">';
+    echo '         <TR>';
+    echo '            <TD BGCOLOR="' . $color[4] .  '"><CENTER>';
+    if ( strlen($org_logo) > 3 ) {
+        echo "               <IMG SRC=\"$org_logo\">";
+    } else {
+        echo "               <B>$org_name</B>";
     }
+    echo '         <BR><CENTER>';
+    printf (_("Running SquirrelMail version %s (c) 1999-2001."), $version);
+    echo '            </CENTER><BR>';
+    echo '            </CENTER></TD></TR><TR>';
+    echo '            <TD BGCOLOR="' . $color[4] .  '">';
+    echo "               $motd";
+    echo '            </TD>';
+    echo '         </TR>';
+    echo '      </TABLE>';
+    echo '   </TD></TR>';
+    echo '</TABLE>';
+    echo '</TD></TR></TABLE>';
+}
 
-    function messages_moved_message($mailbox, $sort, $startMessage, $color) {
-      global $PHPSESSID;
-      $urlMailbox = urlencode($mailbox);
-
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
-      echo "   <TR>";
-      echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <B><CENTER>". _("Messages Moved") ."</CENTER></B>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><BR>". _("The selected messages were moved successfully.") ."<BR>\n";
-      echo "      <BR>";
-      echo "              <A HREF=\"webmail.php?PHPSESSID=$PHPSESSID&right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              ". _("Click here to return to ") ."$mailbox</A>.";
-      echo "      </CENTER>";
-      echo "   </TD></TR>";
-      echo "</TABLE>";
-    }
+function error_message($message, $mailbox, $sort, $startMessage, $color) {
+    $urlMailbox = urlencode($mailbox);
+    
+    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 error_message($message, $mailbox, $sort, $startMessage, $color) {
-      global $PHPSESSID;
-      $urlMailbox = urlencode($mailbox);
-
-      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=\"webmail.php?PHPSESSID=$PHPSESSID&right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              ". _("Click here to return to ") ."$mailbox</A>.";
-      echo "      </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>";
-    }
+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>';
+}
+    
 ?>