From 31f3d7c03a7c155d48a955b4beb15105ba154086 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Mon, 6 Dec 1999 20:47:08 +0000 Subject: [PATCH] Got reply and forward working git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@64 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox.php | 10 ++++++++++ src/compose.php | 31 ++++++++++++++++++++++++++++--- src/read_body.php | 27 ++++++++++++++++++++------- 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/functions/mailbox.php b/functions/mailbox.php index f3ea7dbc..9092744d 100644 --- a/functions/mailbox.php +++ b/functions/mailbox.php @@ -116,6 +116,16 @@ } } + function decodeEmailAddr($sender) { + $emailAddr = getEmailAddr($sender); + $emailStart = strpos($emailAddr, "EMAILSTART--"); + $emailEnd = strpos($emailAddr, "--EMAILEND") - 10; + + $emailAddr = ereg_replace("EMAILSTART--", "", $emailAddr); + $emailAddr = ereg_replace("--EMAILEND", "", $emailAddr); + return $emailAddr; + } + function getEmailAddr($sender) { if (strpos($sender, "EMAILSTART--") == false) return ""; diff --git a/src/compose.php b/src/compose.php index d88e087d..f2383bfb 100644 --- a/src/compose.php +++ b/src/compose.php @@ -9,6 +9,23 @@ echo "\n"; $imapConnection = loginToImapServer($username, $key, $imapServerAddress); displayPageHeader($mailbox); + selectMailbox($imapConnection, $mailbox, $numMessages); + + if ($reply_id) { + $body_ary = fetchBody($imapConnection, $reply_id); + for ($i=0;$i < count($body_ary);$i++) { + $tmp = strip_tags($body_ary[$i]); + $tmp = substr($tmp, 0, strlen($tmp) -1); + $body = "$body> $tmp"; + } + } else if ($forward_id) { + $body_ary = fetchBody($imapConnection, $forward_id); + for ($i=0;$i < count($body_ary);$i++) { + $tmp = strip_tags($body_ary[$i]); + $tmp = substr($tmp, 0, strlen($tmp) -1); + $body = "$body> $tmp"; + } + } echo "
\n"; echo "
"; @@ -17,7 +34,10 @@ echo " \n"; echo " To: \n"; echo " \n"; - echo "
"; + if ($send_to) + echo "
"; + else + echo "
"; echo " \n"; echo " \n"; echo " \n"; @@ -38,12 +58,17 @@ echo " \n"; echo " Subject:\n"; echo " \n"; - echo "
"; + if ($reply_subj) + echo "
"; + else if ($forward_subj) + echo "
"; + else + echo "
"; echo " \n"; echo " \n"; echo "\n"; - echo "
"; + echo "
"; echo ""; echo "
"; echo "
"; diff --git a/src/read_body.php b/src/read_body.php index 84f78557..053bcb3f 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -13,23 +13,36 @@ displayPageHeader($mailbox); $body = fetchBody($imapConnection, $passed_id); getMessageHeaders($imapConnection, $passed_id, $passed_id, $f, $s, $d); -// setMessageFlag($imapConnection, $passed_id, $passed_id, "Seen"); $subject = $s[0]; + $url_subj = urlencode(trim($subject)); + $d[0] = ereg_replace(" ", " ", $d[0]); -// $date = explode(" ", trim($d[0])); -// $date = getDateString($date); $date = $d[0]; $from_name = getSenderName($f[0]); $urlMailbox = urlencode($mailbox); + $url_from = trim(decodeEmailAddr($f[0])); + $url_from = urlencode($url_from); + echo "
"; echo "\n"; echo " "; echo "
"; - echo " "; - echo " Message List  "; - echo " Delete  "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo " "; + echo " Message List  "; + echo " Delete  "; + echo " "; + echo " "; + echo " "; + echo " Forward  "; + echo " Reply  "; + echo " "; + echo "
"; echo "
"; echo " \n"; -- 2.25.1