kartero.org

commit f86887c646e3784be970ac784418519cf5b08793
tree 569dc0cfbeefa11ca173c04b36593a22b3073ee5
parent 3c11452aea01e3af9751c6b6ea546f0152a299b1
author Engels Antonio <engels@majcms.org> 1342898414 +0800
committer Engels Antonio <engels@majcms.org> 1342898414 +0800

    Add high priority, read and delivery receipts

diff --git a/index.php b/index.php
index f094c22..2c3c1ce 100644
--- a/index.php
+++ b/index.php
@@ -1003,20 +1003,20 @@ if (isset($_SESSION['logged_uid'])) {
                        $reply_to = trim($_POST['reply_to']);
                        $reply_subj = trim($_POST['reply_subj']);
                        $reply_body = trim($_POST['reply_body']);                      
-                       $reply_headers = "From: $reply_from\nX-Mailer: Kartero/1.0 (PHP/" . phpversion() . ")";
+                       $reply_headers = "From: $reply_from\nX-Mailer: Kartero/1.0 (PHP/" . phpversion() . ")\n";
 
                        if (isset($_POST['reply_cc']) and !empty($_POST['reply_cc'])) {
                       
                                $reply_cc = trim($_POST['reply_cc']);
                               
-                               $reply_headers = "$reply_headers\nCc: $reply_cc";
+                               $reply_headers = $reply_headers . "Cc: $reply_cc\n";
                        }
 
                        if (isset($_POST['reply_bcc']) and !empty($_POST['reply_bcc'])) {
                       
                                $reply_bcc = trim($_POST['reply_bcc']);
                               
-                               $reply_headers = "$reply_headers\nBcc: $reply_bcc";
+                               $reply_headers = $reply_headers . "Bcc: $reply_bcc\n";
                        }
 
                        if (isset($_POST['filedrop_box']) and !empty($_POST['filedrop_box'])) {
@@ -1027,8 +1027,8 @@ if (isset($_SESSION['logged_uid'])) {
 
                                        $mime_boundary = md5(microtime(true));
 
-                                       $reply_headers .= "\nMIME-Version: 1.0";
-                                       $reply_headers .= "\nContent-Type: multipart/mixed; boundary=\"{$mime_boundary}\"";
+                                       $reply_headers .= "MIME-Version: 1.0\n";
+                                       $reply_headers .= "Content-Type: multipart/mixed; boundary=\"{$mime_boundary}\"\n";
                                       
                                        $reply_body = "\nThis is a multi-part message in MIME format.\n\n--{$mime_boundary}\nContent-type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n\n{$reply_body}";
 
@@ -1063,7 +1063,6 @@ if (isset($_SESSION['logged_uid'])) {
 
                                $reply_headers = "Resent-Date: $redirect_date\nResent-To: $reply_to\n";
 
-
                                if (isset($_POST['reply_cc']) and !empty($_POST['reply_cc'])) {
                       
                                        $reply_cc = trim($_POST['reply_cc']);
@@ -1078,22 +1077,36 @@ if (isset($_SESSION['logged_uid'])) {
                                        $reply_headers = $reply_headers . "Resent-Bcc: $reply_bcc\n";
                                }
 
-                               $reply_headers = $reply_headers . imap_fetchheader($mbox,$_POST['msg'],FT_UID|FT_PREFETCHTEXT);
+                               $reply_headers = $reply_headers . imap_fetchheader($mbox,$_POST['msg'],FT_UID|FT_PREFETCHTEXT) . "\n";
 
                                $reply_body = imap_body($mbox,$_POST['msg'],FT_UID);
                        }
 
+                       $reply_fenv = extract_emails_from($reply_from);
+
+                       if ($_POST['reply_hi'] == "on") {
+                               $reply_headers = $reply_headers . "X-Priority: 1 (Highest)\nImportance: High\n";
+                       }
+
+                       if ($_POST['reply_rr'] == "on") {
+                               $reply_headers = $reply_headers . "X-Confirm-Reading-To: {$reply_fenv[0]}\nDisposition-Notification-To: {$reply_fenv[0]}\n";
+                       }
+
+                       if ($_POST['reply_dr'] == "on") {
+                               $reply_headers = $reply_headers . "Return-Receipt-To: {$reply_fenv[0]}\n";
+                       }
+
                        imap_createmailbox($mbox,"{$host}Sent");
 
                        $reply_date = date ("d-M-Y H:i:s O");
                       
                        $reply_body = preg_replace("#(?<!\r)\n#si", "\n", $reply_body);
+
                        $reply_headers = preg_replace('#(?<!\r)\n#si', "\n", $reply_headers);
+                       $reply_headers = str_replace("\n\n","\n",$reply_headers);
 
                        imap_append($mbox,"{$host}Sent","To: $reply_to\nSubject: $reply_subj\nDate: $reply_date\n$reply_headers\n\n$reply_body\n");
 
-                       $reply_fenv = extract_emails_from($reply_from);
-
                        mail($reply_to, $reply_subj, $reply_body, $reply_headers, "-f {$reply_fenv[0]}");
 
                        if ($_POST['ack'] == 1) {
diff --git a/post.php b/post.php
index e1279da..7206969 100644
--- a/post.php
+++ b/post.php
@@ -21,7 +21,7 @@ if (isset($_POST['new']) and !empty($_POST['new']) and is_numeric($_POST['new'])
 
        echo "<form method=\"post\">";
 
-       echo "<tr><td width=\"50\"><b>From:</b></td><td rowspan=\"7\" width=\"5\"></td><td>";
+       echo "<tr><td width=\"50\"><b>From:</b></td><td rowspan=\"7\" width=\"5\"></td><td colspan=\"2\">";
 
         if (mysql_num_rows($post_alias_query) > 0) {
 
@@ -42,18 +42,28 @@ if (isset($_POST['new']) and !empty($_POST['new']) and is_numeric($_POST['new'])
 
        mysql_free_result($post_alias_query);
 
-       echo "<tr><td><b>To:</b></td><td><input required autofocus class=\"input\" type=\"text\" name=\"reply_to\"></td></tr>";
-       echo "<tr><td><b>Cc:</b></td><td><input class=\"input\" type=\"text\" name=\"reply_cc\"></td></tr>";
-       echo "<tr><td><b>Bcc:</b></td><td><input class=\"input\" type=\"text\" name=\"reply_bcc\"></td></tr>";
-       echo "<tr><td><b>Subject:</b></td><td><input required class=\"input\" type=\"text\" name=\"reply_subj\"></td></tr>";
+       echo "<tr><td><b>To:</b></td><td colspan=\"2\"><input required autofocus class=\"input\" type=\"text\" name=\"reply_to\"></td></tr>";
+       echo "<tr><td><b>Cc:</b></td><td colspan=\"2\"><input class=\"input\" type=\"text\" name=\"reply_cc\"></td></tr>";
+       echo "<tr><td><b>Bcc:</b></td><td colspan=\"2\"><input class=\"input\" type=\"text\" name=\"reply_bcc\"></td></tr>";
+       echo "<tr><td><b>Subject:</b></td><td colspan=\"2\"><input required class=\"input\" type=\"text\" name=\"reply_subj\"></td></tr>";
 
-       echo "<tr><td></td><td><textarea required class=\"input\" name=\"reply_body\" rows=\"10\">";
+       echo "<tr><td></td><td colspan=\"2\"><textarea required class=\"input\" name=\"reply_body\" rows=\"10\">";
 
        echo "</textarea></td></tr>";
 
        echo "<input type=\"hidden\" name=\"filedrop_box\" value=\"$filedrop_box\">";
 
-       echo "<tr><td></td><td align=\"right\"><div class=\"label\"><input type=\"image\" src=\"images/mail-reply.png\" onclick=\"if (confirm('Send message?')) {return true;} else {return false;}\"></div><div class=\"label\">send</div></td></tr>";
+       echo "<tr><td></td><td>";
+
+       echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
+       echo "<td valign=\"middle\"><input type=\"checkbox\" name=\"reply_hi\"></td><td valign=\"middle\">high priority</td>";
+       echo "<td width=\"10\"></td>";
+       echo "<td valign=\"middle\"><input type=\"checkbox\" name=\"reply_rr\"></td><td valign=\"middle\">read receipt</td>";
+       echo "<td width=\"10\"></td>";
+       echo "<td valign=\"middle\"><input type=\"checkbox\" name=\"reply_dr\"></td><td valign=\"middle\">delivery receipt</td>";
+       echo "</tr></table>";
+
+       echo "</td><td align=\"right\"><div class=\"label\"><input type=\"image\" src=\"images/mail-reply.png\" onclick=\"if (confirm('Send message?')) {return true;} else {return false;}\"></div><div class=\"label\">send</div></td></tr>";
 
        echo "</table>";
 
diff --git a/send.php b/send.php
index 782e26e..745944b 100644
--- a/send.php
+++ b/send.php
@@ -151,7 +151,7 @@ if (isset($_POST['msg']) and !empty($_POST['msg']) and is_numeric($_POST['msg'])
                echo "<input type=\"hidden\" name=\"ack\" value=\"1\">";
        }
 
-       echo "<tr><td width=\"50\"><b>From:</b></td><td rowspan=\"7\" width=\"5\"></td><td>";
+       echo "<tr><td width=\"50\"><b>From:</b></td><td rowspan=\"7\" width=\"5\"></td><td colspan=\"2\">";
       
        if ($_POST['rep'] == 4) {
                echo "<input type=\"hidden\" name=\"redirect\" value=\"1\">";
@@ -187,11 +187,11 @@ if (isset($_POST['msg']) and !empty($_POST['msg']) and is_numeric($_POST['msg'])
 
        mysql_free_result($send_alias_query);
 
-       echo "<tr><td><b>To:</b></td><td><input required class=\"input\" type=\"text\" name=\"reply_to\" value=\"$reply_to\" required></td></tr>";
-       echo "<tr><td><b>Cc:</b></td><td><input class=\"input\" type=\"text\" name=\"reply_cc\" value=\"$reply_cc\"></td></tr>";
-       echo "<tr><td><b>Bcc:</b></td><td><input class=\"input\" type=\"text\" name=\"reply_bcc\"></td></tr>";
+       echo "<tr><td><b>To:</b></td><td colspan=\"2\"><input required class=\"input\" type=\"text\" name=\"reply_to\" value=\"$reply_to\" required></td></tr>";
+       echo "<tr><td><b>Cc:</b></td><td colspan=\"2\"><input class=\"input\" type=\"text\" name=\"reply_cc\" value=\"$reply_cc\"></td></tr>";
+       echo "<tr><td><b>Bcc:</b></td><td colspan=\"2\"><input class=\"input\" type=\"text\" name=\"reply_bcc\"></td></tr>";
 
-       echo "<tr><td><b>Subject:</b></td><td><input required class=\"input\" type=\"text\" name=\"reply_subj\" value=\"$reply_subject\" required";
+       echo "<tr><td><b>Subject:</b></td><td colspan=\"2\"><input required class=\"input\" type=\"text\" name=\"reply_subj\" value=\"$reply_subject\" required";
 
        if ($_POST['rep'] == 4) {
                echo " readonly";
@@ -199,7 +199,7 @@ if (isset($_POST['msg']) and !empty($_POST['msg']) and is_numeric($_POST['msg'])
 
        echo "></td></tr>";
 
-       echo "<tr><td></td><td><textarea required class=\"input\" name=\"reply_body\" rows=\"$reply_quote_rows\"";
+       echo "<tr><td></td><td colspan=\"2\"><textarea required class=\"input\" name=\"reply_body\" rows=\"$reply_quote_rows\"";
 
        if ($_POST['rep'] == 4) {
                echo " readonly=\"yes\"";
@@ -250,7 +250,20 @@ if (isset($_POST['msg']) and !empty($_POST['msg']) and is_numeric($_POST['msg'])
                echo "<input type=\"hidden\" name=\"imap_search_where\" value=\"{$_POST['imap_search_where']}\">";
        }
 
-       echo "<tr><td></td><td align=\"right\"><div class=\"label\"><input type=\"image\" src=\"images/mail-reply.png\" onclick=\"if (confirm('Send message?')) {return true;} else {return false;}\"></div><div class=\"label\">send</div></td></tr>";
+       echo "<tr><td></td><td>";
+
+       if ($_POST['rep'] != 4) {
+
+               echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
+               echo "<td valign=\"middle\"><input type=\"checkbox\" name=\"reply_hi\"></td><td valign=\"middle\">high priority</td>";
+               echo "<td width=\"10\"></td>";
+               echo "<td valign=\"middle\"><input type=\"checkbox\" name=\"reply_rr\"></td><td valign=\"middle\">read receipt</td>";
+               echo "<td width=\"10\"></td>";
+               echo "<td valign=\"middle\"><input type=\"checkbox\" name=\"reply_dr\"></td><td valign=\"middle\">delivery receipt</td>";
+               echo "</tr></table>";
+       }
+
+       echo "</td><td align=\"right\"><div class=\"label\"><input type=\"image\" src=\"images/mail-reply.png\" onclick=\"if (confirm('Send message?')) {return true;} else {return false;}\"></div><div class=\"label\">send</div></td></tr>";
 
        echo "</table>";
 
@@ -260,6 +273,8 @@ if (isset($_POST['msg']) and !empty($_POST['msg']) and is_numeric($_POST['msg'])
        echo "</table>";
 }
 
+if ($_POST['rep'] != 4) {
+
 ?>
 
 <div class="message">
@@ -293,3 +308,9 @@ else {
 </div>
 
 <iframe id="filedrop" name="filedrop" src="filedrop.php" frameborder="0" scrolling="0" width="100%" height="0"></iframe>
+
+<?php
+
+}
+
+?>