X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=config%2Fconf.pl;h=5c7a1e9afb047f56e418256b10515f8c7fa38ff0;hb=8278a58d0af9f91901d68c3ab9d9f6b6715ad079;hp=9377672689d71b08d90172ed9e033ec31f5a2008;hpb=7eb64c3e40281a191591e7ecd9c338039b8144cc;p=squirrelmail.git diff --git a/config/conf.pl b/config/conf.pl index 93776726..5c7a1e9a 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2003 The SquirrelMail Project Team +# Copyright (c) 1999-2005 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail # # $Id$ -############################################################ +############################################################ $conf_pl_version = "1.4.0"; ############################################################ @@ -22,9 +22,9 @@ if ( eval q{require "File/Basename.pm"} ) { chdir($dir); } -############################################################ +############################################################ # Some people try to run this as a CGI. That's wrong! -############################################################ +############################################################ if ( defined( $ENV{'PATH_INFO'} ) || defined( $ENV{'QUERY_STRING'} ) || defined( $ENV{'REQUEST_METHOD'} ) ) { @@ -36,15 +36,15 @@ if ( defined( $ENV{'PATH_INFO'} ) ############################################################ # If we got here, use Cwd to get the full directory path # (the Basename stuff above will sometimes return '.' as -# the base directory, which is not helpful here). +# the base directory, which is not helpful here). ############################################################ use Cwd; $dir = cwd(); - -############################################################ + +############################################################ # First, lets read in the data already in there... -############################################################ +############################################################ if ( -e "config.php" ) { open( FILE, "config.php" ); while ( $line = ) { @@ -160,7 +160,7 @@ if ( -e "config.php" ) { # Read and parse the current configuration file # (either config.php or config_default.php). while ( $line = ) { - $line =~ s/^\s+//; + $line =~ s/^\s+//; $line =~ s/^\$//; $var = $line; @@ -188,11 +188,15 @@ while ( $line = ) { $sub =~ s/\]\[['"]NAME['"]\]//; $sub =~ s/.*\[//; $theme_name[$sub] = $options[1]; - } elsif ( $options[0] =~ /^plugins\[[0-9]+\]/ ) { + } elsif ( $options[0] =~ /^plugins\[[0-9]*\]/ ) { $sub = $options[0]; $sub =~ s/\]//; $sub =~ s/^plugins\[//; - $plugins[$sub] = $options[1]; + if ($sub eq '') { + push @plugins, $options[1]; + } else { + $plugins[$sub] = $options[1]; + } } elsif ( $options[0] =~ /^ldap_server\[[0-9]+\]/ ) { $sub = $options[0]; $sub =~ s/\]//; @@ -228,6 +232,11 @@ while ( $line = ) { $tmp =~ s/[\'\"]?,?\s*$//; $tmp =~ s/[\'\"]?\);\s*$//; $maxrows = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]filter[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]filter[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; + $filter = $tmp; } elsif ( $tmp =~ /^\s*[\'\"]name[\'\"]/i ) { $tmp =~ s/^\s*[\'\"]name[\'\"]\s*=>\s*[\'\"]//i; $tmp =~ s/[\'\"],?\s*$//; @@ -248,6 +257,26 @@ while ( $line = ) { $tmp =~ s/[\'\"]?,?\s*$//; $tmp =~ s/[\'\"]?\);\s*$//; $protocol = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]limit_scope[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]limit_scope[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; + $limit_scope = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]listing[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]listing[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; + $listing = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]search_tree[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]search_tree[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; + $search_tree = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]starttls[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]starttls[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; + $starttls = $tmp; } } $ldap_host[$sub] = $host; @@ -255,10 +284,15 @@ while ( $line = ) { $ldap_name[$sub] = $name; $ldap_port[$sub] = $port; $ldap_maxrows[$sub] = $maxrows; + $ldap_filter[$sub] = $filter; $ldap_charset[$sub] = $charset; $ldap_binddn[$sub] = $binddn; $ldap_bindpw[$sub] = $bindpw; $ldap_protocol[$sub] = $protocol; + $ldap_limit_scope[$sub] = $limit_scope; + $ldap_listing[$sub] = $listing; + $ldap_search_tree[$sub] = $search_tree; + $ldap_starttls[$sub] = $starttls; } elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page)$/ ) { ${ $options[0] } = &change_to_rel_path($options[1]); } else { @@ -296,26 +330,39 @@ $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 ); -$addrbook_global_table = 'global_abook' if ( !$addrbook_global_table ); -$addrbook_global_writeable = 'false' if ( !$addrbook_global_writeable ); -$addrbook_global_listing = 'false' if ( !$addrbook_global_listing ); -$abook_global_file = '' if ( !$abook_global_file); -$abook_global_file_writeable = 'false' if ( !$abook_global_file_writeable); $use_smtp_tls= 'false' if ( !$use_smtp_tls); $smtp_auth_mech = 'none' if ( !$smtp_auth_mech ); $use_imap_tls = 'false' if ( !$use_imap_tls ); $imap_auth_mech = 'login' if ( !$imap_auth_mech ); $session_name = 'SQMSESSID' if ( !$session_name ); +$skip_SM_header = 'false' if ( !$skip_SM_header ); +$default_use_javascript_addr_book = 'false' if (! $default_use_javascript_addr_book); +# since 1.5.0 $show_alternative_names = 'false' if ( !$show_alternative_names ); -$available_languages = 'all' if ( !$available_languages ); +# $available_languages option available only in 1.5.0. removed due to $languages +# implementation changes. options are provided by limit_languages plugin +# $available_languages = 'all' if ( !$available_languages ); $aggressive_decoding = 'false' if ( !$aggressive_decoding ); -$lossy_encoding = 'false' if ( !$lossy_encoding ); $advanced_tree = 'false' if ( !$advanced_tree ); -$oldway = 'false' if ( !$oldway ); -$use_icons = 'false' if ( !$use_icons ); $use_php_recode = 'false' if ( !$use_php_recode ); $use_php_iconv = 'false' if ( !$use_php_iconv ); -$skip_SM_header = 'false' if ( !$skip_SM_header ); +# since 1.5.1 +$use_icons = 'false' if ( !$use_icons ); +$use_iframe = 'false' if ( !$use_iframe ); +$lossy_encoding = 'false' if ( !$lossy_encoding ); +$allow_remote_configtest = 'false' if ( !$allow_remote_configtest ); +$addrbook_global_table = 'global_abook' if ( !$addrbook_global_table ); +$addrbook_global_writeable = 'false' if ( !$addrbook_global_writeable ); +$addrbook_global_listing = 'false' if ( !$addrbook_global_listing ); +$abook_global_file = '' if ( !$abook_global_file); +$abook_global_file_writeable = 'false' if ( !$abook_global_file_writeable); +$abook_global_file_listing = 'true' if ( !$abook_global_file_listing ); +$encode_header_key = '' if ( !$encode_header_key ); +$hide_auth_header = 'false' if ( !$hide_auth_header ); +$time_zone_type = '0' if ( !$time_zone_type ); +$prefs_user_size = 128 if ( !$prefs_user_size ); +$prefs_key_size = 64 if ( !$prefs_key_size ); +$prefs_val_size = 65536 if ( !$prefs_val_size ); if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; @@ -344,7 +391,7 @@ if ( $config_use_color == 1 ) { $config_use_color = 2; } -while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { +while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { clear_screen(); print $WHT. "SquirrelMail Configuration : " . $NRM; if ( $config == 1 ) { print "Read: config.php"; } @@ -363,8 +410,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 "10. Language settings\n"; + print "11. Tweaks\n"; print "\n"; print "D. Set pre-defined settings for specific IMAP servers\n"; print "\n"; @@ -395,7 +442,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } print "$NRM\n"; print "\n"; - + if ( $show_imap_settings ) { print $WHT . "IMAP Settings". $NRM . "\n--------------\n"; print "4. IMAP Server : $WHT$imapServerAddress$NRM\n"; @@ -409,7 +456,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { if ( lc($useSendmail) eq 'true' ) { print $WHT . "Sendmail" . $NRM . "\n--------\n"; print "4. Sendmail Path : $WHT$sendmail_path$NRM\n"; - print "5. Suppress SM header : $WHT$skip_SM_header$NRM\n"; + print "5. Header encryption key : $WHT$encode_header_key$NRM\n"; print "\n"; } else { print $WHT . "SMTP Settings" . $NRM . "\n-------------\n"; @@ -418,7 +465,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "6. POP before SMTP : $WHT$pop_before_smtp$NRM\n"; print "7. SMTP Authentication : $WHT$smtp_auth_mech$NRM\n"; print "8. Secure SMTP (TLS) : $WHT$use_smtp_tls$NRM\n"; - print "9. Suppress SM header : $WHT$skip_SM_header$NRM\n"; + print "9. Header encryption key : $WHT$encode_header_key$NRM\n"; print "\n"; } } @@ -428,7 +475,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "$WHT$imapServerAddress$NRM:"; print "$WHT$imapPort$NRM "; print "($WHT$imap_server_type$NRM)\n"; - } + } if ($show_smtp_settings == 0) { if ( lc($useSendmail) eq 'true' ) { print "B. Change Sendmail Config : $WHT$sendmail_path$NRM\n"; @@ -440,11 +487,11 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } if ( $show_smtp_settings || $show_imap_settings ) { - print "H. Hide " . - ($show_imap_settings ? "IMAP Server" : + print "H. Hide " . + ($show_imap_settings ? "IMAP Server" : (lc($useSendmail) eq 'true') ? "Sendmail" : "SMTP") . " Settings\n"; } - + print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 3 ) { @@ -479,12 +526,15 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { 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 "9. Allow editing of identity : $WHT$edit_identity$NRM\n"; + print " Allow editing of name : $WHT$edit_name$NRM\n"; + print " Remove username from header : $WHT$hide_auth_header$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. Allow advanced search : $WHT$allow_advanced_search$NRM\n"; print "14. PHP session name : $WHT$session_name$NRM\n"; + print "15. Time zone configuration : $WHT$time_zone_type$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 5 ) { @@ -492,7 +542,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "1. Change Themes\n"; for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) { $temp_name = $theme_name[$count*2]; - printf " %s%*s %s\n", $temp_name, + printf " %s%*s %s\n", $temp_name, 40 - length($temp_name), " ", $theme_name[($count*2)+1]; } @@ -505,9 +555,10 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { for ( $count = 0 ; $count <= $#ldap_host ; $count++ ) { print " > $ldap_host[$count]\n"; } - print "2. Use Javascript address book search : $WHT$default_use_javascript_addr_book$NRM\n"; - print "3. Use global file address book : $WHT$abook_global_file$NRM\n"; + print "2. Use Javascript address book search : $WHT$default_use_javascript_addr_book$NRM\n"; + print "3. Global address book file : $WHT$abook_global_file$NRM\n"; print "4. Allow writing into global file address book : $WHT$abook_global_file_writeable$NRM\n"; + print "5. Allow listing of global file address book : $WHT$abook_global_file_listing$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 7 ) { @@ -560,9 +611,9 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "\n"; print "3. DSN for Preferences : $WHT$prefs_dsn$NRM\n"; print "4. Table for Preferences : $WHT$prefs_table$NRM\n"; - print "5. Field for username : $WHT$prefs_user_field$NRM\n"; - 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 "5. Field for username : $WHT$prefs_user_field$NRM ($prefs_user_size)\n"; + print "6. Field for prefs key : $WHT$prefs_key_field$NRM ($prefs_key_size)\n"; + print "7. Field for prefs value : $WHT$prefs_val_field$NRM ($prefs_val_size)\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"; @@ -575,20 +626,22 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { 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. Enable aggressive decoding : $WHT$aggressive_decoding$NRM\n"; - print "6. Enable lossy encoding : $WHT$lossy_encoding$NRM\n"; + print "4. Enable aggressive decoding : $WHT$aggressive_decoding$NRM\n"; + print "5. Enable lossy encoding : $WHT$lossy_encoding$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 "1. Advanced tree : $WHT$advanced_tree$NRM\n"; + print "2. Display html mails in iframe : $WHT$use_iframe$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 "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 $WHT. "Configuration tweaks\n" . $NRM; + print "6. Allow remote configtest : $WHT$allow_remote_configtest$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } @@ -667,14 +720,15 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 8 ) { $imap_server_type = command19(); } elsif ( $command == 9 ) { $optional_delimiter = command111(); } } elsif ( $show_smtp_settings && lc($useSendmail) eq 'true' ) { - if ( $command == 4 ) { $sendmail_path = command15(); } + if ( $command == 4 ) { $sendmail_path = command15(); } + elsif ( $command == 5 ) { $encode_header_key = command114(); } } elsif ( $show_smtp_settings ) { if ( $command == 4 ) { $smtpServerAddress = command16(); } elsif ( $command == 5 ) { $smtpPort = command17(); } elsif ( $command == 6 ) { $pop_before_smtp = command18a(); } elsif ( $command == 7 ) { $smtp_auth_mech = command112b(); } elsif ( $command == 8 ) { $use_smtp_tls = command113("SMTP",$use_smtp_tls); } - elsif ( $command == 9 ) { $skip_SM_header = command114(); } + elsif ( $command == 9 ) { $encode_header_key = command114(); } } } elsif ( $menu == 3 ) { if ( $command == 1 ) { $default_folder_prefix = command21(); } @@ -704,12 +758,13 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { 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 == 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 ) { $allow_advanced_search = command316(); } elsif ( $command == 14 ) { $session_name = command317(); } + elsif ( $command == 15 ) { $time_zone_type = command318(); } } elsif ( $menu == 5 ) { if ( $command == 1 ) { command41(); } elsif ( $command == 2 ) { $theme_css = command42(); } @@ -718,6 +773,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 2 ) { command62(); } elsif ( $command == 3 ) { $abook_global_file=command63(); } elsif ( $command == 4 ) { command64(); } + elsif ( $command == 5 ) { command65(); } } elsif ( $menu == 7 ) { if ( $command == 1 ) { $motd = command71(); } } elsif ( $menu == 8 ) { @@ -736,17 +792,17 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { 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 == 2 ) { $default_charset = commandA2(); } elsif ( $command == 3 ) { $show_alternative_names = commandA3(); } - elsif ( $command == 4 ) { $available_languages = commandA4(); } - elsif ( $command == 5 ) { $aggressive_decoding = commandA5(); } - elsif ( $command == 6 ) { $lossy_encoding = commandA6(); } + elsif ( $command == 4 ) { $aggressive_decoding = commandA4(); } + elsif ( $command == 5 ) { $lossy_encoding = commandA5(); } } elsif ( $menu == 11 ) { if ( $command == 1 ) { $advanced_tree = commandB1(); } - elsif ( $command == 2 ) { $oldway = commandB2(); } + if ( $command == 2 ) { $use_iframe = commandB2(); } elsif ( $command == 3 ) { $use_icons = commandB3(); } elsif ( $command == 4 ) { $use_php_recode = commandB4(); } elsif ( $command == 5 ) { $use_php_iconv = commandB5(); } + elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); } } } } @@ -769,8 +825,6 @@ sub command1 { print "If your Organization Name includes a '\$', please precede it with a \\. \n"; print "Other '\$' will be considered the beginning of a variable that\n"; print "must be defined before the \$org_name is printed.\n"; - print "\$version, for example, is included by default, and will print the\n"; - print "string representing the current SquirrelMail version.\n"; print "\n"; print "[$WHT$org_name$NRM]: $WHT"; $new_org_name = ; @@ -839,7 +893,7 @@ sub command3 { print "If your Organization Title includes a '\$', please precede it with a \\. \n"; print "Other '\$' will be considered the beginning of a variable that\n"; print "must be defined before the \$org_title is printed.\n"; - print "\$version, for example, is included by default, and will print the\n"; + print "\$version, for example can be used, and will print the\n"; print "string representing the current SquirrelMail version.\n"; print "\n"; print "[$WHT$org_title$NRM]: $WHT"; @@ -891,12 +945,12 @@ sub command6 { # Default link to provider sub command7 { print "Here you can set the link on the right of the page.\n"; - print "The default is 'http://www.squirrelmail.org/'\n"; + print "If empty, it will link to the SquirrelMail About page.\n"; print "\n"; print "[$WHT$provider_uri$NRM]: $WHT"; $new_provider_uri = ; if ( $new_provider_uri eq "\n" ) { - $new_provider_uri = 'http://www.squirrelmail.org/'; + $new_provider_uri = ''; } else { $new_provider_uri =~ s/[\r\n]//g; $new_provider_uri =~ s/^\s+$//g; @@ -1029,7 +1083,7 @@ sub command17 { return $new_smtpPort; } -# authenticated server +# authenticated server sub command18 { return; # This sub disabled by tassium - it has been replaced with smtp_auth_mech @@ -1066,7 +1120,7 @@ sub command18a { return $pop_before_smtp; } -# imap_server_type +# imap_server_type sub command19 { print "Each IMAP server has its own quirks. As much as we tried to stick\n"; print "to standards, it doesn't help much if the IMAP server doesn't follow\n"; @@ -1074,12 +1128,17 @@ sub command19 { print "these servers. If you would like to use them, please select your\n"; print "IMAP server. If you do not wish to use these work-arounds, you can\n"; print "set this to \"other\", and none will be used.\n"; - print " cyrus = Cyrus IMAP server\n"; - print " uw = University of Washington's IMAP server\n"; - print " exchange = Microsoft Exchange IMAP server\n"; - print " courier = Courier IMAP server\n"; - print " macosx = Mac OS X Mailserver\n"; - print " other = Not one of the above servers\n"; + print " courier = Courier IMAP server\n"; + print " cyrus = Cyrus IMAP server\n"; + print " dovecot = Dovecot Secure IMAP server\n"; + print " exchange = Microsoft Exchange IMAP server\n"; + print " hmailserver = hMailServer\n"; + print " macosx = Mac OS X Mailserver\n"; + print " mercury32 = Mercury Mail Transport System\n"; + print " uw = University of Washington's IMAP server\n"; + print "\n"; + print " other = Not one of the above servers\n"; + print "\n"; print "[$WHT$imap_server_type$NRM]: $WHT"; $new_imap_server_type = ; @@ -1175,9 +1234,9 @@ sub command112a { } else { print $WHT . " ERROR DETECTING$NRM\n"; } - + } - } + } print "\nWhat authentication mechanism do you want to use for IMAP connections?\n\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"; @@ -1196,7 +1255,7 @@ sub command112a { } } - + # SMTP authentication type # Possible choices: none, plain, cram-md5, digest-md5 sub command112b { @@ -1212,7 +1271,7 @@ sub command112b { 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@microsoft.com $host = $smtpServerAddress . ':' . $smtpPort; @@ -1250,7 +1309,7 @@ sub command112b { } else { print $WHT . "ERROR DETECTING$NRM\n"; } - + # Try CRAM-MD5 print "Testing CRAM-MD5:\t"; $tmp=detect_auth_support('SMTP',$host,'CRAM-MD5'); @@ -1263,7 +1322,7 @@ sub command112b { } else { print $WHT . "ERROR DETECTING$NRM\n"; } - + print "Testing DIGEST-MD5:\t"; $tmp=detect_auth_support('SMTP',$host,'DIGEST-MD5'); @@ -1276,7 +1335,7 @@ sub command112b { } else { print $WHT . "ERROR DETECTING$NRM\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"; @@ -1293,7 +1352,7 @@ sub command112b { # SMTP doesn't necessarily require logins return "none"; } - if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\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 { @@ -1321,7 +1380,7 @@ sub command113 { } else { print "n"; } - print "$NRM]: $WHT"; + print "$NRM]: $WHT"; $inval=; $inval =~ tr/yn//cd; return 'true' if ( $inval eq "y" ); @@ -1329,20 +1388,28 @@ sub command113 { return $default_val; } +# $encode_header_key sub command114{ - print "\nUse this to suppress insertion of SquirrelMail Received: headers\n"; - print "in outbound messages.\n\n"; - - $YesNo = 'n'; - $YesNo = 'y' if ( lc($skip_SM_header) eq 'true' ); - - print "Suppress SM header (y/n) [$WHT$YesNo$NRM]: $WHT"; - $new_skip_SM_header = ; - chomp($new_skip_SM_header); - - return 'true' if ( lc($new_skip_SM_header) eq 'y' ); - return 'false' if ( lc($new_skip_SM_header) eq 'n' ); - return $skip_SM_header; + print "Encryption key allows to hide SquirrelMail Received: headers\n"; + print "in outbound messages. Interface uses encryption key to encode\n"; + print "username, remote address and proxied address, then stores encoded\n"; + print "information in X-Squirrel-* headers.\n"; + print "\n"; + print "Warning: used encryption function is not bulletproof. When used\n"; + print "with static encryption keys, it provides only minimal security\n"; + print "measures and information can be decoded quickly.\n"; + print "\n"; + print "Encoded information can be decoded with decrypt_headers.php script\n"; + print "from SquirrelMail contrib/ directory.\n"; + print "\n"; + print "Enter encryption key: "; + $new_encode_header_key = ; + if ( $new_encode_header_key eq "\n" ) { + $new_encode_header_key = $encode_header_key; + } else { + $new_encode_header_key =~ s/[\r\n]//g; + } + return $new_encode_header_key; } # MOTD @@ -1361,7 +1428,7 @@ sub command71 { $line =~ s/ /\ \ /g; $line =~ s/\t/\ \ \ \ /g; $line =~ s/$/ /; - $line =~ s/\"/"/g; + $line =~ s/\"/\\\"/g; $new_motd = $new_motd . $line; } @@ -1468,7 +1535,7 @@ sub command22 { return $show_prefix_option; } -# Trash Folder +# Trash Folder sub command23a { print "You can now specify where the default trash folder is located.\n"; print "On servers where you do not want this, you can set it to anything\n"; @@ -1490,7 +1557,7 @@ sub command23a { return $new_trash_folder; } -# Sent Folder +# Sent Folder sub command23b { print "This is where messages that are sent will be stored. SquirrelMail\n"; print "by default puts a copy of all outgoing messages in this folder.\n"; @@ -1511,7 +1578,7 @@ sub command23b { return $new_sent_folder; } -# Draft Folder +# Draft Folder sub command23c { print "You can now specify where the default draft folder is located.\n"; print "On servers where you do not want this, you can set it to anything\n"; @@ -1533,7 +1600,7 @@ sub command23c { return $new_draft_folder; } -# default move to trash +# default move to trash sub command24a { print "By default, should messages get moved to the trash folder? You\n"; print "can specify the default trash folder in option 3. If this is set\n"; @@ -1558,7 +1625,7 @@ sub command24a { return $default_move_to_trash; } -# default move to sent +# default move to sent sub command24b { print "By default, should messages get moved to the sent folder? You\n"; print "can specify the default sent folder in option 4. If this is set\n"; @@ -1606,7 +1673,7 @@ sub command24c { return $default_save_as_draft; } -# List special folders first +# List special folders first sub command27 { print "SquirrelMail has what we call 'special folders' that are not\n"; print "manipulated and viewed like normal folders. Some examples of\n"; @@ -1631,7 +1698,7 @@ sub command27 { return $list_special_folders_first; } -# Show special folders color +# Show special folders color sub command28 { print "SquirrelMail has what we call 'special folders' that are not\n"; print "manipulated and viewed like normal folders. Some examples of\n"; @@ -1656,7 +1723,7 @@ sub command28 { return $use_special_folder_color; } -# Auto expunge +# Auto expunge sub command29 { print "The way that IMAP handles deleting messages is as follows. You\n"; print "mark the message as deleted, and then to 'really' delete it, you\n"; @@ -1680,7 +1747,7 @@ sub command29 { return $auto_expunge; } -# Default sub of inbox +# Default sub of inbox sub command210 { print "Some IMAP servers (Cyrus) have all folders as subfolders of INBOX.\n"; print "This can cause some confusion in folder creation for users when\n"; @@ -1704,7 +1771,7 @@ sub command210 { return $default_sub_of_inbox; } -# Show contain subfolder option +# Show contain subfolder option sub command211 { print "Some IMAP servers (UW) make it so that there are two types of\n"; print "folders. Those that contain messages, and those that contain\n"; @@ -1728,7 +1795,7 @@ sub command211 { return $show_contain_subfolders_option; } -# Default Unseen Notify +# Default Unseen Notify sub command212 { print "This option specifies where the users will receive notification\n"; print "about unseen messages by default. This is of course an option that\n"; @@ -1747,7 +1814,7 @@ sub command212 { return $default_unseen_notify; } -# Default Unseen Type +# Default Unseen Type sub command213 { print "Here you can define the default way that unseen messages will be displayed\n"; print "to the user in the folder listing on the left side.\n"; @@ -1787,7 +1854,7 @@ sub command214 { return $auto_create_special; } -# Automatically delete folders +# Automatically delete folders sub command215 { if ( $imap_server_type eq "uw" ) { print "UW IMAP servers will not allow folders containing mail to also contain folders.\n"; @@ -1797,7 +1864,7 @@ sub command215 { print "Press any key to continue...\n"; $new_delete = ; $delete_folder = 'true'; - } else { + } else { if ( $imap_server_type eq "courier" ) { print "Courier (or Courier-IMAP) IMAP servers may not support "; print "subfolders of Trash. \n"; @@ -1805,7 +1872,7 @@ sub command215 { 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 "when changing this setting.\n\n"; } print "Are subfolders of the Trash supported by your IMAP server?\n"; @@ -1813,8 +1880,8 @@ sub command215 { 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.. + # 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 { @@ -1857,10 +1924,11 @@ sub command216 { # Data directory sub command33a { print "Specify the location for your data directory.\n"; + print "You need to create this directory yourself.\n"; print "The path name can be absolute or relative (to the config directory).\n"; - print "It doesn't matter. Here are two examples:\n"; - print " Absolute: /var/spool/data/\n"; - print " Relative: ../data/\n"; + print "Here are two examples:\n"; + print " Absolute: /var/local/squirrelmail/data/\n"; + 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 writeable directory\n"; @@ -1888,9 +1956,9 @@ sub command33a { # Attachment directory sub command33b { print "Path to directory used for storing attachments while a mail is\n"; - print "being sent. The path name can be absolute or relative (to the config directory).\n"; - print "It doesn't matter. Here are two examples:\n"; - print " Absolute: /var/spool/attach/\n"; + print "being composed. The path name can be absolute or relative (to the\n"; + print "config directory). Here are two examples:\n"; + print " Absolute: /var/local/squirrelmail/attach/\n"; print " Relative: ../attach/\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"; @@ -1927,9 +1995,9 @@ sub command33b { sub command33c { print "The directory hash level setting allows you to configure the level\n"; - print "of hashing that Squirremail employs in your data and attachment\n"; + print "of hashing that SquirrelMail employs in your data and attachment\n"; print "directories. This value must be an integer ranging from 0 to 4.\n"; - print "When this value is set to 0, Squirrelmail will simply store all\n"; + print "When this value is set to 0, SquirrelMail will simply store all\n"; print "files as normal in the data and attachment directories. However,\n"; print "when set to a value from 1 to 4, a simple hashing scheme will be\n"; print "used to organize the files in this directory. In short, the crc32\n"; @@ -2050,6 +2118,7 @@ sub command39 { return 'false'; } + sub command310 { 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 "; @@ -2066,9 +2135,11 @@ sub command310 { if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { $edit_identity = 'true'; $edit_name = 'true'; + $hide_auth_header = 'false'; } else { $edit_identity = 'false'; $edit_name = command311(); + $hide_auth_header = command311b(); } return $edit_identity; } @@ -2094,6 +2165,32 @@ sub command311 { return $edit_name; } +sub command311b { + print "SquirrelMail adds username information to every sent email."; + print "It is done in order to prevent possible sender forging when "; + print "end users are allowed to change their email and name "; + print "information.\n"; + print "\n"; + print "You can disable this header, if you think that it violates "; + print "user's privacy or security. Please note, that setting will "; + print "work only when users are not allowed to change their identity.\n"; + print "\n"; + + if ( lc($hide_auth_header) eq "true" ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Remove username from email headers? (y/n) [$WHT$default_value$NRM]: $WHT"; + $new_header = ; + if ( ( $new_header =~ /^y\n/i ) || ( ( $new_header =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $hide_auth_header = "true"; + } else { + $hide_auth_header = "false"; + } + return $edit_name; +} + sub command312 { print "This option allows you to choose if users can use thread sorting\n"; print "Your IMAP server must support the THREAD command for this to work\n"; @@ -2188,6 +2285,29 @@ sub command317 { return $new_session_name; } +# time zone config (since 1.5.1) +sub command318 { + print "This option allows you to control the use of time zones.\n"; + print " 0 = (default) standard, GNU C time zone names\n"; + print " 1 = strict, generic time zone codes with offsets\n"; + print " 2 = custom, GNU C time zones loaded from config/timezones.php\n"; + print " 3 = custom strict, generic time zone codes with offsets loaded \n"; + print " from config/timezones.php\n"; + print "See SquirrelMail documentation about format of config/timezones.php file.\n"; + print "\n"; + + print "Used time zone configuration (0,1,2,3)? [$WHT$time_zone_type$NRM]: $WHT"; + $new_time_zone_type = ; + if ( $new_time_zone_type =~ /^[0123]\n/i ) { + $time_zone_type = $new_time_zone_type; + } else { + print "\nInvalid configuration value.\n"; + print "\nPress enter to continue..."; + $tmp = ; + } + $time_zone_type =~ s/[\r\n]//g; + return $time_zone_type; +} sub command41 { @@ -2385,15 +2505,30 @@ sub command61 { if ( $ldap_maxrows[$count] ) { print " maxrows: $ldap_maxrows[$count]\n"; } + if ( $ldap_filter[$count] ) { + print " filter: $ldap_filter[$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] ) { + if ( $ldap_protocol[$count] ) { print " protocol: $ldap_protocol[$count]\n"; } + if ( $ldap_limit_scope[$count] ) { + print " limit_scope: $ldap_limit_scope[$count]\n"; + } + if ( $ldap_listing[$count] ) { + print " listing: $ldap_listing[$count]\n"; + } + if ( $ldap_search_tree[$count] ) { + print " search_tree: $ldap_search_tree[$count]\n"; + } + if ( $ldap_starttls[$count] ) { + print " starttls: $ldap_starttls[$count]\n"; + } print "\n"; $count++; @@ -2448,12 +2583,13 @@ sub command61 { print "\n"; print "You can specify the maximum number of rows in the search result.\n"; - print "Default is unlimited. Press ENTER for default.\n"; + print "Default value is equal to 250 rows. Press ENTER for default.\n"; print "maxrows: "; $name = ; $name =~ s/[\r\n]//g; $ldap_maxrows[$sub] = $name; + print "\n"; print "If your LDAP server does not like anonymous logins, you can specify bind DN.\n"; @@ -2476,9 +2612,9 @@ sub command61 { print "\n"; } - print "You can specify bind protocol version here.\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 "Press ENTER for default.\n"; print "protocol: "; $name = ; $name =~ s/[\r\n]//g; @@ -2486,6 +2622,94 @@ sub command61 { print "\n"; + print "This configuration section allows to set some rarely used\n"; + print "options and options specific to some LDAP implementations.\n"; + print "\n"; + print "Do you want to set advanced LDAP directory settings? (y/N):"; + $ldap_advanced_settings = ; + if ( $ldap_advanced_settings =~ /^y\n/i ) { + $ldap_advanced_settings = 'true'; + } else { + $ldap_advanced_settings = 'false'; + } + + if ($ldap_advanced_settings eq 'true') { + print "\n"; + + print "You can control LDAP directory listing here. This option can\n"; + print "be useful if you run small LDAP server and want to provide listing\n"; + print "of all addresses stored in LDAP to users of webmail interface.\n"; + print "Number of displayed entries is limited by maxrows setting.\n"; + print "\n"; + print "Don't enable this option for public LDAP directories.\n"; + print "This feature is experimental.\n"; + print "\n"; + print "Allow listing of LDAP directory? (y/N):"; + $name = ; + if ( $name =~ /^y\n/i ) { + $name = 'true'; + } else { + $name = 'false'; + } + $ldap_listing[$sub] = $name; + + print "\n"; + + print "You can specify an additional search filter.\n"; + print "This could be something like \"(objectclass=posixAccount)\".\n"; + print "No filtering is performed by default. Press ENTER for default.\n"; + print "filter: "; + $name = ; + $name =~ s/[\r|\n]//g; + $ldap_filter[$sub] = $name; + + print "\n"; + + print "You can control search scope here.\n"; + print "This option is specific to Microsoft ADS implementation.\n"; + print "It requires use of v3 or newer LDAP protocol.\n"; + print "Don't enable it, if you use other LDAP server.\n"; + print "\n"; + print "Limit ldap scope? (y/N):"; + $name = ; + if ( $name =~ /^y\n/i ) { + $name = 'true'; + } else { + $name = 'false'; + } + $ldap_limit_scope[$sub] = $name; + + print "\n"; + + print "You can control ldap search type here.\n"; + print "Addresses can be searched in entire LDAP subtree (default)\n"; + print "or only first level entries are returned.\n"; + print "\n"; + print "Search entire LDAP subtree? (Y/n):"; + $name = ; + if ( $name =~ /^n\n/i ) { + $name = 'false'; + } else { + $name = 'true'; + } + $ldap_search_tree[$sub] = $name; + + print "\n"; + + print "You can control use of StartTLS on LDAP connection here.\n"; + print "This option requires use of v3 or newer LDAP protocol and php 4.2+.\n"; + print "\n"; + print "Use StartTLS? (y/N):"; + $name = ; + if ( $name =~ /^y\n/i ) { + $name = 'true'; + } else { + $name = 'false'; + } + $ldap_starttls[$sub] = $name; + } + print "\n"; + } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { if ( $input =~ /[0-9]+\s*$/ ) { $rem_num = $input; @@ -2501,9 +2725,14 @@ sub command61 { @new_ldap_name = (); @new_ldap_charset = (); @new_ldap_maxrows = (); + @new_ldap_filter = (); @new_ldap_bindpw = (); @new_ldap_binddn = (); @new_ldap_protocol = (); + @new_ldap_limit_scope = (); + @new_ldap_listing = (); + @new_ldap_search_tree = (); + @new_ldap_starttls = (); while ( $count <= $#ldap_host ) { if ( $count != $rem_num ) { @@ -2513,9 +2742,14 @@ 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_filter = ( @new_ldap_filter, $ldap_filter[$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] ); + @new_ldap_limit_scope = ( @new_ldap_limit_scope, $ldap_limit_scope[$count] ); + @new_ldap_listing = ( @new_ldap_listing, $ldap_listing[$count] ); + @new_ldap_search_tree = ( @new_ldap_search_tree, $ldap_search_tree[$count] ); + @new_ldap_starttls = ( @new_ldap_starttls, $ldap_starttls[$count] ); } $count++; } @@ -2525,9 +2759,14 @@ sub command61 { @ldap_name = @new_ldap_name; @ldap_charset = @new_ldap_charset; @ldap_maxrows = @new_ldap_maxrows; + @ldap_filter = @new_ldap_filter; @ldap_binddn = @new_ldap_binddn; @ldap_bindpw = @new_ldap_bindpw; @ldap_protocol = @new_ldap_protocol; + @ldap_limit_scope = @new_ldap_limit_scope; + @ldap_listing = @new_ldap_listing; + @ldap_search_tree = @new_ldap_search_tree; + @ldap_starttls = @new_ldap_starttls; } elsif ( $input =~ /^\s*\?\s*/ ) { print ".-------------------------.\n"; @@ -2576,7 +2815,7 @@ sub command63 { print "must set this option to a valid value. If option does\n"; print "not have path elements, system assumes that file is\n"; print "stored in data directory. If relative path is set, it is\n"; - print "relative to main squirrelmail directory. If value is empty,\n"; + print "relative to main SquirrelMail directory. If value is empty,\n"; print "address book is not enabled.\n"; print "\n"; @@ -2613,6 +2852,28 @@ sub command64 { return $abook_global_file_writeable; } +# listing of global filebased abook control +sub command65 { + print "This setting controls listing of global file address\n"; + print "book in addresses page.\n"; + print "\n"; + + if ( lc($abook_global_file_listing) eq 'true' ) { + $default_value = "y"; + } else { + $abook_global_file_listing = 'false'; + $default_value = "n"; + } + print "Allow listing of global file address book (y/n) [$WHT$default_value$NRM]: $WHT"; + $new_show = ; + if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $abook_global_file_listing = 'true'; + } else { + $abook_global_file_listing = 'false'; + } + return $abook_global_file_listing; +} + sub command91 { print "If you want to store your users address book details in a database then\n"; print "you need to set this DSN to a valid value. The format for this is:\n"; @@ -2706,6 +2967,7 @@ sub command95 { } else { $new_field =~ s/[\r\n]//g; } + $prefs_user_size = db_pref_size($prefs_user_size); return $new_field; } @@ -2720,6 +2982,7 @@ sub command96 { } else { $new_field =~ s/[\r\n]//g; } + $prefs_key_size = db_pref_size($prefs_key_size); return $new_field; } @@ -2734,9 +2997,26 @@ sub command97 { } else { $new_field =~ s/[\r\n]//g; } + $prefs_val_size = db_pref_size($prefs_val_size); return $new_field; } +# routine is used to set database field limits +# it needs one argument +sub db_pref_size() { + my ($size) = $_[0]; + print "\nDatabase fields have size limits.\n"; + print "\n"; + print "What limit is set for this field? [$WHT$size$NRM]: $WHT"; + $new_size = ; + if ( $new_size eq "\n" ) { + $new_size = $size; + } else { + $new_size =~ s/[\r\n]//g; + } + return $new_size; +} + 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"; @@ -2765,7 +3045,8 @@ sub command98 { 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 "data in. Default table name is 'global_abook'. Address book uses same\n"; + print "database format as personal address book.\n"; print "\n"; print "[$WHT$addrbook_global_table$NRM]: $WHT"; $new_table = ; @@ -2852,9 +3133,8 @@ sub commandA2 { # 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 "language selection box. Note, that this option can trigger\n"; + print "installation of foreign language support modules in some browsers.\n"; print "\n"; if ( lc($show_alternative_names) eq 'true' ) { @@ -2871,30 +3151,9 @@ sub commandA3 { } 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 "You can find valid language names in doc/i18n.txt.\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; -} + # Aggressive decoding -sub commandA5 { +sub commandA4 { 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"; @@ -2917,7 +3176,7 @@ sub commandA5 { } # Lossy encoding -sub commandA6 { +sub commandA5 { print "Enable this option if you want to allow lossy charset encoding in message\n"; print "composition pages. This option allows charset conversions when output\n"; print "charset does not support all symbols used in original charset. Symbols\n"; @@ -2961,25 +3220,27 @@ sub commandB1 { } return $advanced_tree; } -# Oldway +# display html emails in iframe 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 "This option can enable html email rendering inside iframe.\n"; + print "Inline frames are used in order to provide sandbox environment"; + print "for html code included in html formated emails."; + print "Option is experimental and might have glitches in some parts of code."; print "\n"; - if ( lc($oldway) eq 'true' ) { + if ( lc($use_iframe) 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'; + print "Display html emails in iframe? (y/n) [$WHT$default_value$NRM]: $WHT"; + $use_iframe = ; + if ( ( $use_iframe =~ /^y\n/i ) || ( ( $use_iframe =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $use_iframe = 'true'; } else { - $oldway = 'false'; + $use_iframe = 'false'; } - return $oldway; + return $use_iframe; } # use icons sub commandB3 { @@ -3054,6 +3315,28 @@ sub commandB5 { return $use_php_iconv; } +# configtest block +sub commandB6 { + print "Enable this option if you want to check SquirrelMail configuration\n"; + print "remotely with configtest.php script.\n"; + print "\n"; + + if ( lc($allow_remote_configtest) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Allow remote configuration tests? (y/n) [$WHT$default_value$NRM]: $WHT"; + $allow_remote_configtest = ; + if ( ( $allow_remote_configtest =~ /^y\n/i ) || ( ( $allow_remote_configtest =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $allow_remote_configtest = 'true'; + } else { + $allow_remote_configtest = 'false'; + } + return $allow_remote_configtest; +} + + sub save_data { $tab = " "; @@ -3067,14 +3350,14 @@ sub save_data { print CF " */\n"; print CF "\n"; print CF "global \$version;\n"; - + if ($print_config_version) { print CF "\$config_version = '$print_config_version';\n"; } # integer print CF "\$config_use_color = $config_use_color;\n"; print CF "\n"; - + # string print CF "\$org_name = \"$org_name\";\n"; # string @@ -3102,15 +3385,13 @@ sub save_data { # string that can contain variables print CF "\$motd = \"$motd\";\n"; print CF "\n"; - + # 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 "\$aggressive_decoding = $aggressive_decoding;\n"; # boolean @@ -3141,8 +3422,8 @@ sub save_data { print CF "\$invert_time = $invert_time;\n"; # string print CF "\$optional_delimiter = '$optional_delimiter';\n"; - #boolean - print CF "\$skip_SM_header = $skip_SM_header;\n"; + # string + print CF "\$encode_header_key = '$encode_header_key';\n"; print CF "\n"; # string @@ -3204,6 +3485,8 @@ sub save_data { print CF "\$edit_identity = $edit_identity;\n"; # boolean print CF "\$edit_name = $edit_name;\n"; + # boolean + print CF "\$hide_auth_header = $hide_auth_header;\n"; # boolean print CF "\$allow_thread_sort = $allow_thread_sort;\n"; # boolean @@ -3213,10 +3496,13 @@ sub save_data { # integer print CF "\$allow_advanced_search = $allow_advanced_search;\n"; print CF "\n"; - + # integer + print CF "\$time_zone_type = $time_zone_type;\n"; + print CF "\n"; + # all plugins are strings for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) { - print CF "\$plugins[$ct] = '$plugins[$ct]';\n"; + print CF "\$plugins[] = '$plugins[$ct]';\n"; } print CF "\n"; @@ -3235,11 +3521,8 @@ sub save_data { } print CF "\n"; - if ( $default_use_javascript_addr_book ne 'true' ) { - $default_use_javascript_addr_book = 'false'; - } - - # boolean + ## Address books + # boolean print CF "\$default_use_javascript_addr_book = $default_use_javascript_addr_book;\n"; for ( $count = 0 ; $count <= $#ldap_host ; $count++ ) { print CF "\$ldap_server[$count] = array(\n"; @@ -3267,6 +3550,11 @@ sub save_data { # integer print CF " 'maxrows' => $ldap_maxrows[$count]"; } + # string + if ( $ldap_filter[$count] ) { + print CF ",\n"; + print CF " 'filter' => '$ldap_filter[$count]'"; + } if ( $ldap_binddn[$count] ) { print CF ",\n"; # string @@ -3279,9 +3567,29 @@ sub save_data { } if ( $ldap_protocol[$count] ) { print CF ",\n"; - # integer + # integer print CF " 'protocol' => $ldap_protocol[$count]"; } + if ( $ldap_limit_scope[$count] ) { + print CF ",\n"; + # boolean + print CF " 'limit_scope' => $ldap_limit_scope[$count]"; + } + if ( $ldap_listing[$count] ) { + print CF ",\n"; + # boolean + print CF " 'listing' => $ldap_listing[$count]"; + } + if ( $ldap_search_tree[$count] ) { + print CF ",\n"; + # integer + print CF " 'search_tree' => $ldap_search_tree[$count]"; + } + if ( $ldap_listing[$count] ) { + print CF ",\n"; + # boolean + print CF " 'starttls' => $ldap_starttls[$count]"; + } print CF "\n"; print CF ");\n"; print CF "\n"; @@ -3297,10 +3605,16 @@ sub save_data { print CF "\$prefs_table = '$prefs_table';\n"; # string print CF "\$prefs_user_field = '$prefs_user_field';\n"; + # integer + print CF "\$prefs_user_size = $prefs_user_size;\n"; # string print CF "\$prefs_key_field = '$prefs_key_field';\n"; + # integer + print CF "\$prefs_key_size = $prefs_key_size;\n"; # string - print CF "\$prefs_val_field = '$prefs_val_field';\n\n"; + print CF "\$prefs_val_field = '$prefs_val_field';\n"; + # integer + print CF "\$prefs_val_size = $prefs_val_size;\n\n"; # string print CF "\$addrbook_global_dsn = '$addrbook_global_dsn';\n"; # string @@ -3313,6 +3627,8 @@ sub save_data { print CF "\$abook_global_file = '$abook_global_file';\n"; # boolean print CF "\$abook_global_file_writeable = $abook_global_file_writeable;\n\n"; + # boolean + print CF "\$abook_global_file_listing = $abook_global_file_listing;\n\n"; # boolean print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n"; @@ -3333,7 +3649,7 @@ sub save_data { print CF "\$advanced_tree = $advanced_tree;\n"; print CF "\n"; # boolean - print CF "\$oldway = $oldway;\n"; + print CF "\$use_iframe = $use_iframe;\n"; print CF "\n"; # boolean print CF "\$use_icons = $use_icons;\n"; @@ -3343,10 +3659,13 @@ sub save_data { print CF "\n"; # boolean print CF "\$use_php_iconv = $use_php_iconv;\n"; + print CF "\n"; + # boolean + print CF "\$allow_remote_configtest = $allow_remote_configtest;\n"; print CF "\n"; print CF "\@include SM_PATH . 'config/config_local.php';\n"; - + print CF "\n/**\n"; print CF " * Make sure there are no characters after the PHP closing\n"; print CF " * tag below (including newline characters and whitespace).\n"; @@ -3355,7 +3674,7 @@ sub save_data { print CF " * things up when we try to send more headers later.\n"; print CF " */\n"; print CF "?>"; - + close CF; print "Data saved in config.php\n"; @@ -3385,17 +3704,25 @@ sub set_defaults { $continue = 0; while ( $continue != 1 ) { print "Please select your IMAP server:\n"; - print " cyrus = Cyrus IMAP server\n"; - print " uw = University of Washington's IMAP server\n"; - 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 " bincimap = Binc IMAP server\n"; + print " courier = Courier IMAP server\n"; + print " cyrus = Cyrus IMAP server\n"; + print " dovecot = Dovecot Secure IMAP server\n"; + print " exchange = Microsoft Exchange IMAP server\n"; + print " hmailserver = hMailServer\n"; + print " macosx = Mac OS X Mailserver\n"; + print " mercury32 = Mercury/32\n"; + print " uw = University of Washington's IMAP server\n"; + print "\n"; + print " quit = Do not change anything\n"; + print "\n"; print "Command >> "; $server = ; $server =~ s/[\r\n]//g; + # variable is used to display additional messages. + $message = ""; + print "\n"; if ( $server eq "cyrus" ) { $imap_server_type = "cyrus"; @@ -3424,7 +3751,7 @@ sub set_defaults { $disp_default_folder_prefix = $default_folder_prefix; $delete_folder = true; $force_username_lowercase = true; - + $continue = 1; } elsif ( $server eq "exchange" ) { $imap_server_type = "exchange"; @@ -3453,7 +3780,7 @@ sub set_defaults { $disp_default_folder_prefix = $default_folder_prefix; $delete_folder = true; $force_username_lowercase = false; - + $continue = 1; } elsif ( $server eq "macosx" ) { $imap_server_type = "macosx"; @@ -3469,19 +3796,68 @@ sub set_defaults { $disp_default_folder_prefix = $default_folder_prefix; $continue = 1; - } elsif ( $server eq "mercury32" ) { - $imap_server_type = "mercury32"; + } elsif ( $server eq "hmailserver" ) { + $imap_server_type = "hmailserver"; $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 = false; + $optional_delimiter = "detect"; + $allow_charset_search = false; + $disp_default_folder_prefix = $default_folder_prefix; + $delete_folder = false; + $force_username_lowercase = false; + + $continue = 1; + } elsif ( $server eq "mercury32" ) { + $imap_server_type = "mercury32"; + $default_folder_prefix = ""; + $trash_folder = "Trash"; + $sent_folder = "Sent"; + $draft_folder = "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 "dovecot" ) { + $imap_server_type = "dovecot"; + $default_folder_prefix = ""; + $trash_folder = "Trash"; + $sent_folder = "Sent"; + $draft_folder = "Drafts"; + $show_prefix_option = false; + $default_sub_of_inbox = false; + $show_contain_subfolders_option = false; + $delete_folder = false; + $force_username_lowercase = true; + $optional_delimiter = "detect"; + $disp_default_folder_prefix = ""; + + $continue = 1; + } elsif ( $server eq "bincimap" ) { + $imap_server_type = "bincimap"; + $default_folder_prefix = "INBOX/"; + $trash_folder = "Trash"; + $sent_folder = "Sent"; + $draft_folder = "Drafts"; + $show_prefix_option = false; + $default_sub_of_inbox = false; + $show_contain_subfolders_option = false; + $delete_folder = true; + $force_username_lowercase = false; + $optional_delimiter = "detect"; + $disp_default_folder_prefix = $default_folder_prefix; + + # Default folder prefix depends on used depot. + $message = "\nIf you use IMAPdir depot, you must set default folder prefix to empty string.\n"; + $continue = 1; } elsif ( $server eq "quit" ) { $continue = 1; @@ -3502,6 +3878,8 @@ sub set_defaults { print " optional_delimiter = $optional_delimiter\n"; print " delete_folder = $delete_folder\n"; print " force_username_lowercase = $force_username_lowercase\n"; + + print "$message"; } print "\nPress enter to continue..."; $tmp = ; @@ -3509,7 +3887,7 @@ sub set_defaults { # This subroutine corrects relative paths to ensure they # will work within the SM space. If the path falls within -# the SM directory tree, the SM_PATH variable will be +# the SM directory tree, the SM_PATH variable will be # 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' @@ -3532,7 +3910,7 @@ sub change_to_SM_path() { 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 "" @@ -3541,17 +3919,17 @@ sub change_to_SM_path() { } return $old_path; } - + # Remove remaining ' $old_path =~ s/\'//g; - + # For relative paths, split on '../' @rel_path = split(/\.\.\//, $old_path); if ( $#rel_path > 1 ) { # more than two levels away. Make it absolute. @abs_path = split(/\//, $dir); - + # Lop off the relative pieces of the absolute path.. for ( $i = 0; $i <= $#rel_path; $i++ ) { pop @abs_path; @@ -3566,7 +3944,7 @@ sub change_to_SM_path() { $new_path .= "\'"; } else { # Last, it's a relative path without any leading '.' - # Prepend SM_PATH and config, since the paths are + # Prepend SM_PATH and config, since the paths are # relative to the config directory $new_path = "SM_PATH . \'config/" . $old_path . "\'"; } @@ -3607,7 +3985,7 @@ sub detect_auth_support { print "BAD ARGS!\n"; return undef; } - + if ($service eq 'SMTP') { $cmd = "AUTH $mech\r\n"; $logout = "QUIT\r\n";