--- rpms/smeserver-wbl/contribs8/smeserver-wbl-0.1.0_earlier_declaration_in_same_scope.patch	2014/04/08 21:54:31	1.1
+++ rpms/smeserver-wbl/contribs8/smeserver-wbl-0.1.0_earlier_declaration_in_same_scope.patch	2014/04/11 20:03:51	1.3
@@ -1,6 +1,18 @@
+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
+--- 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
++++ 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
+@@ -152,7 +152,7 @@
+     <entry>
+         <base>WHITELISTSENDERS_DESCRIPTION</base>
+         <trans>
+-	Any envelope sender of a mail (@host or user@host) matching an entry in whitelistsenders 
++	Any envelope sender of a mail (host.domain or user@host.domain) matching an entry in whitelistsenders  
+ 	will be exempted from further validation during the 'mail' stage.
+         </trans>
+     </entry>
 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
 --- 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/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
 @@ -190,14 +190,14 @@
  	}
  
@@ -10,16 +22,16 @@ diff -Nur smeserver-wbl-0.1.0.old/root/u
 -    my $value = "";
 -    while (($parameter,$value) = each(%list)) {
 -        if ($parameter eq "type") {next;}
-+    my %list_bis = $wdb->get('badmailfrom')->props;
-+    my $parameter_bis = "";
-+    my $value_bis = "";
-+    while (($parameter_bis,$value_bis) = each(%list_bis)) {
-+        if ($parameter_bis eq "type") {next;}
++    my %list_badmailfrom = $wdb->get('badmailfrom')->props;
++    my $parameter_badmailfrom = "";
++    my $value_badmailfrom = "";
++    while (($parameter_badmailfrom,$value_badmailfrom) = each(%list_badmailfrom)) {
++        if ($parameter_badmailfrom eq "type") {next;}
  
 -        if ($value eq "Black") {
 -            $wdb->get_prop_and_delete('badmailfrom', "$parameter");
-+        if ($value_bis eq "Black") {
-+            $wdb->get_prop_and_delete('badmailfrom', "$parameter_bis");
++        if ($value_badmailfrom eq "Black") {
++            $wdb->get_prop_and_delete('badmailfrom', "$parameter_badmailfrom");
          }
      }
  
@@ -32,16 +44,16 @@ diff -Nur smeserver-wbl-0.1.0.old/root/u
 -    my $value = "";
 -    while (($parameter,$value) = each(%list)) {
 -        if ($parameter eq "type") {next;}
-+    my %list_bis = $wdb->get('whitelisthelo')->props;
-+    my $parameter_bis = "";
-+    my $value_bis = "";
-+    while (($parameter_bis,$value_bis) = each(%list_bis)) {
-+        if ($parameter_bis eq "type") {next;}
++    my %list_whitelisthelo = $wdb->get('whitelisthelo')->props;
++    my $parameter_whitelisthelo = "";
++    my $value_whitelisthelo = "";
++    while (($parameter_whitelisthelo,$value_whitelisthelo) = each(%list_whitelisthelo)) {
++        if ($parameter_whitelisthelo eq "type") {next;}
  
 -        if ($value eq "White") {
 -            $wdb->get_prop_and_delete('whitelisthelo', "$parameter");
-+        if ($value_bis eq "White") {
-+            $wdb->get_prop_and_delete('whitelisthelo', "$parameter_bis");
++        if ($value_whitelisthelo eq "White") {
++            $wdb->get_prop_and_delete('whitelisthelo', "$parameter_whitelisthelo");
          }
      }
  
@@ -54,16 +66,16 @@ diff -Nur smeserver-wbl-0.1.0.old/root/u
 -    my $value = "";
 -    while (($parameter,$value) = each(%list)) {
 -        if ($parameter eq "type") {next;}
-+    my %list_ter = $wdb->get('whitelistsenders')->props;
-+    my $parameter_ter = "";
-+    my $value_ter = "";
-+    while (($parameter_ter,$value_ter) = each(%list_ter)) {
-+        if ($parameter_ter eq "type") {next;}
++    my %list_whitelistsenders = $wdb->get('whitelistsenders')->props;
++    my $parameter_whitelistsenders = "";
++    my $value_whitelistsenders = "";
++    while (($parameter_whitelistsenders,$value_whitelistsenders) = each(%list_whitelistsenders)) {
++        if ($parameter_whitelistsenders eq "type") {next;}
  
 -        if ($value eq "White") {
 -            $wdb->get_prop_and_delete('whitelistsenders', "$parameter");
-+        if ($value_ter eq "White") {
-+            $wdb->get_prop_and_delete('whitelistsenders', "$parameter_ter");
++        if ($value_whitelistsenders eq "White") {
++            $wdb->get_prop_and_delete('whitelistsenders', "$parameter_whitelistsenders");
          }
      }
  
@@ -76,16 +88,16 @@ diff -Nur smeserver-wbl-0.1.0.old/root/u
 -    my $value = "";
 -    while (($parameter,$value) = each(%list)) {
 -        if ($parameter eq "type") {next;}
-+    my %list_four = $sdb->get('wbl.global')->props;
-+    my $parameter_four = "";
-+    my $value_four = "";
-+    while (($parameter_four,$value_four) = each(%list_four)) {
-+        if ($parameter_four eq "type") {next;}
++    my %list_wblglobal = $sdb->get('wbl.global')->props;
++    my $parameter_wblglobal = "";
++    my $value_wblglobal = "";
++    while (($parameter_wblglobal,$value_wblglobal) = each(%list_wblglobal)) {
++        if ($parameter_wblglobal eq "type") {next;}
  
 -        if ($value eq "White") {
 -            $sdb->get_prop_and_delete('wbl.global', "$parameter");
-+        if ($value_four eq "White") {
-+            $sdb->get_prop_and_delete('wbl.global', "$parameter_four");
++        if ($value_wblglobal eq "White") {
++            $sdb->get_prop_and_delete('wbl.global', "$parameter_wblglobal");
          }
      }