some plugins might use own hooks

[squirrelmail.git] / config / conf.pl

diff --git a/config/conf.pl b/config/conf.pl
index 436388b8288c9de7da8b45f586e3865a4e1e07d0..5b191039eabaecaca04273925693dd58ea71349b 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -292,7 +292,7 @@ $allow_thread_sort = 'false'            if ( !$allow_thread_sort );
 $allow_server_sort = 'false'            if ( !$allow_server_sort );
 $no_list_for_subscribe = 'false'        if ( !$no_list_for_subscribe );
 $allow_charset_search = 'true'          if ( !$allow_charset_search );
-$allow_advanced_search = '0'            if ( !$allow_advanced_search) ;
+$allow_advanced_search = 0              if ( !$allow_advanced_search) ;
 $prefs_user_field = 'user'              if ( !$prefs_user_field );
 $prefs_key_field = 'prefkey'            if ( !$prefs_key_field );
 $prefs_val_field = 'prefval'            if ( !$prefs_val_field );
@@ -481,7 +481,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         print "11. Allow server-side sorting   : $WHT$allow_server_sort$NRM\n";
         print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n";
         print "13. Allow advanced search       : $WHT$allow_advanced_search$NRM\n";
-    print "14. PHP session name            : $WHT$session_name$NRM\n";
+        print "14. PHP session name            : $WHT$session_name$NRM\n";
         print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 5 ) {
@@ -2148,18 +2148,20 @@ sub command314 {
 # command315 (UID support) obsoleted.
 
 # advanced search option
-
 sub command316 {
-    print "This option allows you to change the advanced search form.\n";
-    print "Set to 0 to disable the advanced search, 1 to have advanced\n";
-    print "and search only or 2 for both forms.\n";
-    print "[$WHT$allow_advanced_search$NRM]: $WHT";
-    $allows_advanced_search = <STDIN>;
-    chomp($allows_advanced_search);
-    if ( $allows_advanced_search eq "" ) {
-        $allows_advanced_searchn=0;
+    print "This option allows you to control the use of advanced search form.\n";
+    print "  0 = enable basic search only\n";
+    print "  1 = enable advanced search only\n";
+    print "  2 = enable both\n";
+    print "\n";
+
+    print "Allowed search (0,1,2)? [$WHT$allow_advanced_search$NRM]: $WHT";
+    $new_allow_advanced_search = <STDIN>;
+    if ( $new_allow_advanced_search =~ /^[0|1|2]\n/i ) {
+        $allow_advanced_search = $new_allow_advanced_search;
     }
-    return $allows_advanced_search;
+    $allow_advanced_search =~ s/[\r|\n]//g;
+    return $allow_advanced_search;
 }
 
 
@@ -3141,8 +3143,10 @@ sub save_data {
         print CF "\$allow_thread_sort        = $allow_thread_sort;\n";
     # boolean
         print CF "\$allow_server_sort        = $allow_server_sort;\n";
-        # boolean
+    # boolean
         print CF "\$allow_charset_search     = $allow_charset_search;\n";
+    # integer
+        print CF "\$allow_advanced_search    = $allow_advanced_search;\n";
         print CF "\n";
     
     # all plugins are strings
@@ -3253,8 +3257,6 @@ sub save_data {
         print CF "\$use_smtp_tls = $use_smtp_tls;\n";
     # string
         print CF "\$session_name = '$session_name';\n";
-    # string
-        print CF "\$allow_advanced_search = '$allow_advanced_search';\n";
 
     print CF "\n";