X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=config%2Fconf.pl;h=efb040786ab9c6360e04fe8437b86f4de4a634f3;hp=3d9e562ffb51b3e1ba18f48f352acf4470a45e3f;hb=a33764f643ab638d0cd2450e570a556e0c257eb7;hpb=80e3fcf80409bcb65d06f728414cda4fdb00f824 diff --git a/config/conf.pl b/config/conf.pl index 3d9e562f..efb04078 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2003 The SquirrelMail Project Team +# Copyright (c) 1999-2005 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail # # $Id$ -############################################################ +############################################################ $conf_pl_version = "1.4.0"; ############################################################ @@ -22,9 +22,9 @@ if ( eval q{require "File/Basename.pm"} ) { chdir($dir); } -############################################################ +############################################################ # Some people try to run this as a CGI. That's wrong! -############################################################ +############################################################ if ( defined( $ENV{'PATH_INFO'} ) || defined( $ENV{'QUERY_STRING'} ) || defined( $ENV{'REQUEST_METHOD'} ) ) { @@ -36,15 +36,15 @@ if ( defined( $ENV{'PATH_INFO'} ) ############################################################ # If we got here, use Cwd to get the full directory path # (the Basename stuff above will sometimes return '.' as -# the base directory, which is not helpful here). +# the base directory, which is not helpful here). ############################################################ use Cwd; $dir = cwd(); - -############################################################ + +############################################################ # First, lets read in the data already in there... -############################################################ +############################################################ if ( -e "config.php" ) { open( FILE, "config.php" ); while ( $line = ) { @@ -53,13 +53,13 @@ if ( -e "config.php" ) { $var = $line; $var =~ s/=/EQUALS/; - if ( $var =~ /^([a-z]|[A-Z])/ ) { + if ( $var =~ /^([a-z])/i ) { @o = split ( /\s*EQUALS\s*/, $var ); if ( $o[0] eq "config_version" ) { - $o[1] =~ s/[\n|\r]//g; - $o[1] =~ s/[\'|\"];\s*$//; + $o[1] =~ s/[\n\r]//g; + $o[1] =~ s/[\'\"];\s*$//; $o[1] =~ s/;$//; - $o[1] =~ s/^[\'|\"]//; + $o[1] =~ s/^[\'\"]//; $config_version = $o[1]; close(FILE); @@ -106,13 +106,13 @@ if ( -e "config.php" ) { $var = $line; $var =~ s/=/EQUALS/; - if ( $var =~ /^([a-z]|[A-Z])/ ) { + if ( $var =~ /^([a-z])/i ) { @o = split ( /\s*EQUALS\s*/, $var ); if ( $o[0] eq "config_version" ) { - $o[1] =~ s/[\n|\r]//g; - $o[1] =~ s/[\'|\"];\s*$//; + $o[1] =~ s/[\n\r]//g; + $o[1] =~ s/[\'\"];\s*$//; $o[1] =~ s/;$//; - $o[1] =~ s/^[\'|\"]//; + $o[1] =~ s/^[\'\"]//; $config_version = $o[1]; close(FILE); @@ -160,36 +160,43 @@ if ( -e "config.php" ) { # Read and parse the current configuration file # (either config.php or config_default.php). while ( $line = ) { - $line =~ s/^\s+//; + $line =~ s/^\s+//; $line =~ s/^\$//; $var = $line; $var =~ s/=/EQUALS/; - if ( $var =~ /^([a-z]|[A-Z])/ ) { + if ( $var =~ /^([a-z])/i ) { @options = split ( /\s*EQUALS\s*/, $var ); - $options[1] =~ s/[\n|\r]//g; - $options[1] =~ s/[\'|\"];\s*$//; + $options[1] =~ s/[\n\r]//g; + $options[1] =~ s/[\'\"];\s*$//; $options[1] =~ s/;$//; - $options[1] =~ s/^[\'|\"]//; + $options[1] =~ s/^[\'\"]//; + # de-escape escaped strings + $options[1] =~ s/\\'/'/g; + $options[1] =~ s/\\\\/\\/g; - if ( $options[0] =~ /^theme\[[0-9]+\]\[['|"]PATH['|"]\]/ ) { + if ( $options[0] =~ /^theme\[[0-9]+\]\[['"]PATH['"]\]/ ) { $sub = $options[0]; - $sub =~ s/\]\[['|"]PATH['|"]\]//; + $sub =~ s/\]\[['"]PATH['"]\]//; $sub =~ s/.*\[//; if ( -e "../themes" ) { $options[1] =~ s/^\.\.\/config/\.\.\/themes/; } $theme_path[$sub] = &change_to_rel_path($options[1]); - } elsif ( $options[0] =~ /^theme\[[0-9]+\]\[['|"]NAME['|"]\]/ ) { + } elsif ( $options[0] =~ /^theme\[[0-9]+\]\[['"]NAME['"]\]/ ) { $sub = $options[0]; - $sub =~ s/\]\[['|"]NAME['|"]\]//; + $sub =~ s/\]\[['"]NAME['"]\]//; $sub =~ s/.*\[//; $theme_name[$sub] = $options[1]; - } elsif ( $options[0] =~ /^plugins\[[0-9]+\]/ ) { + } elsif ( $options[0] =~ /^plugins\[[0-9]*\]/ ) { $sub = $options[0]; $sub =~ s/\]//; $sub =~ s/^plugins\[//; - $plugins[$sub] = $options[1]; + if ($sub eq '') { + push @plugins, $options[1]; + } else { + $plugins[$sub] = $options[1]; + } } elsif ( $options[0] =~ /^ldap_server\[[0-9]+\]/ ) { $sub = $options[0]; $sub =~ s/\]//; @@ -200,36 +207,61 @@ while ( $line = ) { $continue = 1; } - if ( $tmp =~ /^\s*[\'|\"]host[\'|\"]/i ) { - $tmp =~ s/^\s*[\'|\"]host[\'|\"]\s*=>\s*[\'|\"]//i; - $tmp =~ s/[\'|\"],?\s*$//; - $tmp =~ s/[\'|\"]\);\s*$//; + if ( $tmp =~ /^\s*[\'\"]host[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]host[\'\"]\s*=>\s*[\'\"]//i; + $tmp =~ s/[\'\"],?\s*$//; + $tmp =~ s/[\'\"]\);\s*$//; $host = $tmp; - } elsif ( $tmp =~ /^\s*[\'|\"]base[\'|\"]/i ) { - $tmp =~ s/^\s*[\'|\"]base[\'|\"]\s*=>\s*[\'|\"]//i; - $tmp =~ s/[\'|\"],?\s*$//; - $tmp =~ s/[\'|\"]\);\s*$//; + } elsif ( $tmp =~ /^\s*[\'\"]base[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]base[\'\"]\s*=>\s*[\'\"]//i; + $tmp =~ s/[\'\"],?\s*$//; + $tmp =~ s/[\'\"]\);\s*$//; $base = $tmp; - } elsif ( $tmp =~ /^\s*[\'|\"]charset[\'|\"]/i ) { - $tmp =~ s/^\s*[\'|\"]charset[\'|\"]\s*=>\s*[\'|\"]//i; - $tmp =~ s/[\'|\"],?\s*$//; - $tmp =~ s/[\'|\"]\);\s*$//; + } elsif ( $tmp =~ /^\s*[\'\"]charset[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]charset[\'\"]\s*=>\s*[\'\"]//i; + $tmp =~ s/[\'\"],?\s*$//; + $tmp =~ s/[\'\"]\);\s*$//; $charset = $tmp; - } elsif ( $tmp =~ /^\s*[\'|\"]port[\'|\"]/i ) { - $tmp =~ s/^\s*[\'|\"]port[\'|\"]\s*=>\s*[\'|\"]?//i; - $tmp =~ s/[\'|\"]?,?\s*$//; - $tmp =~ s/[\'|\"]?\);\s*$//; + } elsif ( $tmp =~ /^\s*[\'\"]port[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]port[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; $port = $tmp; - } elsif ( $tmp =~ /^\s*[\'|\"]maxrows[\'|\"]/i ) { - $tmp =~ s/^\s*[\'|\"]maxrows[\'|\"]\s*=>\s*[\'|\"]?//i; - $tmp =~ s/[\'|\"]?,?\s*$//; - $tmp =~ s/[\'|\"]?\);\s*$//; + } elsif ( $tmp =~ /^\s*[\'\"]maxrows[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]maxrows[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; $maxrows = $tmp; - } elsif ( $tmp =~ /^\s*[\'|\"]name[\'|\"]/i ) { - $tmp =~ s/^\s*[\'|\"]name[\'|\"]\s*=>\s*[\'|\"]//i; - $tmp =~ s/[\'|\"],?\s*$//; - $tmp =~ s/[\'|\"]\);\s*$//; + } 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*$//; + $tmp =~ s/[\'\"]\);\s*$//; $name = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]binddn[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]binddn[\'\"]\s*=>\s*[\'\"]//i; + $tmp =~ s/[\'\"],?\s*$//; + $tmp =~ s/[\'\"]\);\s*$//; + $binddn = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]bindpw[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]bindpw[\'\"]\s*=>\s*[\'\"]//i; + $tmp =~ s/[\'\"],?\s*$//; + $tmp =~ s/[\'\"]\);\s*$//; + $bindpw = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]protocol[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]protocol[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; + $protocol = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]limit_scope[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]limit_scope[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; + $limit_scope = $tmp; } } $ldap_host[$sub] = $host; @@ -237,7 +269,12 @@ 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; } elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page)$/ ) { ${ $options[0] } = &change_to_rel_path($options[1]); } else { @@ -246,113 +283,60 @@ while ( $line = ) { } } close FILE; -if ( lc($useSendmail) ne "true" ) { - $useSendmail = "false"; -} -if ( !$sendmail_path ) { - $sendmail_path = "/usr/sbin/sendmail"; -} -if ( !$pop_before_smtp ) { - $pop_before_smtp = "false"; -} -if ( !$default_unseen_notify ) { - $default_unseen_notify = 2; -} -if ( !$default_unseen_type ) { - $default_unseen_type = 1; -} -if ( !$config_use_color ) { - $config_use_color = 0; -} -if ( !$invert_time ) { - $invert_time = "false"; -} -if ( !$force_username_lowercase ) { - $force_username_lowercase = "false"; -} -if ( !$optional_delimiter ) { - $optional_delimiter = "detect"; -} -if ( !$auto_create_special ) { - $auto_create_special = "false"; -} -if ( !$default_use_priority ) { - $default_use_priority = "true"; -} -if ( !$hide_sm_attributions ) { - $hide_sm_attributions = "false"; -} -if ( !$default_use_mdn ) { - $default_use_mdn = "true"; -} -if ( !$delete_folder ) { - $delete_folder = "false"; -} -if ( !$noselect_fix_enable ) { - $noselect_fix_enable = "false"; -} -if ( !$frame_top ) { - $frame_top = "_top"; -} -if ( !$provider_uri ) { - $provider_uri = "http://www.squirrelmail.org/"; -} - -if ( !$provider_name ) { - $provider_name = "SquirrelMail"; -} - -if ( !$edit_identity ) { - $edit_identity = "true"; -} -if ( !$edit_name ) { - $edit_name = "true"; -} -if ( !$allow_thread_sort ) { - $allow_thread_sort = 'false'; -} -if ( !$allow_server_sort ) { - $allow_server_sort = 'false'; -} -if ( !$uid_support ) { - $uid_support = 'true'; -} -if ( !$no_list_for_subscribe ) { - $no_list_for_subscribe = 'false'; -} -if ( !$allow_charset_search ) { - $allow_charset_search = 'true'; -} -if ( !$prefs_user_field ) { - $prefs_user_field = 'user'; -} -if ( !$prefs_key_field ) { - $prefs_key_field = 'prefkey'; -} -if ( !$prefs_val_field ) { - $prefs_val_field = 'prefval'; -} - -if ( !$use_smtp_tls) { - $use_smtp_tls= 'false'; -} - -if ( !$smtp_auth_mech ) { - $smtp_auth_mech = 'none'; -} - -if ( !$use_imap_tls ) { - $use_imap_tls = 'false'; -} - -if ( !$imap_auth_mech ) { - $imap_auth_mech = 'login'; -} - -if (!$session_name ) { - $session_name = 'SQMSESSID'; -} +$useSendmail = 'false' if ( lc($useSendmail) ne 'true' ); +$sendmail_path = "/usr/sbin/sendmail" if ( !$sendmail_path ); +$pop_before_smtp = 'false' if ( !$pop_before_smtp ); +$default_unseen_notify = 2 if ( !$default_unseen_notify ); +$default_unseen_type = 1 if ( !$default_unseen_type ); +$config_use_color = 0 if ( !$config_use_color ); +$invert_time = 'false' if ( !$invert_time ); +$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 ); +$frame_top = "_top" if ( !$frame_top ); +$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 ); +$use_smtp_tls= 'false' if ( !$use_smtp_tls); +$smtp_auth_mech = 'none' if ( !$smtp_auth_mech ); +$use_imap_tls = 'false' if ( !$use_imap_tls ); +$imap_auth_mech = 'login' if ( !$imap_auth_mech ); +$session_name = 'SQMSESSID' if ( !$session_name ); +$skip_SM_header = 'false' if ( !$skip_SM_header ); +$default_use_javascript_addr_book = 'false' if (! $default_use_javascript_addr_book); +# since 1.5.0 +$show_alternative_names = 'false' if ( !$show_alternative_names ); +$available_languages = 'all' if ( !$available_languages ); +$aggressive_decoding = 'false' if ( !$aggressive_decoding ); +$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 ); +$lossy_encoding = 'false' if ( !$lossy_encoding ); +$allow_remote_configtest = 'false' if ( !$allow_remote_configtest ); +$addrbook_global_table = 'global_abook' if ( !$addrbook_global_table ); +$addrbook_global_writeable = 'false' if ( !$addrbook_global_writeable ); +$addrbook_global_listing = 'false' if ( !$addrbook_global_listing ); +$abook_global_file = '' if ( !$abook_global_file); +$abook_global_file_writeable = 'false' if ( !$abook_global_file_writeable); +$abook_global_file_listing = 'true' if ( !$abook_global_file_listing ); if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; @@ -381,7 +365,7 @@ if ( $config_use_color == 1 ) { $config_use_color = 2; } -while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { +while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { clear_screen(); print $WHT. "SquirrelMail Configuration : " . $NRM; if ( $config == 1 ) { print "Read: config.php"; } @@ -396,10 +380,12 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "3. Folder Defaults\n"; print "4. General Options\n"; print "5. Themes\n"; - print "6. Address Books (LDAP)\n"; + print "6. Address Books\n"; print "7. Message of the Day (MOTD)\n"; print "8. Plugins\n"; print "9. Database\n"; + print "10. Language settings\n"; + print "11. Tweaks\n"; print "\n"; print "D. Set pre-defined settings for specific IMAP servers\n"; print "\n"; @@ -410,10 +396,9 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "3. Org. Logo Width/Height : $WHT($org_logo_width/$org_logo_height)$NRM\n"; print "4. Organization Title : $WHT$org_title$NRM\n"; print "5. Signout Page : $WHT$signout_page$NRM\n"; - print "6. Default Language : $WHT$squirrelmail_default_language$NRM\n"; - print "7. Top Frame : $WHT$frame_top$NRM\n"; - print "8. Provider link : $WHT$provider_uri$NRM\n"; - print "9. Provider name : $WHT$provider_name$NRM\n"; + print "6. Top Frame : $WHT$frame_top$NRM\n"; + print "7. Provider link : $WHT$provider_uri$NRM\n"; + print "8. Provider name : $WHT$provider_name$NRM\n"; print "\n"; print "R Return to Main Menu\n"; @@ -424,14 +409,14 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "1. Domain : $WHT$domain$NRM\n"; print "2. Invert Time : $WHT$invert_time$NRM\n"; print "3. Sendmail or SMTP : $WHT"; - if ( lc($useSendmail) eq "true" ) { + if ( lc($useSendmail) eq 'true' ) { print "Sendmail"; } else { print "SMTP"; } print "$NRM\n"; print "\n"; - + if ( $show_imap_settings ) { print $WHT . "IMAP Settings". $NRM . "\n--------------\n"; print "4. IMAP Server : $WHT$imapServerAddress$NRM\n"; @@ -442,9 +427,10 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "9. Delimiter : $WHT$optional_delimiter$NRM\n"; print "\n"; } elsif ( $show_smtp_settings ) { - if ( lc($useSendmail) eq "true" ) { + 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 "\n"; } else { print $WHT . "SMTP Settings" . $NRM . "\n-------------\n"; @@ -453,6 +439,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "6. POP before SMTP : $WHT$pop_before_smtp$NRM\n"; print "7. SMTP Authentication : $WHT$smtp_auth_mech$NRM\n"; print "8. Secure SMTP (TLS) : $WHT$use_smtp_tls$NRM\n"; + print "9. Suppress SM header : $WHT$skip_SM_header$NRM\n"; print "\n"; } } @@ -462,9 +449,9 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "$WHT$imapServerAddress$NRM:"; print "$WHT$imapPort$NRM "; print "($WHT$imap_server_type$NRM)\n"; - } + } if ($show_smtp_settings == 0) { - if ( lc($useSendmail) eq "true" ) { + if ( lc($useSendmail) eq 'true' ) { print "B. Change Sendmail Config : $WHT$sendmail_path$NRM\n"; } else { print "B. Update SMTP Settings : "; @@ -474,11 +461,11 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } if ( $show_smtp_settings || $show_imap_settings ) { - print "H. Hide " . - ($show_imap_settings ? "IMAP Server" : - (lc($useSendmail) eq "true") ? "Sendmail" : "SMTP") . " Settings\n"; + print "H. Hide " . + ($show_imap_settings ? "IMAP Server" : + (lc($useSendmail) eq 'true') ? "Sendmail" : "SMTP") . " Settings\n"; } - + print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 3 ) { @@ -505,20 +492,20 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "R Return to Main Menu\n"; } elsif ( $menu == 4 ) { print $WHT. "General Options\n" . $NRM; - print "1. Default Charset : $WHT$default_charset$NRM\n"; - print "2. Data Directory : $WHT$data_dir$NRM\n"; - print "3. Attachment Directory : $WHT$attachment_dir$NRM\n"; - print "4. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; - print "5. Default Left Size : $WHT$default_left_size$NRM\n"; - print "6. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; - print "7. Allow use of priority : $WHT$default_use_priority$NRM\n"; - print "8. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; - print "9. Allow use of receipts : $WHT$default_use_mdn$NRM\n"; - print "10. Allow editing of identity : $WHT$edit_identity$NRM/$WHT$edit_name$NRM\n"; - print "11. Allow server thread sort : $WHT$allow_thread_sort$NRM\n"; - print "12. Allow server-side sorting : $WHT$allow_server_sort$NRM\n"; - print "13. Allow server charset search : $WHT$allow_charset_search$NRM\n"; - print "14. PHP session name : $WHT$session_name$NRM\n"; + print "1. Data Directory : $WHT$data_dir$NRM\n"; + print "2. Attachment Directory : $WHT$attachment_dir$NRM\n"; + print "3. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; + print "4. Default Left Size : $WHT$default_left_size$NRM\n"; + print "5. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; + print "6. Allow use of priority : $WHT$default_use_priority$NRM\n"; + print "7. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; + print "8. Allow use of receipts : $WHT$default_use_mdn$NRM\n"; + print "9. Allow editing of identity : $WHT$edit_identity$NRM/$WHT$edit_name$NRM\n"; + print "10. Allow server thread sort : $WHT$allow_thread_sort$NRM\n"; + print "11. Allow server-side sorting : $WHT$allow_server_sort$NRM\n"; + print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n"; + print "13. Allow advanced search : $WHT$allow_advanced_search$NRM\n"; + print "14. PHP session name : $WHT$session_name$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 5 ) { @@ -526,7 +513,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "1. Change Themes\n"; for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) { $temp_name = $theme_name[$count*2]; - printf " %s%*s %s\n", $temp_name, + printf " %s%*s %s\n", $temp_name, 40 - length($temp_name), " ", $theme_name[($count*2)+1]; } @@ -534,13 +521,15 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 6 ) { - print $WHT. "Address Books (LDAP)\n" . $NRM; - print "1. Change Servers\n"; + print $WHT. "Address Books\n" . $NRM; + print "1. Change LDAP Servers\n"; for ( $count = 0 ; $count <= $#ldap_host ; $count++ ) { print " > $ldap_host[$count]\n"; } - print - "2. Use Javascript Address Book Search : $WHT$default_use_javascript_addr_book$NRM\n"; + print "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 "4. Allow writing into global file address book : $WHT$abook_global_file_writeable$NRM\n"; + print "5. Allow listing of global file address book : $WHT$abook_global_file_listing$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 7 ) { @@ -597,12 +586,41 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "6. Field for prefs key : $WHT$prefs_key_field$NRM\n"; print "7. Field for prefs value : $WHT$prefs_val_field$NRM\n"; print "\n"; + print "8. DSN for Global Address Book : $WHT$addrbook_global_dsn$NRM\n"; + print "9. Table for Global Address Book : $WHT$addrbook_global_table$NRM\n"; + print "10. Allow writing into Global Address Book : $WHT$addrbook_global_writeable$NRM\n"; + print "11. Allow listing of Global Address Book : $WHT$addrbook_global_listing$NRM\n"; + print "\n"; + print "R Return to Main Menu\n"; + } elsif ( $menu == 10 ) { + print $WHT. "Language settings\n" . $NRM; + print "1. Default Language : $WHT$squirrelmail_default_language$NRM\n"; + print "2. Default Charset : $WHT$default_charset$NRM\n"; + print "3. Show alternative language names : $WHT$show_alternative_names$NRM\n"; + print "4. Available languages : $WHT$available_languages$NRM\n"; + print "5. Enable aggressive decoding : $WHT$aggressive_decoding$NRM\n"; + print "6. 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. 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 "\n"; + print $WHT. "Configuration tweaks\n" . $NRM; + print "6. Allow remote configtest : $WHT$allow_remote_configtest$NRM\n"; + print "\n"; print "R Return to Main Menu\n"; } if ( $config_use_color == 1 ) { - print "C. Turn color off\n"; + print "C Turn color off\n"; } else { - print "C. Turn color on\n"; + print "C Turn color on\n"; } print "S Save data\n"; print "Q Quit\n"; @@ -610,7 +628,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "\n"; print "Command >> " . $WHT; $command = ; - $command =~ s/[\n|\r]//g; + $command =~ s/[\n\r]//g; $command =~ tr/A-Z/a-z/; print "$NRM\n"; @@ -644,7 +662,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } else { $saved = 0; if ( $menu == 0 ) { - if ( ( $command > 0 ) && ( $command < 10 ) ) { + if ( ( $command > 0 ) && ( $command < 12 ) ) { $menu = $command; } } elsif ( $menu == 1 ) { @@ -653,10 +671,9 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 3 ) { ($org_logo_width,$org_logo_height) = command2a(); } elsif ( $command == 4 ) { $org_title = command3(); } elsif ( $command == 5 ) { $signout_page = command4(); } - elsif ( $command == 6 ) { $squirrelmail_default_language = command5(); } - elsif ( $command == 7 ) { $frame_top = command6(); } - elsif ( $command == 8 ) { $provider_uri = command7(); } - elsif ( $command == 9 ) { $provider_name = command8(); } + elsif ( $command == 6 ) { $frame_top = command6(); } + elsif ( $command == 7 ) { $provider_uri = command7(); } + elsif ( $command == 8 ) { $provider_name = command8(); } } elsif ( $menu == 2 ) { if ( $command eq "a" ) { $show_imap_settings = 1; $show_smtp_settings = 0; } @@ -674,7 +691,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 7 ) { $use_imap_tls = command113("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" ) { + } elsif ( $show_smtp_settings && lc($useSendmail) eq 'true' ) { if ( $command == 4 ) { $sendmail_path = command15(); } } elsif ( $show_smtp_settings ) { if ( $command == 4 ) { $smtpServerAddress = command16(); } @@ -682,6 +699,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { 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 ( $menu == 3 ) { if ( $command == 1 ) { $default_folder_prefix = command21(); } @@ -703,26 +721,29 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 17 ) { $delete_folder = command215(); } elsif ( $command == 18 ) { $noselect_fix_enable = command216(); } } elsif ( $menu == 4 ) { - if ( $command == 1 ) { $default_charset = command31(); } - elsif ( $command == 2 ) { $data_dir = command33a(); } - elsif ( $command == 3 ) { $attachment_dir = command33b(); } - elsif ( $command == 4 ) { $dir_hash_level = command33c(); } - elsif ( $command == 5 ) { $default_left_size = command35(); } - elsif ( $command == 6 ) { $force_username_lowercase = command36(); } - elsif ( $command == 7 ) { $default_use_priority = command37(); } - elsif ( $command == 8 ) { $hide_sm_attributions = command38(); } - elsif ( $command == 9 ) { $default_use_mdn = command39(); } - elsif ( $command == 10 ) { $edit_identity = command310(); } - elsif ( $command == 11 ) { $allow_thread_sort = command312(); } - elsif ( $command == 12 ) { $allow_server_sort = command313(); } - elsif ( $command == 13 ) { $allow_charset_search = command314(); } - elsif ( $command == 14 ) { $session_name = command316(); } + if ( $command == 1 ) { $data_dir = command33a(); } + elsif ( $command == 2 ) { $attachment_dir = command33b(); } + elsif ( $command == 3 ) { $dir_hash_level = command33c(); } + elsif ( $command == 4 ) { $default_left_size = command35(); } + elsif ( $command == 5 ) { $force_username_lowercase = command36(); } + elsif ( $command == 6 ) { $default_use_priority = command37(); } + elsif ( $command == 7 ) { $hide_sm_attributions = command38(); } + elsif ( $command == 8 ) { $default_use_mdn = command39(); } + elsif ( $command == 9 ) { $edit_identity = command310(); } + elsif ( $command == 10 ) { $allow_thread_sort = command312(); } + elsif ( $command == 11 ) { $allow_server_sort = command313(); } + elsif ( $command == 12 ) { $allow_charset_search = command314(); } + elsif ( $command == 13 ) { $allow_advanced_search = command316(); } + elsif ( $command == 14 ) { $session_name = command317(); } } elsif ( $menu == 5 ) { if ( $command == 1 ) { command41(); } elsif ( $command == 2 ) { $theme_css = command42(); } } elsif ( $menu == 6 ) { if ( $command == 1 ) { command61(); } elsif ( $command == 2 ) { command62(); } + elsif ( $command == 3 ) { $abook_global_file=command63(); } + elsif ( $command == 4 ) { command64(); } + elsif ( $command == 5 ) { command65(); } } elsif ( $menu == 7 ) { if ( $command == 1 ) { $motd = command71(); } } elsif ( $menu == 8 ) { @@ -735,10 +756,35 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { elsif ( $command == 5 ) { $prefs_user_field = command95(); } elsif ( $command == 6 ) { $prefs_key_field = command96(); } elsif ( $command == 7 ) { $prefs_val_field = command97(); } + elsif ( $command == 8 ) { $addrbook_global_dsn = command98(); } + elsif ( $command == 9 ) { $addrbook_global_table = command99(); } + elsif ( $command == 10 ) { $addrbook_global_writeable = command910(); } + elsif ( $command == 11 ) { $addrbook_global_listing = command911(); } + } elsif ( $menu == 10 ) { + if ( $command == 1 ) { $squirrelmail_default_language = commandA1(); } + elsif ( $command == 2 ) { $default_charset = commandA2(); } + elsif ( $command == 3 ) { $show_alternative_names = commandA3(); } + elsif ( $command == 4 ) { $available_languages = commandA4(); } + elsif ( $command == 5 ) { $aggressive_decoding = commandA5(); } + elsif ( $command == 6 ) { $lossy_encoding = commandA6(); } + } 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(); } } } } +# we exit here +print "\nExiting conf.pl.\n". + "You might want to test your configuration by browsing to\n". + "http://your-squirrelmail-location/src/configtest.php\n". + "Happy SquirrelMailing!\n\n"; + + #################################################################################### # org_name @@ -750,16 +796,14 @@ sub command1 { print "If your Organization Name includes a '\$', please precede it with a \\. \n"; print "Other '\$' will be considered the beginning of a variable that\n"; print "must be defined before the \$org_name is printed.\n"; - print "\$version, for example, is included by default, and will print the\n"; - print "string representing the current SquirrelMail version.\n"; print "\n"; print "[$WHT$org_name$NRM]: $WHT"; $new_org_name = ; if ( $new_org_name eq "\n" ) { $new_org_name = $org_name; } else { - $new_org_name =~ s/[\r|\n]//g; - $new_org_name =~ s/\"/"/g; + $new_org_name =~ s/[\r\n]//g; + $new_org_name =~ s/\"/"/g; } return $new_org_name; } @@ -774,14 +818,14 @@ sub command2 { print " to use the default logo, use ../images/sm_logo.png\n"; print " - To specify a logo defined outside the SquirrelMail source tree\n"; print " use the absolute URL the webserver would use to include the file\n"; - print " e.g. http://some.host.com/images/mylogo.gif or /images/mylogo.jpg\n"; + print " e.g. http://www.example.com/images/mylogo.gif or /images/mylogo.jpg\n"; print "\n"; print "[$WHT$org_logo$NRM]: $WHT"; $new_org_logo = ; if ( $new_org_logo eq "\n" ) { $new_org_logo = $org_logo; } else { - $new_org_logo =~ s/[\r|\n]//g; + $new_org_logo =~ s/[\r\n]//g; } return $new_org_logo; } @@ -803,8 +847,8 @@ sub command2a { $new_org_logo_height = ; $new_org_logo_height =~ tr/0-9//cd; # only want digits! if( $new_org_logo_height eq '' ) { - $new_org_logo_height = $org_logo_height; - } + $new_org_logo_height = $org_logo_height; + } } else { $new_org_logo_height = 0; } @@ -820,7 +864,7 @@ sub command3 { print "If your Organization Title includes a '\$', please precede it with a \\. \n"; print "Other '\$' will be considered the beginning of a variable that\n"; print "must be defined before the \$org_title is printed.\n"; - print "\$version, for example, is included by default, and will print the\n"; + print "\$version, for example can be used, and will print the\n"; print "string representing the current SquirrelMail version.\n"; print "\n"; print "[$WHT$org_title$NRM]: $WHT"; @@ -828,8 +872,8 @@ sub command3 { if ( $new_org_title eq "\n" ) { $new_org_title = $org_title; } else { - $new_org_title =~ s/[\r|\n]//g; - $new_org_title =~ s/\"/\'/g; + $new_org_title =~ s/[\r\n]//g; + $new_org_title =~ s/\"/\'/g; } return $new_org_title; } @@ -846,24 +890,7 @@ sub command4 { if ( $new_signout_page eq "\n" ) { $new_signout_page = $signout_page; } else { - $new_signout_page =~ s/[\r|\n]//g; - $new_signout_page =~ s/^\s+$//g; - } - return $new_signout_page; -} - -# Default language -sub command5 { - print "SquirrelMail attempts to set the language in many ways. If it\n"; - print "can not figure it out in another way, it will default to this\n"; - print "language. Please use the code for the desired language.\n"; - print "\n"; - print "[$WHT$squirrelmail_default_language$NRM]: $WHT"; - $new_signout_page = ; - if ( $new_signout_page eq "\n" ) { - $new_signout_page = $squirrelmail_default_language; - } else { - $new_signout_page =~ s/[\r|\n]//g; + $new_signout_page =~ s/[\r\n]//g; $new_signout_page =~ s/^\s+$//g; } return $new_signout_page; @@ -880,7 +907,7 @@ sub command6 { if ( $new_frame_top eq "\n" ) { $new_frame_top = '_top'; } else { - $new_frame_top =~ s/[\r|\n]//g; + $new_frame_top =~ s/[\r\n]//g; $new_frame_top =~ s/^\s+$//g; } return $new_frame_top; @@ -889,14 +916,14 @@ sub command6 { # Default link to provider sub command7 { print "Here you can set the link on the right of the page.\n"; - print "The default is 'http://www.squirrelmail.org/'\n"; + print "If empty, it will link to the SquirrelMail About page.\n"; print "\n"; print "[$WHT$provider_uri$NRM]: $WHT"; $new_provider_uri = ; if ( $new_provider_uri eq "\n" ) { - $new_provider_uri = 'http://www.squirrelmail.org/'; + $new_provider_uri = ''; } else { - $new_provider_uri =~ s/[\r|\n]//g; + $new_provider_uri =~ s/[\r\n]//g; $new_provider_uri =~ s/^\s+$//g; } return $new_provider_uri; @@ -911,7 +938,7 @@ sub command8 { if ( $new_provider_name eq "\n" ) { $new_provider_name = 'SquirrelMail'; } else { - $new_provider_name =~ s/[\r|\n]//g; + $new_provider_name =~ s/[\r\n]//g; $new_provider_name =~ s/^\s+$//g; } return $new_provider_name; @@ -922,15 +949,15 @@ sub command8 { # domain sub command11 { print "The domain name is the suffix at the end of all email addresses. If\n"; - print "for example, your email address is jdoe\@myorg.com, then your domain\n"; - print "would be myorg.com.\n"; + print "for example, your email address is jdoe\@example.com, then your domain\n"; + print "would be example.com.\n"; print "\n"; print "[$WHT$domain$NRM]: $WHT"; $new_domain = ; if ( $new_domain eq "\n" ) { $new_domain = $domain; } else { - $new_domain =~ s/[\r|\n]//g; + $new_domain =~ s/[\r\n]//g; } return $new_domain; } @@ -943,7 +970,7 @@ sub command12 { if ( $new_imapServerAddress eq "\n" ) { $new_imapServerAddress = $imapServerAddress; } else { - $new_imapServerAddress =~ s/[\r|\n]//g; + $new_imapServerAddress =~ s/[\r\n]//g; } return $new_imapServerAddress; } @@ -956,7 +983,7 @@ sub command13 { if ( $new_imapPort eq "\n" ) { $new_imapPort = $imapPort; } else { - $new_imapPort =~ s/[\r|\n]//g; + $new_imapPort =~ s/[\r\n]//g; } return $new_imapPort; } @@ -966,7 +993,7 @@ sub command14 { print "You now need to choose the method that you will use for sending\n"; print "messages in SquirrelMail. You can either connect to an SMTP server\n"; print "or use sendmail directly.\n"; - if ( lc($useSendmail) eq "true" ) { + if ( lc($useSendmail) eq 'true' ) { $default_value = "1"; } else { $default_value = "2"; @@ -978,9 +1005,9 @@ sub command14 { $use_sendmail = ; if ( ( $use_sendmail =~ /^1\n/i ) || ( ( $use_sendmail =~ /^\n/ ) && ( $default_value eq "1" ) ) ) { - $useSendmail = "true"; + $useSendmail = 'true'; } else { - $useSendmail = "false"; + $useSendmail = 'false'; } return $useSendmail; } @@ -996,7 +1023,7 @@ sub command15 { if ( $new_sendmail_path eq "\n" ) { $new_sendmail_path = $sendmail_path; } else { - $new_sendmail_path =~ s/[\r|\n]//g; + $new_sendmail_path =~ s/[\r\n]//g; } return $new_sendmail_path; } @@ -1009,7 +1036,7 @@ sub command16 { if ( $new_smtpServerAddress eq "\n" ) { $new_smtpServerAddress = $smtpServerAddress; } else { - $new_smtpServerAddress =~ s/[\r|\n]//g; + $new_smtpServerAddress =~ s/[\r\n]//g; } return $new_smtpServerAddress; } @@ -1022,28 +1049,28 @@ sub command17 { if ( $new_smtpPort eq "\n" ) { $new_smtpPort = $smtpPort; } else { - $new_smtpPort =~ s/[\r|\n]//g; + $new_smtpPort =~ s/[\r\n]//g; } return $new_smtpPort; } -# authenticated server +# authenticated server sub command18 { return; - # This sub disabled by tassium - it has been replaced with smtp_auth_mech + # This sub disabled by tassium - it has been replaced with smtp_auth_mech print "Do you wish to use an authenticated SMTP server? Your server must\n"; print "support this in order for SquirrelMail to work with it. We implemented\n"; print "it according to RFC 2554.\n"; $YesNo = 'n'; - $YesNo = 'y' if ( lc($use_authenticated_smtp) eq "true" ); + $YesNo = 'y' if ( lc($use_authenticated_smtp) eq 'true' ); print "Use authenticated SMTP server (y/n) [$WHT$YesNo$NRM]: $WHT"; $new_use_authenticated_smtp = ; $new_use_authenticated_smtp =~ tr/yn//cd; - return "true" if ( $new_use_authenticated_smtp eq "y" ); - return "false" if ( $new_use_authenticated_smtp eq "n" ); + return 'true' if ( $new_use_authenticated_smtp eq "y" ); + return 'false' if ( $new_use_authenticated_smtp eq "n" ); return $use_authenticated_smtp; } @@ -1053,18 +1080,18 @@ sub command18a { print "support this in order for SquirrelMail to work with it.\n"; $YesNo = 'n'; - $YesNo = 'y' if ( lc($pop_before_smtp) eq "true" ); + $YesNo = 'y' if ( lc($pop_before_smtp) eq 'true' ); print "Use pop before SMTP (y/n) [$WHT$YesNo$NRM]: $WHT"; $new_pop_before_smtp = ; $new_pop_before_smtp =~ tr/yn//cd; - return "true" if ( $new_pop_before_smtp eq "y" ); - return "false" if ( $new_pop_before_smtp eq "n" ); + return 'true' if ( $new_pop_before_smtp eq "y" ); + return 'false' if ( $new_pop_before_smtp eq "n" ); return $pop_before_smtp; } -# imap_server_type +# imap_server_type sub command19 { print "Each IMAP server has its own quirks. As much as we tried to stick\n"; print "to standards, it doesn't help much if the IMAP server doesn't follow\n"; @@ -1072,19 +1099,23 @@ sub command19 { print "these servers. If you would like to use them, please select your\n"; print "IMAP server. If you do not wish to use these work-arounds, you can\n"; print "set this to \"other\", and none will be used.\n"; - print " cyrus = Cyrus IMAP server\n"; - print " uw = University of Washington's IMAP server\n"; - print " exchange = Microsoft Exchange IMAP server\n"; - print " courier = Courier IMAP server\n"; - print " macosx = Mac OS X Mailserver\n"; - print " other = Not one of the above servers\n"; + print " courier = Courier IMAP server\n"; + print " cyrus = Cyrus IMAP server\n"; + print " dovecot = Dovecot Secure IMAP server\n"; + print " exchange = Microsoft Exchange IMAP server\n"; + print " hmailserver = hMailServer\n"; + print " macosx = Mac OS X Mailserver\n"; + print " 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 = ; if ( $new_imap_server_type eq "\n" ) { $new_imap_server_type = $imap_server_type; } else { - $new_imap_server_type =~ s/[\r|\n]//g; + $new_imap_server_type =~ s/[\r\n]//g; } return $new_imap_server_type; } @@ -1101,14 +1132,14 @@ sub command110 { print " yes = Fix the time for this system\n"; $YesNo = 'n'; - $YesNo = 'y' if ( lc($invert_time) eq "true" ); + $YesNo = 'y' if ( lc($invert_time) eq 'true' ); print "Fix the time for this system (y/n) [$WHT$YesNo$NRM]: $WHT"; $new_invert_time = ; $new_invert_time =~ tr/yn//cd; - return "true" if ( $new_invert_time eq "y" ); - return "false" if ( $new_invert_time eq "n" ); + return 'true' if ( $new_invert_time eq "y" ); + return 'false' if ( $new_invert_time eq "n" ); return $invert_time; } @@ -1126,7 +1157,7 @@ sub command111 { if ( $new_optional_delimiter eq "\n" ) { $new_optional_delimiter = $optional_delimiter; } else { - $new_optional_delimiter =~ s/[\r|\n]//g; + $new_optional_delimiter =~ s/[\r\n]//g; } return $new_optional_delimiter; } @@ -1138,52 +1169,52 @@ sub command112a { if ($use_imap_tls =~ /^true\b/i) { print "Auto-detection of login methods is unavailable when using TLS.\n"; } else { - print "If you have already set the hostname and port number, I can try to\n"; - print "detect the mechanisms your IMAP server supports.\n"; - print "I will try to detect CRAM-MD5 and DIGEST-MD5 support. I can't test\n"; - print "for \"login\" or \"plain\" without knowing a username and password.\n"; - print "Auto-detecting is optional - you can safely say \"n\" here.\n"; - print "\nTry to detect supported mechanisms? [y/N]: "; - $inval=; - chomp($inval); - if ($inval =~ /^y\b/i) { - # Yes, let's try to detect. - print "Trying to detect IMAP capabilities...\n"; - my $host = $imapServerAddress . ':'. $imapPort; - print "CRAM-MD5:\t"; - my $tmp = detect_auth_support('IMAP',$host,'CRAM-MD5'); - if (defined($tmp)) { - if ($tmp eq 'YES') { - print "$WHT SUPPORTED$NRM\n"; - } else { - print "$WHT NOT SUPPORTED$NRM\n"; - } + print "If you have already set the hostname and port number, I can try to\n"; + print "detect the mechanisms your IMAP server supports.\n"; + print "I will try to detect CRAM-MD5 and DIGEST-MD5 support. I can't test\n"; + print "for \"login\" or \"plain\" without knowing a username and password.\n"; + print "Auto-detecting is optional - you can safely say \"n\" here.\n"; + print "\nTry to detect supported mechanisms? [y/N]: "; + $inval=; + chomp($inval); + if ($inval =~ /^y\b/i) { + # Yes, let's try to detect. + print "Trying to detect IMAP capabilities...\n"; + my $host = $imapServerAddress . ':'. $imapPort; + print "CRAM-MD5:\t"; + my $tmp = detect_auth_support('IMAP',$host,'CRAM-MD5'); + if (defined($tmp)) { + if ($tmp eq 'YES') { + print "$WHT SUPPORTED$NRM\n"; + } else { + print "$WHT NOT SUPPORTED$NRM\n"; + } } else { - print $WHT . " ERROR DETECTING$NRM\n"; - } - - print "DIGEST-MD5:\t"; - $tmp = detect_auth_support('IMAP',$host,'DIGEST-MD5'); - if (defined($tmp)) { - if ($tmp eq 'YES') { - print "$WHT SUPPORTED$NRM\n"; - } else { - print "$WHT NOT SUPPORTED$NRM\n"; - } - } else { - print $WHT . " ERROR DETECTING$NRM\n"; - } - - } - } - print "\nWhat authentication mechanism do you want to use for IMAP connections?\n\n"; - print $WHT . "login" . $NRM . " - Plaintext. If you can do better, you probably should.\n"; + print $WHT . " ERROR DETECTING$NRM\n"; + } + + print "DIGEST-MD5:\t"; + $tmp = detect_auth_support('IMAP',$host,'DIGEST-MD5'); + if (defined($tmp)) { + if ($tmp eq 'YES') { + print "$WHT SUPPORTED$NRM\n"; + } else { + print "$WHT NOT SUPPORTED$NRM\n"; + } + } else { + print $WHT . " ERROR DETECTING$NRM\n"; + } + + } + } + print "\nWhat authentication mechanism do you want to use for IMAP connections?\n\n"; + print $WHT . "login" . $NRM . " - Plaintext. If you can do better, you probably should.\n"; print $WHT . "plain" . $NRM . " - SASL PLAIN. If you need this, you already know it.\n"; - print $WHT . "cram-md5" . $NRM . " - Slightly better than plaintext methods.\n"; - print $WHT . "digest-md5" . $NRM . " - Privacy protection - better than cram-md5.\n"; - print "\n*** YOUR IMAP SERVER MUST SUPPORT THE MECHANISM YOU CHOOSE HERE ***\n"; - print "If you don't understand or are unsure, you probably want \"login\"\n\n"; - print "login, plain, cram-md5, or digest-md5 [$WHT$imap_auth_mech$NRM]: $WHT"; + print $WHT . "cram-md5" . $NRM . " - Slightly better than plaintext methods.\n"; + print $WHT . "digest-md5" . $NRM . " - Privacy protection - better than cram-md5.\n"; + print "\n*** YOUR IMAP SERVER MUST SUPPORT THE MECHANISM YOU CHOOSE HERE ***\n"; + print "If you don't understand or are unsure, you probably want \"login\"\n\n"; + print "login, plain, cram-md5, or digest-md5 [$WHT$imap_auth_mech$NRM]: $WHT"; $inval=; chomp($inval); if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || ($inval =~ /^login\b/i) || ($inval =~ /^plain\b/i)) { @@ -1194,7 +1225,7 @@ sub command112a { } } - + # SMTP authentication type # Possible choices: none, plain, cram-md5, digest-md5 sub command112b { @@ -1203,51 +1234,53 @@ sub command112b { } else { print "If you have already set the hostname and port number, I can try to\n"; print "automatically detect some of the mechanisms your SMTP server supports.\n"; - print "Auto-detection is *optional* - you can safely say \"n\" here.\n"; + print "Auto-detection is *optional* - you can safely say \"n\" here.\n"; print "\nTry to detect auth mechanisms? [y/N]: "; $inval=; chomp($inval); if ($inval =~ /^y\b/i) { - # Yes, let's try to detect. - print "Trying to detect supported methods (SMTP)...\n"; - - # Special case! - # Check none by trying to relay to junk@microsoft.com - $host = $smtpServerAddress . ':' . $smtpPort; - use IO::Socket; - my $sock = IO::Socket::INET->new($host); - print "Testing none:\t\t$WHT"; - if (!defined($sock)) { - print " ERROR TESTING\n"; - close $sock; - } else { - print $sock "mail from: tester\@squirrelmail.org\n"; - $got = <$sock>; # Discard - print $sock "rcpt to: junk\@microsoft.com\n"; - $got = <$sock>; # This is the important line - if ($got =~ /^250\b/) { # SMTP will relay without auth - print "SUPPORTED$NRM\n"; - } else { - print "NOT SUPPORTED$NRM\n"; - } - print $sock "rset\n"; - print $sock "quit\n"; - close $sock; - } - # Try login (SquirrelMail default) - print "Testing login:\t\t"; - $tmp=detect_auth_support('SMTP',$host,'LOGIN'); - if (defined($tmp)) { - if ($tmp eq 'YES') { - print $WHT . "SUPPORTED$NRM\n"; - } else { - print $WHT . "NOT SUPPORTED$NRM\n"; - } - } else { - print $WHT . "ERROR DETECTING$NRM\n"; - } - - # Try CRAM-MD5 + # Yes, let's try to detect. + print "Trying to detect supported methods (SMTP)...\n"; + + # Special case! + # Check none by trying to relay to junk@microsoft.com + $host = $smtpServerAddress . ':' . $smtpPort; + use IO::Socket; + my $sock = IO::Socket::INET->new($host); + print "Testing none:\t\t$WHT"; + if (!defined($sock)) { + print " ERROR TESTING\n"; + close $sock; + } else { + print $sock "HELO $domain\r\n"; + $got = <$sock>; # Discard + print $sock "MAIL FROM:\r\n"; + $got = <$sock>; # Discard + print $sock "RCPT TO:; # This is the important line + if ($got =~ /^250\b/) { # SMTP will relay without auth + print "SUPPORTED$NRM\n"; + } else { + print "NOT SUPPORTED$NRM\n"; + } + print $sock "RSET\r\n"; + print $sock "QUIT\r\n"; + close $sock; + } + # Try login (SquirrelMail default) + print "Testing login:\t\t"; + $tmp=detect_auth_support('SMTP',$host,'LOGIN'); + if (defined($tmp)) { + if ($tmp eq 'YES') { + print $WHT . "SUPPORTED$NRM\n"; + } else { + print $WHT . "NOT SUPPORTED$NRM\n"; + } + } else { + print $WHT . "ERROR DETECTING$NRM\n"; + } + + # Try CRAM-MD5 print "Testing CRAM-MD5:\t"; $tmp=detect_auth_support('SMTP',$host,'CRAM-MD5'); if (defined($tmp)) { @@ -1259,7 +1292,7 @@ sub command112b { } else { print $WHT . "ERROR DETECTING$NRM\n"; } - + print "Testing DIGEST-MD5:\t"; $tmp=detect_auth_support('SMTP',$host,'DIGEST-MD5'); @@ -1272,7 +1305,7 @@ sub command112b { } else { print $WHT . "ERROR DETECTING$NRM\n"; } - } + } } print "\nWhat authentication mechanism do you want to use for SMTP connections?\n"; print $WHT . "none" . $NRM . " - Your SMTP server does not require authorization.\n"; @@ -1289,12 +1322,12 @@ sub command112b { # SMTP doesn't necessarily require logins return "none"; } - if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || + if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || ($inval =~ /^login\b/i) || ($inval =~/^plain\b/i)) { return lc($inval); } else { # user entered garbage, or default value so nothing needs to be set - return $smtp_auth_mech; + return $smtp_auth_mech; } } @@ -1302,31 +1335,44 @@ sub command112b { # This sub is reused for IMAP and SMTP # Args: service name, default value sub command113 { - 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 "If it is remote, you may wish to seriously consider enabling this.\n"; + 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 "If it is remote, you may wish to seriously consider enabling this.\n"; print "Enable TLS (y/n) [$WHT"; - if ($default_val eq "true") { + if ($default_val eq 'true') { print "y"; } else { print "n"; } - print "$NRM]: $WHT"; + print "$NRM]: $WHT"; $inval=; $inval =~ tr/yn//cd; - return "true" if ( $inval eq "y" ); - return "false" if ( $inval eq "n" ); + return 'true' if ( $inval eq "y" ); + return 'false' if ( $inval eq "n" ); return $default_val; +} +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; +} # MOTD sub command71 { @@ -1339,7 +1385,7 @@ sub command71 { do { print "] "; $line = ; - $line =~ s/[\r|\n]//g; + $line =~ s/[\r\n]//g; if ( $line ne "@" ) { $line =~ s/ /\ \ /g; $line =~ s/\t/\ \ \ \ /g; @@ -1355,7 +1401,7 @@ sub command71 { ################# PLUGINS ################### sub command81 { - $command =~ s/[\s|\n|\r]*//g; + $command =~ s/[\s\n\r]*//g; if ( $command > 0 ) { $command = $command - 1; if ( $command <= $#plugins ) { @@ -1435,7 +1481,7 @@ sub command22 { print " specify anything different.\n"; print "\n"; - if ( lc($show_prefix_option) eq "true" ) { + if ( lc($show_prefix_option) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1444,14 +1490,14 @@ sub command22 { print "Show option (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $show_prefix_option = "true"; + $show_prefix_option = 'true'; } else { - $show_prefix_option = "false"; + $show_prefix_option = 'false'; } return $show_prefix_option; } -# Trash Folder +# Trash Folder sub command23a { print "You can now specify where the default trash folder is located.\n"; print "On servers where you do not want this, you can set it to anything\n"; @@ -1468,12 +1514,12 @@ sub command23a { if ( $new_trash_folder eq "\n" ) { $new_trash_folder = $trash_folder; } else { - $new_trash_folder =~ s/[\r|\n]//g; + $new_trash_folder =~ s/[\r\n]//g; } return $new_trash_folder; } -# Sent Folder +# Sent Folder sub command23b { print "This is where messages that are sent will be stored. SquirrelMail\n"; print "by default puts a copy of all outgoing messages in this folder.\n"; @@ -1489,12 +1535,12 @@ sub command23b { if ( $new_sent_folder eq "\n" ) { $new_sent_folder = $sent_folder; } else { - $new_sent_folder =~ s/[\r|\n]//g; + $new_sent_folder =~ s/[\r\n]//g; } return $new_sent_folder; } -# Draft Folder +# Draft Folder sub command23c { print "You can now specify where the default draft folder is located.\n"; print "On servers where you do not want this, you can set it to anything\n"; @@ -1511,12 +1557,12 @@ sub command23c { if ( $new_draft_folder eq "\n" ) { $new_draft_folder = $draft_folder; } else { - $new_draft_folder =~ s/[\r|\n]//g; + $new_draft_folder =~ s/[\r\n]//g; } return $new_draft_folder; } -# default move to trash +# default move to trash sub command24a { print "By default, should messages get moved to the trash folder? You\n"; print "can specify the default trash folder in option 3. If this is set\n"; @@ -1526,7 +1572,7 @@ sub command24a { print "Trash folder is currently: $trash_folder\n"; print "\n"; - if ( lc($default_move_to_trash) eq "true" ) { + if ( lc($default_move_to_trash) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1534,14 +1580,14 @@ sub command24a { print "By default, move to trash (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $default_move_to_trash = "true"; + $default_move_to_trash = 'true'; } else { - $default_move_to_trash = "false"; + $default_move_to_trash = 'false'; } return $default_move_to_trash; } -# default move to sent +# default move to sent sub command24b { print "By default, should messages get moved to the sent folder? You\n"; print "can specify the default sent folder in option 4. If this is set\n"; @@ -1550,7 +1596,7 @@ sub command24b { print "Sent folder is currently: $sent_folder\n"; print "\n"; - if ( lc($default_move_to_sent) eq "true" ) { + if ( lc($default_move_to_sent) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1558,9 +1604,9 @@ sub command24b { print "By default, move to sent (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $default_move_to_sent = "true"; + $default_move_to_sent = 'true'; } else { - $default_move_to_sent = "false"; + $default_move_to_sent = 'false'; } return $default_move_to_sent; } @@ -1574,7 +1620,7 @@ sub command24c { print "Drafts folder is currently: $draft_folder\n"; print "\n"; - if ( lc($default_move_to_draft) eq "true" ) { + if ( lc($default_move_to_draft) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1582,14 +1628,14 @@ sub command24c { print "By default, save as draft (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $default_save_as_draft = "true"; + $default_save_as_draft = 'true'; } else { - $default_save_as_draft = "false"; + $default_save_as_draft = 'false'; } return $default_save_as_draft; } -# List special folders first +# List special folders first sub command27 { print "SquirrelMail has what we call 'special folders' that are not\n"; print "manipulated and viewed like normal folders. Some examples of\n"; @@ -1598,7 +1644,7 @@ sub command27 { print "listing.\n"; print "\n"; - if ( lc($list_special_folders_first) eq "true" ) { + if ( lc($list_special_folders_first) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1607,14 +1653,14 @@ sub command27 { print "List first (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $list_special_folders_first = "true"; + $list_special_folders_first = 'true'; } else { - $list_special_folders_first = "false"; + $list_special_folders_first = 'false'; } return $list_special_folders_first; } -# Show special folders color +# Show special folders color sub command28 { print "SquirrelMail has what we call 'special folders' that are not\n"; print "manipulated and viewed like normal folders. Some examples of\n"; @@ -1623,7 +1669,7 @@ sub command28 { print "color than the other folders.\n"; print "\n"; - if ( lc($use_special_folder_color) eq "true" ) { + if ( lc($use_special_folder_color) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1632,14 +1678,14 @@ sub command28 { print "Show color (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $use_special_folder_color = "true"; + $use_special_folder_color = 'true'; } else { - $use_special_folder_color = "false"; + $use_special_folder_color = 'false'; } return $use_special_folder_color; } -# Auto expunge +# Auto expunge sub command29 { print "The way that IMAP handles deleting messages is as follows. You\n"; print "mark the message as deleted, and then to 'really' delete it, you\n"; @@ -1648,7 +1694,7 @@ sub command29 { print "messages too.\n"; print "\n"; - if ( lc($auto_expunge) eq "true" ) { + if ( lc($auto_expunge) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1656,14 +1702,14 @@ sub command29 { print "Auto expunge (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $auto_expunge = "true"; + $auto_expunge = 'true'; } else { - $auto_expunge = "false"; + $auto_expunge = 'false'; } return $auto_expunge; } -# Default sub of inbox +# Default sub of inbox sub command210 { print "Some IMAP servers (Cyrus) have all folders as subfolders of INBOX.\n"; print "This can cause some confusion in folder creation for users when\n"; @@ -1672,7 +1718,7 @@ sub command210 { print "to be subfolders of INBOX by default.\n"; print "\n"; - if ( lc($default_sub_of_inbox) eq "true" ) { + if ( lc($default_sub_of_inbox) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1680,14 +1726,14 @@ sub command210 { print "Default sub of INBOX (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $default_sub_of_inbox = "true"; + $default_sub_of_inbox = 'true'; } else { - $default_sub_of_inbox = "false"; + $default_sub_of_inbox = 'false'; } return $default_sub_of_inbox; } -# Show contain subfolder option +# Show contain subfolder option sub command211 { print "Some IMAP servers (UW) make it so that there are two types of\n"; print "folders. Those that contain messages, and those that contain\n"; @@ -1696,7 +1742,7 @@ sub command211 { print "creating contains subfolders or messages.\n"; print "\n"; - if ( lc($show_contain_subfolders_option) eq "true" ) { + if ( lc($show_contain_subfolders_option) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1704,14 +1750,14 @@ sub command211 { print "Show option (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $show_contain_subfolders_option = "true"; + $show_contain_subfolders_option = 'true'; } else { - $show_contain_subfolders_option = "false"; + $show_contain_subfolders_option = 'false'; } return $show_contain_subfolders_option; } -# Default Unseen Notify +# Default Unseen Notify sub command212 { print "This option specifies where the users will receive notification\n"; print "about unseen messages by default. This is of course an option that\n"; @@ -1723,14 +1769,14 @@ sub command212 { print "Which one should be default (1,2,3)? [$WHT$default_unseen_notify$NRM]: $WHT"; $new_show = ; - if ( $new_show =~ /^[1|2|3]\n/i ) { + if ( $new_show =~ /^[123]\n/i ) { $default_unseen_notify = $new_show; } - $default_unseen_notify =~ s/[\r|\n]//g; + $default_unseen_notify =~ s/[\r\n]//g; return $default_unseen_notify; } -# Default Unseen Type +# Default Unseen Type sub command213 { print "Here you can define the default way that unseen messages will be displayed\n"; print "to the user in the folder listing on the left side.\n"; @@ -1740,10 +1786,10 @@ sub command213 { print "Which one should be default (1,2)? [$WHT$default_unseen_type$NRM]: $WHT"; $new_show = ; - if ( $new_show =~ /^[1|2]\n/i ) { + if ( $new_show =~ /^[12]\n/i ) { $default_unseen_type = $new_show; } - $default_unseen_type =~ s/[\r|\n]//g; + $default_unseen_type =~ s/[\r\n]//g; return $default_unseen_type; } @@ -1755,7 +1801,7 @@ sub command214 { print "automatically create it again for them.\n"; print "\n"; - if ( lc($auto_create_special) eq "true" ) { + if ( lc($auto_create_special) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1763,14 +1809,14 @@ sub command214 { print "Auto create special folders? (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $auto_create_special = "true"; + $auto_create_special = 'true'; } else { - $auto_create_special = "false"; + $auto_create_special = 'false'; } return $auto_create_special; } -# Automatically delete folders +# Automatically delete folders sub command215 { if ( $imap_server_type eq "uw" ) { print "UW IMAP servers will not allow folders containing mail to also contain folders.\n"; @@ -1779,8 +1825,8 @@ sub command215 { print "please use option D on the Main Menu to configure your server correctly.\n\n"; print "Press any key to continue...\n"; $new_delete = ; - $delete_folder = "true"; - } else { + $delete_folder = 'true'; + } else { if ( $imap_server_type eq "courier" ) { print "Courier (or Courier-IMAP) IMAP servers may not support "; print "subfolders of Trash. \n"; @@ -1788,7 +1834,7 @@ sub command215 { print "Trash will be treated by Courier as a special folder that does not \n"; print "allow subfolders. \n\n"; print "Please verify your Courier configuration, and test folder deletion \n"; - print "when changing this setting.\n\n"; + print "when changing this setting.\n\n"; } print "Are subfolders of the Trash supported by your IMAP server?\n"; @@ -1796,9 +1842,9 @@ sub command215 { print "If not, say no (deleted folders should not be sent to Trash)\n\n"; # reversal of logic. # question was: Should folders be automatically deleted instead of sent to trash.. - # we've changed the question to make it more clear, - # and are here handling that to avoid changing the answers.. - if ( lc($delete_folder) eq "true" ) { + # we've changed the question to make it more clear, + # and are here handling that to avoid changing the answers.. + if ( lc($delete_folder) eq 'true' ) { $default_value = "n"; } else { $default_value = "y"; @@ -1806,9 +1852,9 @@ sub command215 { print "Send deleted folders to Trash? (y/n) [$WHT$default_value$NRM]: $WHT"; $new_delete = ; if ( ( $new_delete =~ /^y\n/i ) || ( ( $new_delete =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $delete_folder = "false"; + $delete_folder = 'false'; } else { - $delete_folder = "true"; + $delete_folder = 'true'; } } return $delete_folder; @@ -1821,7 +1867,7 @@ sub command216 { print "when this is the case, causing the /NoSelect folders to be displayed\n"; print "\n"; - if ( lc($noselect_fix_enable) eq "true" ) { + if ( lc($noselect_fix_enable) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1829,43 +1875,24 @@ sub command216 { print "enable noselect fix? (y/n) [$WHT$noselect_fix_enable$NRM]: $WHT"; $noselect_fix_enable = ; if ( ( $noselect_fix_enable =~ /^y\n/i ) || ( ( $noselect_fix_enable =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $noselect_fix_enable = "true"; + $noselect_fix_enable = 'true'; } else { - $noselect_fix_enable = "false"; + $noselect_fix_enable = 'false'; } return $noselect_fix_enable; } ############# GENERAL OPTIONS ##################### -# Default Charset -sub command31 { - print "This option controls what character set is used when sending\n"; - print "mail and when sending HTML to the browser. Do not set this\n"; - print "to US-ASCII, use ISO-8859-1 instead. For cyrillic, it is best\n"; - print "to use KOI8-R, since this implementation is faster than most\n"; - print "of the alternatives\n"; - print "\n"; - - print "[$WHT$default_charset$NRM]: $WHT"; - $new_default_charset = ; - if ( $new_default_charset eq "\n" ) { - $new_default_charset = $default_charset; - } else { - $new_default_charset =~ s/[\r|\n]//g; - } - return $new_default_charset; -} - # Data directory sub command33a { print "Specify the location for your data directory.\n"; print "The path name can be absolute or relative (to the config directory).\n"; print "It doesn't matter. Here are two examples:\n"; print " Absolute: /var/spool/data/\n"; - print " Relative: ../data/\n"; + print " Relative: ../data/\n"; print "Relative paths to directories outside of the SquirrelMail distribution\n"; print "will be converted to their absolute path equivalents in config.php.\n\n"; - print "Note: There are potential security risks with having a writable directory\n"; + print "Note: There are potential security risks with having a writeable directory\n"; print "under the web server's root directory (ex: /home/httpd/html).\n"; print "For this reason, it is recommended to put the data directory\n"; print "in an alternate location of your choice. \n"; @@ -1876,7 +1903,7 @@ sub command33a { if ( $new_data_dir eq "\n" ) { $new_data_dir = $data_dir; } else { - $new_data_dir =~ s/[\r|\n]//g; + $new_data_dir =~ s/[\r\n]//g; } if ( $new_data_dir =~ /^\s*$/ ) { $new_data_dir = ""; @@ -1916,7 +1943,7 @@ sub command33b { if ( $new_attachment_dir eq "\n" ) { $new_attachment_dir = $attachment_dir; } else { - $new_attachment_dir =~ s/[\r|\n]//g; + $new_attachment_dir =~ s/[\r\n]//g; } if ( $new_attachment_dir =~ /^\s*$/ ) { $new_attachment_dir = ""; @@ -1929,9 +1956,9 @@ sub command33b { sub command33c { print "The directory hash level setting allows you to configure the level\n"; - print "of hashing that Squirremail employs in your data and attachment\n"; + print "of hashing that SquirrelMail employs in your data and attachment\n"; print "directories. This value must be an integer ranging from 0 to 4.\n"; - print "When this value is set to 0, Squirrelmail will simply store all\n"; + print "When this value is set to 0, SquirrelMail will simply store all\n"; print "files as normal in the data and attachment directories. However,\n"; print "when set to a value from 1 to 4, a simple hashing scheme will be\n"; print "used to organize the files in this directory. In short, the crc32\n"; @@ -1947,7 +1974,7 @@ sub command33c { if ( $new_dir_hash_level eq "\n" ) { $new_dir_hash_level = $dir_hash_level; } else { - $new_dir_hash_level =~ s/[\r|\n]//g; + $new_dir_hash_level =~ s/[\r\n]//g; } if ( ( int($new_dir_hash_level) < 0 ) || ( int($new_dir_hash_level) > 4 ) @@ -1973,7 +2000,7 @@ sub command35 { if ( $new_default_left_size eq "\n" ) { $new_default_left_size = $default_left_size; } else { - $new_default_left_size =~ s/[\r|\n]//g; + $new_default_left_size =~ s/[\r\n]//g; } return $new_default_left_size; } @@ -1985,7 +2012,7 @@ sub command36 { print "transparently changes all usernames to lowercase."; print "\n"; - if ( lc($force_username_lowercase) eq "true" ) { + if ( lc($force_username_lowercase) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -1993,16 +2020,16 @@ sub command36 { print "Convert usernames to lowercase (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - return "true"; + return 'true'; } - return "false"; + return 'false'; } sub command37 { print ""; print "\n"; - if ( lc($default_use_priority) eq "true" ) { + if ( lc($default_use_priority) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -2011,16 +2038,16 @@ sub command37 { print "Allow users to specify priority of outgoing mail (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - return "true"; + return 'true'; } - return "false"; + return 'false'; } sub command38 { print ""; print "\n"; - if ( lc($default_hide_attribution) eq "true" ) { + if ( lc($default_hide_attribution) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -2029,16 +2056,16 @@ sub command38 { print "Hide SM attributions (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - return "true"; + return 'true'; } - return "false"; + return 'false'; } sub command39 { print ""; print "\n"; - if ( lc($default_use_mdn) eq "true" ) { + if ( lc($default_use_mdn) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -2047,9 +2074,9 @@ sub command39 { print "Enable support for read/delivery receipt support (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - return "true"; + return 'true'; } - return "false"; + return 'false'; } sub command310 { @@ -2058,7 +2085,7 @@ sub command310 { print "retrieveuserdata plugin\n"; print "\n"; - if ( lc($edit_identity) eq "true" ) { + if ( lc($edit_identity) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -2066,10 +2093,10 @@ sub command310 { print "Allow editing of user's identity? (y/n) [$WHT$default_value$NRM]: $WHT"; $new_edit = ; if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $edit_identity = "true"; - $edit_name = "true"; + $edit_identity = 'true'; + $edit_name = 'true'; } else { - $edit_identity = "false"; + $edit_identity = 'false'; $edit_name = command311(); } return $edit_identity; @@ -2081,7 +2108,7 @@ sub command311 { print "change their username\n"; print "\n"; - if ( lc($edit_name) eq "true" ) { + if ( lc($edit_name) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -2089,9 +2116,9 @@ sub command311 { print "Allow editing of the users 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"; + $edit_name = 'true'; } else { - $edit_name = "false"; + $edit_name = 'false'; } return $edit_name; } @@ -2099,10 +2126,10 @@ sub command311 { 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 "PHP versions later than 4.0.3 recommended\n"; print "\n"; - if ( lc($allow_thread_sort) eq "true" ) { + if ( lc($allow_thread_sort) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -2110,9 +2137,9 @@ sub command312 { 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"; + $allow_thread_sort = 'true'; } else { - $allow_thread_sort = "false"; + $allow_thread_sort = 'false'; } return $allow_thread_sort; } @@ -2122,7 +2149,7 @@ sub command313 { print "Your IMAP server must support the SORT command for this to work\n"; print "\n"; - if ( lc($allow_server_sort) eq "true" ) { + if ( lc($allow_server_sort) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -2130,9 +2157,9 @@ sub command313 { 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"; + $allow_server_sort = 'true'; } else { - $allow_server_sort = "false"; + $allow_server_sort = 'false'; } return $allow_server_sort; } @@ -2142,7 +2169,7 @@ sub command314 { print "Your IMAP server must support the SEARCH CHARSET command for this to work\n"; print "\n"; - if ( lc($allow_charset_search) eq "true" ) { + if ( lc($allow_charset_search) eq 'true' ) { $default_value = "y"; } else { $default_value = "n"; @@ -2150,41 +2177,40 @@ sub command314 { print "Allow charset searching? (y/n) [$WHT$default_value$NRM]: $WHT"; $allow_charset_search = ; if ( ( $allow_charset_search =~ /^y\n/i ) || ( ( $allow_charset_search =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $allow_charset_search = "true"; + $allow_charset_search = 'true'; } else { - $allow_charset_search = "false"; + $allow_charset_search = 'false'; } return $allow_charset_search; } -sub command315 { - ## OBSOLETE - UID support is now always enabled - return "true"; - print "This option allows you to enable unique identifier (UID) support.\n"; +# command315 (UID support) obsoleted. + +# advanced search option +sub command316 { + print "This option allows you to control the use of advanced search form.\n"; + print " 0 = enable basic search only\n"; + print " 1 = enable advanced search only\n"; + print " 2 = enable both\n"; print "\n"; - if ( lc($uid_support) eq "true" ) { - $default_value = "y"; - } else { - $default_value = "n"; - } - print "Enable Unique identifier (UID) support? (y/n) [$WHT$default_value$NRM]: $WHT"; - $uid_support = ; - if ( ( $uid_support =~ /^y\n/i ) || ( ( $uid_support =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $uid_support = "true"; - } else { - $uid_support = "false"; + print "Allowed search (0,1,2)? [$WHT$allow_advanced_search$NRM]: $WHT"; + $new_allow_advanced_search = ; + if ( $new_allow_advanced_search =~ /^[012]\n/i ) { + $allow_advanced_search = $new_allow_advanced_search; } - return $uid_support; + $allow_advanced_search =~ s/[\r\n]//g; + return $allow_advanced_search; } -sub command316 { - print "This option allows you to change the name of the PHP session used\n"; - print "by SquirrelMail. Unless you know what you are doing, you probably\n"; - print "don't need or want to change this from the default of SQMSESSID.\n"; + +sub command317 { + print "This option allows you to change the name of the PHP session used\n"; + print "by SquirrelMail. Unless you know what you are doing, you probably\n"; + print "don't need or want to change this from the default of SQMSESSID.\n"; print "[$WHT$session_name$NRM]: $WHT"; $new_session_name = ; - chomp($new_session_name); + chomp($new_session_name); if ( $new_session_name eq "" ) { $new_session_name = $session_name; } @@ -2199,7 +2225,7 @@ sub command41 { print "them. You can also change the default theme.\n"; print "[theme] command (?=help) > "; $input = ; - $input =~ s/[\r|\n]//g; + $input =~ s/[\r\n]//g; while ( $input ne "d" ) { if ( $input =~ /^\s*l\s*/i ) { $count = 0; @@ -2234,12 +2260,12 @@ sub command41 { } elsif ( $input =~ /^\s*\+/ ) { print "What is the name of this theme: "; $name = ; - $name =~ s/[\r|\n]//g; + $name =~ s/[\r\n]//g; $theme_name[ $#theme_name + 1 ] = $name; print "Be sure to put ../themes/ before the filename.\n"; print "What file is this stored in (ex: ../themes/default_theme.php): "; $name = ; - $name =~ s/[\r|\n]//g; + $name =~ s/[\r\n]//g; $theme_path[ $#theme_path + 1 ] = $name; } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { if ( $input =~ /[0-9]+\s*$/ ) { @@ -2287,7 +2313,7 @@ sub command41 { print "** Found theme: $filename\n"; print " What is its name? "; $nm = ; - $nm =~ s/[\n|\r]//g; + $nm =~ s/[\n\r]//g; $theme_name[ $#theme_name + 1 ] = $nm; $theme_path[ $#theme_path + 1 ] = $filename; } @@ -2333,7 +2359,7 @@ sub command41 { } print "[theme] command (?=help) > "; $input = ; - $input =~ s/[\r|\n]//g; + $input =~ s/[\r\n]//g; } } @@ -2359,7 +2385,7 @@ sub command42 { if ( $new_theme_css eq "\n" ) { $new_theme_css = $theme_css; } else { - $new_theme_css =~ s/[\r|\n]//g; + $new_theme_css =~ s/[\r\n]//g; } $new_theme_css =~ s/^\s*//; return $new_theme_css; @@ -2369,7 +2395,7 @@ sub command61 { print "You can now define different LDAP servers.\n"; print "[ldap] command (?=help) > "; $input = ; - $input =~ s/[\r|\n]//g; + $input =~ s/[\r\n]//g; while ( $input ne "d" ) { if ( $input =~ /^\s*l\s*/i ) { $count = 0; @@ -2388,6 +2414,22 @@ 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] ) { + print " protocol: $ldap_protocol[$count]\n"; + } + if ( $ldap_limit_scope[$count] ) { + print " limit_scope: $ldap_limit_scope[$count]\n"; + } + print "\n"; $count++; } @@ -2398,7 +2440,7 @@ sub command61 { print "this LDAP server resides. Example: ldap.bigfoot.com\n"; print "hostname: "; $name = ; - $name =~ s/[\r|\n]//g; + $name =~ s/[\r\n]//g; $ldap_host[$sub] = $name; print "\n"; @@ -2408,7 +2450,7 @@ sub command61 { print "Example: ou=member_directory,o=netcenter.com\n"; print "base: "; $name = ; - $name =~ s/[\r|\n]//g; + $name =~ s/[\r\n]//g; $ldap_base[$sub] = $name; print "\n"; @@ -2417,7 +2459,7 @@ sub command61 { print "port is 389. This is optional. Press ENTER for default.\n"; print "port: "; $name = ; - $name =~ s/[\r|\n]//g; + $name =~ s/[\r\n]//g; $ldap_port[$sub] = $name; print "\n"; @@ -2426,7 +2468,7 @@ sub command61 { print "is also optional. Press ENTER for default.\n"; print "charset: "; $name = ; - $name =~ s/[\r|\n]//g; + $name =~ s/[\r\n]//g; $ldap_charset[$sub] = $name; print "\n"; @@ -2435,7 +2477,7 @@ sub command61 { print "the search. Default it \"LDAP: hostname\". Press ENTER for default\n"; print "name: "; $name = ; - $name =~ s/[\r|\n]//g; + $name =~ s/[\r\n]//g; $ldap_name[$sub] = $name; print "\n"; @@ -2444,11 +2486,67 @@ sub command61 { print "Default is unlimited. Press ENTER for default.\n"; print "maxrows: "; $name = ; - $name =~ s/[\r|\n]//g; + $name =~ s/[\r\n]//g; $ldap_maxrows[$sub] = $name; print "\n"; + print "You can specify an additional search filter.\n"; + print "This could be something like \"(objectclass=posixAccount)\".\n"; + print "Default is no extra filter. Press ENTER for default.\n"; + print "filter: "; + $name = ; + $name =~ s/[\r|\n]//g; + $ldap_filter[$sub] = $name; + + print "\n"; + + print "If your LDAP server does not like anonymous logins, you can specify bind DN.\n"; + print "Default is none, anonymous bind. Press ENTER for default.\n"; + print "binddn: "; + $name = ; + $name =~ s/[\r\n]//g; + $ldap_binddn[$sub] = $name; + + print "\n"; + + if ( $ldap_binddn[$sub] ne '' ) { + + print "Now, please specify password for that DN.\n"; + print "bindpw: "; + $name = ; + $name =~ s/[\r\n]//g; + $ldap_bindpw[$sub] = $name; + + print "\n"; + } + + print "You can specify bind protocol version here.\n"; + print "Default protocol version depends on your php ldap settings.\n"; + print "Press ENTER for default.\n"; + print "protocol: "; + $name = ; + $name =~ s/[\r\n]//g; + $ldap_protocol[$sub] = $name; + + print "\n"; + + 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"; + } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { if ( $input =~ /[0-9]+\s*$/ ) { $rem_num = $input; @@ -2464,6 +2562,11 @@ 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 = (); while ( $count <= $#ldap_host ) { if ( $count != $rem_num ) { @@ -2473,6 +2576,11 @@ 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] ); } $count++; } @@ -2482,6 +2590,12 @@ 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; + } elsif ( $input =~ /^\s*\?\s*/ ) { print ".-------------------------.\n"; print "| + (add host) |\n"; @@ -2492,7 +2606,7 @@ sub command61 { } print "[ldap] command (?=help) > "; $input = ; - $input =~ s/[\r|\n]//g; + $input =~ s/[\r\n]//g; } } @@ -2507,22 +2621,87 @@ sub command62 { print "user can configure individually\n"; print "\n"; - if ( lc($default_use_javascript_addr_book) eq "true" ) { + if ( lc($default_use_javascript_addr_book) eq 'true' ) { $default_value = "y"; } else { - $default_use_javascript_addr_book = "false"; + $default_use_javascript_addr_book = 'false'; $default_value = "n"; } print "Use javascript version by default (y/n) [$WHT$default_value$NRM]: $WHT"; $new_show = ; if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { - $default_use_javascript_addr_book = "true"; + $default_use_javascript_addr_book = 'true'; } else { - $default_use_javascript_addr_book = "false"; + $default_use_javascript_addr_book = 'false'; } return $default_use_javascript_addr_book; } +# global filebased address book +sub command63 { + print "If you want to use global file address book, then you\n"; + print "must set this option to a valid value. If option does\n"; + print "not have path elements, system assumes that file is\n"; + print "stored in data directory. If relative path is set, it is\n"; + print "relative to main SquirrelMail directory. If value is empty,\n"; + print "address book is not enabled.\n"; + print "\n"; + + print "[$WHT$abook_global_file$NRM]: $WHT"; + $new_abook_global_file = ; + if ( $new_abook_global_file eq "\n" ) { + $new_abook_global_file = $abook_global_file; + } else { + $new_abook_global_file =~ s/[\r\n]//g; + } + return $new_abook_global_file; +} + +# writing into global filebased abook control +sub command64 { + print "This setting controls writing into global file address\n"; + print "book options. Address book file must be writeable by\n"; + print "webserver's user, if you want to enable this option.\n"; + print "\n"; + + if ( lc($abook_global_file_writeable) eq 'true' ) { + $default_value = "y"; + } else { + $abook_global_file_writeable = 'false'; + $default_value = "n"; + } + print "Allow writing into global file address book (y/n) [$WHT$default_value$NRM]: $WHT"; + $new_show = ; + if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $abook_global_file_writeable = 'true'; + } else { + $abook_global_file_writeable = 'false'; + } + return $abook_global_file_writeable; +} + +# listing of global filebased abook control +sub command65 { + print "This setting controls listing of global file address\n"; + print "book in addresses page.\n"; + print "\n"; + + if ( lc($abook_global_file_listing) eq 'true' ) { + $default_value = "y"; + } else { + $abook_global_file_listing = 'false'; + $default_value = "n"; + } + print "Allow listing of global file address book (y/n) [$WHT$default_value$NRM]: $WHT"; + $new_show = ; + if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $abook_global_file_listing = 'true'; + } else { + $abook_global_file_listing = 'false'; + } + return $abook_global_file_listing; +} + sub command91 { print "If you want to store your users address book details in a database then\n"; print "you need to set this DSN to a valid value. The format for this is:\n"; @@ -2543,7 +2722,7 @@ sub command91 { if ( $new_dsn eq "\n" ) { $new_dsn = ""; } else { - $new_dsn =~ s/[\r|\n]//g; + $new_dsn =~ s/[\r\n]//g; $new_dsn =~ s/^\s+$//g; } return $new_dsn; @@ -2558,7 +2737,7 @@ sub command92 { if ( $new_table eq "\n" ) { $new_table = $addrbook_table; } else { - $new_table =~ s/[\r|\n]//g; + $new_table =~ s/[\r\n]//g; } return $new_table; } @@ -2583,7 +2762,7 @@ sub command93 { if ( $new_dsn eq "\n" ) { $new_dsn = ""; } else { - $new_dsn =~ s/[\r|\n]//g; + $new_dsn =~ s/[\r\n]//g; $new_dsn =~ s/^\s+$//g; } return $new_dsn; @@ -2598,7 +2777,7 @@ sub command94 { if ( $new_table eq "\n" ) { $new_table = $prefs_table; } else { - $new_table =~ s/[\r|\n]//g; + $new_table =~ s/[\r\n]//g; } return $new_table; } @@ -2614,7 +2793,7 @@ sub command95 { if ( $new_field eq "\n" ) { $new_field = $prefs_user_field; } else { - $new_field =~ s/[\r|\n]//g; + $new_field =~ s/[\r\n]//g; } return $new_field; } @@ -2628,7 +2807,7 @@ sub command96 { if ( $new_field eq "\n" ) { $new_field = $prefs_key_field; } else { - $new_field =~ s/[\r|\n]//g; + $new_field =~ s/[\r\n]//g; } return $new_field; } @@ -2642,11 +2821,354 @@ sub command97 { if ( $new_field eq "\n" ) { $new_field = $prefs_val_field; } else { - $new_field =~ s/[\r|\n]//g; + $new_field =~ s/[\r\n]//g; } return $new_field; } +sub command98 { + print "If you want to store your global address book in a database then\n"; + print "you need to set this DSN to a valid value. The format for this is:\n"; + print "mysql://user:pass\@hostname/dbname\n"; + print "Where mysql can be one of the databases PHP supports, the most common\n"; + print "of these are mysql, msql and pgsql\n"; + print "If the DSN is left empty (hit space and then return) the database\n"; + print "related code for global SQL address book will not be used\n"; + print "\n"; + + if ( $addrbook_global_dsn eq "" ) { + $default_value = "Disabled"; + } else { + $default_value = $addrbook_global_dsn; + } + print "[$WHT$addrbook_global_dsn$NRM]: $WHT"; + $new_dsn = ; + if ( $new_dsn eq "\n" ) { + $new_dsn = ""; + } else { + $new_dsn =~ s/[\r\n]//g; + $new_dsn =~ s/^\s+$//g; + } + return $new_dsn; +} + +sub command99 { + print "This is the name of the table you want to store the global address book\n"; + print "data in. Default table name is 'global_abook'. Address book uses same\n"; + print "database format as personal address book.\n"; + print "\n"; + print "[$WHT$addrbook_global_table$NRM]: $WHT"; + $new_table = ; + if ( $new_table eq "\n" ) { + $new_table = $addrbook_global_table; + } else { + $new_table =~ s/[\r\n]//g; + } + return $new_table; +} + +sub command910 { + print "This option controls users\' ability to add or modify records stored \n"; + print "in global address book\n"; + + if ( lc($addrbook_global_writeable) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Allow writing into global address book? (y/n) [$WHT$default_value$NRM]: $WHT"; + $addrbook_global_writeable = ; + if ( ( $addrbook_global_writeable =~ /^y\n/i ) || ( ( $addrbook_global_writeable =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $addrbook_global_writeable = 'true'; + } else { + $addrbook_global_writeable = 'false'; + } + return $addrbook_global_writeable; +} + +sub command911 { + print "Enable this option if you want to see listing of addresses stored \n"; + print "in global address book\n"; + + if ( lc($addrbook_global_listing) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Allow listing of global address book? (y/n) [$WHT$default_value$NRM]: $WHT"; + $addrbook_global_listing = ; + if ( ( $addrbook_global_listing =~ /^y\n/i ) || ( ( $addrbook_global_listing =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $addrbook_global_listing = 'true'; + } else { + $addrbook_global_listing = 'false'; + } + return $addrbook_global_listing; +} + + +# Default language +sub commandA1 { + print "SquirrelMail attempts to set the language in many ways. If it\n"; + print "can not figure it out in another way, it will default to this\n"; + print "language. Please use the code for the desired language.\n"; + print "\n"; + print "[$WHT$squirrelmail_default_language$NRM]: $WHT"; + $new_squirrelmail_default_language = ; + if ( $new_squirrelmail_default_language eq "\n" ) { + $new_squirrelmail_default_language = $squirrelmail_default_language; + } else { + $new_squirrelmail_default_language =~ s/[\r\n]//g; + $new_squirrelmail_default_language =~ s/^\s+$//g; + } + return $new_squirrelmail_default_language; +} +# Default Charset +sub commandA2 { + print "This option controls what character set is used when sending\n"; + print "mail and when sending HTML to the browser. Option works only\n"; + print "with US English (en_US) translation. Other translations use\n"; + print "charsets that are set in functions/i18n.php.\n"; + print "\n"; + + print "[$WHT$default_charset$NRM]: $WHT"; + $new_default_charset = ; + if ( $new_default_charset eq "\n" ) { + $new_default_charset = $default_charset; + } else { + $new_default_charset =~ s/[\r\n]//g; + } + return $new_default_charset; +} +# Alternative language names +sub commandA3 { + print "Enable this option if you want to see localized language names in\n"; + print "language selection box. Note, that if don't limit list of available\n"; + print "languages, this option can trigger installation of foreign language\n"; + print "support modules in some browsers.\n"; + print "\n"; + + if ( lc($show_alternative_names) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Show alternative language names? (y/n) [$WHT$default_value$NRM]: $WHT"; + $show_alternative_names = ; + if ( ( $show_alternative_names =~ /^y\n/i ) || ( ( $show_alternative_names =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $show_alternative_names = 'true'; + } else { + $show_alternative_names = 'false'; + } + return $show_alternative_names; +} +# Available languages +sub commandA4 { + print "This option allows to limit number of languages available in\n"; + print "language selection box. You can enter as code of every language that\n"; + print "you want to enable. Language codes should be separated by space. If you\n"; + print "enter name unsupported by SquirrelMail, it will be ignored. If you enter\n"; + print "special key \'all\' - all languages available in SquirrelMail will be\n"; + print "listed. If you enter special key \'none\' - user won't be able to change"; + print "language and interface will use language set it \"Default language\" option.\n"; + print "\n"; + print "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 { + print "Enable this option if you want to use CPU and memory intensive decoding\n"; + print "functions. This option allows reading multibyte charset, that are used\n"; + print "in Eastern Asia. SquirrelMail will try to use recode functions here,\n"; + print "even when you have disabled use of recode in Tweaks section.\n"; + print "\n"; + + if ( lc($aggressive_decoding) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Enable aggressive decoding? (y/n) [$WHT$default_value$NRM]: $WHT"; + $aggressive_decoding = ; + if ( ( $aggressive_decoding =~ /^y\n/i ) || ( ( $aggressive_decoding =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $aggressive_decoding = 'true'; + } else { + $aggressive_decoding = 'false'; + } + return $aggressive_decoding; +} + +# Lossy encoding +sub commandA6 { + 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"; + print "unsupported by output charset will be replaced with question marks.\n"; + print "\n"; + + if ( lc($lossy_encoding) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Enable lossy encoding? (y/n) [$WHT$default_value$NRM]: $WHT"; + $lossy_encoding = ; + if ( ( $lossy_encoding =~ /^y\n/i ) || ( ( $lossy_encoding =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $lossy_encoding = 'true'; + } else { + $lossy_encoding = 'false'; + } + 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"; + 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($use_iframe) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + 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 { + $use_iframe = 'false'; + } + return $use_iframe; +} +# use icons +sub commandB3 { + print "Enabling this option will cause icons to be used instead of text\n"; + print "markers next to each message in mailbox lists that represent\n"; + print "new, read, flagged, and deleted messages, as well as those that\n"; + print "have been replied to and forwarded. Icons are also used next to\n"; + print "(un)expanded folders in the folder list (Oldway = false). These\n"; + print "icons are quite small, but will obviously be more of a resource\n"; + print "drain than text markers.\n"; + print "\n"; + + if ( lc($use_icons) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use icons? (y/n) [$WHT$default_value$NRM]: $WHT"; + $use_icons = ; + if ( ( $use_icons =~ /^y\n/i ) || ( ( $use_icons =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $use_icons = 'true'; + } else { + $use_icons = 'false'; + } + return $use_icons; +} +# php recode +sub commandB4 { + print "Enable this option if you want to use php recode functions to read\n"; + print "emails written in charset that differs from the one that is set in\n"; + print "translation selected by user. Code is experimental, it might cause\n"; + print "errors, if email contains charset unsupported by recode or if your\n"; + print "php does not have recode support.\n"; + print "\n"; + + if ( lc($use_php_recode) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use php recode functions? (y/n) [$WHT$default_value$NRM]: $WHT"; + $use_php_recode = ; + if ( ( $use_php_recode =~ /^y\n/i ) || ( ( $use_php_recode =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $use_php_recode = 'true'; + } else { + $use_php_recode = 'false'; + } + return $use_php_recode; +} +# php iconv +sub commandB5 { + print "Enable this option if you want to use php iconv functions to read\n"; + print "emails written in charset that differs from the one that is set in\n"; + print "translation selected by user. Code is experimental, it works only\n"; + print "with translations that use utf-8 charset. Code might cause errors,\n"; + print "if email contains charset unsupported by iconv or if your php does\n"; + print "not have iconv support.\n"; + print "\n"; + + if ( lc($use_php_iconv) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Use php iconv functions? (y/n) [$WHT$default_value$NRM]: $WHT"; + $use_php_iconv = ; + if ( ( $use_php_iconv =~ /^y\n/i ) || ( ( $use_php_iconv =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $use_php_iconv = 'true'; + } else { + $use_php_iconv = 'false'; + } + return $use_php_iconv; +} + +# configtest block +sub commandB6 { + print "Enable this option if you want to check SquirrelMail configuration\n"; + print "remotely with configtest.php script.\n"; + print "\n"; + + if ( lc($allow_remote_configtest) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Allow remote configuration tests? (y/n) [$WHT$default_value$NRM]: $WHT"; + $allow_remote_configtest = ; + if ( ( $allow_remote_configtest =~ /^y\n/i ) || ( ( $allow_remote_configtest =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $allow_remote_configtest = 'true'; + } else { + $allow_remote_configtest = 'false'; + } + return $allow_remote_configtest; +} + + + sub save_data { $tab = " "; if ( open( CF, ">config.php" ) ) { @@ -2659,29 +3181,29 @@ sub save_data { print CF " */\n"; print CF "\n"; print CF "global \$version;\n"; - + if ($print_config_version) { print CF "\$config_version = '$print_config_version';\n"; } - # integer + # integer print CF "\$config_use_color = $config_use_color;\n"; print CF "\n"; - - # string + + # string print CF "\$org_name = \"$org_name\";\n"; # string - print CF "\$org_logo = " . &change_to_SM_path($org_logo) . ";\n"; + print CF "\$org_logo = " . &change_to_SM_path($org_logo) . ";\n"; $org_logo_width |= 0; $org_logo_height |= 0; - # string + # string print CF "\$org_logo_width = '$org_logo_width';\n"; # string - print CF "\$org_logo_height = '$org_logo_height';\n"; - # string that can contain variables. + print CF "\$org_logo_height = '$org_logo_height';\n"; + # string that can contain variables. print CF "\$org_title = \"$org_title\";\n"; - # string + # string print CF "\$signout_page = " . &change_to_SM_path($signout_page) . ";\n"; - # string + # string print CF "\$frame_top = '$frame_top';\n"; print CF "\n"; @@ -2691,206 +3213,278 @@ sub save_data { print CF "\$provider_name = '$provider_name';\n"; print CF "\n"; - # string that can contain variables + # string that can contain variables print CF "\$motd = \"$motd\";\n"; print CF "\n"; - - # string + + # string print CF "\$squirrelmail_default_language = '$squirrelmail_default_language';\n"; + # string + print CF "\$default_charset = '$default_charset';\n"; + # boolean + print CF "\$show_alternative_names = $show_alternative_names;\n"; + # string + print CF "\$available_languages = '$available_languages';\n"; + # boolean + print CF "\$aggressive_decoding = $aggressive_decoding;\n"; + # boolean + print CF "\$lossy_encoding = $lossy_encoding;\n"; print CF "\n"; - # string + # string print CF "\$domain = '$domain';\n"; - # string + # string print CF "\$imapServerAddress = '$imapServerAddress';\n"; - # integer + # integer print CF "\$imapPort = $imapPort;\n"; - # boolean + # boolean print CF "\$useSendmail = $useSendmail;\n"; - # string + # string print CF "\$smtpServerAddress = '$smtpServerAddress';\n"; - # integer + # integer print CF "\$smtpPort = $smtpPort;\n"; - # string + # string print CF "\$sendmail_path = '$sendmail_path';\n"; - # boolean + # boolean # print CF "\$use_authenticated_smtp = $use_authenticated_smtp;\n"; - # boolean + # boolean print CF "\$pop_before_smtp = $pop_before_smtp;\n"; - # string + # string print CF "\$imap_server_type = '$imap_server_type';\n"; - # boolean + # boolean print CF "\$invert_time = $invert_time;\n"; - # string + # string print CF "\$optional_delimiter = '$optional_delimiter';\n"; + #boolean + print CF "\$skip_SM_header = $skip_SM_header;\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 print CF "\$noselect_fix_enable = $noselect_fix_enable;\n"; print CF "\n"; - # string - print CF "\$default_charset = '$default_charset';\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 "\$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"; - # boolean - print CF "\$uid_support = true;\n"; + # integer + print CF "\$allow_advanced_search = $allow_advanced_search;\n"; print CF "\n"; - - # all plugins are strings + + # all plugins are strings for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) { - print CF "\$plugins[$ct] = '$plugins[$ct]';\n"; + print CF "\$plugins[] = '$plugins[$ct]';\n"; } print CF "\n"; - # 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++ ) { print CF "\$theme[$count]['PATH'] = " . &change_to_SM_path($theme_path[$count]) . ";\n"; - print CF "\$theme[$count]['NAME'] = '$theme_name[$count]';\n"; + # escape theme name so it can contain single quotes. + $esc_name = $theme_name[$count]; + $esc_name =~ s/\\/\\\\/g; + $esc_name =~ s/'/\\'/g; + print CF "\$theme[$count]['NAME'] = '$esc_name';\n"; } print CF "\n"; - if ( $default_use_javascript_addr_book ne "true" ) { - $default_use_javascript_addr_book = "false"; - } - - # boolean + ## Address books + # boolean print CF "\$default_use_javascript_addr_book = $default_use_javascript_addr_book;\n"; for ( $count = 0 ; $count <= $#ldap_host ; $count++ ) { print CF "\$ldap_server[$count] = array(\n"; - # 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 + print CF " 'binddn' => '$ldap_binddn[$count]'"; + if ( $ldap_bindpw[$count] ) { + print CF ",\n"; + # string + print CF " 'bindpw' => '$ldap_bindpw[$count]'"; + } + } + if ( $ldap_protocol[$count] ) { + print CF ",\n"; + # integer + print CF " 'protocol' => $ldap_protocol[$count]"; + } + if ( $ldap_limit_scope[$count] ) { + print CF ",\n"; + # boolean + print CF " 'limit_scope' => $ldap_limit_scope[$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 + # string print CF "\$prefs_key_field = '$prefs_key_field';\n"; - # string - print CF "\$prefs_val_field = '$prefs_val_field';\n"; - # boolean - print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n"; - - # string - print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; - print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; - # boolean - print CF "\$use_imap_tls = $use_imap_tls;\n"; - print CF "\$use_smtp_tls = $use_smtp_tls;\n"; - - print CF "\$session_name = '$session_name';\n"; - - print CF "\n"; - print CF "\@include SM_PATH . 'config/config_local.php';\n"; - - print CF "\n/**\n"; - print CF " * Make sure there are no characters after the PHP closing\n"; - print CF " * tag below (including newline characters and whitespace).\n"; - print CF " * Otherwise, that character will cause the headers to be\n"; - print CF " * sent and regular output to begin, which will majorly screw\n"; - print CF " * things up when we try to send more headers later.\n"; - print CF " */\n"; - print CF "?>"; - - close CF; - - print "Data saved in config.php\n"; + # string + print CF "\$prefs_val_field = '$prefs_val_field';\n\n"; + # string + print CF "\$addrbook_global_dsn = '$addrbook_global_dsn';\n"; + # string + print CF "\$addrbook_global_table = '$addrbook_global_table';\n"; + # boolean + print CF "\$addrbook_global_writeable = $addrbook_global_writeable;\n"; + # boolean + print CF "\$addrbook_global_listing = $addrbook_global_listing;\n\n"; + # string + print CF "\$abook_global_file = '$abook_global_file';\n"; + # boolean + print CF "\$abook_global_file_writeable = $abook_global_file_writeable;\n\n"; + # boolean + print CF "\$abook_global_file_listing = $abook_global_file_listing;\n\n"; + # boolean + print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n"; + + # string + print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; + # string + print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; + # boolean + print CF "\$use_imap_tls = $use_imap_tls;\n"; + # boolean + print CF "\$use_smtp_tls = $use_smtp_tls;\n"; + # 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 "\@include SM_PATH . 'config/config_local.php';\n"; + + print CF "\n/**\n"; + print CF " * Make sure there are no characters after the PHP closing\n"; + print CF " * tag below (including newline characters and whitespace).\n"; + print CF " * Otherwise, that character will cause the headers to be\n"; + print CF " * sent and regular output to begin, which will majorly screw\n"; + print CF " * things up when we try to send more headers later.\n"; + print CF " */\n"; + print CF "?>"; + + close CF; + + print "Data saved in config.php\n"; } else { print "Error saving config.php: $!\n"; } @@ -2917,16 +3511,20 @@ sub set_defaults { $continue = 0; while ( $continue != 1 ) { print "Please select your IMAP server:\n"; - print " cyrus = Cyrus IMAP server\n"; - print " uw = University of Washington's IMAP server\n"; - print " exchange = Microsoft Exchange IMAP server\n"; - print " courier = Courier IMAP server\n"; - print " macosx = Mac OS X Mailserver\n"; - print " mercury32 = Mercury/32\n"; - print " quit = Do not change anything\n"; + print " courier = Courier IMAP server\n"; + print " cyrus = Cyrus IMAP server\n"; + print " dovecot = Dovecot Secure IMAP server\n"; + print " exchange = Microsoft Exchange IMAP server\n"; + print " hmailserver = hMailServer\n"; + print " macosx = Mac OS X Mailserver\n"; + print " mercury32 = Mercury/32\n"; + print " uw = University of Washington's IMAP server\n"; + print "\n"; + print " quit = Do not change anything\n"; + print "\n"; print "Command >> "; $server = ; - $server =~ s/[\r|\n]//g; + $server =~ s/[\r\n]//g; print "\n"; if ( $server eq "cyrus" ) { @@ -2956,7 +3554,7 @@ sub set_defaults { $disp_default_folder_prefix = $default_folder_prefix; $delete_folder = true; $force_username_lowercase = true; - + $continue = 1; } elsif ( $server eq "exchange" ) { $imap_server_type = "exchange"; @@ -2985,7 +3583,7 @@ sub set_defaults { $disp_default_folder_prefix = $default_folder_prefix; $delete_folder = true; $force_username_lowercase = false; - + $continue = 1; } elsif ( $server eq "macosx" ) { $imap_server_type = "macosx"; @@ -3000,6 +3598,22 @@ sub set_defaults { $allow_charset_search = false; $disp_default_folder_prefix = $default_folder_prefix; + $continue = 1; + } elsif ( $server eq "hmailserver" ) { + $imap_server_type = "hmailserver"; + $default_folder_prefix = ""; + $trash_folder = "INBOX.Trash"; + $sent_folder = "INBOX.Sent"; + $draft_folder = "INBOX.Drafts"; + $show_prefix_option = false; + $default_sub_of_inbox = true; + $show_contain_subfolders_option = false; + $optional_delimiter = "detect"; + $allow_charset_search = false; + $disp_default_folder_prefix = $default_folder_prefix; + $delete_folder = false; + $force_username_lowercase = false; + $continue = 1; } elsif ( $server eq "mercury32" ) { $imap_server_type = "mercury32"; @@ -3014,6 +3628,21 @@ 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 "quit" ) { $continue = 1; @@ -3041,7 +3670,7 @@ sub set_defaults { # This subroutine corrects relative paths to ensure they # will work within the SM space. If the path falls within -# the SM directory tree, the SM_PATH variable will be +# the SM directory tree, the SM_PATH variable will be # prepended to the path, if not, then the path will be # converted to an absolute path, e.g. # '../images/logo.gif' --> SM_PATH . 'images/logo.gif' @@ -3064,7 +3693,7 @@ sub change_to_SM_path() { return $old_path if ( $old_path =~ /^\'(\/|http)/ ); return $old_path if ( $old_path =~ /^\'\w:\// ); return $old_path if ( $old_path =~ /^SM_PATH/); - + if ( $old_path =~ /^\$/ ) { # check if it's a single var, or a $var/path combination # if it's $var/path, enclose in "" @@ -3073,17 +3702,17 @@ sub change_to_SM_path() { } return $old_path; } - + # Remove remaining ' $old_path =~ s/\'//g; - + # For relative paths, split on '../' @rel_path = split(/\.\.\//, $old_path); if ( $#rel_path > 1 ) { # more than two levels away. Make it absolute. @abs_path = split(/\//, $dir); - + # Lop off the relative pieces of the absolute path.. for ( $i = 0; $i <= $#rel_path; $i++ ) { pop @abs_path; @@ -3098,8 +3727,8 @@ sub change_to_SM_path() { $new_path .= "\'"; } else { # Last, it's a relative path without any leading '.' - # Prepend SM_PATH and config, since the paths are - # relative to the config directory + # Prepend SM_PATH and config, since the paths are + # relative to the config directory $new_path = "SM_PATH . \'config/" . $old_path . "\'"; } return $new_path; @@ -3128,77 +3757,79 @@ sub detect_auth_support { # Called by 'command112a' and 'command112b' # ARGS: service-name (IMAP or SMTP), host:port, mech-name (ie. CRAM-MD5) - # Misc setup - use IO::Socket; - my $service = shift; - my $host = shift; - my $mech = shift; - # Sanity checks - if ((!defined($service)) or (!defined($host)) or (!defined($mech))) { - # Error - wrong # of args - print "BAD ARGS!\n"; - return undef; - } - - if ($service eq 'SMTP') { - $cmd = "AUTH $mech\n"; - $logout = "QUIT\n"; - } elsif ($service eq 'IMAP') { - $cmd = "A01 AUTHENTICATE $mech\n"; - $logout = "C01 LOGOUT\n"; - } else { - # unknown service - whoops. - return undef; - } - - # Get this show on the road + # Misc setup + use IO::Socket; + my $service = shift; + my $host = shift; + my $mech = shift; + # Sanity checks + if ((!defined($service)) or (!defined($host)) or (!defined($mech))) { + # Error - wrong # of args + print "BAD ARGS!\n"; + return undef; + } + + if ($service eq 'SMTP') { + $cmd = "AUTH $mech\r\n"; + $logout = "QUIT\r\n"; + } elsif ($service eq 'IMAP') { + $cmd = "A01 AUTHENTICATE $mech\n"; + $logout = "C01 LOGOUT\n"; + } else { + # unknown service - whoops. + return undef; + } + + # Get this show on the road my $sock=IO::Socket::INET->new($host); if (!defined($sock)) { # Connect failed return undef; } - my $discard = <$sock>; # Server greeting/banner - who cares.. - - if ($service eq 'SMTP') { - # Say hello first.. - print $sock "helo $domain\n"; - $discard = <$sock>; # Yeah yeah, you're happy to see me.. - } - print $sock $cmd; - - my $response = <$sock>; - chomp($response); - if (!defined($response)) { - return undef; - } - - # So at this point, we have a response, and it is (hopefully) valid. - if ($service eq 'SMTP') { - if (($response =~ /^535/) or ($response =~/^502/)) { - # Not supported - close $sock; - return 'NO'; - } elsif ($response =~ /^503/) { - #Something went wrong - return undef; - } - } elsif ($service eq 'IMAP') { - if ($response =~ /^A01/) { - # Not supported - close $sock; - return 'NO'; - } - } else { - # Unknown service - this shouldn't be able to happen. - close $sock; - return undef; - } - - # If it gets here, the mech is supported - print $sock "*\n"; # Attempt to cancel authentication - print $sock $logout; # Try to log out, but we don't really care if this fails - close $sock; - return 'YES'; + my $discard = <$sock>; # Server greeting/banner - who cares.. + + if ($service eq 'SMTP') { + # Say hello first.. + print $sock "HELO $domain\r\n"; + $discard = <$sock>; # Yeah yeah, you're happy to see me.. + } + print $sock $cmd; + + my $response = <$sock>; + chomp($response); + if (!defined($response)) { + return undef; + } + + # So at this point, we have a response, and it is (hopefully) valid. + if ($service eq 'SMTP') { + if (($response =~ /^535/) or ($response =~/^502/)) { + # Not supported + print $sock $logout; + close $sock; + return 'NO'; + } elsif ($response =~ /^503/) { + #Something went wrong + return undef; + } + } elsif ($service eq 'IMAP') { + if ($response =~ /^A01/) { + # Not supported + print $sock $logout; + close $sock; + return 'NO'; + } + } else { + # Unknown service - this shouldn't be able to happen. + close $sock; + return undef; + } + + # If it gets here, the mech is supported + print $sock "*\n"; # Attempt to cancel authentication + print $sock $logout; # Try to log out, but we don't really care if this fails + close $sock; + return 'YES'; } sub clear_screen() {