X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=config%2Fconf.pl;h=3798683bbd9470023c53cd28503f93e76da5a55b;hp=dc9f20c9a5a933bd80ef5bcc3f0693392e2e1b68;hb=6395c46db0a732860324fa43886b6ca806ad2588;hpb=2222aed08072c3711463c6bd16b69b41b0a55e25 diff --git a/config/conf.pl b/config/conf.pl index dc9f20c9..3798683b 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -40,6 +40,7 @@ if ( defined( $ENV{'PATH_INFO'} ) ############################################################ use Cwd; $dir = cwd(); + ############################################################ # First, lets read in the data already in there... @@ -68,7 +69,7 @@ if ( -e "config.php" ) { close(FILE); if ( $config_version ne $conf_pl_version ) { - system "clear"; + clear_screen(); print $WHT. "WARNING:\n" . $NRM; print " The file \"config/config.php\" was found, but it is for\n"; print " an older version of SquirrelMail. It is possible to still\n"; @@ -121,7 +122,7 @@ if ( -e "config.php" ) { close(FILE); if ( $config_version ne $conf_pl_version ) { - system "clear"; + clear_screen(); print $WHT. "WARNING:\n" . $NRM; print " You are trying to use a 'config_default.php' from an older\n"; print " version of SquirrelMail. This is HIGHLY unrecommended. You\n"; @@ -229,6 +230,21 @@ while ( $line = ) { $tmp =~ s/[\'|\"],?\s*$//; $tmp =~ s/[\'|\"]\);\s*$//; $name = $tmp; + } elsif ( $tmp =~ /^\s*[\'|\"]binddn[\'|\"]/i ) { + $tmp =~ s/^\s*[\'|\"]binddn[\'|\"]\s*=>\s*[\'|\"]//i; + $tmp =~ s/[\'|\"],?\s*$//; + $tmp =~ s/[\'|\"]\);\s*$//; + $binddn = $tmp; + } elsif ( $tmp =~ /^\s*[\'|\"]bindpw[\'|\"]/i ) { + $tmp =~ s/^\s*[\'|\"]bindpw[\'|\"]\s*=>\s*[\'|\"]//i; + $tmp =~ s/[\'|\"],?\s*$//; + $tmp =~ s/[\'|\"]\);\s*$//; + $bindpw = $tmp; + } elsif ( $tmp =~ /^\s*[\'|\"]protocol[\'|\"]/i ) { + $tmp =~ s/^\s*[\'|\"]protocol[\'|\"]\s*=>\s*[\'|\"]?//i; + $tmp =~ s/[\'|\"]?,?\s*$//; + $tmp =~ s/[\'|\"]?\);\s*$//; + $protocol = $tmp; } } $ldap_host[$sub] = $host; @@ -237,6 +253,9 @@ while ( $line = ) { $ldap_port[$sub] = $port; $ldap_maxrows[$sub] = $maxrows; $ldap_charset[$sub] = $charset; + $ldap_binddn[$sub] = $binddn; + $ldap_bindpw[$sub] = $bindpw; + $ldap_protocol[$sub] = $protocol; } elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page)$/ ) { ${ $options[0] } = &change_to_rel_path($options[1]); } else { @@ -245,7 +264,7 @@ while ( $line = ) { } } close FILE; -if ( $useSendmail ne "true" ) { +if ( lc($useSendmail) ne "true" ) { $useSendmail = "false"; } if ( !$sendmail_path ) { @@ -314,9 +333,6 @@ if ( !$allow_thread_sort ) { if ( !$allow_server_sort ) { $allow_server_sort = 'false'; } -if ( !$uid_support ) { - $uid_support = 'true'; -} if ( !$no_list_for_subscribe ) { $no_list_for_subscribe = 'false'; } @@ -329,6 +345,15 @@ if ( !$prefs_user_field ) { if ( !$prefs_key_field ) { $prefs_key_field = 'prefkey'; } +if ( !$addrbook_global_table ) { + $addrbook_global_table = 'global_abook'; +} +if ( !$addrbook_global_writeable ) { + $addrbook_global_writeable = 'false'; +} +if ( !$addrbook_global_listing ) { + $addrbook_global_listing = 'false'; +} if ( !$prefs_val_field ) { $prefs_val_field = 'prefval'; } @@ -346,13 +371,45 @@ if ( !$use_imap_tls ) { } if ( !$imap_auth_mech ) { - $imap_auth_mech = 'plain'; + $imap_auth_mech = 'login'; } if (!$session_name ) { $session_name = 'SQMSESSID'; } +if (!$show_alternative_names ) { + $show_alternative_names = 'false'; +} + +if (!$available_languages ) { + $available_languages = 'all'; +} + +if (!$agresive_decoding ) { + $agresive_decoding = 'false'; +} + +if (!$advanced_tree ) { + $advanced_tree = 'false'; +} + +if (!$oldway ) { + $oldway = 'false'; +} + +if (!$use_icons ) { + $use_icons = 'false'; +} + +if (!$use_php_recode ) { + $use_php_recode = 'false'; +} + +if (!$use_php_iconv ) { + $use_php_iconv = 'false'; +} + if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; push @plugins, $ARGV[1]; @@ -381,7 +438,7 @@ if ( $config_use_color == 1 ) { } while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { - system "clear"; + clear_screen(); print $WHT. "SquirrelMail Configuration : " . $NRM; if ( $config == 1 ) { print "Read: config.php"; } elsif ( $config == 2 ) { print "Read: config_default.php"; } @@ -399,6 +456,8 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "7. Message of the Day (MOTD)\n"; print "8. Plugins\n"; print "9. Database\n"; + print "10. Language settings\n"; + print "11. Tweaks\n"; print "\n"; print "D. Set pre-defined settings for specific IMAP servers\n"; print "\n"; @@ -409,10 +468,9 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "3. Org. Logo Width/Height : $WHT($org_logo_width/$org_logo_height)$NRM\n"; print "4. Organization Title : $WHT$org_title$NRM\n"; print "5. Signout Page : $WHT$signout_page$NRM\n"; - print "6. Default Language : $WHT$squirrelmail_default_language$NRM\n"; - print "7. Top Frame : $WHT$frame_top$NRM\n"; - print "8. Provider link : $WHT$provider_uri$NRM\n"; - print "9. Provider name : $WHT$provider_name$NRM\n"; + print "6. Top Frame : $WHT$frame_top$NRM\n"; + print "7. Provider link : $WHT$provider_uri$NRM\n"; + print "8. Provider name : $WHT$provider_name$NRM\n"; print "\n"; print "R Return to Main Menu\n"; @@ -498,37 +556,35 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "14. Default Unseen Notify : $WHT$default_unseen_notify$NRM\n"; print "15. Default Unseen Type : $WHT$default_unseen_type$NRM\n"; print "16. Auto Create Special Folders : $WHT$auto_create_special$NRM\n"; - print "17. Don't move folders into Trash : $WHT$delete_folder$NRM\n"; + 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"; } 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"; - 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 "16. PHP session name : $WHT$session_name$NRM\n"; + print "1. Data Directory : $WHT$data_dir$NRM\n"; + print "2. Attachment Directory : $WHT$attachment_dir$NRM\n"; + print "3. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; + print "4. Default Left Size : $WHT$default_left_size$NRM\n"; + print "5. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; + print "6. Allow use of priority : $WHT$default_use_priority$NRM\n"; + print "7. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; + print "8. Allow use of receipts : $WHT$default_use_mdn$NRM\n"; + print "9. Allow editing of identity : $WHT$edit_identity$NRM/$WHT$edit_name$NRM\n"; + 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 "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 5 ) { print $WHT. "Themes\n" . $NRM; print "1. Change Themes\n"; - for ( $count = 0 ; $count <= $#theme_name ; $count++ ) { - print " > $theme_name[$count]\n"; + for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) { + $temp_name = $theme_name[$count*2]; + printf " %s%*s %s\n", $temp_name, + 40 - length($temp_name), " ", + $theme_name[($count*2)+1]; } print "2. CSS File : $WHT$theme_css$NRM\n"; print "\n"; @@ -597,6 +653,31 @@ 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 "8. DSN for Global Address Book : $WHT$addrbook_global_dsn$NRM\n"; + print "9. Table for Global Address Book : $WHT$addrbook_global_table$NRM\n"; + print "10. Allow writing into Global Address Book : $WHT$addrbook_global_writeable$NRM\n"; + print "11. Allow listing of Global Address Book : $WHT$addrbook_global_listing$NRM\n"; + print "\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"; + } 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 "3. Use Icons : $WHT$use_icons$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 ) { @@ -644,7 +725,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } else { $saved = 0; if ( $menu == 0 ) { - if ( ( $command > 0 ) && ( $command < 10 ) ) { + if ( ( $command > 0 ) && ( $command < 12 ) ) { $menu = $command; } } elsif ( $menu == 1 ) { @@ -653,10 +734,9 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 3 ) { ($org_logo_width,$org_logo_height) = command2a(); } elsif ( $command == 4 ) { $org_title = command3(); } elsif ( $command == 5 ) { $signout_page = command4(); } - elsif ( $command == 6 ) { $squirrelmail_default_language = command5(); } - elsif ( $command == 7 ) { $frame_top = command6(); } - elsif ( $command == 8 ) { $provider_uri = command7(); } - elsif ( $command == 9 ) { $provider_name = command8(); } + elsif ( $command == 6 ) { $frame_top = command6(); } + elsif ( $command == 7 ) { $provider_uri = command7(); } + elsif ( $command == 8 ) { $provider_name = command8(); } } elsif ( $menu == 2 ) { if ( $command eq "a" ) { $show_imap_settings = 1; $show_smtp_settings = 0; } @@ -703,22 +783,19 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 17 ) { $delete_folder = command215(); } elsif ( $command == 18 ) { $noselect_fix_enable = command216(); } } elsif ( $menu == 4 ) { - if ( $command == 1 ) { $default_charset = command31(); } - elsif ( $command == 2 ) { $data_dir = command33a(); } - elsif ( $command == 3 ) { $attachment_dir = command33b(); } - elsif ( $command == 4 ) { $dir_hash_level = command33c(); } - elsif ( $command == 5 ) { $default_left_size = command35(); } - elsif ( $command == 6 ) { $force_username_lowercase = command36(); } - elsif ( $command == 7 ) { $default_use_priority = command37(); } - elsif ( $command == 8 ) { $hide_sm_attributions = command38(); } - elsif ( $command == 9 ) { $default_use_mdn = command39(); } - elsif ( $command == 10 ) { $edit_identity = command310(); } - elsif ( $command == 11 ) { $allow_thread_sort = command312(); } - elsif ( $command == 12 ) { $allow_server_sort = command313(); } - 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(); } + if ( $command == 1 ) { $data_dir = command33a(); } + elsif ( $command == 2 ) { $attachment_dir = command33b(); } + elsif ( $command == 3 ) { $dir_hash_level = command33c(); } + elsif ( $command == 4 ) { $default_left_size = command35(); } + elsif ( $command == 5 ) { $force_username_lowercase = command36(); } + elsif ( $command == 6 ) { $default_use_priority = command37(); } + elsif ( $command == 7 ) { $hide_sm_attributions = command38(); } + elsif ( $command == 8 ) { $default_use_mdn = command39(); } + elsif ( $command == 9 ) { $edit_identity = command310(); } + elsif ( $command == 10 ) { $allow_thread_sort = command312(); } + elsif ( $command == 11 ) { $allow_server_sort = command313(); } + elsif ( $command == 12 ) { $allow_charset_search = command314(); } + elsif ( $command == 13 ) { $session_name = command316(); } } elsif ( $menu == 5 ) { if ( $command == 1 ) { command41(); } elsif ( $command == 2 ) { $theme_css = command42(); } @@ -737,6 +814,22 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 5 ) { $prefs_user_field = command95(); } elsif ( $command == 6 ) { $prefs_key_field = command96(); } elsif ( $command == 7 ) { $prefs_val_field = command97(); } + elsif ( $command == 8 ) { $addrbook_global_dsn = command98(); } + elsif ( $command == 9 ) { $addrbook_global_table = command99(); } + elsif ( $command == 10 ) { $addrbook_global_writeable = command910(); } + elsif ( $command == 11 ) { $addrbook_global_listing = command911(); } + } 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 == 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_icons = commandB3(); } + elsif ( $command == 4 ) { $use_php_recode = commandB4(); } + elsif ( $command == 5 ) { $use_php_iconv = commandB5(); } } } } @@ -769,11 +862,14 @@ sub command1 { # org_logo sub command2 { print "Your organization's logo is an image that will be displayed at\n"; - print "different times throughout SquirrelMail. This is asking for the\n"; - print "literal (/usr/local/squirrelmail/images/logo.png) or relative\n"; - print "(../images/logo.png) path from the config directory to your logo.\n"; - print "Relative paths to files outside the SquirrelMail distribution\n"; - print "will be converted to their absolute path equivalents in config.php.\n"; + print "different times throughout SquirrelMail. "; + print "\n"; + print "Please be aware of the following: \n"; + print " - Relative URLs are relative to the config dir\n"; + print " to use the default logo, use ../images/sm_logo.png\n"; + print " - To specify a logo defined outside the SquirrelMail source tree\n"; + print " use the absolute URL the webserver would use to include the file\n"; + print " e.g. http://some.host.com/images/mylogo.gif or /images/mylogo.jpg\n"; print "\n"; print "[$WHT$org_logo$NRM]: $WHT"; $new_org_logo = ; @@ -851,23 +947,6 @@ sub command4 { return $new_signout_page; } -# Default language -sub command5 { - print "SquirrelMail attempts to set the language in many ways. If it\n"; - print "can not figure it out in another way, it will default to this\n"; - print "language. Please use the code for the desired language.\n"; - print "\n"; - print "[$WHT$squirrelmail_default_language$NRM]: $WHT"; - $new_signout_page = ; - if ( $new_signout_page eq "\n" ) { - $new_signout_page = $squirrelmail_default_language; - } else { - $new_signout_page =~ s/[\r|\n]//g; - $new_signout_page =~ s/^\s+$//g; - } - return $new_signout_page; -} - # Default top frame sub command6 { print "SquirrelMail defaults to using the whole of the browser window.\n"; @@ -1130,57 +1209,62 @@ sub command111 { return $new_optional_delimiter; } # IMAP authentication type -# Possible values: plain, cram-md5, digest-md5 +# Possible values: login, plain, cram-md5, digest-md5 # Now offers to detect supported mechs, assuming server & port are set correctly sub command112a { - print "If you have already set the hostname and port number, I can try to\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 "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) { - # Yes, let's try to detect. - print "Trying to detect IMAP capabilities...\n"; - my $host = $imapServerAddress . ':'. $imapPort; - print "CRAM-MD5:\t"; - my $tmp = detect_auth_support('IMAP',$host,'CRAM-MD5'); - if (defined($tmp)) { - if ($tmp eq 'YES') { - print "$WHT SUPPORTED$NRM\n"; - } else { - print "$WHT NOT SUPPORTED$NRM\n"; - } - } else { - print $WHT . " ERROR DETECTING$NRM\n"; - } - - print "DIGEST-MD5:\t"; - $tmp = detect_auth_support('IMAP',$host,'DIGEST-MD5'); - if (defined($tmp)) { - if ($tmp eq 'YES') { - print "$WHT SUPPORTED$NRM\n"; - } else { - print "$WHT NOT SUPPORTED$NRM\n"; - } - } else { - print $WHT . " ERROR DETECTING$NRM\n"; - } - - } + if ($use_imap_tls =~ /^true\b/i) { + print "Auto-detection of login methods is unavailable when using TLS.\n"; + } else { + print "If you have already set the hostname and port number, I can try to\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 \"login\" or \"plain\" without knowing a username and password.\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) { + # Yes, let's try to detect. + print "Trying to detect IMAP capabilities...\n"; + my $host = $imapServerAddress . ':'. $imapPort; + print "CRAM-MD5:\t"; + my $tmp = detect_auth_support('IMAP',$host,'CRAM-MD5'); + if (defined($tmp)) { + if ($tmp eq 'YES') { + print "$WHT SUPPORTED$NRM\n"; + } else { + print "$WHT NOT SUPPORTED$NRM\n"; + } + } else { + print $WHT . " ERROR DETECTING$NRM\n"; + } + + print "DIGEST-MD5:\t"; + $tmp = detect_auth_support('IMAP',$host,'DIGEST-MD5'); + if (defined($tmp)) { + if ($tmp eq 'YES') { + print "$WHT SUPPORTED$NRM\n"; + } else { + print "$WHT NOT SUPPORTED$NRM\n"; + } + } else { + print $WHT . " ERROR DETECTING$NRM\n"; + } + + } + } print "\nWhat authentication mechanism do you want to use for IMAP connections?\n\n"; - print $WHT . "plain" . $NRM . " - Plaintext. If you can do better, you probably should.\n"; - print $WHT . "cram-md5" . $NRM . " - Slightly better than plaintext.\n"; + print $WHT . "login" . $NRM . " - Plaintext. If you can do better, you probably should.\n"; + print $WHT . "plain" . $NRM . " - SASL PLAIN. If you need this, you already know it.\n"; + print $WHT . "cram-md5" . $NRM . " - Slightly better than plaintext methods.\n"; print $WHT . "digest-md5" . $NRM . " - Privacy protection - better than cram-md5.\n"; print "\n*** YOUR IMAP SERVER MUST SUPPORT THE MECHANISM YOU CHOOSE HERE ***\n"; - print "If you don't understand or are unsure, you probably want \"plain\"\n\n"; - print "plain, cram-md5, or digest-md5 [$WHT$imap_auth_mech$NRM]: $WHT"; + print "If you don't understand or are unsure, you probably want \"login\"\n\n"; + print "login, plain, cram-md5, or digest-md5 [$WHT$imap_auth_mech$NRM]: $WHT"; $inval=; chomp($inval); - if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || ($inval =~ /^plain\b/i)) { + if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || ($inval =~ /^login\b/i) || ($inval =~ /^plain\b/i)) { return lc($inval); } else { # user entered garbage or default value so nothing needs to be set @@ -1192,86 +1276,91 @@ sub command112a { # SMTP authentication type # 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 "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 "Trying to detect supported methods (SMTP)...\n"; + if ($use_smtp_tls =~ /^true\b/i) { + print "Auto-detection of login methods is unavailable when using TLS.\n"; + } else { + print "If you have already set the hostname and port number, I can try to\n"; + print "automatically detect some of 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 "Trying to detect supported methods (SMTP)...\n"; - # Special case! - # Check none by trying to relay to junk@birdbrained.org - $host = $smtpServerAddress . ':' . $smtpPort; - use IO::Socket; - my $sock = IO::Socket::INET->new($host); - print "Testing none:\t\t$WHT"; - if (!defined($sock)) { - print " ERROR TESTING\n"; - close $sock; - } else { - print $sock "mail from: tester\@squirrelmail.org\n"; - $got = <$sock>; # Discard - print $sock "rcpt to: junk\@birdbrained.org\n"; - $got = <$sock>; # This is the important line - if ($got =~ /^250\b/) { # SMTP will relay without auth - print "SUPPORTED$NRM\n"; - } else { - print "NOT SUPPORTED$NRM\n"; - } - print $sock "rset\n"; - print $sock "quit\n"; - close $sock; - } - # Try plain (SquirrelMail default) - print "Testing plain:\t\t"; - $tmp=detect_auth_support('SMTP',$host,'LOGIN'); - if (defined($tmp)) { - if ($tmp eq 'YES') { - print $WHT . "SUPPORTED$NRM\n"; - } else { - print $WHT . "NOT SUPPORTED$NRM\n"; - } - } else { - print $WHT . "ERROR DETECTING$NRM\n"; - } - - # Try CRAM-MD5 - print "Testing CRAM-MD5:\t"; - $tmp=detect_auth_support('SMTP',$host,'CRAM-MD5'); - if (defined($tmp)) { - if ($tmp eq 'YES') { - print $WHT . "SUPPORTED$NRM\n"; - } else { - print $WHT . "NOT SUPPORTED$NRM\n"; + # Special case! + # Check none by trying to relay to junk@microsoft.com + $host = $smtpServerAddress . ':' . $smtpPort; + use IO::Socket; + my $sock = IO::Socket::INET->new($host); + print "Testing none:\t\t$WHT"; + if (!defined($sock)) { + print " ERROR TESTING\n"; + close $sock; + } else { + print $sock "mail from: tester\@squirrelmail.org\n"; + $got = <$sock>; # Discard + print $sock "rcpt to: junk\@microsoft.com\n"; + $got = <$sock>; # This is the important line + if ($got =~ /^250\b/) { # SMTP will relay without auth + print "SUPPORTED$NRM\n"; + } else { + print "NOT SUPPORTED$NRM\n"; + } + print $sock "rset\n"; + print $sock "quit\n"; + close $sock; + } + # Try login (SquirrelMail default) + print "Testing login:\t\t"; + $tmp=detect_auth_support('SMTP',$host,'LOGIN'); + if (defined($tmp)) { + if ($tmp eq 'YES') { + print $WHT . "SUPPORTED$NRM\n"; + } else { + print $WHT . "NOT SUPPORTED$NRM\n"; + } + } else { + print $WHT . "ERROR DETECTING$NRM\n"; + } + + # Try CRAM-MD5 + print "Testing CRAM-MD5:\t"; + $tmp=detect_auth_support('SMTP',$host,'CRAM-MD5'); + if (defined($tmp)) { + if ($tmp eq 'YES') { + print $WHT . "SUPPORTED$NRM\n"; + } else { + print $WHT . "NOT SUPPORTED$NRM\n"; + } + } else { + print $WHT . "ERROR DETECTING$NRM\n"; } - } else { - print $WHT . "ERROR DETECTING$NRM\n"; - } - + - print "Testing DIGEST-MD5:\t"; - $tmp=detect_auth_support('SMTP',$host,'DIGEST-MD5'); - if (defined($tmp)) { - if ($tmp eq 'YES') { - print $WHT . "SUPPORTED$NRM\n"; - } else { - print $WHT . "NOT SUPPORTED$NRM\n"; + print "Testing DIGEST-MD5:\t"; + $tmp=detect_auth_support('SMTP',$host,'DIGEST-MD5'); + if (defined($tmp)) { + if ($tmp eq 'YES') { + print $WHT . "SUPPORTED$NRM\n"; + } else { + print $WHT . "NOT SUPPORTED$NRM\n"; + } + } else { + print $WHT . "ERROR DETECTING$NRM\n"; } - } else { - print $WHT . "ERROR DETECTING$NRM\n"; - } - } - print "\tWhat authentication mechanism do you want to use for SMTP connections?\n"; + } + } + print "\nWhat authentication mechanism do you want to use for SMTP connections?\n"; print $WHT . "none" . $NRM . " - Your SMTP server does not require authorization.\n"; - print $WHT . "plain" . $NRM . " - Plaintext. If you can do better, you probably should.\n"; + print $WHT . "login" . $NRM . " - Plaintext. If you can do better, you probably should.\n"; + print $WHT . "plain" . $NRM . " - SASL PLAIN. You already know it if you need this.\n"; print $WHT . "cram-md5" . $NRM . " - Slightly better than plaintext.\n"; print $WHT . "digest-md5" . $NRM . " - Privacy protection - better than cram-md5.\n"; - print "\n*** YOUR SMTP SERVER MUST SUPPORT THE MECHANISM YOU CHOOSE HERE ***\n"; + print $WHT . "\n*** YOUR SMTP SERVER MUST SUPPORT THE MECHANISM YOU CHOOSE HERE ***\n" . $NRM; print "If you don't understand or are unsure, you probably want \"none\"\n\n"; - print "none, plain, cram-md5, or digest-md5 [$WHT$smtp_auth_mech$NRM]: $WHT"; + print "none, login, cram-md5, or digest-md5 [$WHT$smtp_auth_mech$NRM]: $WHT"; $inval=; chomp($inval); if ($inval =~ /^none\b/i) { @@ -1279,7 +1368,7 @@ sub command112b { return "none"; } if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || - ($inval =~ /^plain\b/i)) { + ($inval =~ /^login\b/i) || ($inval =~/^plain\b/i)) { return lc($inval); } else { # user entered garbage, or default value so nothing needs to be set @@ -1759,24 +1848,46 @@ sub command214 { return $auto_create_special; } -# Auto create special folders +# Automatically delete folders sub command215 { - print "Would you like to automatically completely delete any deleted\n"; - print "folders? If not then they will be moved to the Trash folder\n"; - print "and can be deleted from there\n"; - print "\n"; - - if ( lc($delete_folder) eq "true" ) { - $default_value = "y"; - } else { - $default_value = "n"; - } - print "Auto delete folders? (y/n) [$WHT$default_value$NRM]: $WHT"; - $new_delete = ; - if ( ( $new_delete =~ /^y\n/i ) || ( ( $new_delete =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + if ( $imap_server_type eq "uw" ) { + print "UW IMAP servers will not allow folders containing mail to also contain folders.\n"; + print "Deleting folders will bypass the trash folder and 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 { - $delete_folder = "false"; + } else { + if ( $imap_server_type eq "courier" ) { + print "Courier (or Courier-IMAP) IMAP servers may not support "; + print "subfolders of Trash. \n"; + print "Specifically, if Courier is set to always move messages to Trash, \n"; + print "Trash will be treated by Courier as a special folder that does not \n"; + print "allow subfolders. \n\n"; + print "Please verify your Courier configuration, and test folder deletion \n"; + print "when changing this setting.\n\n"; + } + + print "Are subfolders of the Trash supported by your IMAP server?\n"; + print "If so, should deleted folders be sent to Trash?\n"; + print "If not, say no (deleted folders should not be sent to Trash)\n\n"; + # reversal of logic. + # question was: Should folders be automatically deleted instead of sent to trash.. + # we've changed the question to make it more clear, + # and are here handling that to avoid changing the answers.. + if ( lc($delete_folder) eq "true" ) { + $default_value = "n"; + } else { + $default_value = "y"; + } + print "Send deleted folders to Trash? (y/n) [$WHT$default_value$NRM]: $WHT"; + $new_delete = ; + if ( ( $new_delete =~ /^y\n/i ) || ( ( $new_delete =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $delete_folder = "false"; + } else { + $delete_folder = "true"; + } } return $delete_folder; } @@ -1804,25 +1915,6 @@ sub command216 { } ############# GENERAL OPTIONS ##################### -# Default Charset -sub command31 { - print "This option controls what character set is used when sending\n"; - print "mail and when sending HTML to the browser. Do not set this\n"; - print "to US-ASCII, use ISO-8859-1 instead. For cyrillic, it is best\n"; - print "to use KOI8-R, since this implementation is faster than most\n"; - print "of the alternatives\n"; - print "\n"; - - print "[$WHT$default_charset$NRM]: $WHT"; - $new_default_charset = ; - if ( $new_default_charset eq "\n" ) { - $new_default_charset = $default_charset; - } else { - $new_default_charset =~ s/[\r|\n]//g; - } - return $new_default_charset; -} - # Data directory sub command33a { print "Specify the location for your data directory.\n"; @@ -1832,7 +1924,7 @@ sub command33a { print " Relative: ../data/\n"; print "Relative paths to directories outside of the SquirrelMail distribution\n"; print "will be converted to their absolute path equivalents in config.php.\n\n"; - print "Note: There are potential security risks with having a writable directory\n"; + print "Note: There are potential security risks with having a writeable directory\n"; print "under the web server's root directory (ex: /home/httpd/html).\n"; print "For this reason, it is recommended to put the data directory\n"; print "in an alternate location of your choice. \n"; @@ -2020,8 +2112,8 @@ sub command39 { } sub command310 { - print "This allows you to prevent the editing of the users name and"; - print "email address. This is mainly useful when used with the"; + print "This allows you to prevent the editing of the user's name and "; + print "email address. This is mainly useful when used with the "; print "retrieveuserdata plugin\n"; print "\n"; @@ -2030,19 +2122,22 @@ sub command310 { } else { $default_value = "n"; } - print "Allow editing? (y/n) [$WHT$default_value$NRM]: $WHT"; + print "Allow editing of user's identity? (y/n) [$WHT$default_value$NRM]: $WHT"; $new_edit = ; if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { $edit_identity = "true"; + $edit_name = "true"; } else { $edit_identity = "false"; + $edit_name = command311(); } return $edit_identity; } sub command311 { - print "This option allows you to choose if the user can edit their full name"; - print "even when you don't want them to change their username\n"; + print "As a follow-up, this option allows you to choose if the user "; + print "can edit their full name even when you don't want them to "; + print "change their username\n"; print "\n"; if ( lc($edit_name) eq "true" ) { @@ -2122,6 +2217,8 @@ sub command314 { } sub command315 { + ## OBSOLETE - UID support is now always enabled + return "true"; print "This option allows you to enable unique identifier (UID) support.\n"; print "\n"; @@ -2156,8 +2253,8 @@ sub command316 { sub command41 { - print "\nNow we will define the themes that you wish to use. If you have added\n"; - print "a theme of your own, just follow the instructions (?) about how to add\n"; + print "\nDefine the themes that you wish to use. If you have added "; + print "a theme of your own, just follow the instructions (?) about how to add "; print "them. You can also change the default theme.\n"; print "[theme] command (?=help) > "; $input = ; @@ -2171,8 +2268,11 @@ sub command41 { } else { print " "; } + if ( $count < 10 ) { + print " "; + } $name = $theme_name[$count]; - $num_spaces = 25 - length($name); + $num_spaces = 35 - length($name); for ( $i = 0 ; $i < $num_spaces ; $i++ ) { $name = $name . " "; } @@ -2305,8 +2405,12 @@ sub command42 { print "\n"; print "To clear out an existing value, just type a space for the input.\n"; print "\n"; - print "Relative links to files outside the SquirrelMail distribution\n"; - print "will be converted to their absolute path equivalents in config.php.\n"; + print "Please be aware of the following: \n"; + print " - Relative URLs are relative to the config dir\n"; + print " to use the themes directory, use ../themes/css/newdefault.css\n"; + print " - To specify a css file defined outside the SquirrelMail source tree\n"; + print " use the absolute URL the webserver would use to include the file\n"; + print " e.g. http://some.host.com/css/mystyle.css or /css/mystyle.css\n"; print "\n"; print "[$WHT$theme_css$NRM]: $WHT"; $new_theme_css = ; @@ -2343,6 +2447,16 @@ sub command61 { if ( $ldap_maxrows[$count] ) { print " maxrows: $ldap_maxrows[$count]\n"; } + if ( $ldap_binddn[$count] ) { + print " binddn: $ldap_binddn[$count]\n"; + if ( $ldap_bindpw[$count] ) { + print " bindpw: $ldap_bindpw[$count]\n"; + } + } + if ( $ldap_protocol[$count] ) { + print " protocol: $ldap_protocol[$count]\n"; + } + print "\n"; $count++; } @@ -2404,6 +2518,36 @@ sub command61 { print "\n"; + print "If your LDAP server does not like anonymous logins, you can specify bind DN.\n"; + print "Default is none, anonymous bind. Press ENTER for default.\n"; + print "binddn: "; + $name = ; + $name =~ s/[\r|\n]//g; + $ldap_binddn[$sub] = $name; + + print "\n"; + + if ( $ldap_binddn[$sub] ne '' ) { + + print "Now, please specify password for that DN.\n"; + print "bindpw: "; + $name = ; + $name =~ s/[\r|\n]//g; + $ldap_bindpw[$sub] = $name; + + print "\n"; + } + + print "You can specify bind protocol version here.\n"; + print "Default protocol version depends on your php ldap settings.\n"; + print "Press ENTER for default.\n"; + print "protocol: "; + $name = ; + $name =~ s/[\r|\n]//g; + $ldap_protocol[$sub] = $name; + + print "\n"; + } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { if ( $input =~ /[0-9]+\s*$/ ) { $rem_num = $input; @@ -2419,6 +2563,9 @@ sub command61 { @new_ldap_name = (); @new_ldap_charset = (); @new_ldap_maxrows = (); + @new_ldap_bindpw = (); + @new_ldap_binddn = (); + @new_ldap_protocol = (); while ( $count <= $#ldap_host ) { if ( $count != $rem_num ) { @@ -2428,6 +2575,9 @@ sub command61 { @new_ldap_name = ( @new_ldap_name, $ldap_name[$count] ); @new_ldap_charset = ( @new_ldap_charset, $ldap_charset[$count] ); @new_ldap_maxrows = ( @new_ldap_maxrows, $ldap_maxrows[$count] ); + @new_ldap_binddn = ( @new_ldap_binddn, $ldap_binddn[$count] ); + @new_ldap_bindpw = ( @new_ldap_bindpw, $ldap_bindpw[$count] ); + @new_ldap_protocol = ( @new_ldap_protocol, $ldap_protocol[$count] ); } $count++; } @@ -2437,6 +2587,10 @@ sub command61 { @ldap_name = @new_ldap_name; @ldap_charset = @new_ldap_charset; @ldap_maxrows = @new_ldap_maxrows; + @ldap_binddn = @new_ldap_binddn; + @ldap_bindpw = @new_ldap_bindpw; + @ldap_protocol = @new_ldap_protocol; + } elsif ( $input =~ /^\s*\?\s*/ ) { print ".-------------------------.\n"; print "| + (add host) |\n"; @@ -2602,6 +2756,314 @@ sub command97 { return $new_field; } +sub command98 { + print "If you want to store your global address book in a database then\n"; + print "you need to set this DSN to a valid value. The format for this is:\n"; + print "mysql://user:pass\@hostname/dbname\n"; + print "Where mysql can be one of the databases PHP supports, the most common\n"; + print "of these are mysql, msql and pgsql\n"; + print "If the DSN is left empty (hit space and then return) the database\n"; + print "related code for global SQL address book will not be used\n"; + print "\n"; + + if ( $addrbook_global_dsn eq "" ) { + $default_value = "Disabled"; + } else { + $default_value = $addrbook_global_dsn; + } + print "[$WHT$addrbook_global_dsn$NRM]: $WHT"; + $new_dsn = ; + if ( $new_dsn eq "\n" ) { + $new_dsn = ""; + } else { + $new_dsn =~ s/[\r|\n]//g; + $new_dsn =~ s/^\s+$//g; + } + return $new_dsn; +} + +sub command99 { + print "This is the name of the table you want to store the global address book\n"; + print "data in, it defaults to 'global_address'\n"; + print "\n"; + print "[$WHT$addrbook_global_table$NRM]: $WHT"; + $new_table = ; + if ( $new_table eq "\n" ) { + $new_table = $addrbook_global_table; + } else { + $new_table =~ s/[\r|\n]//g; + } + return $new_table; +} + +sub command910 { + print "This option controls users\' ability to add or modify records stored \n"; + print "in global address book\n"; + + if ( lc($addrbook_global_writeable) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Allow writing into global address book? (y/n) [$WHT$default_value$NRM]: $WHT"; + $addrbook_global_writeable = ; + if ( ( $addrbook_global_writeable =~ /^y\n/i ) || ( ( $addrbook_global_writeable =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $addrbook_global_writeable = "true"; + } else { + $addrbook_global_writeable = "false"; + } + return $addrbook_global_writeable; +} + +sub command911 { + print "Enable this option if you want to see listing of addresses stored \n"; + print "in global address book\n"; + + if ( lc($addrbook_global_listing) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Allow listing of global address book? (y/n) [$WHT$default_value$NRM]: $WHT"; + $addrbook_global_listing = ; + if ( ( $addrbook_global_listing =~ /^y\n/i ) || ( ( $addrbook_global_listing =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $addrbook_global_listing = "true"; + } else { + $addrbook_global_listing = "false"; + } + return $addrbook_global_listing; +} + + +# Default language +sub commandA1 { + print "SquirrelMail attempts to set the language in many ways. If it\n"; + print "can not figure it out in another way, it will default to this\n"; + print "language. Please use the code for the desired language.\n"; + print "\n"; + print "[$WHT$squirrelmail_default_language$NRM]: $WHT"; + $new_squirrelmail_default_language = ; + if ( $new_squirrelmail_default_language eq "\n" ) { + $new_squirrelmail_default_language = $squirrelmail_default_language; + } else { + $new_squirrelmail_default_language =~ s/[\r|\n]//g; + $new_squirrelmail_default_language =~ s/^\s+$//g; + } + return $new_squirrelmail_default_language; +} +# Default Charset +sub commandA2 { +# print "This option controls what character set is used when sending\n"; +# print "mail and when sending HTML to the browser. Do not set this\n"; +# print "to US-ASCII, use ISO-8859-1 instead. For cyrillic, it is best\n"; +# print "to use KOI8-R, since this implementation is faster than most\n"; +# print "of the alternatives\n"; + print "This option is obsolate. Default charset depends on language\n"; + print "you have selected in \"Default language\" option.\n"; + print "\n"; + + print "[$WHT$default_charset$NRM]: $WHT"; + $new_default_charset = ; + if ( $new_default_charset eq "\n" ) { + $new_default_charset = $default_charset; + } else { + $new_default_charset =~ s/[\r|\n]//g; + } + return $new_default_charset; +} +# Alternative language names +sub commandA3 { + print "Enable this option if you want to see localized language names in\n"; + print "language selection box. Note, that if don't limit list of available\n"; + print "languages, this option can trigger installation of foreign language\n"; + print "support modules in some browsers.\n"; + print "\n"; + + if ( lc($show_alternative_names) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Show alternative language names? (y/n) [$WHT$default_value$NRM]: $WHT"; + $show_alternative_names = ; + if ( ( $show_alternative_names =~ /^y\n/i ) || ( ( $show_alternative_names =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $show_alternative_names = "true"; + } else { + $show_alternative_names = "false"; + } + return $show_alternative_names; +} +# Available languages +sub commandA4 { + print "This option allows to limit number of languages available in\n"; + print "language selection box. You can enter as code of every language that\n"; + print "you want to enable. Language codes should be separated by space. If you\n"; + print "enter name unsupported by SquirrelMail, it will be ignored. If you enter\n"; + print "special key \'all\' - all languages available in SquirrelMail will be\n"; + print "listed. If you enter special key \'none\' - user won't be able to change"; + print "language and interface will use language set it \"Default language\" option.\n"; + print "\n"; + print "Valid language names are:\n"; + print " ar (Arabic), bg_BG (Bulgarian), ca_ES (Catalan), cy_GB (Welsh)\n"; + print " cs_CZ (Chech), da_DK (Danish), de_DE (German), el_GR (Greek),\n"; + print " en_US (English), es_ES (Spanish), et_EE (Estonian), fi_FI (Finnish),\n"; + print " fo_FO (Faroese), fr_FR (French), he_IL (Hebrew), hr_HR (Croatian),\n"; + print " hu_HU (Hungarian), id_ID (Indonesian), is_IS (Icelandic), it_IT (Italian),\n"; + print " ja_JP (Japanese), ko_KR (Korean), lt_LT (Lithuanian), ms_MY (Malay),\n"; + print " nl_NL (Dutch), nn_NO (Norwegian (Nynorsk)), no_NO (Norwegian (Bokmal)),\n"; + print " pl_PL (Polish), pt_BR (Portuguese (Brazil)), pt_PT (Portuguese (Portugal)),\n"; + print " ro_RO (Romanian), ru_RU (Russian), sk_SK (Slovak), sl_SI (Slovenian),\n"; + print " sr_YU (Serbian), sv_SE (Swedish), th_TH (Thai), tr_TR (Turkish),\n"; + print " zh_CN (Chinese Simplified), zh_TW (Chinese Traditional).\n"; + print "\n"; + print "[$WHT$available_languages$NRM]: $WHT"; + $new_available_languages = ; + if ( $new_available_languages eq "\n" ) { + $new_available_languages = $available_languages; + } else { + $new_available_languages =~ s/[\r|\n]//g; + $new_available_languages =~ s/^\s+$//g; + } + return $new_available_languages; +} +# Agresive decoding +sub commandA5 { + print "Enable this option if you want to use CPU and memory intensive decoding\n"; + print "functions. This option allows reading multibyte charset, that are used\n"; + print "in Eastern Asia. SquirrelMail will try to use recode functions here,\n"; + print "even when you have disabled use of recode in Tweaks section.\n"; + print "\n"; + + if ( lc($agresive_decoding) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use agresive decoding? (y/n) [$WHT$default_value$NRM]: $WHT"; + $agresive_decoding = ; + if ( ( $agresive_decoding =~ /^y\n/i ) || ( ( $agresive_decoding =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $agresive_decoding = "true"; + } else { + $agresive_decoding = "false"; + } + return $agresive_decoding; +} + +# Advanced tree +sub commandB1 { + print "Enable this option if you want to use DHTML based folder listing.\n"; + print "Code is experimental, works only with some browsers and there might\n"; + print "be some glitches.\n"; + print "\n"; + + if ( lc($advanced_tree) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use advanced tree in folder listing? (y/n) [$WHT$default_value$NRM]: $WHT"; + $advanced_tree = ; + if ( ( $advanced_tree =~ /^y\n/i ) || ( ( $advanced_tree =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $advanced_tree = "true"; + } else { + $advanced_tree = "false"; + } + return $advanced_tree; +} +# Oldway +sub commandB2 { + print "Setting \$oldway to false causes left_main.php to use the new\n"; + print "experimental way of getting the mailbox-tree.\n"; + print "\n"; + + if ( lc($oldway) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use old way of folder list display? (y/n) [$WHT$default_value$NRM]: $WHT"; + $oldway = ; + if ( ( $oldway =~ /^y\n/i ) || ( ( $oldway =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $oldway = "true"; + } else { + $oldway = "false"; + } + return $oldway; +} +# use icons +sub commandB3 { + print "Enabling this option will cause icons to be used instead of text\n"; + print "markers next to each message in mailbox lists that represent\n"; + print "new, read, flagged, and deleted messages, as well as those that\n"; + print "have been replied to and forwarded. Icons are also used next to\n"; + print "(un)expanded folders in the folder list (Oldway = false). These\n"; + print "icons are quite small, but will obviously be more of a resource\n"; + print "drain than text markers.\n"; + print "\n"; + + if ( lc($use_icons) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use icons? (y/n) [$WHT$default_value$NRM]: $WHT"; + $use_icons = ; + if ( ( $use_icons =~ /^y\n/i ) || ( ( $use_icons =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $use_icons = "true"; + } else { + $use_icons = "false"; + } + return $use_icons; +} +# php recode +sub commandB4 { + print "Enable this option if you want to use php recode functions to read\n"; + print "emails written in charset that differs from the one that is set in\n"; + print "translation selected by user. Code is experimental, it might cause\n"; + print "errors, if email contains charset unsupported by recode or if your\n"; + print "php does not have recode support.\n"; + print "\n"; + + if ( lc($use_php_recode) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use php recode functions? (y/n) [$WHT$default_value$NRM]: $WHT"; + $use_php_recode = ; + if ( ( $use_php_recode =~ /^y\n/i ) || ( ( $use_php_recode =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $use_php_recode = "true"; + } else { + $use_php_recode = "false"; + } + return $use_php_recode; +} +# php iconv +sub commandB5 { + print "Enable this option if you want to use php iconv functions to read\n"; + print "emails written in charset that differs from the one that is set in\n"; + print "translation selected by user. Code is experimental, it works only\n"; + print "with translations that use utf-8 charset. Code might cause errors,\n"; + print "if email contains charset unsupported by iconv or if your php does\n"; + print "not have iconv support.\n"; + print "\n"; + + if ( lc($use_php_iconv) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use php iconv functions? (y/n) [$WHT$default_value$NRM]: $WHT"; + $use_php_iconv = ; + if ( ( $use_php_iconv =~ /^y\n/i ) || ( ( $use_php_iconv =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $use_php_iconv = "true"; + } else { + $use_php_iconv = "false"; + } + return $use_php_iconv; +} + + sub save_data { $tab = " "; if ( open( CF, ">config.php" ) ) { @@ -2652,6 +3114,14 @@ sub save_data { # string print CF "\$squirrelmail_default_language = '$squirrelmail_default_language';\n"; + # string + print CF "\$default_charset = '$default_charset';\n"; + # boolean + print CF "\$show_alternative_names = $show_alternative_names;\n"; + # string + print CF "\$available_languages = '$available_languages';\n"; + # boolean + print CF "\$agresive_decoding = $agresive_decoding;\n"; print CF "\n"; # string @@ -2719,8 +3189,6 @@ sub save_data { print CF "\n"; - # string - print CF "\$default_charset = '$default_charset';\n"; # string print CF "\$data_dir = " . &change_to_SM_path($data_dir) . ";\n"; # string that can contain a variable @@ -2747,8 +3215,6 @@ sub save_data { print CF "\$allow_server_sort = $allow_server_sort;\n"; # boolean print CF "\$allow_charset_search = $allow_charset_search;\n"; - # boolean - print CF "\$uid_support = $uid_support;\n"; print CF "\n"; # all plugins are strings @@ -2800,6 +3266,21 @@ sub save_data { # integer print CF " 'maxrows' => $ldap_maxrows[$count]"; } + if ( $ldap_binddn[$count] ) { + print CF ",\n"; + # string + print CF " 'binddn' => '$ldap_binddn[$count]'"; + if ( $ldap_bindpw[$count] ) { + print CF ",\n"; + # string + print CF " 'bindpw' => '$ldap_bindpw[$count]'"; + } + } + if ( $ldap_protocol[$count] ) { + print CF ",\n"; + # integer + print CF " 'protocol' => $ldap_protocol[$count]"; + } print CF "\n"; print CF ");\n"; print CF "\n"; @@ -2818,20 +3299,47 @@ sub save_data { # string print CF "\$prefs_key_field = '$prefs_key_field';\n"; # string - print CF "\$prefs_val_field = '$prefs_val_field';\n"; + print CF "\$prefs_val_field = '$prefs_val_field';\n\n"; + # string + print CF "\$addrbook_global_dsn = '$addrbook_global_dsn';\n"; + # string + print CF "\$addrbook_global_table = '$addrbook_global_table';\n"; + # boolean + print CF "\$addrbook_global_writeable = $addrbook_global_writeable;\n\n"; # boolean - print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n"; + print CF "\$addrbook_global_listing = $addrbook_global_listing;\n\n"; + # boolean + print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n"; # string - print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; - print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; + print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; + # string + print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; + # boolean + print CF "\$use_imap_tls = $use_imap_tls;\n"; # boolean - print CF "\$use_imap_tls = $use_imap_tls;\n"; - print CF "\$use_smtp_tls = $use_smtp_tls;\n"; + print CF "\$use_smtp_tls = $use_smtp_tls;\n"; + # string + print CF "\$session_name = '$session_name';\n"; + + print CF "\n"; - print CF "\$session_name = '$session_name';\n"; + # boolean + print CF "\$advanced_tree = $advanced_tree;\n"; + print CF "\n"; + # boolean + print CF "\$oldway = $oldway;\n"; + print CF "\n"; + # boolean + print CF "\$use_icons = $use_icons;\n"; + print CF "\n"; + # boolean + print CF "\$use_php_recode = $use_php_recode;\n"; + print CF "\n"; + # boolean + print CF "\$use_php_iconv = $use_php_iconv;\n"; + print CF "\n"; - print CF "\n"; print CF "\@include SM_PATH . 'config/config_local.php';\n"; print CF "\n/**\n"; @@ -2852,7 +3360,7 @@ sub save_data { } sub set_defaults { - system "clear"; + clear_screen(); print $WHT. "SquirrelMail Configuration : " . $NRM; if ( $config == 1 ) { print "Read: config.php"; } elsif ( $config == 2 ) { print "Read: config_default.php"; } @@ -2877,6 +3385,7 @@ sub set_defaults { print " exchange = Microsoft Exchange IMAP server\n"; print " courier = Courier IMAP server\n"; print " macosx = Mac OS X Mailserver\n"; + print " mercury32 = Mercury/32\n"; print " quit = Do not change anything\n"; print "Command >> "; $server = ; @@ -2894,6 +3403,7 @@ sub set_defaults { $show_contain_subfolders_option = false; $optional_delimiter = "."; $disp_default_folder_prefix = ""; + $force_username_lowercase = false; $continue = 1; } elsif ( $server eq "uw" ) { @@ -2907,7 +3417,9 @@ sub set_defaults { $show_contain_subfolders_option = true; $optional_delimiter = "/"; $disp_default_folder_prefix = $default_folder_prefix; - + $delete_folder = true; + $force_username_lowercase = true; + $continue = 1; } elsif ( $server eq "exchange" ) { $imap_server_type = "exchange"; @@ -2920,6 +3432,7 @@ sub set_defaults { $show_contain_subfolders_option = false; $optional_delimiter = "detect"; $disp_default_folder_prefix = ""; + $force_username_lowercase = true; $continue = 1; } elsif ( $server eq "courier" ) { @@ -2933,7 +3446,9 @@ sub set_defaults { $show_contain_subfolders_option = false; $optional_delimiter = "."; $disp_default_folder_prefix = $default_folder_prefix; - + $delete_folder = true; + $force_username_lowercase = false; + $continue = 1; } elsif ( $server eq "macosx" ) { $imap_server_type = "macosx"; @@ -2948,6 +3463,20 @@ sub set_defaults { $allow_charset_search = false; $disp_default_folder_prefix = $default_folder_prefix; + $continue = 1; + } elsif ( $server eq "mercury32" ) { + $imap_server_type = "mercury32"; + $default_folder_prefix = ""; + $trash_folder = "INBOX.Trash"; + $sent_folder = "INBOX.Sent"; + $draft_folder = "INBOX.Drafts"; + $show_prefix_option = false; + $default_sub_of_inbox = true; + $show_contain_subfolders_option = true; + $optional_delimiter = "detect"; + $delete_folder = true; + $force_username_lowercase = true; + $continue = 1; } elsif ( $server eq "quit" ) { $continue = 1; @@ -2966,8 +3495,10 @@ sub set_defaults { print " default_sub_of_inbox = $default_sub_of_inbox\n"; print "show_contain_subfolders_option = $show_contain_subfolders_option\n"; print " optional_delimiter = $optional_delimiter\n"; + print " delete_folder = $delete_folder\n"; + print " force_username_lowercase = $force_username_lowercase\n"; } - print "\nPress any key to continue..."; + print "\nPress enter to continue..."; $tmp = ; } @@ -2977,9 +3508,11 @@ sub set_defaults { # prepended to the path, if not, then the path will be # converted to an absolute path, e.g. # '../images/logo.gif' --> SM_PATH . 'images/logo.gif' +# '../../someplace/data' --> '/absolute/path/someplace/data' # 'images/logo.gif' --> SM_PATH . 'config/images/logo.gif' # '/absolute/path/logo.gif' --> '/absolute/path/logo.gif' # 'http://whatever/' --> 'http://whatever' +# $some_var/path --> "$some_var/path" sub change_to_SM_path() { my ($old_path) = @_; my $new_path = ''; @@ -2989,10 +3522,23 @@ sub change_to_SM_path() { # If the path is absolute, don't bother. return "\'" . $old_path . "\'" if ( $old_path eq ''); - return "\'" . $old_path . "\'" if ( $old_path =~ /^\// ); - return "\'" . $old_path . "\'" if ( $old_path =~ /^http/ ); - return $old_path if ( $old_path =~ /^\$/); - return $old_path if ( $old_path =~ /^SM_PATH/ ); + return "\'" . $old_path . "\'" if ( $old_path =~ /^(\/|http)/ ); + return "\'" . $old_path . "\'" if ( $old_path =~ /^\w:\// ); + return $old_path if ( $old_path =~ /^\'(\/|http)/ ); + return $old_path if ( $old_path =~ /^\'\w:\// ); + return $old_path if ( $old_path =~ /^SM_PATH/); + + if ( $old_path =~ /^\$/ ) { + # check if it's a single var, or a $var/path combination + # if it's $var/path, enclose in "" + if ( $old_path =~ /\// ) { + return '"'.$old_path.'"'; + } + return $old_path; + } + + # Remove remaining ' + $old_path =~ s/\'//g; # For relative paths, split on '../' @rel_path = split(/\.\.\//, $old_path); @@ -3000,28 +3546,25 @@ sub change_to_SM_path() { if ( $#rel_path > 1 ) { # more than two levels away. Make it absolute. @abs_path = split(/\//, $dir); - foreach $subdir (@rel_path) { - if ($subdir eq '') { - pop @abs_path; - } else { - push @abs_path, $subdir; - } - } - foreach $subdir (@abs_path) { - $new_path .= $subdir . '/'; + + # Lop off the relative pieces of the absolute path.. + for ( $i = 0; $i <= $#rel_path; $i++ ) { + pop @abs_path; + shift @rel_path; } + push @abs_path, @rel_path; + $new_path = "\'" . join('/', @abs_path) . "\'"; } elsif ( $#rel_path > 0 ) { # it's within the SM tree, prepend SM_PATH $new_path = $old_path; $new_path =~ s/^\.\.\//SM_PATH . \'/; - $new_path .= '\''; + $new_path .= "\'"; } else { # Last, it's a relative path without any leading '.' # Prepend SM_PATH and config, since the paths are # relative to the config directory $new_path = "SM_PATH . \'config/" . $old_path . "\'"; } - return $new_path; } @@ -3037,7 +3580,7 @@ sub change_to_rel_path() { if ( $old_path =~ /^SM_PATH/ ) { $new_path =~ s/^SM_PATH . \'/\.\.\//; - $new_path =~ s/\.\.\/config\///; + $new_path =~ s/\.\.\/config\///; } return $new_path; @@ -3078,9 +3621,16 @@ sub detect_auth_support { return undef; } my $discard = <$sock>; # Server greeting/banner - who cares.. + + if ($service eq 'SMTP') { + # Say hello first.. + print $sock "helo $domain\n"; + $discard = <$sock>; # Yeah yeah, you're happy to see me.. + } print $sock $cmd; my $response = <$sock>; + chomp($response); if (!defined($response)) { return undef; } @@ -3091,6 +3641,9 @@ sub detect_auth_support { # Not supported close $sock; return 'NO'; + } elsif ($response =~ /^503/) { + #Something went wrong + return undef; } } elsif ($service eq 'IMAP') { if ($response =~ /^A01/) { @@ -3110,3 +3663,11 @@ sub detect_auth_support { close $sock; return 'YES'; } + +sub clear_screen() { + if ( $^O =~ /^mswin/i) { + system "cls"; + } else { + system "clear"; + } +}