X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=89305b7299f280f7ab6158b66a36fde24035b966;hb=6ff1c69061784933fba5cf76c1bbd9e14e659b0f;hp=30f0084f74a25853f6ac3fba775315f7065e54e6;hpb=5917742752bea11a547aeba6e4102dd3655b4800;p=squirrelmail.git

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 30f0084f..89305b72 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -5,119 +5,85 @@
     **  This contains all messages, including information, error, and just
     **  about any other message you can think of.
     **
+    ** $Id$
     **/
 
-    $display_messages_php = true;
+    if (defined ('display_messages_php'))
+       return; 
+    define ('display_messages_php', true); 
 
     function error_username_password_incorrect($color) {
-      global $PHPSESSID;
-
-      echo "<BR>";
-      echo "<TABLE COLS=1 WIDTH=75% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
-      echo "   <TR>";
+      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>";
+      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) {
-      echo "<BR>";
+      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 '<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>";
+      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>$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 '         <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>";
+      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>";
-      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 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) {
-      global $PHPSESSID;
       $urlMailbox = urlencode($mailbox);
 
-      echo "<BR>";
+      echo '<BR>';
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
-      echo "   <TR>";
+      echo '   <TR>';
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>". _("ERROR") ."</CENTER></B></FONT>";
-      echo "   </TD></TR><TR><TD>";
+      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>";
+      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, $color) {
-      echo "<BR>";
+      echo '<BR>';
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
-      echo "   <TR>";
+      echo '   <TR>';
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . "</CENTER></B></FONT>";
-      echo "   </TD></TR><TR><TD>";
+      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>";
+      echo '      </CENTER>';
+      echo '   </TD></TR>';
+      echo '</TABLE>';
     }
 ?>