michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Do exact matching for ignore list, rather than regexps

Browse Source
This commit is contained in:
Jamie Cameron
2007-04-26 17:18:33 +00:00
parent 8ee4229fea
commit db20675ec5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailboxes/config_info.pl
View File

@@ -3,6 +3,7 @@ do '../web-lib-funcs.pl';
sub show_userIgnoreList
{
my($ig_usr) = shift(@_) || '';
$ig_usr =~ s/\t/\n/g;
my($preta) = '<TEXTAREA NAME="ignore_users" COLS="35" ROWS="4">';
my($postta) = '</TEXTAREA>';
@@ -16,5 +17,6 @@ sub show_userIgnoreList
sub parse_userIgnoreList
{
$in{'ignore_users'} =~ s/\r?\n/\t/g;
return $in{'ignore_users'};
}

8
mailboxes/mailboxes-lib.pl
View File

@@ -17,6 +17,8 @@ if ($config{'mail_system'} == 3) {
&save_module_config() if ($config{'mail_system'} != 3);
}
@ignore_users_list = &split_quoted_string($config{'ignore_users'});
# send_mail_program(from, to)
# Returns the command for injecting email, based on the mail system in use
sub send_mail_program
@@ -400,7 +402,7 @@ if ($config{'sort_mode'} == 2 || $config{'show_size'} > 0 || $_[1] ||
# Need to check folders
foreach $u (@users) {
next if ($config{'ignore_users_enabled'} == 1 &&
$config{'ignore_users'} =~ /$u->[0]/);
&indexof($u->[0], @ignore_users_list) >= 0);
local @folders = &list_user_folders(@$u);
$foldercount{$u->[0]} = scalar(@folders);
if ($config{'sort_mode'} == 2 ||
@@ -457,7 +459,7 @@ elsif ($config{'show_size'} == 2) {
foreach $u (@users) {
local $g = getgrgid($u->[3]);
next if ($config{'ignore_users_enabled'} == 1 &&
$config{'ignore_users'} =~ /$u->[0]/);
&indexof($u->[0], @ignore_users_list) >= 0);
$u->[6] =~ s/,.*$// if ($uconfig{'extra_real'});
local $home = $u->[7];
if (length($home) > 30) {
@@ -489,7 +491,7 @@ else {
local $i = 0;
foreach $u (@users) {
next if ($config{'ignore_users_enabled'} == 1 &&
$config{'ignore_users'} =~ /$u->[0]/);
&indexof($u->[0], @ignore_users_list) >= 0);
print "<tr>\n" if ($i % $config{'column_count'} == 0);
print "<td width=", int(100/$config{'column_count'}), "%><a href='list_mail.cgi?user=$u->[0]'>";
print $u->[0];