From 98468fbac5463f240ced5101bb475d57b7f1fb1b Mon Sep 17 00:00:00 2001 From: ebullient Date: Tue, 8 Apr 2003 01:01:02 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 ++++- config/conf.pl | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 917f290c..50dad991 100644 --- 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 34dfa4b1..487d3c2e 100755 --- 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 = ; $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 = ; $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 { -- 2.25.1