workaround for php3 dealing with optional arguments to function loginToImapServer

[squirrelmail.git] / src / compose.php
diff --git a/src/compose.php b/src/compose.php

index 042a1c4018584de820c14e811ecfd65b78899615..e13c8a257c156237b34c1a550624c1249c690818 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -10,7 +10,7 @@
     include("../src/load_prefs.php");
  
     echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
+   $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
     displayPageHeader($color, "None");
  
     if ($forward_id) {
@@ -30,13 +30,13 @@
           } else if (containsType($msg, "msg", "any_type", $ent_num)) {
              $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
           } else {
-            $body = "No Message";
+            $body = _("No Message");
           }
        }
  
        $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
  
-      $tmp = "-------- Original Message ---------\n";
+      $tmp = _("-------- Original Message ---------\n");
        $body_ary = explode("\n", $body);
        $body = "";
        for ($i=0;$i < count($body_ary);$i++) {
@@ -66,7 +66,7 @@
           } else if (containsType($msg, "msg", "any_type", $ent_num)) {
              $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
           } else {
-            $body = "No Message";
+            $body = _("No Message");
           }
        }
  
@@ -92,17 +92,45 @@
     $send_to = ereg_replace("\"", "", $send_to);
     $send_to = stripslashes($send_to);
  
+   /** This formats a CC string if they hit "reply all" **/
     if ($send_to_cc != "") {
-      $send_to_cc = strtolower($send_to_cc);
-      $send_to_cc = ereg_replace("\"", "", $send_to_cc);
-      $send_to_cc = stripslashes($send_to_cc);
+      $send_to_cc = ereg_replace(";", ",", $send_to_cc);
+      $sendcc = explode(",", $send_to_cc);
+      $send_to_cc = "";
+
+      for ($i = 0; $i < count($sendcc); $i++) {
+         $sendcc[$i] = trim($sendcc[$i]);
+         if ($sendcc[$i] == "")
+            continue;
+
+         $sendcc[$i] = encodeEmailAddr($sendcc[$i]);
+         $sendcc[$i] = decodeEmailAddr($sendcc[$i]);
+
+         $whofrom = encodeEmailAddr($msg["HEADER"]["FROM"]);
+         $whofrom = decodeEmailAddr($whofrom);
+
+         $whoreplyto = encodeEmailAddr($msg["HEADER"]["REPLYTO"]);
+         $whoreplyto = decodeEmailAddr($whoreplyto);
+
+         if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) &&
+             (strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) &&
+             (trim($sendcc[$i]) != "")) {
+            $send_to_cc .= trim($sendcc[$i]) . ", ";
+         }
+      }
+      $send_to_cc = trim($send_to_cc);
+      if (substr($send_to_cc, -1) == ",") {
+         $send_to_cc = substr($send_to_cc, 0, strlen($send_to_cc) - 1);
+      }
     }
  
     echo "<FORM action=\"compose_send.php\" METHOD=POST>\n";
     echo "<TABLE COLS=2 WIDTH=50 ALIGN=CENTER CELLSPACING=0 BORDER=0>\n";
     echo "   <TR>\n";
     echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-   echo "         <FONT FACE=\"Arial,Helvetica\">To: </FONT>\n";
+   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo _("To:");
+   echo " </FONT>\n";
     echo "      </TD><TD WIDTH=% \"$color[4]\" ALIGN=LEFT>\n";
     if ($send_to)
        echo "         <INPUT TYPE=TEXT NAME=passed_to VALUE=\"$send_to\" SIZE=60><BR>";
@@ -127,10 +155,11 @@
     echo "         <INPUT TYPE=TEXT NAME=passed_bcc SIZE=60><BR>";
     echo "      </TD>\n";
     echo "   </TR>\n";
-
     echo "   <TR>\n";
     echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-   echo "         <FONT FACE=\"Arial,Helvetica\">Subject:</FONT>\n";
+   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo _("Subject:");
+   echo " </FONT>\n";
     echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
     if ($reply_subj) {
        $reply_subj = str_replace("\"", "'", $reply_subj);
@@ -151,7 +180,9 @@
     } else {
        echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60>";
     }
-   echo "&nbsp;&nbsp;<INPUT TYPE=SUBMIT VALUE=\"Send\"><BR>";
+   echo "&nbsp;&nbsp;<INPUT TYPE=SUBMIT VALUE=\"";
+   echo _("Send");
+   echo "\"><BR>";
     echo "      </TD>\n";
     echo "   </TR>\n";
     echo "   <TR>\n";
@@ -163,6 +194,8 @@
     echo "      </TD>";
     echo "   </TR>\n";
     echo "</TABLE>\n";
-   echo "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Send\"></CENTER>";
+   echo "<CENTER><INPUT TYPE=SUBMIT VALUE=\"";
+   echo _("Send");
+   echo "\"></CENTER>";
     echo "</FORM>";
-?>
-\ No newline at end of file
+?>