X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=e13c8a257c156237b34c1a550624c1249c690818;hb=b235d62915dba943446744b725971bd2c47bc347;hp=1f26644b5a5e1549a3797451675a5720c6d41ae3;hpb=78509c544d86d8e4260ec93faed8d2a17362082b;p=squirrelmail.git diff --git a/src/compose.php b/src/compose.php index 1f26644b..e13c8a25 100644 --- a/src/compose.php +++ b/src/compose.php @@ -7,9 +7,10 @@ include("../functions/date.php"); include("../functions/mime.php"); + include("../src/load_prefs.php"); echo "\n"; - $imapConnection = loginToImapServer($username, $key, $imapServerAddress); + $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0); displayPageHeader($color, "None"); if ($forward_id) { @@ -29,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++) { @@ -65,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"); } } @@ -91,11 +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 = 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 "
\n"; echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; @@ -117,10 +155,11 @@ echo "
"; echo " \n"; echo " \n"; - echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " "; echo " \n"; echo "
\n"; - echo " To: \n"; + echo " "; + echo _("To:"); + echo " \n"; echo " \n"; if ($send_to) echo "
"; @@ -107,7 +142,10 @@ echo " 		\n"; echo " CC:\n"; echo " \n"; - echo "
"; + if ($send_to_cc) + echo "
"; + else + echo "
"; echo "
\n"; - echo " Subject:\n"; + echo " "; + echo _("Subject:"); + echo " \n"; echo " \n"; if ($reply_subj) { $reply_subj = str_replace("\"", "'", $reply_subj); @@ -141,15 +180,22 @@ } else { echo " "; } - echo "  
"; + echo "  
"; echo "
\n"; - echo "   
"; + if ($use_signature == true) + echo "   
"; + else + echo "   
"; echo "
\n"; - echo "
"; + echo "
"; echo "
"; -?> \ No newline at end of file +?>