X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=config%2Fconf.pl;h=d71b82ac198d9c9af0d9632b9c7bdb4d6454904e;hp=24626032cf949f41b35847b1137cec261a88f607;hb=26eed4f778e1602da8e78d5e7cbc05318b82ac98;hpb=5ba5dc8e820c4f821073fecb16b33a036a1cf594 diff --git a/config/conf.pl b/config/conf.pl index 24626032..d71b82ac 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 @@ -188,6 +188,19 @@ while ( $line = ) { $sub =~ s/\]\[['"]NAME['"]\]//; $sub =~ s/.*\[//; $theme_name[$sub] = $options[1]; + } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]PATH['"]\]/ ) { + $sub = $options[0]; + $sub =~ s/\]\[['"]PATH['"]\]//; + $sub =~ s/.*\[//; + if ( -e "../templates" ) { + $options[1] =~ s/^\.\.\/config/\.\.\/templates/; + } + $templateset_path[$sub] = &change_to_rel_path($options[1]); + } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]NAME['"]\]/ ) { + $sub = $options[0]; + $sub =~ s/\]\[['"]NAME['"]\]//; + $sub =~ s/.*\[//; + $templateset_name[$sub] = $options[1]; } elsif ( $options[0] =~ /^plugins\[[0-9]*\]/ ) { $sub = $options[0]; $sub =~ s/\]//; @@ -197,6 +210,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/\]//; @@ -302,6 +321,7 @@ while ( $line = ) { } close FILE; +# FIXME: unknown introduction date $useSendmail = 'false' if ( lc($useSendmail) ne 'true' ); $sendmail_path = "/usr/sbin/sendmail" if ( !$sendmail_path ); $pop_before_smtp = 'false' if ( !$pop_before_smtp ); @@ -313,7 +333,6 @@ $force_username_lowercase = 'false' if ( !$force_username_lowercase ); $optional_delimiter = "detect" if ( !$optional_delimiter ); $auto_create_special = 'false' if ( !$auto_create_special ); $default_use_priority = 'true' if ( !$default_use_priority ); -$hide_sm_attributions = 'false' if ( !$hide_sm_attributions ); $default_use_mdn = 'true' if ( !$default_use_mdn ); $delete_folder = 'false' if ( !$delete_folder ); $noselect_fix_enable = 'false' if ( !$noselect_fix_enable ); @@ -322,30 +341,36 @@ $provider_uri = '' if ( !$provider_uri ); $provider_name = '' if ( !$provider_name ); $edit_identity = 'true' if ( !$edit_identity ); $edit_name = 'true' if ( !$edit_name ); -$allow_thread_sort = 'false' if ( !$allow_thread_sort ); -$allow_server_sort = 'false' if ( !$allow_server_sort ); $no_list_for_subscribe = 'false' if ( !$no_list_for_subscribe ); $allow_charset_search = 'true' if ( !$allow_charset_search ); $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 ); +$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.2.0 +$hide_sm_attributions = 'false' if ( !$hide_sm_attributions ); + +# since 1.4.0 $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 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 ); +# available only in 1.5.0 and 1.5.1 +# $advanced_tree = 'false' if ( !$advanced_tree ); $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 ); @@ -360,6 +385,35 @@ $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'); +} + +# $use_imap_tls and $use_smtp_tls are switched to integer since 1.5.1 +$use_imap_tls = 0 if ( $use_imap_tls eq 'false'); +$use_imap_tls = 1 if ( $use_imap_tls eq 'true'); +$use_smtp_tls = 0 if ( $use_smtp_tls eq 'false'); +$use_smtp_tls = 1 if ( $use_smtp_tls eq 'true'); +# sorting options changed names and reversed values in 1.5.1 +$disable_thread_sort = 'false' if ( !$disable_thread_sort ); +$disable_server_sort = 'false' if ( !$disable_server_sort ); if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; @@ -402,7 +456,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "2. Server Settings\n"; print "3. Folder Defaults\n"; print "4. General Options\n"; - print "5. Themes\n"; + print "5. Templates\n"; print "6. Address Books\n"; print "7. Message of the Day (MOTD)\n"; print "8. Plugins\n"; @@ -453,7 +507,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. Header encryption key : $WHT$encode_header_key$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"; @@ -526,8 +581,8 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { 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 "10. Disable server thread sort : $WHT$disable_thread_sort$NRM\n"; + print "11. Disable server-side sorting : $WHT$disable_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"; @@ -536,14 +591,18 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "R Return to Main Menu\n"; } elsif ( $menu == 5 ) { print $WHT. "Themes\n" . $NRM; - print "1. Change Themes\n"; - for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) { - $temp_name = $theme_name[$count*2]; - printf " %s%*s %s\n", $temp_name, - 40 - length($temp_name), " ", - $theme_name[($count*2)+1]; - } + print "1. Change Template set\n"; +# for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) { +# $temp_name = $theme_name[$count*2]; +# printf " %s%*s %s\n", $temp_name, +# 40 - length($temp_name), " ", +# $theme_name[($count*2)+1]; +# } print "2. CSS File : $WHT$theme_css$NRM\n"; + print "3. Default font size: $WHT$default_fontsize$NRM\n"; + print "4. Change available font sets\n"; + print "5. Change Themes\n"; + print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 6 ) { @@ -608,9 +667,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"; @@ -629,16 +688,15 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { 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. Display html mails in iframe : $WHT$use_iframe$NRM\n"; - print "3. Use Icons : $WHT$use_icons$NRM\n"; + print "1. Display html mails in iframe : $WHT$use_iframe$NRM\n"; + print "2. 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 "3. Use php recode functions : $WHT$use_php_recode$NRM\n"; + print "4. Use php iconv functions : $WHT$use_php_iconv$NRM\n"; print "\n"; print $WHT. "Configuration tweaks\n" . $NRM; - print "6. Allow remote configtest : $WHT$allow_remote_configtest$NRM\n"; + print "5. Allow remote configtest : $WHT$allow_remote_configtest$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } @@ -713,18 +771,19 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { if ( $command == 4 ) { $imapServerAddress = command12(); } elsif ( $command == 5 ) { $imapPort = command13(); } elsif ( $command == 6 ) { $imap_auth_mech = command112a(); } - elsif ( $command == 7 ) { $use_imap_tls = command113("IMAP",$use_imap_tls); } + elsif ( $command == 7 ) { $use_imap_tls = command_use_tls("IMAP",$use_imap_tls); } 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(); } - elsif ( $command == 5 ) { $encode_header_key = command114(); } + 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 == 8 ) { $use_smtp_tls = command_use_tls("SMTP",$use_smtp_tls); } elsif ( $command == 9 ) { $encode_header_key = command114(); } } } elsif ( $menu == 3 ) { @@ -756,15 +815,18 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { elsif ( $command == 7 ) { $hide_sm_attributions = command38(); } elsif ( $command == 8 ) { $default_use_mdn = command39(); } elsif ( $command == 9 ) { $edit_identity = command310(); } - elsif ( $command == 10 ) { $allow_thread_sort = command312(); } - elsif ( $command == 11 ) { $allow_server_sort = command313(); } + elsif ( $command == 10 ) { $disable_thread_sort = command312(); } + elsif ( $command == 11 ) { $disable_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(); } + if ( $command == 1 ) { $templateset_default = command_templates(); } elsif ( $command == 2 ) { $theme_css = command42(); } + elsif ( $command == 3 ) { $default_fontsize = command_default_fontsize(); } + elsif ( $command == 4 ) { command_fontsets(); } + elsif ( $command == 5 ) { command41(); } } elsif ( $menu == 6 ) { if ( $command == 1 ) { command61(); } elsif ( $command == 2 ) { command62(); } @@ -794,12 +856,11 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { elsif ( $command == 4 ) { $aggressive_decoding = commandA4(); } elsif ( $command == 5 ) { $lossy_encoding = commandA5(); } } elsif ( $menu == 11 ) { - if ( $command == 1 ) { $advanced_tree = commandB1(); } - 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(); } + if ( $command == 1 ) { $use_iframe = commandB2(); } + elsif ( $command == 2 ) { $use_icons = commandB3(); } + elsif ( $command == 3 ) { $use_php_recode = commandB4(); } + elsif ( $command == 4 ) { $use_php_iconv = commandB5(); } + elsif ( $command == 5 ) { $allow_remote_configtest = commandB6(); } } } } @@ -957,7 +1018,7 @@ sub command7 { sub command8 { print "Here you can set the name of the link on the right of the page.\n"; - print "The default is 'SquirrelMail/'\n"; + print "The default is 'SquirrelMail'\n"; print "\n"; print "[$WHT$provider_name$NRM]: $WHT"; $new_provider_name = ; @@ -966,6 +1027,7 @@ sub command8 { } else { $new_provider_name =~ s/[\r\n]//g; $new_provider_name =~ s/^\s+$//g; + $new_provider_name =~ s/\'/\\'/g; } return $new_provider_name; } @@ -1040,9 +1102,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 = ; @@ -1054,6 +1113,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"; @@ -1361,27 +1441,31 @@ sub command112b { # TLS # This sub is reused for IMAP and SMTP # Args: service name, default value -sub command113 { +sub command_use_tls { my($default_val,$service,$inval); $service=$_[0]; $default_val=$_[1]; print "TLS (Transport Layer Security) encrypts the traffic between server and client.\n"; - print "If you're familiar with SSL, you get the idea.\n"; - print "To use this feature, your " . $service . " server must offer TLS\n"; - print "capability, plus PHP 4.3.x with OpenSSL support.\n"; - print "\nIf your " . $service . " server is localhost, you can safely disable this.\n"; + print "STARTTLS extensions allow to start encryption on existing plain text connection.\n"; + print "These options add specific PHP and IMAP server configuration requirements.\n"; + print "See SquirrelMail documentation about connection security.\n"; + print "\n"; + print "If your " . $service . " server is localhost, you can safely disable this.\n"; print "If it is remote, you may wish to seriously consider enabling this.\n"; - print "Enable TLS (y/n) [$WHT"; - if ($default_val eq 'true') { - print "y"; - } else { - print "n"; + $valid_input=0; + while ($valid_input eq 0) { + print "\nSelect connection security model:\n"; + print " 0 - Use plain text connection\n"; + print " 1 - Use TLS connection\n"; + print " 2 - Use STARTTLS extension\n"; + print "Select [$default_val]: "; + $inval=; + $inval=trim($inval); + if ($inval =~ /^[012]$/ || $inval eq '') { + $valid_input = 1; + } } - print "$NRM]: $WHT"; - $inval=; - $inval =~ tr/yn//cd; - return 'true' if ( $inval eq "y" ); - return 'false' if ( $inval eq "n" ); + if ($inval ne '') {$default_val = $inval}; return $default_val; } @@ -1425,7 +1509,7 @@ sub command71 { $line =~ s/ /\ \ /g; $line =~ s/\t/\ \ \ \ /g; $line =~ s/$/ /; - $line =~ s/\"/"/g; + $line =~ s/\"/\\\"/g; $new_motd = $new_motd . $line; } @@ -1921,9 +2005,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/lib/squirrelmail/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"; @@ -1952,9 +2037,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/squirrelmail/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"; @@ -2116,10 +2201,15 @@ sub command39 { 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"; @@ -2131,7 +2221,7 @@ 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'; + $hide_auth_header = command311b(); } else { $edit_identity = 'false'; $edit_name = command311(); @@ -2141,17 +2231,17 @@ sub command310 { } 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'; @@ -2162,15 +2252,18 @@ sub command311 { } 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"; + 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"; @@ -2184,48 +2277,55 @@ sub command311b { } else { $hide_auth_header = "false"; } - return $edit_name; + 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"; - print "PHP versions later than 4.0.3 recommended\n"; + print "This option allows you to disable server side thread sorting if your server \n"; + print "declares THREAD support, but you don't want to provide threading options \n"; + print "to end users or THREAD extension is broken or extension does not work with \n"; + print "options used by SquirrelMail. Option is not used, if THREAD extension is \n"; + print "not declared in IMAP CAPABILITY.\n"; print "\n"; - if ( lc($allow_thread_sort) eq 'true' ) { + if ( lc($disable_thread_sort) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; } - print "Allow server side thread sorting? (y/n) [$WHT$default_value$NRM]: $WHT"; - $allow_thread_sort = ; - if ( ( $allow_thread_sort =~ /^y\n/i ) || ( ( $allow_thread_sort =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $allow_thread_sort = 'true'; + print "Disable server side thread sorting? (y/n) [$WHT$default_value$NRM]: $WHT"; + $disable_thread_sort = ; + if ( ( $disable_thread_sort =~ /^y\n/i ) || ( ( $disable_thread_sort =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $disable_thread_sort = 'true'; } else { - $allow_thread_sort = 'false'; + $disable_thread_sort = 'false'; } - return $allow_thread_sort; + return $disable_thread_sort; } sub command313 { - print "This option allows you to choose if SM uses server-side sorting\n"; - print "Your IMAP server must support the SORT command for this to work\n"; + print "This option allows you to disable server side sorting if your server declares \n"; + print "SORT support, but SORT extension is broken or does not work with options \n"; + print "used by SquirrelMail. Option is not used, if SORT extension is not declared \n"; + print "in IMAP CAPABILITY.\n"; + print "\n"; + print "It is strongly recommended to keep server side sorting enabled, if your "; + print "IMAP server supports it."; print "\n"; - if ( lc($allow_server_sort) eq 'true' ) { + if ( lc($disable_server_sort) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; } - print "Allow server-side sorting? (y/n) [$WHT$default_value$NRM]: $WHT"; - $allow_server_sort = ; - if ( ( $allow_server_sort =~ /^y\n/i ) || ( ( $allow_server_sort =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $allow_server_sort = 'true'; + print "Disable server-side sorting? (y/n) [$WHT$default_value$NRM]: $WHT"; + $disable_server_sort = ; + if ( ( $disable_server_sort =~ /^y\n/i ) || ( ( $disable_server_sort =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $disable_server_sort = 'true'; } else { - $allow_server_sort = 'false'; + $disable_server_sort = 'false'; } - return $allow_server_sort; + return $disable_server_sort; } sub command314 { @@ -2450,6 +2550,233 @@ sub command41 { } } +sub command_templates { + print "\nDefine the template sets that you wish to use. If you have added "; + print "a template set of your own, just follow the instructions (?) about how to add "; + print "them. You can also change the default template.\n"; + + print "\n Available Templates:\n"; + + $count = 0; + while ( $count <= $#templateset_name ) { + if ( $count == $templateset_default ) { + print " *"; + } else { + print " "; + } + if ( $count < 10 ) { + print " "; + } + $name = $templateset_name[$count]; + $num_spaces = 35 - length($name); + for ( $i = 0 ; $i < $num_spaces ; $i++ ) { + $name = $name . " "; + } + + print " $count. $name"; + print "($templateset_path[$count])\n"; + + $count++; + } + +# opendir( DIR, "../templates" ); +# @files = readdir(DIR); +# $pos = 0; +# +# while ( $cnt <= $#files ) { +# if ( -d "../templates/" . $files[$i] && $files[$i] !~ /^\./ && $files[$i] ne "CVS" ) { +# $filename = "../templates/" . $files[$cnt]; +# $found = 0; +# for ( $x = 0 ; $x <= $#templateset_path ; $x++ ) { +# if ( $theme_path[$x] eq $filename ) { +# $found = 1; +# } +# } +# } +# $cnt++; +# } +# for ( $i = 0 ; $i <= $#files ; $i++ ) { +# if ( -d "../templates/" . $files[$i] && $files[$i] !~ /^\./ && $files[$i] ne "CVS" ) { +# $match = 0; +# for ( $k = 0 ; $k <= $#aTemplateSets ; $k++ ) { +# if ( $aTemplateSets[$chosen] eq $files[$i] ) { +# $match = 1; +# } +# } +# if ( $match == 0 ) { +# $unused_plugins[$pos] = $files[$i]; +# $pos++; +# } +# } +# } +# +# for ( $i = 0 ; $i <= $#unused_plugins ; $i++ ) { +# $num = $num + 1; +# print " $num. $unused_plugins[$i]\n"; +# } +# closedir DIR; + + print "\n"; + print ".--------------------------------.\n"; + print "| t (detect templates set) |\n"; + print "| + (add template set) |\n"; + print "| - N (remove template set) |\n"; + print "| m N (mark template set) |\n"; + print "| l (list template set) |\n"; + print "| d (done) |\n"; + print "`--------------------------------'\n"; + print "\n[template set] command (?=help) > "; + + $input = ; + $input =~ s/[\r\n]//g; + while ( $input ne "d" ) { + if ( $input =~ /^\s*l\s*/i ) { + $count = 0; + while ( $count <= $#templateset_name ) { + if ( $count == $templateset_default ) { + print " *"; + } else { + print " "; + } + if ( $count < 10 ) { + print " "; + } + $name = $templateset_name[$count]; + $num_spaces = 35 - length($name); + for ( $i = 0 ; $i < $num_spaces ; $i++ ) { + $name = $name . " "; + } + + print " $count. $name"; + print "($templateset_path[$count])\n"; + + $count++; + } + } elsif ( $input =~ /^\s*m\s*[0-9]+/i ) { + $old_def = $templateset_default; + $templateset_default = $input; + $templateset_default =~ s/^\s*m\s*//; + if ( ( $templateset_default > $#templateset_name ) || ( $templateset_default < 0 ) ) { + print "Cannot set default template set to $templateset_default. That template set does not exist.\n"; + $templateset_default = $old_def; + } + } elsif ( $input =~ /^\s*\+/ ) { + print "What is the name of this template: "; + $name = ; + $name =~ s/[\r\n]//g; + $templateset_name[ $#templateset_name + 1 ] = $name; + print "Be sure to put ../templates/ before the dirname.\n"; + print "What file is this stored in (ex: ../templates/default/): "; + $name = ; + $name =~ s/[\r\n]//g; + $templateset_path[ $#templateset_path + 1 ] = $name; + } elsif ( $input =~ /^\s*t\s*/i ) { + print "\nStarting detection...\n\n"; + opendir( DIR, "../templates" ); + @files = readdir(DIR); + $cnt = 0; + $detected = 0; + while ( $cnt <= $#files ) { + if ( -d "../templates/" . $files[$cnt] && $files[$cnt] !~ /^\./ && $files[$cnt] ne "CVS" ) { + $filename = "../templates/" . $files[$cnt]. "/"; + $found = 0; + for ( $x = 0 ; $x <= $#templateset_path ; $x++ ) { + if ( $templateset_path[$x] eq $filename ) { + $found = 1; + } + } + if ( $found != 1 && $detected == 0) { + $templateset_path[ $#templateset_path + 1 ] = $filename; + $templateset_name[ $#templateset_name + 1 ] = "Default template"; + $aTemplateSet[ $#templateset_name + 1 ] = "Default template"; + $aTemplateSet[ $#templateset_path + 1 ] = $filename; + } elsif ( $found != 1) { + print "** Found template set: $filename\n"; + print " What is it's name? "; + $nm = ; + $nm =~ s/[\n\r]//g; + $templateset_path[ $#templateset_path + 1 ] = $filename; + $templateset_name[ $#templateset_name + 1 ] = $nm; + + $aTemplateSet[ $#templateset_name + 1 ] = $nm; + $aTemplateSet[ $#templateset_path + 1 ] = $filename; + } + $detected++; + } + $cnt++; + } + print "\n"; + for ( $cnt = 0 ; $cnt <= $#templateset_path ; $cnt++ ) { + $filename = $templateset_path[$cnt]; + if ( !(-d $filename) ) { + print " Removing $filename (file not found)\n"; + $offset = 0; + @new_templateset_name = (); + @new_templateset_path = (); + for ( $x = 0 ; $x < $#templateset_path ; $x++ ) { + if ( $templateset_path[$x] eq $filename ) { + $offset = 1; + } + if ( $offset == 1 ) { + $new_templateset_name[$x] = $templateset_name[ $x + 1 ]; + $new_theme_path[$x] = $templateset_path[ $x + 1 ]; + } else { + $new_templateset_name[$x] = $templateset_name[$x]; + $new_templateset_path[$x] = $templateset_path[$x]; + } + } + @templateset_name = @new_templateset_name; + @templateset_path = @new_templateset_path; + } + } + print "\nDetection complete!\n\n"; + + closedir DIR; + } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { + if ( $input =~ /[0-9]+\s*$/ ) { + $rem_num = $input; + $rem_num =~ s/^\s*-\s*//g; + $rem_num =~ s/\s*$//; + } else { + $rem_num = $#templateset_name; + } + if ( $rem_num == $templateset_default ) { + print "You cannot remove the default template set!\n"; + } else { + $count = 0; + @new_templateset_name = (); + @new_templateset_path = (); + while ( $count <= $#templateset_name ) { + if ( $count != $rem_num ) { + @new_templateset_name = ( @new_templateset_name, $templateset_name[$count] ); + @new_templateset_path = ( @new_templateset_path, $templateset_path[$count] ); + } + $count++; + } + @templateset_name = @new_templateset_name; + @templateset_path = @new_templateset_path; + if ( $templateset_default > $rem_num ) { + $templateset_default--; + } + } + } elsif ( $input =~ /^\s*\?\s*/ ) { + print ".--------------------------------.\n"; + print "| t (detect templates set) |\n"; + print "| + (add template set) |\n"; + print "| - N (remove template set) |\n"; + print "| m N (mark template set) |\n"; + print "| l (list template set) |\n"; + print "| d (done) |\n"; + print "`--------------------------------'\n"; + } + print "[template set] command (?=help) > "; + $input = ; + $input =~ s/[\r\n]//g; + } + return $templateset_default; +} + + # Theme - CSS file sub command42 { print "You may specify a cascading style-sheet (CSS) file to be included\n"; @@ -2478,6 +2805,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) > "; @@ -2963,6 +3373,7 @@ sub command95 { } else { $new_field =~ s/[\r\n]//g; } + $prefs_user_size = db_pref_size($prefs_user_size); return $new_field; } @@ -2977,6 +3388,7 @@ sub command96 { } else { $new_field =~ s/[\r\n]//g; } + $prefs_key_size = db_pref_size($prefs_key_size); return $new_field; } @@ -2991,9 +3403,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"; @@ -3175,28 +3604,6 @@ sub commandA5 { return $lossy_encoding; } - -# Advanced tree -sub commandB1 { - print "Enable this option if you want to use DHTML based folder listing.\n"; - print "Code is experimental, works only with some browsers and there might\n"; - print "be some glitches.\n"; - print "\n"; - - if ( lc($advanced_tree) eq 'true' ) { - $default_value = "y"; - } else { - $default_value = "n"; - } - print "Use advanced tree in folder listing? (y/n) [$WHT$default_value$NRM]: $WHT"; - $advanced_tree = ; - if ( ( $advanced_tree =~ /^y\n/i ) || ( ( $advanced_tree =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $advanced_tree = 'true'; - } else { - $advanced_tree = 'false'; - } - return $advanced_tree; -} # display html emails in iframe sub commandB2 { print "This option can enable html email rendering inside iframe.\n"; @@ -3389,6 +3796,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 @@ -3403,89 +3812,89 @@ sub save_data { 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 - print CF "\$allow_server_sort = $allow_server_sort;\n"; - # boolean + # boolean + print CF "\$disable_thread_sort = $disable_thread_sort;\n"; + # boolean + print CF "\$disable_server_sort = $disable_server_sort;\n"; + # 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++ ) { @@ -3498,33 +3907,59 @@ sub save_data { } print CF "\n"; + if ( $templateset_default eq '' ) { $templateset_default = '0'; } + print CF "\$templateset_default = $templateset_default;\n"; + + for ( $count = 0 ; $count <= $#templateset_name ; $count++ ) { + print CF "\$aTemplateSet[$count]['PATH'] = " . &change_to_SM_path($templateset_path[$count]) . ";\n"; + # escape theme name so it can contain single quotes. + $esc_name = $templateset_name[$count]; + $esc_name =~ s/\\/\\\\/g; + $esc_name =~ s/'/\\'/g; + print CF "\$aTemplateSet[$count]['NAME'] = '$esc_name';\n"; + } + 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 @@ -3572,68 +4007,71 @@ sub save_data { 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 "\$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 "\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"; @@ -3675,6 +4113,7 @@ 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 " dovecot = Dovecot Secure IMAP server\n"; @@ -3690,6 +4129,9 @@ sub set_defaults { $server = ; $server =~ s/[\r\n]//g; + # variable is used to display additional messages. + $message = ""; + print "\n"; if ( $server eq "cyrus" ) { $imap_server_type = "cyrus"; @@ -3704,6 +4146,9 @@ sub set_defaults { $disp_default_folder_prefix = ""; $force_username_lowercase = false; + # Delimiter might differ if unixhierarchysep is set to yes. + $message = "\nIf you have enabled unixhierarchysep, you must change delimiter and special folder names.\n"; + $continue = 1; } elsif ( $server eq "uw" ) { $imap_server_type = "uw"; @@ -3807,6 +4252,24 @@ sub set_defaults { $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; @@ -3827,6 +4290,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 = ; @@ -3996,6 +4461,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";