$tmp =~ s/[\'\"]?,?\s*$//;
$tmp =~ s/[\'\"]?\);\s*$//;
$listing = $tmp;
+ } elsif ( $tmp =~ /^\s*[\'\"]writeable[\'\"]/i ) {
+ $tmp =~ s/^\s*[\'\"]writeable[\'\"]\s*=>\s*[\'\"]?//i;
+ $tmp =~ s/[\'\"]?,?\s*$//;
+ $tmp =~ s/[\'\"]?\);\s*$//;
+ $writeable = $tmp;
} elsif ( $tmp =~ /^\s*[\'\"]search_tree[\'\"]/i ) {
$tmp =~ s/^\s*[\'\"]search_tree[\'\"]\s*=>\s*[\'\"]?//i;
$tmp =~ s/[\'\"]?,?\s*$//;
$ldap_protocol[$sub] = $protocol;
$ldap_limit_scope[$sub] = $limit_scope;
$ldap_listing[$sub] = $listing;
+ $ldap_writeable[$sub] = $writeable;
$ldap_search_tree[$sub] = $search_tree;
$ldap_starttls[$sub] = $starttls;
} elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page)$/ ) {
$disable_thread_sort = 'false' if ( !$disable_thread_sort );
$disable_server_sort = 'false' if ( !$disable_server_sort );
+# since 1.5.2
+$abook_file_line_length = 2048 if ( !$abook_file_line_length );
+
if ( $ARGV[0] eq '--install-plugin' ) {
print "Activating plugin " . $ARGV[1] . "\n";
push @plugins, $ARGV[1];
print "4. IMAP Server : $WHT$imapServerAddress$NRM\n";
print "5. IMAP Port : $WHT$imapPort$NRM\n";
print "6. Authentication type : $WHT$imap_auth_mech$NRM\n";
- print "7. Secure IMAP (TLS) : $WHT$use_imap_tls$NRM\n";
+ print "7. Secure IMAP (TLS) : $WHT" . display_use_tls($use_imap_tls) . "$NRM\n";
print "8. Server software : $WHT$imap_server_type$NRM\n";
print "9. Delimiter : $WHT$optional_delimiter$NRM\n";
print "\n";
print "5. SMTP Port : $WHT$smtpPort$NRM\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 "8. Secure SMTP (TLS) : $WHT" . display_use_tls($use_smtp_tls) . "$NRM\n";
print "9. Header encryption key : $WHT$encode_header_key$NRM\n";
print "\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 "6. Allowed address book line length : $WHT$abook_file_line_length$NRM\n";
print "\n";
print "R Return to Main Menu\n";
} elsif ( $menu == 7 ) {
elsif ( $command == 3 ) { $abook_global_file=command63(); }
elsif ( $command == 4 ) { command64(); }
elsif ( $command == 5 ) { command65(); }
+ elsif ( $command == 6 ) { command_abook_file_line_length(); }
} elsif ( $menu == 7 ) {
if ( $command == 1 ) { $motd = command71(); }
} elsif ( $menu == 8 ) {
return $default_val;
}
+# This sub is used to display human readable text for
+# $use_imap_tls and $use_smtp_tls values in conf.pl menu
+sub display_use_tls($) {
+ my $val = shift(@_);
+ my $ret = 'disabled';
+ if ($val eq '2') {
+ $ret = 'STARTTLS';
+ } elsif ($val eq '1') {
+ $ret = 'TLS';
+ }
+ return $ret;
+}
+
# $encode_header_key
sub command114{
print "Encryption key allows to hide SquirrelMail Received: headers\n";
if ( $new_trash_folder eq "\n" ) {
$new_trash_folder = $trash_folder;
} else {
- $new_trash_folder =~ s/[\r\n]//g;
+ if (check_imap_folder($new_trash_folder)) {
+ $new_trash_folder =~ s/[\r\n]//g;
+ } else {
+ $new_trash_folder = $trash_folder;
+ }
}
return $new_trash_folder;
}
if ( $new_sent_folder eq "\n" ) {
$new_sent_folder = $sent_folder;
} else {
- $new_sent_folder =~ s/[\r\n]//g;
+ if (check_imap_folder($new_sent_folder)) {
+ $new_sent_folder =~ s/[\r\n]//g;
+ } else {
+ $new_sent_folder = $sent_folder;
+ }
}
return $new_sent_folder;
}
if ( $new_draft_folder eq "\n" ) {
$new_draft_folder = $draft_folder;
} else {
- $new_draft_folder =~ s/[\r\n]//g;
+ if (check_imap_folder($new_draft_folder)) {
+ $new_draft_folder =~ s/[\r\n]//g;
+ } else {
+ $new_draft_folder = $draft_folder;
+ }
}
return $new_draft_folder;
}
sub command61 {
print "You can now define different LDAP servers.\n";
+ print "Please ensure proper permissions for config.php when including\n";
+ print "sensitive passwords.\n\n";
print "[ldap] command (?=help) > ";
$input = <STDIN>;
$input =~ s/[\r\n]//g;
if ( $ldap_listing[$count] ) {
print " listing: $ldap_listing[$count]\n";
}
+ if ( $ldap_writeable[$count] ) {
+ print " writeable: $ldap_writeable[$count]\n";
+ }
if ( $ldap_search_tree[$count] ) {
print " search_tree: $ldap_search_tree[$count]\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>;
print "\n";
+ print "You can control write access to LDAP address book here. This option can\n";
+ print "be useful if you run small LDAP server and want to provide writable\n";
+ print "shared address book stored in LDAP to users of webmail interface.\n";
+ print "\n";
+ print "Don't enable this option for public LDAP directories.\n";
+ print "\n";
+ print "Allow writing to LDAP directory? (y/N):";
+ $name = <STDIN>;
+ if ( $name =~ /^y\n/i ) {
+ $name = 'true';
+ } else {
+ $name = 'false';
+ }
+ $ldap_writeable[$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";
@new_ldap_protocol = ();
@new_ldap_limit_scope = ();
@new_ldap_listing = ();
+ @new_ldap_writeable = ();
@new_ldap_search_tree = ();
@new_ldap_starttls = ();
@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_writeable = ( @new_ldap_writeable, $ldap_writeable[$count] );
@new_ldap_search_tree = ( @new_ldap_search_tree, $ldap_search_tree[$count] );
@new_ldap_starttls = ( @new_ldap_starttls, $ldap_starttls[$count] );
}
@ldap_protocol = @new_ldap_protocol;
@ldap_limit_scope = @new_ldap_limit_scope;
@ldap_listing = @new_ldap_listing;
+ @ldap_writeable = @new_ldap_writeable;
@ldap_search_tree = @new_ldap_search_tree;
@ldap_starttls = @new_ldap_starttls;
return $abook_global_file_listing;
}
+# controls $abook_file_line_length setting
+sub command_abook_file_line_length {
+ print "This setting controls space allocated to file based address book records.\n";
+ print "End users will be unable to save address book entry, if total entry size \n";
+ print "(quoted address book fields + 4 delimiters + linefeed) exceeds allowed \n";
+ print "address book length size.\n";
+ print "\n";
+ print "Same setting is applied to personal and global file based address books.\n";
+ print "\n";
+ print "It is strongly recommended to keep default setting value. Change it only\n";
+ print "if you really want to store address book entries that are bigger than two\n";
+ print "kilobytes (2048).\n";
+ print "\n";
+
+ print "Enter allowed address book line length [$abook_file_line_length]: ";
+ my $tmp = <STDIN>;
+ $tmp = trim($tmp);
+ # value is not modified, if user hits Enter or enters space
+ if ($tmp ne '') {
+ # make sure that input is numeric
+ if ($tmp =~ /^\d+$/) {
+ $abook_file_line_length = $tmp;
+ } else {
+ print "If you want to change this setting, you must enter number.\n";
+ print "If you want to keep original setting - enter space.\n\n";
+ print "Press Enter to continue...";
+ $tmp = <STDIN>;
+ }
+ }
+}
+
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";
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 "of these are mysql, msql and pgsql.\n";
+ print "Please ensure proper permissions for config.php when including\n";
+ print "sensitive passwords.\n\n";
print "If the DSN is left empty (hit space and then return) the database\n";
- print "related code for address books will not be used\n";
+ print "related code for address books will not be used.\n";
print "\n";
if ( $addrbook_dsn eq "" ) {
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 "of these are mysql, msql and pgsql.\n";
+ print "Please ensure proper permissions for config.php when including\n";
+ print "sensitive passwords.\n\n";
print "If the DSN is left empty (hit space and then return) the database\n";
- print "related code for address books will not be used\n";
+ print "related code for address books will not be used.\n";
print "\n";
if ( $prefs_dsn eq "" ) {
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 "of these are mysql, msql and pgsql.\n";
+ print "Please ensure proper permissions for config.php when including\n";
+ print "sensitive passwords.\n\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 "related code for global SQL address book will not be used.\n";
print "\n";
if ( $addrbook_global_dsn eq "" ) {
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 "charsets that are set in translation settings.\n";
print "\n";
print "[$WHT$default_charset$NRM]: $WHT";
# boolean
print CF " 'listing' => $ldap_listing[$count]";
}
+ if ( $ldap_writeable[$count] ) {
+ print CF ",\n";
+ # boolean
+ print CF " 'writeable' => $ldap_writeable[$count]";
+ }
if ( $ldap_search_tree[$count] ) {
print CF ",\n";
# integer
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";
+ # integer
+ print CF "\$abook_file_line_length = $abook_file_line_length;\n\n";
# boolean
print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\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";
system "clear";
}
}
+
+# checks IMAP mailbox name. Refuses to accept 8bit folders
+# returns 0 (folder name is not correct) or 1 (folder name is correct)
+sub check_imap_folder($) {
+ my $folder_name = shift(@_);
+ if ($folder_name =~ /[\x{80}-\x{FFFF}]/) {
+ # check for 8bit. Using iso-10646 range, because x80-xFF range does not match unicode chars
+ print "Folder name contains 8bit characters. Configuration utility requires\n";
+ print "UTF7-IMAP encoded folder names.\n";
+ print "Press any key to continue...";
+ my $tmp = <STDIN>;
+ return 0;
+ } elsif ($folder_name =~ /[&\*\%]/) {
+ # check for ampersand and list-wildcards
+ print "Folder name contains special UTF7-IMAP characters.\n";
+ print "Are you sure that folder name is correct? (yN): ";
+ my $tmp = <STDIN>;
+ $tmp = lc(trim($tmp));
+ if ($tmp =~ /^y$/) {
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ return 1;
+ }
+}
projects / squirrelmail.git / blobdiff