Fix broken default value for 'save as draft' and fix explanation of 'move to sent...

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

diff --git a/config/conf.pl b/config/conf.pl
index c5460f1b742e04ed1865cb5f9f0595f33c9940e1..7c37409ee58b9caaf5536a232e5562a5d6593166 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -649,24 +649,24 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) {
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 3 ) {
         print $WHT. "Folder Defaults\n" . $NRM;
-        print "1.  Default Folder Prefix         : $WHT$default_folder_prefix$NRM\n";
-        print "2.  Show Folder Prefix Option     : $WHT$show_prefix_option$NRM\n";
-        print "3.  Trash Folder                  : $WHT$trash_folder$NRM\n";
-        print "4.  Sent Folder                   : $WHT$sent_folder$NRM\n";
-        print "5.  Drafts Folder                 : $WHT$draft_folder$NRM\n";
-        print "6.  By default, move to trash     : $WHT$default_move_to_trash$NRM\n";
-        print "7.  By default, move to sent      : $WHT$default_move_to_sent$NRM\n";
-        print "8.  By default, save as draft     : $WHT$default_save_as_draft$NRM\n";
-        print "9.  List Special Folders First    : $WHT$list_special_folders_first$NRM\n";
-        print "10. Show Special Folders Color    : $WHT$use_special_folder_color$NRM\n";
-        print "11. Auto Expunge                  : $WHT$auto_expunge$NRM\n";
-        print "12. Default Sub. of INBOX         : $WHT$default_sub_of_inbox$NRM\n";
-        print "13. Show 'Contain Sub.' Option    : $WHT$show_contain_subfolders_option$NRM\n";
-        print "14. Default Unseen Notify         : $WHT$default_unseen_notify$NRM\n";
-        print "15. Default Unseen Type           : $WHT$default_unseen_type$NRM\n";
-        print "16. Auto Create Special Folders   : $WHT$auto_create_special$NRM\n";
-        print "17. Folder Delete Bypasses Trash  : $WHT$delete_folder$NRM\n";
-        print "18. Enable /NoSelect folder fix   : $WHT$noselect_fix_enable$NRM\n";
+        print "1.  Default Folder Prefix          : $WHT$default_folder_prefix$NRM\n";
+        print "2.  Show Folder Prefix Option      : $WHT$show_prefix_option$NRM\n";
+        print "3.  Trash Folder                   : $WHT$trash_folder$NRM\n";
+        print "4.  Sent Folder                    : $WHT$sent_folder$NRM\n";
+        print "5.  Drafts Folder                  : $WHT$draft_folder$NRM\n";
+        print "6.  By default, move to trash      : $WHT$default_move_to_trash$NRM\n";
+        print "7.  By default, save sent messages : $WHT$default_move_to_sent$NRM\n";
+        print "8.  By default, save as draft      : $WHT$default_save_as_draft$NRM\n";
+        print "9.  List Special Folders First     : $WHT$list_special_folders_first$NRM\n";
+        print "10. Show Special Folders Color     : $WHT$use_special_folder_color$NRM\n";
+        print "11. Auto Expunge                   : $WHT$auto_expunge$NRM\n";
+        print "12. Default Sub. of INBOX          : $WHT$default_sub_of_inbox$NRM\n";
+        print "13. Show 'Contain Sub.' Option     : $WHT$show_contain_subfolders_option$NRM\n";
+        print "14. Default Unseen Notify          : $WHT$default_unseen_notify$NRM\n";
+        print "15. Default Unseen Type            : $WHT$default_unseen_type$NRM\n";
+        print "16. Auto Create Special Folders    : $WHT$auto_create_special$NRM\n";
+        print "17. Folder Delete Bypasses Trash   : $WHT$delete_folder$NRM\n";
+        print "18. Enable /NoSelect folder fix    : $WHT$noselect_fix_enable$NRM\n";
         print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 4 ) {
@@ -1939,11 +1939,12 @@ sub command24a {
     return $default_move_to_trash;
 }
 
-# default move to sent
+# default move to sent (save sent messages)
 sub command24b {
-    print "By default, should messages get moved to the sent folder?  You\n";
-    print "can specify the default sent folder in option 4.  If this is set\n";
-    print "to false, messages will get sent and no copy will be made.\n";
+    print "By default, should copies of outgoing messages get saved in the\n";
+    print "sent folder?  You can specify the default sent folder in option 4.\n";
+    print "If this is set to false, messages will get sent and no copy will\n";
+    print "be made.\n";
     print "\n";
     print "Sent folder is currently: $sent_folder\n";
     print "\n";
@@ -1953,7 +1954,7 @@ sub command24b {
     } else {
         $default_value = "n";
     }
-    print "By default, move to sent (y/n) [$WHT$default_value$NRM]: $WHT";
+    print "By default, save sent messages (y/n) [$WHT$default_value$NRM]: $WHT";
     $new_show = <STDIN>;
     if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
         $default_move_to_sent = 'true';
@@ -1972,7 +1973,7 @@ sub command24c {
     print "Drafts folder is currently: $draft_folder\n";
     print "\n";
 
-    if ( lc($default_move_to_draft) eq 'true' ) {
+    if ( lc($default_save_as_draft) eq 'true' ) {
         $default_value = "y";
     } else {
         $default_value = "n";