X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=242f48f60e48bc027dea35766b3ece35f46c0b2c;hb=f1f3803aab9214d9d65a6e2ff9a5fbb4339be0ad;hp=d5d4931e6be1fc3bf4307de89b33bc4e83860e1e;hpb=97be216806423d7008317ac7b4ca81ca8a4c8504;p=squirrelmail.git

diff --git a/functions/display_messages.php b/functions/display_messages.php
index d5d4931e..242f48f6 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  display_messages.php
     **
@@ -7,14 +7,16 @@
     **
     **/
 
+    $display_messages_php = true;
+
     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 "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>ERROR</CENTER></B></FONT>";
+      echo "         <B><CENTER>ERROR</CENTER></B>";
       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 "      <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>";
@@ -22,78 +24,49 @@
 
     function general_info($motd, $org_logo, $version, $org_name, $color) {
       echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=80% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+      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 "         <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=\"$color[4]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\" SIZE=-1><CENTER>Running SquirrelMail version $version (c) 1999-2000.</CENTER></FONT>";
-      echo "   </TD></TR><TR><TD>";
-      echo "      <TABLE COLS=2 WIDTH=90% NOBORDER align=\"center\">";
+      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=\"$color[4]\"><CENTER>";
+      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 "               <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=\"$color[4]\">";
-      echo "               <FONT FACE=\"Arial,Helvetica\">$motd</FONT>";
+      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) {
-      $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 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, $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 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, $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 FACE=\"Arial,Helvetica\" COLOR=\"$color[2]\"><B><CENTER>ERROR</CENTER></B></FONT>";
+      echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>". _("ERROR") ."</CENTER></B></FONT>";
       echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>$message<BR>\n";
+      echo "      <CENTER><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 "         <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>";
     }
@@ -103,10 +76,10 @@
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[2]\"><B><CENTER>ERROR</CENTER></B></FONT>";
+      echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . "</CENTER></B></FONT>";
       echo "   </TD></TR><TR><TD>";
-      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>$message";
-      echo "      </FONT></CENTER>";
+      echo "      <CENTER><BR>$message";
+      echo "      </CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
     }