Clarification of messages for restricted settings with

Courier-IMAP and UW-IMAP

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

diff --git a/ChangeLog b/ChangeLog
index 917f290c64501f90f4639110d2992b77a60fc41f..50dad991fb0adc3e4c3fff9d8fa009a53d2d6531 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,10 @@
 
 Version 1.5.0 -- CVS
 --------------------
-  - Added support in conf.pl for MS cls command
+  - Added support in conf.pl for MS cls command.
+  - conf.pl changes for relative paths outside the SM tree (#715119).
+  - conf.pl changes for delete_folder restrictions with Courier-IMAP and
+    UW-IMAP (#715550).
 
 
 

diff --git a/config/conf.pl b/config/conf.pl
index 34dfa4b1656e64ef905443d170ed4dee5dfc969c..487d3c2e3a34f4634f701cf6fcd7158282cdc6d8 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1764,13 +1764,13 @@ sub command214 {
 
 # Automatically delete folders 
 sub command215 {
-    print "Should folders selected for deletion bypass the Trash folder?\n\n";
-
     if ( $imap_server_type == "courier" ) {
         print "Courier(or Courier-IMAP) IMAP servers do not support ";
         print "subfolders of Trash. \n";
         print "Deleting folders will bypass the trash folder and ";
         print "be immediately deleted.\n\n";
+        print "If this is not the correct value for your server,\n";
+        print "please use option D on the Main Menu to configure your server correctly.\n\n";
         print "Press any key to continue...\n";
         $new_delete = <STDIN>;
         $delete_folder = "true";
@@ -1779,10 +1779,13 @@ sub command215 {
         print "mail to also contain folders.\n";
         print "Deleting folders will bypass the trash folder and";
         print "be immediately deleted\n\n";
+        print "If this is not the correct value for your server,\n";
+        print "please use option D on the Main Menu to configure your server correctly.\n\n";
         print "Press any key to continue...\n";
         $new_delete = <STDIN>;
         $delete_folder = "true";
     } else { 
+        print "Should folders selected for deletion bypass the Trash folder?\n\n";
         if ( lc($delete_folder) eq "true" ) {
             $default_value = "y";
         } else {