From b278172ff4bb17a3601efc6c2f0c6f30048f6392 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Sat, 8 Jan 2000 22:07:13 +0000 Subject: [PATCH] improvements on reply all git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@149 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/compose.php b/src/compose.php index 7f181f54..e974abfb 100644 --- a/src/compose.php +++ b/src/compose.php @@ -92,18 +92,38 @@ $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]); - if ($i == count($send_cc) - 1) - $send_to_cc .= trim($sendcc[$i]); - else - $send_to_cc .= trim($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]) != "")) { + if ($i == count($send_cc)) + $send_to_cc .= trim($sendcc[$i]); + else + $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); } } -- 2.25.1