Fixed bug #431256 - Alias expanded not RFC 821-compatible

[squirrelmail.git] / functions / display_messages.php

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 242f48f60e48bc027dea35766b3ece35f46c0b2c..7c787d3bc283345833de9c0fc5af6e8852c0231b 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -5,82 +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) {
-      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\" 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>";
+      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>";
+      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>";
+      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 '            </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 error_message($message, $mailbox, $sort, $startMessage, $color) {
       $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 '      <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>";
+      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>';
     }
-?>
+?>
\ No newline at end of file