1 |
stephdl |
1.1 |
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 |
2 |
|
|
--- 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 |
3 |
|
|
+++ smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm 2014-04-08 22:38:46.104430939 +0200 |
4 |
|
|
@@ -190,14 +190,14 @@ |
5 |
|
|
} |
6 |
|
|
|
7 |
|
|
# qmail badmailfrom |
8 |
|
|
- my %list = $wdb->get('badmailfrom')->props; |
9 |
|
|
- my $parameter = ""; |
10 |
|
|
- my $value = ""; |
11 |
|
|
- while (($parameter,$value) = each(%list)) { |
12 |
|
|
- if ($parameter eq "type") {next;} |
13 |
stephdl |
1.2 |
+ my %list_badmailfrom = $wdb->get('badmailfrom')->props; |
14 |
|
|
+ my $parameter_badmailfrom = ""; |
15 |
|
|
+ my $value_badmailfrom = ""; |
16 |
|
|
+ while (($parameter_badmailfrom,$value_badmailfrom) = each(%list_badmailfrom)) { |
17 |
|
|
+ if ($parameter_badmailfrom eq "type") {next;} |
18 |
stephdl |
1.1 |
|
19 |
|
|
- if ($value eq "Black") { |
20 |
|
|
- $wdb->get_prop_and_delete('badmailfrom', "$parameter"); |
21 |
stephdl |
1.2 |
+ if ($value_badmailfrom eq "Black") { |
22 |
|
|
+ $wdb->get_prop_and_delete('badmailfrom', "$parameter_badmailfrom"); |
23 |
stephdl |
1.1 |
} |
24 |
|
|
} |
25 |
|
|
|
26 |
|
|
@@ -247,14 +247,14 @@ |
27 |
|
|
} |
28 |
|
|
|
29 |
|
|
# qpsmtpd whitelisthelo |
30 |
|
|
- my %list = $wdb->get('whitelisthelo')->props; |
31 |
|
|
- my $parameter = ""; |
32 |
|
|
- my $value = ""; |
33 |
|
|
- while (($parameter,$value) = each(%list)) { |
34 |
|
|
- if ($parameter eq "type") {next;} |
35 |
stephdl |
1.2 |
+ my %list_whitelisthelo = $wdb->get('whitelisthelo')->props; |
36 |
|
|
+ my $parameter_whitelisthelo = ""; |
37 |
|
|
+ my $value_whitelisthelo = ""; |
38 |
|
|
+ while (($parameter_whitelisthelo,$value_whitelisthelo) = each(%list_whitelisthelo)) { |
39 |
|
|
+ if ($parameter_whitelisthelo eq "type") {next;} |
40 |
stephdl |
1.1 |
|
41 |
|
|
- if ($value eq "White") { |
42 |
|
|
- $wdb->get_prop_and_delete('whitelisthelo', "$parameter"); |
43 |
stephdl |
1.2 |
+ if ($value_whitelisthelo eq "White") { |
44 |
|
|
+ $wdb->get_prop_and_delete('whitelisthelo', "$parameter_whitelisthelo"); |
45 |
stephdl |
1.1 |
} |
46 |
|
|
} |
47 |
|
|
|
48 |
|
|
@@ -267,14 +267,14 @@ |
49 |
|
|
} |
50 |
|
|
|
51 |
|
|
# qpsmtpd whitelistsenders |
52 |
|
|
- my %list = $wdb->get('whitelistsenders')->props; |
53 |
|
|
- my $parameter = ""; |
54 |
|
|
- my $value = ""; |
55 |
|
|
- while (($parameter,$value) = each(%list)) { |
56 |
|
|
- if ($parameter eq "type") {next;} |
57 |
stephdl |
1.2 |
+ my %list_whitelistsenders = $wdb->get('whitelistsenders')->props; |
58 |
|
|
+ my $parameter_whitelistsenders = ""; |
59 |
|
|
+ my $value_whitelistsenders = ""; |
60 |
|
|
+ while (($parameter_whitelistsenders,$value_whitelistsenders) = each(%list_whitelistsenders)) { |
61 |
|
|
+ if ($parameter_whitelistsenders eq "type") {next;} |
62 |
stephdl |
1.1 |
|
63 |
|
|
- if ($value eq "White") { |
64 |
|
|
- $wdb->get_prop_and_delete('whitelistsenders', "$parameter"); |
65 |
stephdl |
1.2 |
+ if ($value_whitelistsenders eq "White") { |
66 |
|
|
+ $wdb->get_prop_and_delete('whitelistsenders', "$parameter_whitelistsenders"); |
67 |
stephdl |
1.1 |
} |
68 |
|
|
} |
69 |
|
|
|
70 |
|
|
@@ -287,14 +287,14 @@ |
71 |
|
|
} |
72 |
|
|
|
73 |
|
|
# spamassassin whitelist_from |
74 |
|
|
- my %list = $sdb->get('wbl.global')->props; |
75 |
|
|
- my $parameter = ""; |
76 |
|
|
- my $value = ""; |
77 |
|
|
- while (($parameter,$value) = each(%list)) { |
78 |
|
|
- if ($parameter eq "type") {next;} |
79 |
stephdl |
1.2 |
+ my %list_wblglobal = $sdb->get('wbl.global')->props; |
80 |
|
|
+ my $parameter_wblglobal = ""; |
81 |
|
|
+ my $value_wblglobal = ""; |
82 |
|
|
+ while (($parameter_wblglobal,$value_wblglobal) = each(%list_wblglobal)) { |
83 |
|
|
+ if ($parameter_wblglobal eq "type") {next;} |
84 |
stephdl |
1.1 |
|
85 |
|
|
- if ($value eq "White") { |
86 |
|
|
- $sdb->get_prop_and_delete('wbl.global', "$parameter"); |
87 |
stephdl |
1.2 |
+ if ($value_wblglobal eq "White") { |
88 |
|
|
+ $sdb->get_prop_and_delete('wbl.global', "$parameter_wblglobal"); |
89 |
stephdl |
1.1 |
} |
90 |
|
|
} |
91 |
|
|
|