--- rpms/smeserver-wbl/contribs9/smeserver-wbl-0.3.0.bz9092.RBL_Menu.patch 2015/10/14 19:30:35 1.2
+++ rpms/smeserver-wbl/contribs9/smeserver-wbl-0.3.0.bz9092.RBL_Menu.patch 2015/10/15 20:48:22 1.3
@@ -1,34 +1,74 @@
diff -Nur smeserver-wbl-0.3.0.bz9092.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl
--- smeserver-wbl-0.3.0.bz9092.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl 2015-10-13 00:30:41.310389712 +0200
-+++ smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl 2015-10-14 21:27:41.990976109 +0200
-@@ -35,11 +35,15 @@
- E-mail traffic is scanned and may be blocked due to the various screening methods enabled.
- You may use this panel to define e-mail white/black lists.
-
-+
RBL's List is used to adjust DNSBL and RHSBL.
-+ RBL's List
-+
- Black lists are used for rejecting e-mail traffic.
- Black List
++++ smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wbl 2015-10-15 22:34:01.631604797 +0200
+@@ -29,22 +29,40 @@
+
+
+
+- FORM_DESCRIPTION
+-
+- E-mail traffic is scanned and may be blocked due to the various screening methods enabled.
+- You may use this panel to define e-mail white/black lists.
++ WBL_DESCRIPTION
++ E-mail traffic is scanned and may be blocked due to the various screening methods enabled.
++ You may use this panel to define e-mail white/black lists.
++
+
+- Black lists are used for rejecting e-mail traffic.
+- Black List
++
++ RBL_LIST_DESCRIPTION
++ RBL's List is used to adjust DNSBL and RHSBL.
++
-
White lists are used for accepting e-mail traffic.
-+ White lists are used for accepting e-mail traffic.
- White List
+- White List
+
+- ]]>
+-
++
++ RBL_LIST
++ RBL's List
++
++
++
++ BLACK_LIST_DESCRIPTION
++ Black lists are used for rejecting e-mail traffic.
++
++
++
++ BLACK_LIST
++ Black List
++
++
++
++ WHITE_LIST_DESCRIPTION
++ White lists are used for accepting e-mail traffic.
++
++
++
++ WHITE_LIST
++ White List
+
-@@ -53,8 +57,7 @@
+ # WBL_PAGE_BLACK
+@@ -52,18 +70,15 @@
+
BLACK_TITLE
- This server includes built-in support for using two external black list methods,
- DNSBL and RHSBL. It also supports the admin defined black lists, badhelo and
-+ This server includes built-in support for using the admin defined black lists, badhelo and
- badmailfrom.
- ]]>
+- badmailfrom.
+- ]]>
++ This server includes built-in support for using the admin defined black lists, badhelo and
++ badmailfrom.
-@@ -63,7 +66,7 @@
+
+
DNSBL_DESCRIPTION
@@ -37,7 +77,7 @@ diff -Nur smeserver-wbl-0.3.0.bz9092.old
-@@ -75,8 +78,7 @@
+@@ -75,8 +90,7 @@
RHSBL_DESCRIPTION
@@ -47,7 +87,7 @@ diff -Nur smeserver-wbl-0.3.0.bz9092.old
-@@ -115,7 +117,7 @@
+@@ -115,7 +129,7 @@
WHITE_TITLE
@@ -56,7 +96,7 @@ diff -Nur smeserver-wbl-0.3.0.bz9092.old
-@@ -185,4 +187,24 @@
+@@ -185,4 +199,24 @@
will be rejected by spamassassin.
@@ -83,24 +123,50 @@ diff -Nur smeserver-wbl-0.3.0.bz9092.old
diff -Nur smeserver-wbl-0.3.0.bz9092.old/root/etc/e-smith/web/functions/wbl smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/web/functions/wbl
--- smeserver-wbl-0.3.0.bz9092.old/root/etc/e-smith/web/functions/wbl 2015-10-13 00:30:41.316390108 +0200
-+++ smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/web/functions/wbl 2015-10-13 23:38:47.352374175 +0200
-@@ -26,12 +26,10 @@
- FORM_DESCRIPTION
++++ smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/web/functions/wbl 2015-10-15 22:36:42.341219048 +0200
+@@ -23,15 +23,35 @@
+
+
+
+- FORM_DESCRIPTION
++
++ WBL_DESCRIPTION
++
+
+-
-
--
-
--
++
++ RBL_LIST_DESCRIPTION
++
+
- BLACK_TITLE
++
++
++
++ BLACK_LIST_DESCRIPTION
++
++
++
++
++
++ WHITE_LIST_DESCRIPTION
++
++
++
++
++
++
++
+ RBL_TITLE
DNSBL_LABEL
DNSBL_DESCRIPTION
@@ -117,7 +183,7 @@ diff -Nur smeserver-wbl-0.3.0.bz9092.old
RHSBL_LABEL
RHSBL_DESCRIPTION
@@ -142,7 +208,7 @@ diff -Nur smeserver-wbl-0.3.0.bz9092.old
WHITE_TITLE
get_prop('qpsmtpd', 'RHSBL') || 'disabled');
}
@@ -221,7 +287,7 @@ diff -Nur smeserver-wbl-0.3.0.bz9092.old
# qpsmtpd whitelisthosts
my %list = $wdb->get('whitelisthosts')->props;
my $parameter = "";
-@@ -366,5 +363,42 @@
+@@ -366,5 +363,53 @@
return join "\n", sort(@blacklistfrom);
}
@@ -263,4 +329,15 @@ diff -Nur smeserver-wbl-0.3.0.bz9092.old
+
+ $fm->success('SUCCESS');
+}
++
++#Subroutine to display buttons
++sub print_custom_button{
++ my ($fm,$desc,$url) = @_;
++ my $q = $fm->{cgi};
++ $url="wbl?page=0&page_stack=&Next=Next&wherenext=".$url;
++ print " \n | \n";
++ print $q->p($q->a({href => $url, -class => "button-like"},$fm->localise($desc)));
++ print qq( |
\n);
++ return undef;
++}
1;