#!/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";
############################################################
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'} ) ) {
############################################################
# 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 = <FILE> ) {
$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);
$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);
# Read and parse the current configuration file
# (either config.php or config_default.php).
while ( $line = <FILE> ) {
- $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/\]//;
$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*$//;
+ } 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*$//;
+ } 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*$//;
+ } 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;
$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 {
$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) ;
+$allow_advanced_search = 0 if ( !$allow_advanced_search) ;
$prefs_user_field = 'user' if ( !$prefs_user_field );
$prefs_key_field = 'prefkey' if ( !$prefs_key_field );
$prefs_val_field = 'prefval' if ( !$prefs_val_field );
-$addrbook_global_table = 'global_abook' if ( !$addrbook_global_table );
-$addrbook_global_writeable = 'false' if ( !$addrbook_global_writeable );
-$addrbook_global_listing = 'false' if ( !$addrbook_global_listing );
$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 );
-$agresive_decoding = 'false' if ( !$agresive_decoding );
+$aggressive_decoding = 'false' if ( !$aggressive_decoding );
$advanced_tree = 'false' if ( !$advanced_tree );
-$oldway = 'false' if ( !$oldway );
-$use_icons = 'false' if ( !$use_icons );
$use_php_recode = 'false' if ( !$use_php_recode );
$use_php_iconv = 'false' if ( !$use_php_iconv );
-$skip_SM_header = 'false' if ( !$skip_SM_header );
+# since 1.5.1
+$use_icons = 'false' if ( !$use_icons );
+$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";
$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"; }
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 "10. Language settings\n";
+ print "11. Tweaks\n";
print "\n";
print "D. Set pre-defined settings for specific IMAP servers\n";
print "\n";
}
print "$NRM\n";
print "\n";
-
+
if ( $show_imap_settings ) {
print $WHT . "IMAP Settings". $NRM . "\n--------------\n";
print "4. IMAP Server : $WHT$imapServerAddress$NRM\n";
print "$WHT$imapServerAddress$NRM:";
print "$WHT$imapPort$NRM ";
print "($WHT$imap_server_type$NRM)\n";
- }
+ }
if ($show_smtp_settings == 0) {
if ( lc($useSendmail) eq 'true' ) {
print "B. Change Sendmail Config : $WHT$sendmail_path$NRM\n";
}
if ( $show_smtp_settings || $show_imap_settings )
{
- print "H. Hide " .
- ($show_imap_settings ? "IMAP Server" :
+ print "H. Hide " .
+ ($show_imap_settings ? "IMAP Server" :
(lc($useSendmail) eq 'true') ? "Sendmail" : "SMTP") . " Settings\n";
}
-
+
print "\n";
print "R Return to Main Menu\n";
} elsif ( $menu == 3 ) {
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 "14. PHP session name : $WHT$session_name$NRM\n";
print "\n";
print "R Return to Main Menu\n";
} elsif ( $menu == 5 ) {
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];
}
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 ) {
print "2. Default Charset : $WHT$default_charset$NRM\n";
print "3. Show alternative language names : $WHT$show_alternative_names$NRM\n";
print "4. Available languages : $WHT$available_languages$NRM\n";
- print "5. Use agresive decoding : $WHT$agresive_decoding$NRM\n";
+ print "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. Oldway : $WHT$oldway$NRM\n";
print "3. Use Icons : $WHT$use_icons$NRM\n";
print "\n";
print $WHT. "PHP tweaks\n" . $NRM;
print "4. Use php recode functions : $WHT$use_php_recode$NRM\n";
print "5. Use php iconv functions : $WHT$use_php_iconv$NRM\n";
+ print "\n";
+ print $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";
print "\n";
print "Command >> " . $WHT;
$command = <STDIN>;
- $command =~ s/[\n|\r]//g;
+ $command =~ s/[\n\r]//g;
$command =~ tr/A-Z/a-z/;
print "$NRM\n";
} 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 ) {
elsif ( $command == 2 ) { $default_charset = commandA2(); }
elsif ( $command == 3 ) { $show_alternative_names = commandA3(); }
elsif ( $command == 4 ) { $available_languages = commandA4(); }
- elsif ( $command == 5 ) { $agresive_decoding = commandA5(); }
+ elsif ( $command == 5 ) { $aggressive_decoding = commandA5(); }
+ elsif ( $command == 6 ) { $lossy_encoding = commandA6(); }
} elsif ( $menu == 11 ) {
if ( $command == 1 ) { $advanced_tree = commandB1(); }
- elsif ( $command == 2 ) { $oldway = commandB2(); }
elsif ( $command == 3 ) { $use_icons = commandB3(); }
elsif ( $command == 4 ) { $use_php_recode = commandB4(); }
elsif ( $command == 5 ) { $use_php_iconv = commandB5(); }
+ elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); }
}
}
}
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 = <STDIN>;
if ( $new_org_name eq "\n" ) {
$new_org_name = $org_name;
} else {
- $new_org_name =~ s/[\r|\n]//g;
+ $new_org_name =~ s/[\r\n]//g;
$new_org_name =~ s/\"/"/g;
}
return $new_org_name;
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 = <STDIN>;
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;
}
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";
if ( $new_org_title eq "\n" ) {
$new_org_title = $org_title;
} else {
- $new_org_title =~ s/[\r|\n]//g;
+ $new_org_title =~ s/[\r\n]//g;
$new_org_title =~ s/\"/\'/g;
}
return $new_org_title;
if ( $new_signout_page eq "\n" ) {
$new_signout_page = $signout_page;
} 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;
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;
# 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 = <STDIN>;
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;
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;
# 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 = <STDIN>;
if ( $new_domain eq "\n" ) {
$new_domain = $domain;
} else {
- $new_domain =~ s/[\r|\n]//g;
+ $new_domain =~ s/[\r\n]//g;
}
return $new_domain;
}
if ( $new_imapServerAddress eq "\n" ) {
$new_imapServerAddress = $imapServerAddress;
} else {
- $new_imapServerAddress =~ s/[\r|\n]//g;
+ $new_imapServerAddress =~ s/[\r\n]//g;
}
return $new_imapServerAddress;
}
if ( $new_imapPort eq "\n" ) {
$new_imapPort = $imapPort;
} else {
- $new_imapPort =~ s/[\r|\n]//g;
+ $new_imapPort =~ s/[\r\n]//g;
}
return $new_imapPort;
}
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;
}
if ( $new_smtpServerAddress eq "\n" ) {
$new_smtpServerAddress = $smtpServerAddress;
} else {
- $new_smtpServerAddress =~ s/[\r|\n]//g;
+ $new_smtpServerAddress =~ s/[\r\n]//g;
}
return $new_smtpServerAddress;
}
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
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";
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 " 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 " hmailserver = hMailServer\n";
+ print " other = Not one of the above servers\n";
print "[$WHT$imap_server_type$NRM]: $WHT";
$new_imap_server_type = <STDIN>;
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;
}
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;
}
} 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";
}
}
-
+
# SMTP authentication type
# Possible choices: none, plain, cram-md5, digest-md5
sub command112b {
if ($inval =~ /^y\b/i) {
# Yes, let's try to detect.
print "Trying to detect supported methods (SMTP)...\n";
-
+
# Special case!
# Check none by trying to relay to junk@microsoft.com
$host = $smtpServerAddress . ':' . $smtpPort;
print " ERROR TESTING\n";
close $sock;
} else {
- print $sock "mail from: tester\@squirrelmail.org\n";
+ print $sock "HELO $domain\r\n";
+ $got = <$sock>; # Discard
+ print $sock "MAIL FROM:<tester\@squirrelmail.org>\r\n";
$got = <$sock>; # Discard
- print $sock "rcpt to: junk\@microsoft.com\n";
+ print $sock "RCPT TO:<junk\@microsoft.com\r\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";
+ print $sock "RSET\r\n";
+ print $sock "QUIT\r\n";
close $sock;
}
# Try login (SquirrelMail default)
} else {
print $WHT . "ERROR DETECTING$NRM\n";
}
-
+
# Try CRAM-MD5
print "Testing CRAM-MD5:\t";
$tmp=detect_auth_support('SMTP',$host,'CRAM-MD5');
} else {
print $WHT . "ERROR DETECTING$NRM\n";
}
-
+
print "Testing DIGEST-MD5:\t";
$tmp=detect_auth_support('SMTP',$host,'DIGEST-MD5');
} 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";
# 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 {
} else {
print "n";
}
- print "$NRM]: $WHT";
+ print "$NRM]: $WHT";
$inval=<STDIN>;
$inval =~ tr/yn//cd;
return 'true' if ( $inval eq "y" );
return 'true' if ( lc($new_skip_SM_header) eq 'y' );
return 'false' if ( lc($new_skip_SM_header) eq 'n' );
- return $skip_SM_header;
+ return $skip_SM_header;
}
# MOTD
do {
print "] ";
$line = <STDIN>;
- $line =~ s/[\r|\n]//g;
+ $line =~ s/[\r\n]//g;
if ( $line ne "@" ) {
$line =~ s/ /\ \ /g;
$line =~ s/\t/\ \ \ \ /g;
################# PLUGINS ###################
sub command81 {
- $command =~ s/[\s|\n|\r]*//g;
+ $command =~ s/[\s\n\r]*//g;
if ( $command > 0 ) {
$command = $command - 1;
if ( $command <= $#plugins ) {
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";
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";
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";
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";
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";
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";
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";
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";
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";
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";
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";
print "Which one should be default (1,2,3)? [$WHT$default_unseen_notify$NRM]: $WHT";
$new_show = <STDIN>;
- 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";
print "Which one should be default (1,2)? [$WHT$default_unseen_type$NRM]: $WHT";
$new_show = <STDIN>;
- 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;
}
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";
print "Press any key to continue...\n";
$new_delete = <STDIN>;
$delete_folder = 'true';
- } else {
+ } else {
if ( $imap_server_type eq "courier" ) {
print "Courier (or Courier-IMAP) IMAP servers may not support ";
print "subfolders of Trash. \n";
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";
print "If not, say no (deleted folders should not be sent to Trash)\n\n";
# reversal of logic.
# question was: Should folders be automatically deleted instead of sent to trash..
- # we've changed the question to make it more clear,
- # and are here handling that to avoid changing the answers..
+ # we've changed the question to make it more clear,
+ # and are here handling that to avoid changing the answers..
if ( lc($delete_folder) eq 'true' ) {
$default_value = "n";
} else {
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 writeable directory\n";
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 = "";
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 = "";
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";
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 )
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;
}
# command315 (UID support) obsoleted.
# advanced search option
-
sub command316 {
- print "This option allows you to change the advanced search form.\n";
- print "Set to 0 to disable the advanced search, 1 to have advanced\n";
- print "and search only or 2 for both forms.\n";
- print "[$WHT$allow_advanced_search$NRM]: $WHT";
- $allows_advanced_search = <STDIN>;
- chomp($allows_advanced_search);
- if ( $allows_advanced_search eq "" ) {
- $allows_advanced_searchn=0;
+ 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";
+
+ print "Allowed search (0,1,2)? [$WHT$allow_advanced_search$NRM]: $WHT";
+ $new_allow_advanced_search = <STDIN>;
+ if ( $new_allow_advanced_search =~ /^[012]\n/i ) {
+ $allow_advanced_search = $new_allow_advanced_search;
}
- return $allows_advanced_search;
+ $allow_advanced_search =~ s/[\r\n]//g;
+ return $allow_advanced_search;
}
print "them. You can also change the default theme.\n";
print "[theme] command (?=help) > ";
$input = <STDIN>;
- $input =~ s/[\r|\n]//g;
+ $input =~ s/[\r\n]//g;
while ( $input ne "d" ) {
if ( $input =~ /^\s*l\s*/i ) {
$count = 0;
} elsif ( $input =~ /^\s*\+/ ) {
print "What is the name of this theme: ";
$name = <STDIN>;
- $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 = <STDIN>;
- $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*$/ ) {
print "** Found theme: $filename\n";
print " What is its name? ";
$nm = <STDIN>;
- $nm =~ s/[\n|\r]//g;
+ $nm =~ s/[\n\r]//g;
$theme_name[ $#theme_name + 1 ] = $nm;
$theme_path[ $#theme_path + 1 ] = $filename;
}
}
print "[theme] command (?=help) > ";
$input = <STDIN>;
- $input =~ s/[\r|\n]//g;
+ $input =~ s/[\r\n]//g;
}
}
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;
print "You can now define different LDAP servers.\n";
print "[ldap] command (?=help) > ";
$input = <STDIN>;
- $input =~ s/[\r|\n]//g;
+ $input =~ s/[\r\n]//g;
while ( $input ne "d" ) {
if ( $input =~ /^\s*l\s*/i ) {
$count = 0;
if ( $ldap_maxrows[$count] ) {
print " maxrows: $ldap_maxrows[$count]\n";
}
+ if ( $ldap_filter[$count] ) {
+ print " filter: $ldap_filter[$count]\n";
+ }
if ( $ldap_binddn[$count] ) {
print " binddn: $ldap_binddn[$count]\n";
if ( $ldap_bindpw[$count] ) {
print " bindpw: $ldap_bindpw[$count]\n";
}
}
- if ( $ldap_protocol[$count] ) {
+ if ( $ldap_protocol[$count] ) {
print " protocol: $ldap_protocol[$count]\n";
}
+ if ( $ldap_limit_scope[$count] ) {
+ print " limit_scope: $ldap_limit_scope[$count]\n";
+ }
print "\n";
$count++;
print "this LDAP server resides. Example: ldap.bigfoot.com\n";
print "hostname: ";
$name = <STDIN>;
- $name =~ s/[\r|\n]//g;
+ $name =~ s/[\r\n]//g;
$ldap_host[$sub] = $name;
print "\n";
print "Example: ou=member_directory,o=netcenter.com\n";
print "base: ";
$name = <STDIN>;
- $name =~ s/[\r|\n]//g;
+ $name =~ s/[\r\n]//g;
$ldap_base[$sub] = $name;
print "\n";
print "port is 389. This is optional. Press ENTER for default.\n";
print "port: ";
$name = <STDIN>;
- $name =~ s/[\r|\n]//g;
+ $name =~ s/[\r\n]//g;
$ldap_port[$sub] = $name;
print "\n";
print "is also optional. Press ENTER for default.\n";
print "charset: ";
$name = <STDIN>;
- $name =~ s/[\r|\n]//g;
+ $name =~ s/[\r\n]//g;
$ldap_charset[$sub] = $name;
print "\n";
print "the search. Default it \"LDAP: hostname\". Press ENTER for default\n";
print "name: ";
$name = <STDIN>;
- $name =~ s/[\r|\n]//g;
+ $name =~ s/[\r\n]//g;
$ldap_name[$sub] = $name;
print "\n";
print "Default is unlimited. Press ENTER for default.\n";
print "maxrows: ";
$name = <STDIN>;
- $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 = <STDIN>;
+ $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 = <STDIN>;
- $name =~ s/[\r|\n]//g;
+ $name =~ s/[\r\n]//g;
$ldap_binddn[$sub] = $name;
print "\n";
print "Now, please specify password for that DN.\n";
print "bindpw: ";
$name = <STDIN>;
- $name =~ s/[\r|\n]//g;
+ $name =~ s/[\r\n]//g;
$ldap_bindpw[$sub] = $name;
print "\n";
}
- print "You can specify bind protocol version here.\n";
+ print "You can specify bind protocol version here.\n";
print "Default protocol version depends on your php ldap settings.\n";
- print "Press ENTER for default.\n";
+ print "Press ENTER for default.\n";
print "protocol: ";
$name = <STDIN>;
- $name =~ s/[\r|\n]//g;
+ $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 = <STDIN>;
+ 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;
@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 ) {
@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++;
}
@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 "[ldap] command (?=help) > ";
$input = <STDIN>;
- $input =~ s/[\r|\n]//g;
+ $input =~ s/[\r\n]//g;
}
}
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 = <STDIN>;
+ 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 = <STDIN>;
+ 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 = <STDIN>;
+ 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";
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;
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;
}
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;
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;
}
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;
}
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;
}
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;
}
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;
sub command99 {
print "This is the name of the table you want to store the global address book\n";
- print "data in, it defaults to 'global_address'\n";
+ print "data in. Default table name is 'global_abook'. Address book uses same\n";
+ print "database format as personal address book.\n";
print "\n";
print "[$WHT$addrbook_global_table$NRM]: $WHT";
$new_table = <STDIN>;
if ( $new_table eq "\n" ) {
$new_table = $addrbook_global_table;
} else {
- $new_table =~ s/[\r|\n]//g;
+ $new_table =~ s/[\r\n]//g;
}
return $new_table;
}
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/[\r\n]//g;
$new_squirrelmail_default_language =~ s/^\s+$//g;
}
return $new_squirrelmail_default_language;
}
# Default Charset
sub commandA2 {
-# print "This option controls what character set is used when sending\n";
-# print "mail and when sending HTML to the browser. Do not set this\n";
-# print "to US-ASCII, use ISO-8859-1 instead. For cyrillic, it is best\n";
-# print "to use KOI8-R, since this implementation is faster than most\n";
-# print "of the alternatives\n";
- print "This option is obsolate. Default charset depends on language\n";
- print "you have selected in \"Default language\" option.\n";
+ print "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";
if ( $new_default_charset eq "\n" ) {
$new_default_charset = $default_charset;
} else {
- $new_default_charset =~ s/[\r|\n]//g;
+ $new_default_charset =~ s/[\r\n]//g;
}
return $new_default_charset;
}
print "listed. If you enter special key \'none\' - user won't be able to change";
print "language and interface will use language set it \"Default language\" option.\n";
print "\n";
- print "Valid language names are:\n";
- print " ar (Arabic), bg_BG (Bulgarian), ca_ES (Catalan), cy_GB (Welsh)\n";
- print " cs_CZ (Chech), da_DK (Danish), de_DE (German), el_GR (Greek),\n";
- print " en_US (English), es_ES (Spanish), et_EE (Estonian), fi_FI (Finnish),\n";
- print " fo_FO (Faroese), fr_FR (French), he_IL (Hebrew), hr_HR (Croatian),\n";
- print " hu_HU (Hungarian), id_ID (Indonesian), is_IS (Icelandic), it_IT (Italian),\n";
- print " ja_JP (Japanese), ko_KR (Korean), lt_LT (Lithuanian), ms_MY (Malay),\n";
- print " nl_NL (Dutch), nn_NO (Norwegian (Nynorsk)), no_NO (Norwegian (Bokmal)),\n";
- print " pl_PL (Polish), pt_BR (Portuguese (Brazil)), pt_PT (Portuguese (Portugal)),\n";
- print " ro_RO (Romanian), ru_RU (Russian), sk_SK (Slovak), sl_SI (Slovenian),\n";
- print " sr_YU (Serbian), sv_SE (Swedish), th_TH (Thai), tr_TR (Turkish),\n";
- print " zh_CN (Chinese Simplified), zh_TW (Chinese Traditional).\n";
+ print "You can find valid language names in doc/i18n.txt.\n";
print "\n";
print "[$WHT$available_languages$NRM]: $WHT";
$new_available_languages = <STDIN>;
if ( $new_available_languages eq "\n" ) {
$new_available_languages = $available_languages;
} else {
- $new_available_languages =~ s/[\r|\n]//g;
+ $new_available_languages =~ s/[\r\n]//g;
$new_available_languages =~ s/^\s+$//g;
}
return $new_available_languages;
}
-# Agresive decoding
+# 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 "even when you have disabled use of recode in Tweaks section.\n";
print "\n";
- if ( lc($agresive_decoding) eq 'true' ) {
+ if ( lc($aggressive_decoding) eq 'true' ) {
$default_value = "y";
} else {
$default_value = "n";
}
- print "Use agresive decoding? (y/n) [$WHT$default_value$NRM]: $WHT";
- $agresive_decoding = <STDIN>;
- if ( ( $agresive_decoding =~ /^y\n/i ) || ( ( $agresive_decoding =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
- $agresive_decoding = 'true';
+ print "Enable aggressive decoding? (y/n) [$WHT$default_value$NRM]: $WHT";
+ $aggressive_decoding = <STDIN>;
+ if ( ( $aggressive_decoding =~ /^y\n/i ) || ( ( $aggressive_decoding =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+ $aggressive_decoding = 'true';
} else {
- $agresive_decoding = 'false';
+ $aggressive_decoding = 'false';
}
- return $agresive_decoding;
+ 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 = <STDIN>;
+ 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";
}
return $advanced_tree;
}
-# Oldway
-sub commandB2 {
- print "Setting \$oldway to false causes left_main.php to use the new\n";
- print "experimental way of getting the mailbox-tree.\n";
- print "\n";
-
- if ( lc($oldway) eq 'true' ) {
- $default_value = "y";
- } else {
- $default_value = "n";
- }
- print "Use old way of folder list display? (y/n) [$WHT$default_value$NRM]: $WHT";
- $oldway = <STDIN>;
- if ( ( $oldway =~ /^y\n/i ) || ( ( $oldway =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
- $oldway = 'true';
- } else {
- $oldway = 'false';
- }
- return $oldway;
-}
# use icons
sub commandB3 {
print "Enabling this option will cause icons to be used instead of text\n";
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 = <STDIN>;
+ 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 = " ";
print CF " */\n";
print CF "\n";
print CF "global \$version;\n";
-
+
if ($print_config_version) {
print CF "\$config_version = '$print_config_version';\n";
}
# integer
print CF "\$config_use_color = $config_use_color;\n";
print CF "\n";
-
+
# string
print CF "\$org_name = \"$org_name\";\n";
# string
# string that can contain variables
print CF "\$motd = \"$motd\";\n";
print CF "\n";
-
+
# string
print CF "\$squirrelmail_default_language = '$squirrelmail_default_language';\n";
# string
# string
print CF "\$available_languages = '$available_languages';\n";
# boolean
- print CF "\$agresive_decoding = $agresive_decoding;\n";
+ print CF "\$aggressive_decoding = $aggressive_decoding;\n";
+ # boolean
+ print CF "\$lossy_encoding = $lossy_encoding;\n";
print CF "\n";
# string
print CF "\$allow_thread_sort = $allow_thread_sort;\n";
# boolean
print CF "\$allow_server_sort = $allow_server_sort;\n";
- # boolean
+ # boolean
print CF "\$allow_charset_search = $allow_charset_search;\n";
+ # integer
+ print CF "\$allow_advanced_search = $allow_advanced_search;\n";
print CF "\n";
-
+
# all plugins are strings
for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) {
- print CF "\$plugins[$ct] = '$plugins[$ct]';\n";
+ print CF "\$plugins[] = '$plugins[$ct]';\n";
}
print CF "\n";
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";
# 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
# 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
print CF "\$addrbook_global_table = '$addrbook_global_table';\n";
# boolean
- print CF "\$addrbook_global_writeable = $addrbook_global_writeable;\n\n";
+ 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";
print CF "\$use_smtp_tls = $use_smtp_tls;\n";
# string
print CF "\$session_name = '$session_name';\n";
- # string
- print CF "\$allow_advanced_search = '$allow_advanced_search';\n";
print CF "\n";
print CF "\$advanced_tree = $advanced_tree;\n";
print CF "\n";
# boolean
- print CF "\$oldway = $oldway;\n";
- print CF "\n";
- # boolean
print CF "\$use_icons = $use_icons;\n";
print CF "\n";
# boolean
print CF "\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 " * 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";
$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 " 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 " hmailserver = hMailServer\n";
+ print " mercury32 = Mercury/32\n";
+ print " quit = Do not change anything\n";
print "Command >> ";
$server = <STDIN>;
- $server =~ s/[\r|\n]//g;
+ $server =~ s/[\r\n]//g;
print "\n";
if ( $server eq "cyrus" ) {
$disp_default_folder_prefix = $default_folder_prefix;
$delete_folder = true;
$force_username_lowercase = true;
-
+
$continue = 1;
} elsif ( $server eq "exchange" ) {
$imap_server_type = "exchange";
$disp_default_folder_prefix = $default_folder_prefix;
$delete_folder = true;
$force_username_lowercase = false;
-
+
$continue = 1;
} elsif ( $server eq "macosx" ) {
$imap_server_type = "macosx";
$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";
# 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'
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 ""
}
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;
$new_path .= "\'";
} else {
# Last, it's a relative path without any leading '.'
- # Prepend SM_PATH and config, since the paths are
+ # Prepend SM_PATH and config, since the paths are
# relative to the config directory
$new_path = "SM_PATH . \'config/" . $old_path . "\'";
}
print "BAD ARGS!\n";
return undef;
}
-
+
if ($service eq 'SMTP') {
- $cmd = "AUTH $mech\n";
- $logout = "QUIT\n";
+ $cmd = "AUTH $mech\r\n";
+ $logout = "QUIT\r\n";
} elsif ($service eq 'IMAP') {
$cmd = "A01 AUTHENTICATE $mech\n";
$logout = "C01 LOGOUT\n";
if ($service eq 'SMTP') {
# Say hello first..
- print $sock "helo $domain\n";
+ print $sock "HELO $domain\r\n";
$discard = <$sock>; # Yeah yeah, you're happy to see me..
}
print $sock $cmd;
if ($service eq 'SMTP') {
if (($response =~ /^535/) or ($response =~/^502/)) {
# Not supported
+ print $sock $logout;
close $sock;
return 'NO';
} elsif ($response =~ /^503/) {
} elsif ($service eq 'IMAP') {
if ($response =~ /^A01/) {
# Not supported
+ print $sock $logout;
close $sock;
return 'NO';
}