/[smecontribs]/rpms/smeserver-wbl/contribs8/smeserver-wbl-0.1.0_earlier_declaration_in_same_scope.patch
ViewVC logotype

Diff of /rpms/smeserver-wbl/contribs8/smeserver-wbl-0.1.0_earlier_declaration_in_same_scope.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by stephdl, Tue Apr 8 21:54:31 2014 UTC Revision 1.3 by stephdl, Fri Apr 11 20:03:51 2014 UTC
# Line 1  Line 1 
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  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  --- 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-08 22:38:46.104430939 +0200  +++ 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 @@  @@ -190,14 +190,14 @@
17          }          }
18    
# Line 10  diff -Nur smeserver-wbl-0.1.0.old/root/u Line 22  diff -Nur smeserver-wbl-0.1.0.old/root/u
22  -    my $value = "";  -    my $value = "";
23  -    while (($parameter,$value) = each(%list)) {  -    while (($parameter,$value) = each(%list)) {
24  -        if ($parameter eq "type") {next;}  -        if ($parameter eq "type") {next;}
25  +    my %list_bis = $wdb->get('badmailfrom')->props;  +    my %list_badmailfrom = $wdb->get('badmailfrom')->props;
26  +    my $parameter_bis = "";  +    my $parameter_badmailfrom = "";
27  +    my $value_bis = "";  +    my $value_badmailfrom = "";
28  +    while (($parameter_bis,$value_bis) = each(%list_bis)) {  +    while (($parameter_badmailfrom,$value_badmailfrom) = each(%list_badmailfrom)) {
29  +        if ($parameter_bis eq "type") {next;}  +        if ($parameter_badmailfrom eq "type") {next;}
30    
31  -        if ($value eq "Black") {  -        if ($value eq "Black") {
32  -            $wdb->get_prop_and_delete('badmailfrom', "$parameter");  -            $wdb->get_prop_and_delete('badmailfrom', "$parameter");
33  +        if ($value_bis eq "Black") {  +        if ($value_badmailfrom eq "Black") {
34  +            $wdb->get_prop_and_delete('badmailfrom', "$parameter_bis");  +            $wdb->get_prop_and_delete('badmailfrom', "$parameter_badmailfrom");
35           }           }
36       }       }
37    
# Line 32  diff -Nur smeserver-wbl-0.1.0.old/root/u Line 44  diff -Nur smeserver-wbl-0.1.0.old/root/u
44  -    my $value = "";  -    my $value = "";
45  -    while (($parameter,$value) = each(%list)) {  -    while (($parameter,$value) = each(%list)) {
46  -        if ($parameter eq "type") {next;}  -        if ($parameter eq "type") {next;}
47  +    my %list_bis = $wdb->get('whitelisthelo')->props;  +    my %list_whitelisthelo = $wdb->get('whitelisthelo')->props;
48  +    my $parameter_bis = "";  +    my $parameter_whitelisthelo = "";
49  +    my $value_bis = "";  +    my $value_whitelisthelo = "";
50  +    while (($parameter_bis,$value_bis) = each(%list_bis)) {  +    while (($parameter_whitelisthelo,$value_whitelisthelo) = each(%list_whitelisthelo)) {
51  +        if ($parameter_bis eq "type") {next;}  +        if ($parameter_whitelisthelo eq "type") {next;}
52    
53  -        if ($value eq "White") {  -        if ($value eq "White") {
54  -            $wdb->get_prop_and_delete('whitelisthelo', "$parameter");  -            $wdb->get_prop_and_delete('whitelisthelo', "$parameter");
55  +        if ($value_bis eq "White") {  +        if ($value_whitelisthelo eq "White") {
56  +            $wdb->get_prop_and_delete('whitelisthelo', "$parameter_bis");  +            $wdb->get_prop_and_delete('whitelisthelo', "$parameter_whitelisthelo");
57           }           }
58       }       }
59    
# Line 54  diff -Nur smeserver-wbl-0.1.0.old/root/u Line 66  diff -Nur smeserver-wbl-0.1.0.old/root/u
66  -    my $value = "";  -    my $value = "";
67  -    while (($parameter,$value) = each(%list)) {  -    while (($parameter,$value) = each(%list)) {
68  -        if ($parameter eq "type") {next;}  -        if ($parameter eq "type") {next;}
69  +    my %list_ter = $wdb->get('whitelistsenders')->props;  +    my %list_whitelistsenders = $wdb->get('whitelistsenders')->props;
70  +    my $parameter_ter = "";  +    my $parameter_whitelistsenders = "";
71  +    my $value_ter = "";  +    my $value_whitelistsenders = "";
72  +    while (($parameter_ter,$value_ter) = each(%list_ter)) {  +    while (($parameter_whitelistsenders,$value_whitelistsenders) = each(%list_whitelistsenders)) {
73  +        if ($parameter_ter eq "type") {next;}  +        if ($parameter_whitelistsenders eq "type") {next;}
74    
75  -        if ($value eq "White") {  -        if ($value eq "White") {
76  -            $wdb->get_prop_and_delete('whitelistsenders', "$parameter");  -            $wdb->get_prop_and_delete('whitelistsenders', "$parameter");
77  +        if ($value_ter eq "White") {  +        if ($value_whitelistsenders eq "White") {
78  +            $wdb->get_prop_and_delete('whitelistsenders', "$parameter_ter");  +            $wdb->get_prop_and_delete('whitelistsenders', "$parameter_whitelistsenders");
79           }           }
80       }       }
81    
# Line 76  diff -Nur smeserver-wbl-0.1.0.old/root/u Line 88  diff -Nur smeserver-wbl-0.1.0.old/root/u
88  -    my $value = "";  -    my $value = "";
89  -    while (($parameter,$value) = each(%list)) {  -    while (($parameter,$value) = each(%list)) {
90  -        if ($parameter eq "type") {next;}  -        if ($parameter eq "type") {next;}
91  +    my %list_four = $sdb->get('wbl.global')->props;  +    my %list_wblglobal = $sdb->get('wbl.global')->props;
92  +    my $parameter_four = "";  +    my $parameter_wblglobal = "";
93  +    my $value_four = "";  +    my $value_wblglobal = "";
94  +    while (($parameter_four,$value_four) = each(%list_four)) {  +    while (($parameter_wblglobal,$value_wblglobal) = each(%list_wblglobal)) {
95  +        if ($parameter_four eq "type") {next;}  +        if ($parameter_wblglobal eq "type") {next;}
96    
97  -        if ($value eq "White") {  -        if ($value eq "White") {
98  -            $sdb->get_prop_and_delete('wbl.global', "$parameter");  -            $sdb->get_prop_and_delete('wbl.global', "$parameter");
99  +        if ($value_four eq "White") {  +        if ($value_wblglobal eq "White") {
100  +            $sdb->get_prop_and_delete('wbl.global', "$parameter_four");  +            $sdb->get_prop_and_delete('wbl.global', "$parameter_wblglobal");
101           }           }
102       }       }
103    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed