New Reply citation to include date, and author.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6508 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 3519f06999f0513c98584d7259897dce04f13e97..4c8d38114eb94ba15afa708d6a3cd8f2169ce569 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@
 
 Version 1.5.1 -- CVS
 --------------------
-
+  - New reply citation to include date and author.
 
 Version 1.5.0
 --------------------

diff --git a/include/options/personal.php b/include/options/personal.php
index c7312b97f05043c26d86ec393e63cfdfdce1a46e..aafd54c89f6a0442a0997aa9c7f145ec35a39a61 100644 (file)
--- a/include/options/personal.php
+++ b/include/options/personal.php
@@ -173,6 +173,7 @@ function load_optpage_data_personal() {
         'refresh' => SMOPT_REFRESH_NONE,
         'posvals' => array(SMPREF_NONE    => _("No Citation"),
                            'author_said'  => _("AUTHOR Said"),
+                           'date_time_author' => _("On DATE, AUTHOR Said"),
                            'quote_who'    => _("Quote Who XML"),
                            'user-defined' => _("User-Defined"))
     );

diff --git a/src/compose.php b/src/compose.php
index 0858d133ba4ee9ea9aec3ee456566a200a0c1196..8e65706a74ea55ee1617e81d1522e1af59e39a0d 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -144,7 +144,7 @@ function replyAllString($header) {
    return $url_replytoallcc;
 }
 
-function getReplyCitation($orig_from) {
+function getReplyCitation($orig_from, $orig_date) {
     global $reply_citation_style, $reply_citation_start, $reply_citation_end;
     $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true);
 //    $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false);
@@ -168,6 +168,10 @@ function getReplyCitation($orig_from) {
         $start = '<' . _("quote") . ' ' . _("who") . '="';
         $end   = '">';
         break;
+    case 'date_time_author':
+        $start = 'On ' . getLongDateString($orig_date) . ', ';
+        $end = ' ' . _("said") . ':';
+        break;
     case 'user-defined':
         $start = $reply_citation_start .
          ($reply_citation_start == '' ? '' : ' ');
@@ -777,7 +781,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
                     $body .= '> ' . str_replace("\n", "\n> ", rtrim($line)) . "\n";
                 }
             }
-            $body = getReplyCitation($from) . $body;
+            $body = getReplyCitation($from , $orig_header->date) . $body;
             $composeMessage->reply_rfc822_header = $orig_header;
 
             break;