Make drafts send with in-reply-to headers (fix regression from long ago)

[squirrelmail.git] / config / conf.pl

diff --git a/config/conf.pl b/config/conf.pl
index c9e3d907e7817702a96e65fdff5ae7aa3072f3f4..2de4eefb819b676cf3920bfbc627397b49abad12 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # conf.pl
 #
-# Copyright (c) 1999-2015 The SquirrelMail Project Team
+# Copyright (c) 1999-2017 The SquirrelMail Project Team
 # Licensed under the GNU GPL. For full terms see COPYING.
 #
 # A simple configure script to configure SquirrelMail
@@ -426,6 +426,8 @@ $hide_sm_attributions = 'false'         if ( !$hide_sm_attributions );
 # since 1.2.5
 $edit_identity = 'true'                 if ( !$edit_identity );
 $edit_name = 'true'                     if ( !$edit_name );
+# since 1.4.23/1.5.2
+$edit_reply_to = 'true'                 if ( !$edit_reply_to );
 
 # since 1.4.0
 $use_smtp_tls= 'false'                  if ( !$use_smtp_tls);
@@ -433,6 +435,12 @@ $smtp_auth_mech = 'none'                if ( !$smtp_auth_mech );
 $use_imap_tls = 'false'                 if ( !$use_imap_tls );
 $imap_auth_mech = 'login'               if ( !$imap_auth_mech );
 
+# $use_imap_tls and $use_smtp_tls are switched to integer since 1.5.1
+$use_imap_tls = 0                      if ( $use_imap_tls eq 'false');
+$use_imap_tls = 1                      if ( $use_imap_tls eq 'true');
+$use_smtp_tls = 0                      if ( $use_smtp_tls eq 'false');
+$use_smtp_tls = 1                      if ( $use_smtp_tls eq 'true');
+
 # since 1.5.0
 $show_alternative_names = 'false'       if ( !$show_alternative_names );
 # $available_languages option available only in 1.5.0. removed due to $languages
@@ -489,11 +497,6 @@ if ( !%fontsets) {
                  'verasans',  'bitstream vera sans,verdana,sans-serif');
 }
 
-# $use_imap_tls and $use_smtp_tls are switched to integer since 1.5.1
-$use_imap_tls = 0                      if ( $use_imap_tls eq 'false');
-$use_imap_tls = 1                      if ( $use_imap_tls eq 'true');
-$use_smtp_tls = 0                      if ( $use_smtp_tls eq 'false');
-$use_smtp_tls = 1                      if ( $use_smtp_tls eq 'true');
 # sorting options changed names and reversed values in 1.5.1
 $disable_thread_sort = 'false'         if ( !$disable_thread_sort );
 $disable_server_sort = 'false'         if ( !$disable_server_sort );
@@ -732,6 +735,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) {
         print "8.  Allow use of receipts        : $WHT$default_use_mdn$NRM\n";
         print "9.  Allow editing of identity    : $WHT$edit_identity$NRM\n";
         print "    Allow editing of name        : $WHT$edit_name$NRM\n";
+        print "    Allow editing of reply-to    : $WHT$edit_reply_to$NRM\n";
         print "    Remove username from header  : $WHT$hide_auth_header$NRM\n";
         print "10. Disable server thread sort   : $WHT$disable_thread_sort$NRM\n";
         print "11. Disable server-side sorting  : $WHT$disable_server_sort$NRM\n";
@@ -2577,11 +2581,13 @@ sub command310 {
     if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
         $edit_identity = 'true';
         $edit_name = 'true';
-        $hide_auth_header = command311b();
+        $edit_reply_to = 'true';
+        $hide_auth_header = command311c();
     } else {
         $edit_identity = 'false';
         $edit_name = command311();
-        $hide_auth_header = command311b();
+        $edit_reply_to = command311b();
+        $hide_auth_header = command311c();
     }
     return $edit_identity;
 }
@@ -2609,6 +2615,28 @@ sub command311 {
 }
 
 sub command311b {
+    print "$NRM";
+    print "\n  Given that users are not allowed to modify their
+  email address, can they edit their reply-to address?
+
+  ";
+
+    if ( lc($edit_reply_to) eq 'true' ) {
+        $default_value = "y";
+    } else {
+        $default_value = "n";
+    }
+    print "Allow the user to edit their reply-to address? (y/n) [$WHT$default_value$NRM]: $WHT";
+    $new_edit = <STDIN>;
+    if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+        $edit_reply_to = 'true';
+    } else {
+        $edit_reply_to = 'false';
+    }
+    return $edit_reply_to;
+}
+
+sub command311c {
     print "$NRM";
     print "\n  SquirrelMail adds username information to every outgoing email in
   order to prevent possible sender forging by users that are allowed
@@ -5009,6 +5037,8 @@ sub save_data {
         # boolean
         print CF "\$edit_name                = $edit_name;\n";
         # boolean
+        print CF "\$edit_reply_to            = $edit_reply_to;\n";
+        # boolean
         print CF "\$hide_auth_header         = $hide_auth_header;\n";
         # boolean
         print CF "\$disable_thread_sort      = $disable_thread_sort;\n";
@@ -5238,9 +5268,9 @@ sub save_data {
         print CF "\$smtp_sitewide_pass    = '". quote_single($smtp_sitewide_pass) ."';\n";
         # string
         print CF "\$imap_auth_mech        = '$imap_auth_mech';\n";
-        # boolean
+        # integer
         print CF "\$use_imap_tls          = $use_imap_tls;\n";
-        # boolean
+        # integer
         print CF "\$use_smtp_tls          = $use_smtp_tls;\n";
         # boolean
         print CF "\$display_imap_login_error = $display_imap_login_error;\n";
@@ -5486,13 +5516,13 @@ sub set_defaults {
             $domain                         = "gmail.com";
             $imapServerAddress              = "imap.gmail.com";
             $imapPort                       = 993;
-            $use_imap_tls                   = true;
+            $use_imap_tls                   = 1;
             $imap_auth_mech                 = "login";
             $smtpServerAddress              = "smtp.gmail.com";
             $smtpPort                       = 465;
             $pop_before_smtp                = false;
             $useSendmail                    = false;
-            $use_smtp_tls                   = true;
+            $use_smtp_tls                   = 1;
             $smtp_auth_mech                 = "login";
             $continue = 1;