$tmp =~ s/[\'\"]?,?\s*$//;
$tmp =~ s/[\'\"]?\);\s*$//;
$limit_scope = $tmp;
+ } elsif ( $tmp =~ /^\s*[\'\"]listing[\'\"]/i ) {
+ $tmp =~ s/^\s*[\'\"]listing[\'\"]\s*=>\s*[\'\"]?//i;
+ $tmp =~ s/[\'\"]?,?\s*$//;
+ $tmp =~ s/[\'\"]?\);\s*$//;
+ $listing = $tmp;
+ } elsif ( $tmp =~ /^\s*[\'\"]search_tree[\'\"]/i ) {
+ $tmp =~ s/^\s*[\'\"]search_tree[\'\"]\s*=>\s*[\'\"]?//i;
+ $tmp =~ s/[\'\"]?,?\s*$//;
+ $tmp =~ s/[\'\"]?\);\s*$//;
+ $search_tree = $tmp;
+ } elsif ( $tmp =~ /^\s*[\'\"]starttls[\'\"]/i ) {
+ $tmp =~ s/^\s*[\'\"]starttls[\'\"]\s*=>\s*[\'\"]?//i;
+ $tmp =~ s/[\'\"]?,?\s*$//;
+ $tmp =~ s/[\'\"]?\);\s*$//;
+ $starttls = $tmp;
}
}
$ldap_host[$sub] = $host;
$ldap_bindpw[$sub] = $bindpw;
$ldap_protocol[$sub] = $protocol;
$ldap_limit_scope[$sub] = $limit_scope;
+ $ldap_listing[$sub] = $listing;
+ $ldap_search_tree[$sub] = $search_tree;
+ $ldap_starttls[$sub] = $starttls;
} elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page)$/ ) {
${ $options[0] } = &change_to_rel_path($options[1]);
} else {
$abook_global_file = '' if ( !$abook_global_file);
$abook_global_file_writeable = 'false' if ( !$abook_global_file_writeable);
$abook_global_file_listing = 'true' if ( !$abook_global_file_listing );
+$encode_header_key = '' if ( !$encode_header_key );
+$hide_auth_header = 'false' if ( !$hide_auth_header );
+$time_zone_type = '0' if ( !$time_zone_type );
if ( $ARGV[0] eq '--install-plugin' ) {
print "Activating plugin " . $ARGV[1] . "\n";
if ( lc($useSendmail) eq 'true' ) {
print $WHT . "Sendmail" . $NRM . "\n--------\n";
print "4. Sendmail Path : $WHT$sendmail_path$NRM\n";
- print "5. Suppress SM header : $WHT$skip_SM_header$NRM\n";
+ print "5. Header encryption key : $WHT$encode_header_key$NRM\n";
print "\n";
} else {
print $WHT . "SMTP Settings" . $NRM . "\n-------------\n";
print "6. POP before SMTP : $WHT$pop_before_smtp$NRM\n";
print "7. SMTP Authentication : $WHT$smtp_auth_mech$NRM\n";
print "8. Secure SMTP (TLS) : $WHT$use_smtp_tls$NRM\n";
- print "9. Suppress SM header : $WHT$skip_SM_header$NRM\n";
+ print "9. Header encryption key : $WHT$encode_header_key$NRM\n";
print "\n";
}
}
print "6. Allow use of priority : $WHT$default_use_priority$NRM\n";
print "7. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n";
print "8. Allow use of receipts : $WHT$default_use_mdn$NRM\n";
- print "9. Allow editing of identity : $WHT$edit_identity$NRM/$WHT$edit_name$NRM\n";
+ print "9. Allow editing of identity : $WHT$edit_identity$NRM\n";
+ print " Allow editing of name : $WHT$edit_name$NRM\n";
+ print " Remove username from header : $WHT$hide_auth_header$NRM\n";
print "10. Allow server thread sort : $WHT$allow_thread_sort$NRM\n";
print "11. Allow server-side sorting : $WHT$allow_server_sort$NRM\n";
print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n";
print "13. Allow advanced search : $WHT$allow_advanced_search$NRM\n";
print "14. PHP session name : $WHT$session_name$NRM\n";
+ print "15. Time zone configuration : $WHT$time_zone_type$NRM\n";
print "\n";
print "R Return to Main Menu\n";
} elsif ( $menu == 5 ) {
print " > $ldap_host[$count]\n";
}
print "2. Use Javascript address book search : $WHT$default_use_javascript_addr_book$NRM\n";
- print "3. Use global file address book : $WHT$abook_global_file$NRM\n";
+ print "3. Global address book file : $WHT$abook_global_file$NRM\n";
print "4. Allow writing into global file address book : $WHT$abook_global_file_writeable$NRM\n";
print "5. Allow listing of global file address book : $WHT$abook_global_file_listing$NRM\n";
print "\n";
elsif ( $command == 8 ) { $imap_server_type = command19(); }
elsif ( $command == 9 ) { $optional_delimiter = command111(); }
} elsif ( $show_smtp_settings && lc($useSendmail) eq 'true' ) {
- if ( $command == 4 ) { $sendmail_path = command15(); }
+ if ( $command == 4 ) { $sendmail_path = command15(); }
+ elsif ( $command == 5 ) { $encode_header_key = command114(); }
} elsif ( $show_smtp_settings ) {
if ( $command == 4 ) { $smtpServerAddress = command16(); }
elsif ( $command == 5 ) { $smtpPort = command17(); }
elsif ( $command == 6 ) { $pop_before_smtp = command18a(); }
elsif ( $command == 7 ) { $smtp_auth_mech = command112b(); }
elsif ( $command == 8 ) { $use_smtp_tls = command113("SMTP",$use_smtp_tls); }
- elsif ( $command == 9 ) { $skip_SM_header = command114(); }
+ elsif ( $command == 9 ) { $encode_header_key = command114(); }
}
} elsif ( $menu == 3 ) {
if ( $command == 1 ) { $default_folder_prefix = command21(); }
elsif ( $command == 6 ) { $default_use_priority = command37(); }
elsif ( $command == 7 ) { $hide_sm_attributions = command38(); }
elsif ( $command == 8 ) { $default_use_mdn = command39(); }
- elsif ( $command == 9 ) { $edit_identity = command310(); }
+ elsif ( $command == 9 ) { $edit_identity = command310(); }
elsif ( $command == 10 ) { $allow_thread_sort = command312(); }
elsif ( $command == 11 ) { $allow_server_sort = command313(); }
elsif ( $command == 12 ) { $allow_charset_search = command314(); }
elsif ( $command == 13 ) { $allow_advanced_search = command316(); }
elsif ( $command == 14 ) { $session_name = command317(); }
+ elsif ( $command == 15 ) { $time_zone_type = command318(); }
} elsif ( $menu == 5 ) {
if ( $command == 1 ) { command41(); }
elsif ( $command == 2 ) { $theme_css = command42(); }
print " exchange = Microsoft Exchange IMAP server\n";
print " hmailserver = hMailServer\n";
print " macosx = Mac OS X Mailserver\n";
+ print " mercury32 = Mercury Mail Transport System\n";
print " uw = University of Washington's IMAP server\n";
print "\n";
print " other = Not one of the above servers\n";
return $default_val;
}
+# $encode_header_key
sub command114{
- print "\nUse this to suppress insertion of SquirrelMail Received: headers\n";
- print "in outbound messages.\n\n";
-
- $YesNo = 'n';
- $YesNo = 'y' if ( lc($skip_SM_header) eq 'true' );
-
- print "Suppress SM header (y/n) [$WHT$YesNo$NRM]: $WHT";
- $new_skip_SM_header = <STDIN>;
- chomp($new_skip_SM_header);
-
- return 'true' if ( lc($new_skip_SM_header) eq 'y' );
- return 'false' if ( lc($new_skip_SM_header) eq 'n' );
- return $skip_SM_header;
+ print "Encryption key allows to hide SquirrelMail Received: headers\n";
+ print "in outbound messages. Interface uses encryption key to encode\n";
+ print "username, remote address and proxied address, then stores encoded\n";
+ print "information in X-Squirrel-* headers.\n";
+ print "\n";
+ print "Warning: used encryption function is not bulletproof. When used\n";
+ print "with static encryption keys, it provides only minimal security\n";
+ print "measures and information can be decoded quickly.\n";
+ print "\n";
+ print "Encoded information can be decoded with decrypt_headers.php script\n";
+ print "from SquirrelMail contrib/ directory.\n";
+ print "\n";
+ print "Enter encryption key: ";
+ $new_encode_header_key = <STDIN>;
+ if ( $new_encode_header_key eq "\n" ) {
+ $new_encode_header_key = $encode_header_key;
+ } else {
+ $new_encode_header_key =~ s/[\r\n]//g;
+ }
+ return $new_encode_header_key;
}
# MOTD
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 " Absolute: /var/lib/squirrelmail/data/\n";
print " Relative: ../data/\n";
print "Relative paths to directories outside of the SquirrelMail distribution\n";
print "will be converted to their absolute path equivalents in config.php.\n\n";
print "Path to directory used for storing attachments while a mail is\n";
print "being sent. The path name can be absolute or relative (to the config directory).\n";
print "It doesn't matter. Here are two examples:\n";
- print " Absolute: /var/spool/attach/\n";
+ print " Absolute: /var/spool/squirrelmail/attach/\n";
print " Relative: ../attach/\n";
print "Relative paths to directories outside of the SquirrelMail distribution\n";
print "will be converted to their absolute path equivalents in config.php.\n\n";
return 'false';
}
+
sub command310 {
print "This allows you to prevent the editing of the user's name and ";
print "email address. This is mainly useful when used with the ";
if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
$edit_identity = 'true';
$edit_name = 'true';
+ $hide_auth_header = 'false';
} else {
$edit_identity = 'false';
$edit_name = command311();
+ $hide_auth_header = command311b();
}
return $edit_identity;
}
return $edit_name;
}
+sub command311b {
+ print "SquirrelMail adds username information to every sent email.";
+ print "It is done in order to prevent possible sender forging when ";
+ print "end users are allowed to change their email and name ";
+ print "information.\n";
+ print "\n";
+ print "You can disable this header, if you think that it violates ";
+ print "user's privacy or security. Please note, that setting will ";
+ print "work only when users are not allowed to change their identity.\n";
+ print "\n";
+
+ if ( lc($hide_auth_header) eq "true" ) {
+ $default_value = "y";
+ } else {
+ $default_value = "n";
+ }
+ print "Remove username from email headers? (y/n) [$WHT$default_value$NRM]: $WHT";
+ $new_header = <STDIN>;
+ if ( ( $new_header =~ /^y\n/i ) || ( ( $new_header =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+ $hide_auth_header = "true";
+ } else {
+ $hide_auth_header = "false";
+ }
+ return $edit_name;
+}
+
sub command312 {
print "This option allows you to choose if users can use thread sorting\n";
print "Your IMAP server must support the THREAD command for this to work\n";
return $new_session_name;
}
+# time zone config (since 1.5.1)
+sub command318 {
+ print "This option allows you to control the use of time zones.\n";
+ print " 0 = (default) standard, GNU C time zone names\n";
+ print " 1 = strict, generic time zone codes with offsets\n";
+ print " 2 = custom, GNU C time zones loaded from config/timezones.php\n";
+ print " 3 = custom strict, generic time zone codes with offsets loaded \n";
+ print " from config/timezones.php\n";
+ print "See SquirrelMail documentation about format of config/timezones.php file.\n";
+ print "\n";
+
+ print "Used time zone configuration (0,1,2,3)? [$WHT$time_zone_type$NRM]: $WHT";
+ $new_time_zone_type = <STDIN>;
+ if ( $new_time_zone_type =~ /^[0123]\n/i ) {
+ $time_zone_type = $new_time_zone_type;
+ } else {
+ print "\nInvalid configuration value.\n";
+ print "\nPress enter to continue...";
+ $tmp = <STDIN>;
+ }
+ $time_zone_type =~ s/[\r\n]//g;
+ return $time_zone_type;
+}
sub command41 {
if ( $ldap_limit_scope[$count] ) {
print " limit_scope: $ldap_limit_scope[$count]\n";
}
+ if ( $ldap_listing[$count] ) {
+ print " listing: $ldap_listing[$count]\n";
+ }
+ if ( $ldap_search_tree[$count] ) {
+ print " search_tree: $ldap_search_tree[$count]\n";
+ }
+ if ( $ldap_starttls[$count] ) {
+ print " starttls: $ldap_starttls[$count]\n";
+ }
print "\n";
$count++;
print "\n";
print "You can specify the maximum number of rows in the search result.\n";
- print "Default is unlimited. Press ENTER for default.\n";
+ print "Default value is equal to 250 rows. Press ENTER for default.\n";
print "maxrows: ";
$name = <STDIN>;
$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 "\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 "This configuration section allows to set some rarely used\n";
+ print "options and options specific to some LDAP implementations.\n";
print "\n";
- print "Limit ldap scope? (y/N):";
- $name = <STDIN>;
- if ( $name =~ /^y\n/i ) {
- $name = 'true';
+ print "Do you want to set advanced LDAP directory settings? (y/N):";
+ $ldap_advanced_settings = <STDIN>;
+ if ( $ldap_advanced_settings =~ /^y\n/i ) {
+ $ldap_advanced_settings = 'true';
} else {
- $name = 'false';
+ $ldap_advanced_settings = 'false';
}
- $ldap_limit_scope[$sub] = $name;
+ if ($ldap_advanced_settings eq 'true') {
+ print "\n";
+
+ print "You can control LDAP directory listing here. This option can\n";
+ print "be useful if you run small LDAP server and want to provide listing\n";
+ print "of all addresses stored in LDAP to users of webmail interface.\n";
+ print "Number of displayed entries is limited by maxrows setting.\n";
+ print "\n";
+ print "Don't enable this option for public LDAP directories.\n";
+ print "This feature is experimental.\n";
+ print "\n";
+ print "Allow listing of LDAP directory? (y/N):";
+ $name = <STDIN>;
+ if ( $name =~ /^y\n/i ) {
+ $name = 'true';
+ } else {
+ $name = 'false';
+ }
+ $ldap_listing[$sub] = $name;
+
+ print "\n";
+
+ print "You can specify an additional search filter.\n";
+ print "This could be something like \"(objectclass=posixAccount)\".\n";
+ print "No filtering is performed by default. Press ENTER for default.\n";
+ print "filter: ";
+ $name = <STDIN>;
+ $name =~ s/[\r|\n]//g;
+ $ldap_filter[$sub] = $name;
+
+ print "\n";
+
+ print "You can control search scope here.\n";
+ print "This option is specific to Microsoft ADS implementation.\n";
+ print "It requires use of v3 or newer LDAP protocol.\n";
+ print "Don't enable it, if you use other LDAP server.\n";
+ print "\n";
+ print "Limit ldap scope? (y/N):";
+ $name = <STDIN>;
+ if ( $name =~ /^y\n/i ) {
+ $name = 'true';
+ } else {
+ $name = 'false';
+ }
+ $ldap_limit_scope[$sub] = $name;
+
+ print "\n";
+
+ print "You can control ldap search type here.\n";
+ print "Addresses can be searched in entire LDAP subtree (default)\n";
+ print "or only first level entries are returned.\n";
+ print "\n";
+ print "Search entire LDAP subtree? (Y/n):";
+ $name = <STDIN>;
+ if ( $name =~ /^n\n/i ) {
+ $name = 'false';
+ } else {
+ $name = 'true';
+ }
+ $ldap_search_tree[$sub] = $name;
+
+ print "\n";
+
+ print "You can control use of StartTLS on LDAP connection here.\n";
+ print "This option requires use of v3 or newer LDAP protocol and php 4.2+.\n";
+ print "\n";
+ print "Use StartTLS? (y/N):";
+ $name = <STDIN>;
+ if ( $name =~ /^y\n/i ) {
+ $name = 'true';
+ } else {
+ $name = 'false';
+ }
+ $ldap_starttls[$sub] = $name;
+ }
print "\n";
} elsif ( $input =~ /^\s*-\s*[0-9]?/ ) {
@new_ldap_binddn = ();
@new_ldap_protocol = ();
@new_ldap_limit_scope = ();
+ @new_ldap_listing = ();
+ @new_ldap_search_tree = ();
+ @new_ldap_starttls = ();
while ( $count <= $#ldap_host ) {
if ( $count != $rem_num ) {
@new_ldap_bindpw = ( @new_ldap_bindpw, $ldap_bindpw[$count] );
@new_ldap_protocol = ( @new_ldap_protocol, $ldap_protocol[$count] );
@new_ldap_limit_scope = ( @new_ldap_limit_scope, $ldap_limit_scope[$count] );
+ @new_ldap_listing = ( @new_ldap_listing, $ldap_listing[$count] );
+ @new_ldap_search_tree = ( @new_ldap_search_tree, $ldap_search_tree[$count] );
+ @new_ldap_starttls = ( @new_ldap_starttls, $ldap_starttls[$count] );
}
$count++;
}
@ldap_bindpw = @new_ldap_bindpw;
@ldap_protocol = @new_ldap_protocol;
@ldap_limit_scope = @new_ldap_limit_scope;
+ @ldap_listing = @new_ldap_listing;
+ @ldap_search_tree = @new_ldap_search_tree;
+ @ldap_starttls = @new_ldap_starttls;
} elsif ( $input =~ /^\s*\?\s*/ ) {
print ".-------------------------.\n";
print CF "\$invert_time = $invert_time;\n";
# string
print CF "\$optional_delimiter = '$optional_delimiter';\n";
- #boolean
- print CF "\$skip_SM_header = $skip_SM_header;\n";
+ # string
+ print CF "\$encode_header_key = '$encode_header_key';\n";
print CF "\n";
# string
print CF "\$edit_identity = $edit_identity;\n";
# boolean
print CF "\$edit_name = $edit_name;\n";
+ # boolean
+ print CF "\$hide_auth_header = $hide_auth_header;\n";
# boolean
print CF "\$allow_thread_sort = $allow_thread_sort;\n";
# boolean
# integer
print CF "\$allow_advanced_search = $allow_advanced_search;\n";
print CF "\n";
+ # integer
+ print CF "\$time_zone_type = $time_zone_type;\n";
+ print CF "\n";
# all plugins are strings
for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) {
}
if ( $ldap_protocol[$count] ) {
print CF ",\n";
- # integer
+ # integer
print CF " 'protocol' => $ldap_protocol[$count]";
}
if ( $ldap_limit_scope[$count] ) {
# boolean
print CF " 'limit_scope' => $ldap_limit_scope[$count]";
}
+ if ( $ldap_listing[$count] ) {
+ print CF ",\n";
+ # boolean
+ print CF " 'listing' => $ldap_listing[$count]";
+ }
+ if ( $ldap_search_tree[$count] ) {
+ print CF ",\n";
+ # integer
+ print CF " 'search_tree' => $ldap_search_tree[$count]";
+ }
+ if ( $ldap_listing[$count] ) {
+ print CF ",\n";
+ # boolean
+ print CF " 'starttls' => $ldap_starttls[$count]";
+ }
print CF "\n";
print CF ");\n";
print CF "\n";
} elsif ( $server eq "mercury32" ) {
$imap_server_type = "mercury32";
$default_folder_prefix = "";
- $trash_folder = "INBOX.Trash";
- $sent_folder = "INBOX.Sent";
- $draft_folder = "INBOX.Drafts";
+ $trash_folder = "Trash";
+ $sent_folder = "Sent";
+ $draft_folder = "Drafts";
$show_prefix_option = false;
$default_sub_of_inbox = true;
$show_contain_subfolders_option = true;
projects / squirrelmail.git / blobdiff