Added support for requesting on delivery reciepts

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

diff --git a/config/conf.pl b/config/conf.pl
index a9238792304407fa4baf10f39b131d99d4d5cab8..6a0515883c48ff9f0bcb1645475cf70d7186b309 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -389,7 +389,7 @@ while (($command ne "q") && ($command ne "Q")) {
       print "6.  Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n";
       print "7.  Allow use of priority  : $WHT$default_use_priority$NRM\n";
       print "8.  Hide SM attributions   : $WHT$hide_sm_attributions$NRM\n";
-      print "9.  Allow use of MDN       : $WHT$default_use_mdn$NRM\n";      
+      print "9.  Allow use of receipts  : $WHT$default_use_mdn$NRM\n";      
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 5) {
@@ -1547,7 +1547,7 @@ sub command39 {
       $default_value = "n";
    }
    
-   print "Enable read receipt support (y/n) [$WHT$default_value$NRM]: $WHT";
+   print "Enable support for read/delivery receipt support (y/n) [$WHT$default_value$NRM]: $WHT";
       $new_show = <STDIN>;
       if (($new_show =~ /^y\n/i) || (($new_show =~ /^\n/) && ($default_value eq "y"))) {
          return "true";

diff --git a/src/compose.php b/src/compose.php
index e499efe815841ce8933874e428ba00f928d5c567..5f4a3f1312dce0c99223b63859095df16d2ca277 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -558,14 +558,6 @@ function showInputForm () {
         showComposeButtonRow();
     } else {
         echo '   <TR><TD COLSPAN=2 ALIGN=LEFT>';
-
-        $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
-        if ($default_use_mdn) {
-            if ($mdn_user_support) {
-                echo _("Confirm reading:").
-                    "<input type=\"checkbox\" name=\"request_mdn\" value=1>";
-            }
-        }
         echo ' &nbsp; <INPUT TYPE=SUBMIT NAME=send VALUE="' . _("Send") . '"></TD></TR>' . "\n";
     }
 
@@ -616,6 +608,26 @@ function showComposeButtonRow()
     global $use_javascript_addr_book, $save_as_draft,
            $default_use_priority, $mailprio, $default_use_mdn,
            $data_dir, $username;
+    
+    echo "  <TR><TD>\n</TD><TD>\n";
+    if ($default_use_priority) {
+        if(!isset($mailprio)) {
+            $mailprio = "3";
+       }
+       echo _("Priority") .':<select name="mailprio">'.
+             "<option value=1".($mailprio=='1'?' selected':'').'>'. _("High") .'</option>'.
+             "<option value=3".($mailprio=='3'?' selected':'').'>'. _("Normal") .'</option>'.
+             "<option value=5".($mailprio=='5'?' selected':'').'>'. _("Low").'</option>'.
+             "</select>";
+    }
+    $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
+    if ($default_use_mdn) {
+      if ($mdn_user_support) {
+          echo "\n\t". _("Receipt") .': '.
+           '<input type="checkbox" name="request_mdn" value=1>'. _("On read").
+           ' <input type="checkbox" name="request_dr" value=1>'. _("On Delivery");
+      }
+    }
 
     echo "   <TR><td>\n   </td><td>\n";
     if ($use_javascript_addr_book) {
@@ -635,16 +647,6 @@ function showComposeButtonRow()
     if ($save_as_draft) {
         echo '<input type="submit" name ="draft" value="' . _("Save Draft") . "\">\n";
     }
-    if ($default_use_priority) {
-        if(!isset($mailprio)) {
-            $mailprio = "3";
-        }
-        echo _("Priority") .':<select name="mailprio">'.
-             "<option value=1".($mailprio=='1'?' selected':'').'>'. _("High") .'</option>'.
-             "<option value=3".($mailprio=='3'?' selected':'').'>'. _("Normal") .'</option>'.
-             "<option value=5".($mailprio=='5'?' selected':'').'>'. _("Low").'</option>'.
-             "</select>";
-    }
 
     do_hook('compose_button_row');