| 1 |
diff -Nur smeserver-wbl-0.1.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl smeserver-wbl-0.1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl |
| 2 |
--- smeserver-wbl-0.1.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl 2014-04-08 22:25:04.445107789 +0200 |
| 3 |
+++ smeserver-wbl-0.1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl 2014-04-11 20:46:33.823813670 +0200 |
| 4 |
@@ -152,7 +152,7 @@ |
| 5 |
<entry> |
| 6 |
<base>WHITELISTSENDERS_DESCRIPTION</base> |
| 7 |
<trans> |
| 8 |
- Any envelope sender of a mail (@host or user@host) matching an entry in whitelistsenders |
| 9 |
+ Any envelope sender of a mail (host.domain or user@host.domain) matching an entry in whitelistsenders |
| 10 |
will be exempted from further validation during the 'mail' stage. |
| 11 |
</trans> |
| 12 |
</entry> |
| 13 |
diff -Nur smeserver-wbl-0.1.0.old/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm |
| 14 |
--- smeserver-wbl-0.1.0.old/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm 2014-04-08 22:25:04.450108424 +0200 |
| 15 |
+++ smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm 2014-04-11 20:12:22.233245931 +0200 |
| 16 |
@@ -190,14 +190,14 @@ |
| 17 |
} |
| 18 |
|
| 19 |
# qmail badmailfrom |
| 20 |
- my %list = $wdb->get('badmailfrom')->props; |
| 21 |
- my $parameter = ""; |
| 22 |
- my $value = ""; |
| 23 |
- while (($parameter,$value) = each(%list)) { |
| 24 |
- if ($parameter eq "type") {next;} |
| 25 |
+ my %list_badmailfrom = $wdb->get('badmailfrom')->props; |
| 26 |
+ my $parameter_badmailfrom = ""; |
| 27 |
+ my $value_badmailfrom = ""; |
| 28 |
+ while (($parameter_badmailfrom,$value_badmailfrom) = each(%list_badmailfrom)) { |
| 29 |
+ if ($parameter_badmailfrom eq "type") {next;} |
| 30 |
|
| 31 |
- if ($value eq "Black") { |
| 32 |
- $wdb->get_prop_and_delete('badmailfrom', "$parameter"); |
| 33 |
+ if ($value_badmailfrom eq "Black") { |
| 34 |
+ $wdb->get_prop_and_delete('badmailfrom', "$parameter_badmailfrom"); |
| 35 |
} |
| 36 |
} |
| 37 |
|
| 38 |
@@ -247,14 +247,14 @@ |
| 39 |
} |
| 40 |
|
| 41 |
# qpsmtpd whitelisthelo |
| 42 |
- my %list = $wdb->get('whitelisthelo')->props; |
| 43 |
- my $parameter = ""; |
| 44 |
- my $value = ""; |
| 45 |
- while (($parameter,$value) = each(%list)) { |
| 46 |
- if ($parameter eq "type") {next;} |
| 47 |
+ my %list_whitelisthelo = $wdb->get('whitelisthelo')->props; |
| 48 |
+ my $parameter_whitelisthelo = ""; |
| 49 |
+ my $value_whitelisthelo = ""; |
| 50 |
+ while (($parameter_whitelisthelo,$value_whitelisthelo) = each(%list_whitelisthelo)) { |
| 51 |
+ if ($parameter_whitelisthelo eq "type") {next;} |
| 52 |
|
| 53 |
- if ($value eq "White") { |
| 54 |
- $wdb->get_prop_and_delete('whitelisthelo', "$parameter"); |
| 55 |
+ if ($value_whitelisthelo eq "White") { |
| 56 |
+ $wdb->get_prop_and_delete('whitelisthelo', "$parameter_whitelisthelo"); |
| 57 |
} |
| 58 |
} |
| 59 |
|
| 60 |
@@ -267,14 +267,14 @@ |
| 61 |
} |
| 62 |
|
| 63 |
# qpsmtpd whitelistsenders |
| 64 |
- my %list = $wdb->get('whitelistsenders')->props; |
| 65 |
- my $parameter = ""; |
| 66 |
- my $value = ""; |
| 67 |
- while (($parameter,$value) = each(%list)) { |
| 68 |
- if ($parameter eq "type") {next;} |
| 69 |
+ my %list_whitelistsenders = $wdb->get('whitelistsenders')->props; |
| 70 |
+ my $parameter_whitelistsenders = ""; |
| 71 |
+ my $value_whitelistsenders = ""; |
| 72 |
+ while (($parameter_whitelistsenders,$value_whitelistsenders) = each(%list_whitelistsenders)) { |
| 73 |
+ if ($parameter_whitelistsenders eq "type") {next;} |
| 74 |
|
| 75 |
- if ($value eq "White") { |
| 76 |
- $wdb->get_prop_and_delete('whitelistsenders', "$parameter"); |
| 77 |
+ if ($value_whitelistsenders eq "White") { |
| 78 |
+ $wdb->get_prop_and_delete('whitelistsenders', "$parameter_whitelistsenders"); |
| 79 |
} |
| 80 |
} |
| 81 |
|
| 82 |
@@ -287,14 +287,14 @@ |
| 83 |
} |
| 84 |
|
| 85 |
# spamassassin whitelist_from |
| 86 |
- my %list = $sdb->get('wbl.global')->props; |
| 87 |
- my $parameter = ""; |
| 88 |
- my $value = ""; |
| 89 |
- while (($parameter,$value) = each(%list)) { |
| 90 |
- if ($parameter eq "type") {next;} |
| 91 |
+ my %list_wblglobal = $sdb->get('wbl.global')->props; |
| 92 |
+ my $parameter_wblglobal = ""; |
| 93 |
+ my $value_wblglobal = ""; |
| 94 |
+ while (($parameter_wblglobal,$value_wblglobal) = each(%list_wblglobal)) { |
| 95 |
+ if ($parameter_wblglobal eq "type") {next;} |
| 96 |
|
| 97 |
- if ($value eq "White") { |
| 98 |
- $sdb->get_prop_and_delete('wbl.global', "$parameter"); |
| 99 |
+ if ($value_wblglobal eq "White") { |
| 100 |
+ $sdb->get_prop_and_delete('wbl.global', "$parameter_wblglobal"); |
| 101 |
} |
| 102 |
} |
| 103 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
