Reinstating fix for the "to" addresses. Hopefully won't need them for CC

[squirrelmail.git] / functions / display_messages.php

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 12e2352dd1b519bac5cc2e578ea3ead106eeebad..e4a02c0ef1a0aa3bb421f1b93cdb3104ea0c871a 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -5,6 +5,7 @@
     **  This contains all messages, including information, error, and just
     **  about any other message you can think of.
     **
+    ** $Id$
     **/
 
     $display_messages_php = true;
@@ -28,7 +29,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 "         <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>";
@@ -37,7 +40,9 @@
          echo "               <IMG SRC=\"$org_logo\">";
       else
          echo "               <B>$org_name</B>";
-      echo "         <BR><CENTER>". _("Running SquirrelMail version $version (c) 1999-2000.") ."</CENTER><BR>";
+      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";
@@ -49,42 +54,6 @@
       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 "         <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?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) {
-      $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?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);
 
@@ -96,9 +65,9 @@
       echo "   </TD></TR><TR><TD>";
       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 "      </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>";
     }