X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=config%2Fconf.pl;h=483549bc9692448b6ab141b5b5610a58ac5b897f;hb=6c499577e14e40df2d51cca9b7d4c9a6d3526e71;hp=ad1ff4f3ddee0cb0b7b4913a301deefc179ef5a6;hpb=639c716482e432f35b6f8e3aeb4802562a3824c1;p=squirrelmail.git diff --git a/config/conf.pl b/config/conf.pl index ad1ff4f3..483549bc 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -347,6 +347,10 @@ if ( !$imap_auth_mech ) { $imap_auth_mech = 'plain'; } +if (!$session_name ) { + $session_name = 'SQMSESSID'; +} + if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; push @plugins, $ARGV[1]; @@ -498,23 +502,24 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "R Return to Main Menu\n"; } elsif ( $menu == 4 ) { print $WHT. "General Options\n" . $NRM; - print "1. Default Charset : $WHT$default_charset$NRM\n"; - print "2. Data Directory : $WHT$data_dir$NRM\n"; - print "3. Attachment Directory : $WHT$attachment_dir$NRM\n"; - print "4. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; - print "5. Default Left Size : $WHT$default_left_size$NRM\n"; - print "6. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; - print "7. Allow use of priority : $WHT$default_use_priority$NRM\n"; - print "8. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; - print "9. Allow use of receipts : $WHT$default_use_mdn$NRM\n"; - print "10. Allow editing of identity : $WHT$edit_identity$NRM\n"; - print "11. Allow server thread sort : $WHT$allow_thread_sort$NRM\n"; - print "12. Allow server-side sorting : $WHT$allow_server_sort$NRM\n"; + print "1. Default Charset : $WHT$default_charset$NRM\n"; + print "2. Data Directory : $WHT$data_dir$NRM\n"; + print "3. Attachment Directory : $WHT$attachment_dir$NRM\n"; + print "4. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; + print "5. Default Left Size : $WHT$default_left_size$NRM\n"; + print "6. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; + print "7. Allow use of priority : $WHT$default_use_priority$NRM\n"; + print "8. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; + print "9. Allow use of receipts : $WHT$default_use_mdn$NRM\n"; + print "10. Allow editing of identity : $WHT$edit_identity$NRM\n"; + print "11. Allow server thread sort : $WHT$allow_thread_sort$NRM\n"; + print "12. Allow server-side sorting : $WHT$allow_server_sort$NRM\n"; if ( lc($edit_identity) eq "false" ) { print "13. Allow editing of name : $WHT$edit_name$NRM\n"; } print "14. Allow server charset search : $WHT$allow_charset_search$NRM\n"; - print "15. Enable UID support : $WHT$uid_support$NRM\n"; + print "15. Enable UID support : $WHT$uid_support$NRM\n"; + print "16. PHP session name : $WHT$session_name$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 5 ) { @@ -711,6 +716,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 13 ) { $edit_name = command311(); } elsif ( $command == 14 ) { $allow_charset_search = command314(); } elsif ( $command == 15 ) { $uid_support = command315(); } + elsif ( $command == 16 ) { $session_name = command316(); } } elsif ( $menu == 5 ) { if ( $command == 1 ) { command41(); } elsif ( $command == 2 ) { $theme_css = command42(); } @@ -1115,10 +1121,11 @@ sub command111 { sub command112a { print "If you have already set the hostname and port number, I can try to\n"; - print "detect the methods your IMAP server supports.\n"; + print "detect the mechanisms your IMAP server supports.\n"; print "I will try to detect CRAM-MD5 and DIGEST-MD5 support. I can't test\n"; print "for \"plain\" without knowing a username and password.\n"; - print "\nTry to detect auth methods? [y/N]: "; + print "Auto-detecting is optional - you can safely say \"n\" here.\n"; + print "\nTry to detect supported mechanisms? [y/N]: "; $inval=; chomp($inval); if ($inval =~ /^y\b/i) { @@ -1172,13 +1179,14 @@ sub command112a { # Possible choices: none, plain, cram-md5, digest-md5 sub command112b { print "If you have already set the hostname and port number, I can try to\n"; - print "detect the methods your SMTP server supports.\n"; - print "\nTry to detect auth methods? [y/N]: "; + print "automatically detect the mechanisms your SMTP server supports.\n"; + print "Auto-detection is *optional* - you can safely say \"n\" here.\n"; + print "\nTry to detect auth mechanisms? [y/N]: "; $inval=; chomp($inval); if ($inval =~ /^y\b/i) { # Yes, let's try to detect. - print "Detecting supported methods...\n"; + print "Trying to detect supported methods (SMTP)...\n"; # Special case! # Check none by trying to relay to junk@birdbrained.org @@ -1261,7 +1269,7 @@ sub command112b { return lc($inval); } else { # user entered garbage, or default value so nothing needs to be set - return; + return $smtp_auth_mech; } } @@ -2111,6 +2119,20 @@ sub command315 { return $uid_support; } +sub command316 { + print "This option allows you to change the name of the PHP session used\n"; + print "by SquirrelMail. Unless you know what you are doing, you probably\n"; + print "don't need or want to change this from the default of SQMSESSID.\n"; + print "[$WHT$session_name$NRM]: $WHT"; + $new_session_name = ; + chomp($new_session_name); + if ( $new_session_name eq "\n" ) { + $new_session_name = $session_name; + } + return $new_session_name; +} + + sub command41 { print "\nNow we will define the themes that you wish to use. If you have added\n"; @@ -2785,6 +2807,8 @@ sub save_data { print CF "\$use_imap_tls = $use_imap_tls;\n"; print CF "\$use_smtp_tls = $use_smtp_tls;\n"; + print CF "\$session_name = '$session_name';\n"; + print CF "\n"; print CF "\@include SM_PATH . 'config/config_local.php';\n";