X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=config%2Fconf.pl;h=c36f3bed2a977989e292220c898b3a0605120584;hb=7442e064f52840d6142548c382112faeb94c713d;hp=530e1792416cb1a3b227085b4aab47a66139c139;hpb=71d3f8829d11c0b3469d0edd24f545ab9e4490d4;p=squirrelmail.git diff --git a/config/conf.pl b/config/conf.pl index 530e1792..c36f3bed 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2005 The SquirrelMail Project Team +# Copyright (c) 1999-2006 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail @@ -197,6 +197,12 @@ while ( $line = ) { } else { $plugins[$sub] = $options[1]; } + } elsif ($options[0] =~ /^fontsets\[\'[a-z]*\'\]/) { + # parse associative $fontsets array + $sub = $options[0]; + $sub =~ s/\'\]//; + $sub =~ s/^fontsets\[\'//; + $fontsets{$sub} = $options[1]; } elsif ( $options[0] =~ /^ldap_server\[[0-9]+\]/ ) { $sub = $options[0]; $sub =~ s/\]//; @@ -232,6 +238,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*$//; @@ -252,6 +263,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; @@ -259,10 +290,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 { @@ -307,16 +343,20 @@ $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 ); $advanced_tree = 'false' if ( !$advanced_tree ); -$oldway = 'false' if ( !$oldway ); $use_php_recode = 'false' if ( !$use_php_recode ); $use_php_iconv = 'false' if ( !$use_php_iconv ); + # 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 ); @@ -325,6 +365,30 @@ $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 ); + +# add qmail-inject test here for backwards compatibility +if ( !$sendmail_args && $sendmail_path =~ /qmail-inject/ ) { + $sendmail_args = ''; +} elsif ( !$sendmail_args ) { + $sendmail_args = '-i -t'; +} + +$default_fontsize = '' if ( !$default_fontsize); +$default_fontset = '' if ( !$default_fontset); +if ( !%fontsets) { + %fontsets = ('serif', 'serif', + 'sans', 'helvetica,arial,sans-serif', + 'comicsans', 'comic sans ms,sans-serif', + 'tahoma', 'tahoma,sans-serif', + 'verasans', 'bitstream vera sans,verdana,sans-serif'); +} + if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; @@ -418,7 +482,8 @@ while ( ( $command ne "q" ) && ( $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. Sendmail arguments : $WHT$sendmail_args$NRM\n"; + print "6. Header encryption key : $WHT$encode_header_key$NRM\n"; print "\n"; } else { print $WHT . "SMTP Settings" . $NRM . "\n-------------\n"; @@ -427,7 +492,7 @@ while ( ( $command ne "q" ) && ( $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"; } } @@ -488,12 +553,15 @@ while ( ( $command ne "q" ) && ( $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 ) { @@ -506,6 +574,8 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { $theme_name[($count*2)+1]; } print "2. CSS File : $WHT$theme_css$NRM\n"; + print "3. Default font size: $WHT$default_fontsize$NRM\n"; + print "4. Change available font sets\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 6 ) { @@ -515,7 +585,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { 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 "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"; @@ -570,9 +640,9 @@ while ( ( $command ne "q" ) && ( $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"; @@ -585,23 +655,22 @@ while ( ( $command ne "q" ) && ( $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 "6. Allow remote configtest : $WHT$allow_remote_configtest$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } @@ -680,14 +749,16 @@ while ( ( $command ne "q" ) && ( $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 ) { $sendmail_args = command_sendmail_args(); } + elsif ( $command == 6 ) { $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(); } @@ -717,15 +788,18 @@ while ( ( $command ne "q" ) && ( $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(); } + elsif ( $command == 3 ) { $default_fontsize = command_default_fontsize(); } + elsif ( $command == 4 ) { command_fontsets(); } } elsif ( $menu == 6 ) { if ( $command == 1 ) { command61(); } elsif ( $command == 2 ) { command62(); } @@ -750,14 +824,13 @@ while ( ( $command ne "q" ) && ( $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(); } @@ -1002,9 +1075,6 @@ sub command14 { # sendmail_path sub command15 { - if ( $sendmail_path[0] !~ /./ ) { - $sendmail_path = "/usr/sbin/sendmail"; - } print "Specify where the sendmail executable is located. Usually /usr/sbin/sendmail\n"; print "[$WHT$sendmail_path$NRM]: $WHT"; $new_sendmail_path = ; @@ -1016,6 +1086,27 @@ sub command15 { return $new_sendmail_path; } +# Extra sendmail arguments +sub command_sendmail_args { + print "Specify additional sendmail program arguments.\n"; + print "\n"; + print "Make sure that arguments are supported by your sendmail program. -f argument \n"; + print "is added automatically by SquirrelMail scripts. Variable defaults to standard\n"; + print "/usr/sbin/sendmail arguments. If you use qmail-inject, nbsmtp or any other \n"; + print "sendmail wrapper, which does not support -i and -t arguments, set variable to\n"; + print "empty string or use arguments suitable for your mailer.\n"; + print "\n"; + print "[$WHT$sendmail_args$NRM]: $WHT"; + $new_sendmail_args = ; + if ( $new_sendmail_args eq "\n" ) { + $new_sendmail_args = $sendmail_args; + } else { + # strip linefeeds and crs. + $new_sendmail_args =~ s/[\r\n]//g; + } + return trim($new_sendmail_args); +} + # smtpServerAddress sub command16 { print "This is the hostname of your SMTP server.\n"; @@ -1087,13 +1178,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 " courier = Courier IMAP server\n"; print " cyrus = Cyrus IMAP server\n"; - print " uw = University of Washington's IMAP server\n"; + print " dovecot = Dovecot Secure IMAP server\n"; print " exchange = Microsoft Exchange IMAP server\n"; - print " courier = Courier IMAP server\n"; - print " macosx = Mac OS X Mailserver\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 = ; @@ -1343,20 +1438,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 @@ -1375,7 +1478,7 @@ sub command71 { $line =~ s/ /\ \ /g; $line =~ s/\t/\ \ \ \ /g; $line =~ s/$/ /; - $line =~ s/\"/"/g; + $line =~ s/\"/\\\"/g; $new_motd = $new_motd . $line; } @@ -1871,9 +1974,10 @@ 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 "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"; @@ -1902,9 +2006,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"; @@ -2064,11 +2168,17 @@ 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 "; - print "retrieveuserdata plugin\n"; - print "\n"; + print " In loosely managed environments, you may want to allow users + to edit their full name and email address. In strictly managed + environments, you may want to force users to use the name + and email address assigned to them. + + 'y' - allow a user to edit their full name and email address, + 'n' - users must use the assigned values. + + "; if ( lc($edit_identity) eq 'true' ) { $default_value = "y"; @@ -2080,25 +2190,27 @@ sub command310 { if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { $edit_identity = 'true'; $edit_name = 'true'; + $hide_auth_header = command311b(); } else { $edit_identity = 'false'; $edit_name = command311(); + $hide_auth_header = command311b(); } return $edit_identity; } sub command311 { - 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"; + print " Given that users are not allowed to modify their + email address, can they edit their full name? + + "; if ( lc($edit_name) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; } - print "Allow editing of the users full name? (y/n) [$WHT$default_value$NRM]: $WHT"; + print "Allow the user to edit their full name? (y/n) [$WHT$default_value$NRM]: $WHT"; $new_edit = ; if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { $edit_name = 'true'; @@ -2108,6 +2220,35 @@ sub command311 { return $edit_name; } +sub command311b { + print " SquirrelMail adds username information to every sent email + in order to prevent possible sender forging when users are allowed + to change their email and/or full name. + + You can remove user information from this header (y), if you think that + it violates privacy or security. + + Note: If users are allowed to change their email addresses, + this setting will make it difficult to determine who sent what where. + Use at your own risk. + + "; + + 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 $hide_auth_header; +} + 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"; @@ -2202,6 +2343,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 { @@ -2376,6 +2540,89 @@ sub command42 { return $new_theme_css; } +# sets default font size option +sub command_default_fontsize { + print "Enter default font size [$WHT$$default_fontsize$NRM]: $WHT"; + $new_size = ; + if ( $new_size eq "\n" ) { + $new_size = $size; + } else { + $new_size =~ s/[\r\n]//g; + } + return $new_size; +} + +# controls available fontsets +sub command_fontsets { + # Greeting + print "You can control fontsets available to end users here.\n"; + # set initial $input value + $input = 'l'; + while ( $input ne "x" ) { + if ( $input =~ /^\s*a\s*/i ) { + # add new fontset + print "\nFontset name: "; + $name = ; + if (! $fontsets{trim($name)}) { + print "Fontset string: "; + $value = ; + $fontsets{trim($name)} = trim($value); + } else { + print "\nERROR: Such fontset already exists.\n"; + } + } elsif ( $input =~ /^\s*e\s*/i ) { + # edit existing fontset + print "\nFontset name: "; + $name = ; + if (! $fontsets{trim($name)}) { + print "\nERROR: No such fontset.\n"; + } else { + print "Fontset string [$fontsets{trim($name)}]: "; + $value = ; + $fontsets{trim($name)} = trim($value); + } + } elsif ( $input =~ /^\s*d\s*/ ) { + # delete existing fontset + print "\nFontset name: "; + $name = ; + if (! $fontsets{trim($name)}) { + print "\nERROR: No such fontset.\n"; + } else { + delete $fontsets{trim($name)}; + } + } elsif ( $input =~ /^\s*l\s*/ ) { + # list fontsets + print "\nConfigured fontsets:\n"; + while (($fontset_name, $fontset_string) = each(%fontsets)) { + print " $fontset_name = $fontset_string\n"; + } + print "Default fontset: $default_fontset\n"; + } elsif ( $input =~ /^\s*m\s*/ ) { + # set default fontset + print "\nSet default fontset [$default_fontset]: "; + $name = ; + if (trim($name) ne '' and ! $fontsets{trim($name)}) { + print "\nERROR: No such fontset.\n"; + } else { + $default_fontset = trim($name); + } + } else { + # print available commands on any other input + print "\nAvailable commands:\n"; + print " a - Adds new fontset.\n"; + print " d - Deletes existing fontset.\n"; + print " e - Edits existing fontset.\n"; + print " h or ? - Shows this help screen.\n"; + print " l - Lists available fontsets.\n"; + print " m - Sets default fontset.\n"; + print " x - Exits fontset editor mode.\n"; + } + print "\nCommand [fontsets] (a,d,e,h,?=help,l,m,x)> "; + $input = ; + $input =~ s/[\r\n]//g; + } +} + sub command61 { print "You can now define different LDAP servers.\n"; print "[ldap] command (?=help) > "; @@ -2399,15 +2646,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++; @@ -2462,12 +2724,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"; @@ -2490,9 +2753,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; @@ -2500,6 +2763,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; @@ -2515,9 +2866,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 ) { @@ -2527,9 +2883,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++; } @@ -2539,9 +2900,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"; @@ -2742,6 +3108,7 @@ sub command95 { } else { $new_field =~ s/[\r\n]//g; } + $prefs_user_size = db_pref_size($prefs_user_size); return $new_field; } @@ -2756,6 +3123,7 @@ sub command96 { } else { $new_field =~ s/[\r\n]//g; } + $prefs_key_size = db_pref_size($prefs_key_size); return $new_field; } @@ -2770,9 +3138,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"; @@ -2889,9 +3274,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' ) { @@ -2908,30 +3292,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"; @@ -2954,7 +3317,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"; @@ -2998,25 +3361,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 { @@ -3168,8 +3533,6 @@ sub save_data { 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 @@ -3190,6 +3553,8 @@ sub save_data { print CF "\$smtpPort = $smtpPort;\n"; # string print CF "\$sendmail_path = '$sendmail_path';\n"; + # string + print CF "\$sendmail_args = '$sendmail_args';\n"; # boolean # print CF "\$use_authenticated_smtp = $use_authenticated_smtp;\n"; # boolean @@ -3200,88 +3565,93 @@ 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 + # string print CF "\$default_folder_prefix = '$default_folder_prefix';\n"; - # string + # string print CF "\$trash_folder = '$trash_folder';\n"; - # string + # string print CF "\$sent_folder = '$sent_folder';\n"; - # string + # string print CF "\$draft_folder = '$draft_folder';\n"; - # boolean + # boolean print CF "\$default_move_to_trash = $default_move_to_trash;\n"; - # boolean + # boolean print CF "\$default_move_to_sent = $default_move_to_sent;\n"; - # boolean + # boolean print CF "\$default_save_as_draft = $default_save_as_draft;\n"; - # boolean + # boolean print CF "\$show_prefix_option = $show_prefix_option;\n"; - # boolean + # boolean print CF "\$list_special_folders_first = $list_special_folders_first;\n"; - # boolean + # boolean print CF "\$use_special_folder_color = $use_special_folder_color;\n"; - # boolean + # boolean print CF "\$auto_expunge = $auto_expunge;\n"; - # boolean + # boolean print CF "\$default_sub_of_inbox = $default_sub_of_inbox;\n"; - # boolean + # boolean print CF "\$show_contain_subfolders_option = $show_contain_subfolders_option;\n"; - # integer + # integer print CF "\$default_unseen_notify = $default_unseen_notify;\n"; - # integer + # integer print CF "\$default_unseen_type = $default_unseen_type;\n"; - # boolean + # boolean print CF "\$auto_create_special = $auto_create_special;\n"; - # boolean + # boolean print CF "\$delete_folder = $delete_folder;\n"; - # boolean + # boolean print CF "\$noselect_fix_enable = $noselect_fix_enable;\n"; print CF "\n"; - # string + # string print CF "\$data_dir = " . &change_to_SM_path($data_dir) . ";\n"; - # string that can contain a variable + # string that can contain a variable print CF "\$attachment_dir = " . &change_to_SM_path($attachment_dir) . ";\n"; - # integer + # integer print CF "\$dir_hash_level = $dir_hash_level;\n"; - # string + # string print CF "\$default_left_size = '$default_left_size';\n"; - # boolean + # boolean print CF "\$force_username_lowercase = $force_username_lowercase;\n"; - # boolean + # boolean print CF "\$default_use_priority = $default_use_priority;\n"; - # boolean + # boolean print CF "\$hide_sm_attributions = $hide_sm_attributions;\n"; - # boolean + # boolean print CF "\$default_use_mdn = $default_use_mdn;\n"; - # boolean + # boolean print CF "\$edit_identity = $edit_identity;\n"; - # boolean + # boolean print CF "\$edit_name = $edit_name;\n"; - # boolean + # boolean + print CF "\$hide_auth_header = $hide_auth_header;\n"; + # boolean print CF "\$allow_thread_sort = $allow_thread_sort;\n"; - # boolean + # boolean print CF "\$allow_server_sort = $allow_server_sort;\n"; - # boolean + # boolean print CF "\$allow_charset_search = $allow_charset_search;\n"; - # integer + # 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 + # all plugins are strings for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) { print CF "\$plugins[] = '$plugins[$ct]';\n"; } print CF "\n"; - # strings + # strings print CF "\$theme_css = " . &change_to_SM_path($theme_css) . ";\n"; - if ( $theme_default eq '' ) { $theme_default = '0'; } + if ( $theme_default eq '' ) { $theme_default = '0'; } print CF "\$theme_default = $theme_default;\n"; for ( $count = 0 ; $count <= $#theme_name ; $count++ ) { @@ -3294,35 +3664,52 @@ sub save_data { } print CF "\n"; + # integer + print CF "\$default_fontsize = '$default_fontsize';\n"; + # string + print CF "\$default_fontset = '$default_fontset';\n"; + print CF "\n"; + # assoc. array (maybe initial value should be set somewhere else) + print CF '$fontsets = array();'."\n"; + while (($fontset_name, $fontset_value) = each(%fontsets)) { + print CF "\$fontsets\['$fontset_name'\] = '$fontset_value';\n"; + } + print CF "\n"; + ## 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"; - # string + # string print CF " 'host' => '$ldap_host[$count]',\n"; - # string + # string print CF " 'base' => '$ldap_base[$count]'"; if ( $ldap_name[$count] ) { print CF ",\n"; - # string + # string print CF " 'name' => '$ldap_name[$count]'"; } if ( $ldap_port[$count] ) { print CF ",\n"; - # integer + # integer print CF " 'port' => $ldap_port[$count]"; } if ( $ldap_charset[$count] ) { print CF ",\n"; - # string + # string print CF " 'charset' => '$ldap_charset[$count]'"; } if ( $ldap_maxrows[$count] ) { print CF ",\n"; - # integer + # 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 @@ -3335,77 +3722,103 @@ 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"; } - # string + # string print CF "\$addrbook_dsn = '$addrbook_dsn';\n"; - # string + # string print CF "\$addrbook_table = '$addrbook_table';\n\n"; - # string + # string print CF "\$prefs_dsn = '$prefs_dsn';\n"; - # string + # string print CF "\$prefs_table = '$prefs_table';\n"; - # string + # string print CF "\$prefs_user_field = '$prefs_user_field';\n"; - # string + # integer + print CF "\$prefs_user_size = $prefs_user_size;\n"; + # string print CF "\$prefs_key_field = '$prefs_key_field';\n"; - # string - print CF "\$prefs_val_field = '$prefs_val_field';\n\n"; - # string + # integer + print CF "\$prefs_key_size = $prefs_key_size;\n"; + # string + 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 + # string print CF "\$addrbook_global_table = '$addrbook_global_table';\n"; - # boolean + # boolean print CF "\$addrbook_global_writeable = $addrbook_global_writeable;\n"; - # boolean + # boolean print CF "\$addrbook_global_listing = $addrbook_global_listing;\n\n"; - # string + # string print CF "\$abook_global_file = '$abook_global_file';\n"; - # boolean + # boolean print CF "\$abook_global_file_writeable = $abook_global_file_writeable;\n\n"; - # boolean + # boolean print CF "\$abook_global_file_listing = $abook_global_file_listing;\n\n"; - # boolean + # boolean print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n"; - # string + # string print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; - # string + # string print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; - # boolean + # boolean print CF "\$use_imap_tls = $use_imap_tls;\n"; - # boolean + # boolean print CF "\$use_smtp_tls = $use_smtp_tls;\n"; - # string + # string print CF "\$session_name = '$session_name';\n"; - print CF "\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"; - # boolean - print CF "\$allow_remote_configtest = $allow_remote_configtest;\n"; - print CF "\n"; + print CF "\n"; + # boolean + print CF "\$advanced_tree = $advanced_tree;\n"; + print CF "\n"; + # boolean + print CF "\$use_iframe = $use_iframe;\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"; + # 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"; @@ -3446,18 +3859,25 @@ sub set_defaults { $continue = 0; while ( $continue != 1 ) { print "Please select your IMAP server:\n"; + print " bincimap = Binc IMAP server\n"; + print " courier = Courier IMAP server\n"; print " cyrus = Cyrus IMAP server\n"; - print " uw = University of Washington's IMAP server\n"; + print " dovecot = Dovecot Secure IMAP server\n"; print " exchange = Microsoft Exchange IMAP server\n"; - print " courier = Courier IMAP server\n"; - print " macosx = Mac OS X Mailserver\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"; @@ -3550,9 +3970,9 @@ sub set_defaults { } elsif ( $server eq "mercury32" ) { $imap_server_type = "mercury32"; $default_folder_prefix = ""; - $trash_folder = "INBOX.Trash"; - $sent_folder = "INBOX.Sent"; - $draft_folder = "INBOX.Drafts"; + $trash_folder = "Trash"; + $sent_folder = "Sent"; + $draft_folder = "Drafts"; $show_prefix_option = false; $default_sub_of_inbox = true; $show_contain_subfolders_option = true; @@ -3560,6 +3980,39 @@ sub set_defaults { $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; @@ -3580,6 +4033,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 = ; @@ -3749,6 +4204,17 @@ sub detect_auth_support { return 'YES'; } +# trims whitespace +# Example code from O'Reilly Perl Cookbook +sub trim { + my @out = @_; + for (@out) { + s/^\s+//; + s/\s+$//; + } + return wantarray ? @out : $out[0]; +} + sub clear_screen() { if ( $^O =~ /^mswin/i) { system "cls";