From f0d2bf43158143c5c82f992890a20cea85cfff47 Mon Sep 17 00:00:00 2001 From: ebullient Date: Mon, 1 Dec 2003 20:07:45 +0000 Subject: [PATCH] Move the Frames options to screen 11 (Tweaks) as the interface tweaks there are a more appropriate place than General. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6226 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 99 ++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/config/conf.pl b/config/conf.pl index ed78e042..8990b0ec 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -445,7 +445,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "8. Provider name : $WHT$provider_name$NRM\n"; print "\n"; - print "R Return to Main Menu\n"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 2 ) { print $WHT. "Server Settings\n\n" . $NRM; print $WHT . "General" . $NRM . "\n"; @@ -509,7 +509,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } print "\n"; - print "R Return to Main Menu\n"; + 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"; @@ -531,7 +531,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { 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"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 4 ) { print $WHT. "General Options\n" . $NRM; print "1. Data Directory : $WHT$data_dir$NRM\n"; @@ -546,23 +546,9 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "10. Allow server thread sort : $WHT$allow_thread_sort$NRM\n"; 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. PHP session name : $WHT$session_name$NRM\n"; - print "14. HTML Frame Settings : $WHT"; - if ( $allow_frames == 1) { - print "Force Frames Only"; - } - if ( $allow_frames == 2) { - print "Force No Frames Only"; - } - if ( $allow_frames == 3) { - print "User Select, Default to Frames"; - } - if ( $allow_frames == 4) { - print "User Select, Default to No Frames"; - } - print "$NRM\n"; + print "13. PHP session name : $WHT$session_name$NRM\n"; print "\n"; - print "R Return to Main Menu\n"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 5 ) { print $WHT. "Themes\n" . $NRM; print "1. Change Themes\n"; @@ -574,7 +560,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } print "2. CSS File : $WHT$theme_css$NRM\n"; print "\n"; - print "R Return to Main Menu\n"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 6 ) { print $WHT. "Address Books (LDAP)\n" . $NRM; print "1. Change Servers\n"; @@ -584,14 +570,14 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "2. Use Javascript Address Book Search : $WHT$default_use_javascript_addr_book$NRM\n"; print "\n"; - print "R Return to Main Menu\n"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 7 ) { print $WHT. "Message of the Day (MOTD)\n" . $NRM; print "\n$motd\n"; print "\n"; print "1 Edit the MOTD\n"; print "\n"; - print "R Return to Main Menu\n"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 8 ) { print $WHT. "Plugins\n" . $NRM; print " Installed Plugins\n"; @@ -627,7 +613,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { closedir DIR; print "\n"; - print "R Return to Main Menu\n"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 9 ) { print $WHT. "Database\n" . $NRM; print "1. DSN for Address Book : $WHT$addrbook_dsn$NRM\n"; @@ -639,34 +625,46 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "6. Field for prefs key : $WHT$prefs_key_field$NRM\n"; print "7. Field for prefs value : $WHT$prefs_val_field$NRM\n"; print "\n"; - print "R Return to Main Menu\n"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 10 ) { - print $WHT. "Language settings\n" . $NRM; - print "1. Default Language : $WHT$squirrelmail_default_language$NRM\n"; - print "2. Default Charset : $WHT$default_charset$NRM\n"; - print "3. Show alternative language names : $WHT$show_alternative_names$NRM\n"; - print "4. Available languages : $WHT$available_languages$NRM\n"; - print "5. Use agresive decoding : $WHT$agresive_decoding$NRM\n"; - print "\n"; - print "R Return to Main Menu\n"; + print $WHT. "Language settings\n" . $NRM; + print "1. Default Language : $WHT$squirrelmail_default_language$NRM\n"; + print "2. Default Charset : $WHT$default_charset$NRM\n"; + print "3. Show alternative language names : $WHT$show_alternative_names$NRM\n"; + print "4. Available languages : $WHT$available_languages$NRM\n"; + print "5. Use agresive decoding : $WHT$agresive_decoding$NRM\n"; + print "\n"; + print "R. Return to Main Menu\n"; } elsif ( $menu == 11 ) { - print $WHT. "Interface tweaks\n" . $NRM; - print "1. Advanced tree : $WHT$advanced_tree$NRM\n"; - print "2. Oldway : $WHT$oldway$NRM\n"; - print "\n"; - print $WHT. "PHP tweaks\n" . $NRM; - print "3. Use php recode functions : $WHT$use_php_recode$NRM\n"; - print "4. Use php iconv functions : $WHT$use_php_iconv$NRM\n"; - print "\n"; - print "R Return to Main Menu\n"; + print $WHT. "Interface tweaks\n" . $NRM; + print "1. Advanced tree : $WHT$advanced_tree$NRM\n"; + print "2. Oldway : $WHT$oldway$NRM\n"; + print "3. HTML Frame Settings : $WHT"; + if ( $allow_frames == 1) { + print "Force Frames Only"; + } elsif ( $allow_frames == 2) { + print "Force No Frames Only"; + } elsif ( $allow_frames == 3) { + print "User Select, Default to Frames"; + } elsif ( $allow_frames == 4) { + print "User Select, Default to No Frames"; + } + print "$NRM\n"; + + print "\n"; + print $WHT. "PHP tweaks\n" . $NRM; + print "4. Use php recode functions : $WHT$use_php_recode$NRM\n"; + print "5. Use php iconv functions : $WHT$use_php_iconv$NRM\n"; + print "\n"; + print "R. Return to Main Menu\n"; } if ( $config_use_color == 1 ) { print "C. Turn color off\n"; } else { print "C. Turn color on\n"; } - print "S Save data\n"; - print "Q Quit\n"; + print "S. Save data\n"; + print "Q. Quit\n"; print "\n"; print "Command >> " . $WHT; @@ -776,7 +774,6 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 11 ) { $allow_server_sort = command313(); } elsif ( $command == 12 ) { $allow_charset_search = command314(); } elsif ( $command == 13 ) { $session_name = command316(); } - elsif ( $command == 14 ) { $allow_frames = command317(); } } elsif ( $menu == 5 ) { if ( $command == 1 ) { command41(); } elsif ( $command == 2 ) { $theme_css = command42(); } @@ -798,14 +795,15 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } elsif ( $menu == 10 ) { if ( $command == 1 ) { $squirrelmail_default_language = commandA1(); } elsif ( $command == 2 ) { $default_charset = commandA2(); } - elsif ( $command == 3 ) { $show_alternative_names = commandA3(); } + elsif ( $command == 3 ) { $show_alternative_names = commandA3(); } elsif ( $command == 4 ) { $available_languages = commandA4(); } elsif ( $command == 5 ) { $agresive_decoding = commandA5(); } } elsif ( $menu == 11 ) { if ( $command == 1 ) { $advanced_tree = commandB1(); } elsif ( $command == 2 ) { $oldway = commandB2(); } - elsif ( $command == 3 ) { $use_php_recode = commandB3(); } - elsif ( $command == 4 ) { $use_php_iconv = commandB4(); } + elsif ( $command == 3 ) { $allow_frames = commandB5(); } + elsif ( $command == 4 ) { $use_php_recode = commandB3(); } + elsif ( $command == 5 ) { $use_php_iconv = commandB4(); } } } } @@ -1386,8 +1384,7 @@ sub command113 { sub command71 { print "\nYou can now create the welcome message that is displayed\n"; print "every time a user logs on. You can use HTML or just plain\n"; - print -"text. If you do not wish to have one, just make it blank.\n\n(Type @ on a blank line to exit)\n"; + print "text. If you do not wish to have one, just make it blank.\n\n(Type @ on a blank line to exit)\n"; $new_motd = ""; do { @@ -2226,7 +2223,7 @@ sub command316 { return $new_session_name; } -sub command317 { +sub commandB5 { print "This option allows you to select whether to allow or disallow frames\n"; print "or no frames usage, and what to default to on the login screen.\n"; print "Note: When a user selects to use Frames or No Frames, it is stored\n"; @@ -3456,7 +3453,7 @@ sub detect_auth_support { # So at this point, we have a response, and it is (hopefully) valid. if ($service eq 'SMTP') { - if (($response =~ /^535/) or ($response =~/^502/)) { + if ( $response =~ /^(535|502|504)/ ) { # Not supported close $sock; return 'NO'; -- 2.25.1