| 1 |
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 |
| 2 |
--- 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 |
| 3 |
+++ 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 |
| 4 |
@@ -35,11 +35,15 @@ |
| 5 |
<p>E-mail traffic is scanned and may be blocked due to the various screening methods enabled. |
| 6 |
You may use this panel to define e-mail white/black lists.</p> |
| 7 |
|
| 8 |
+ <p><br>RBL's List is used to adjust DNSBL and RHSBL.</p> |
| 9 |
+ <p><a class="button-like" |
| 10 |
+ href="wbl?page=0&page_stack=&Next=Next&wherenext=WBL_PAGE_RBL">RBL's List</a></p> |
| 11 |
+ |
| 12 |
<p>Black lists are used for rejecting e-mail traffic.</p> |
| 13 |
<p><a class="button-like" |
| 14 |
href="wbl?page=0&page_stack=&Next=Next&wherenext=WBL_PAGE_BLACK">Black List</a></p> |
| 15 |
|
| 16 |
- <p><br>White lists are used for accepting e-mail traffic.</p> |
| 17 |
+ <p>White lists are used for accepting e-mail traffic.</p> |
| 18 |
<p><a class="button-like" |
| 19 |
href="wbl?page=0&page_stack=&Next=Next&wherenext=WBL_PAGE_WHITE">White List</a></p> |
| 20 |
|
| 21 |
@@ -53,8 +57,7 @@ |
| 22 |
<base>BLACK_TITLE</base> |
| 23 |
<trans> |
| 24 |
<![CDATA[ |
| 25 |
- <p>This server includes built-in support for using two external black list methods, |
| 26 |
- DNSBL and RHSBL. It also supports the admin defined black lists, badhelo and |
| 27 |
+ <p>This server includes built-in support for using the admin defined black lists, badhelo and |
| 28 |
badmailfrom.</p> |
| 29 |
]]> |
| 30 |
</trans> |
| 31 |
@@ -63,7 +66,7 @@ |
| 32 |
<entry> |
| 33 |
<base>DNSBL_DESCRIPTION</base> |
| 34 |
<trans> |
| 35 |
- DNSBL is an abbreviation for "DNS blacklist". It is a list of IP addresses known to be spammers. |
| 36 |
+ DNSBL is an abbreviation for "DNS blacklist". |
| 37 |
</trans> |
| 38 |
</entry> |
| 39 |
|
| 40 |
@@ -75,8 +78,7 @@ |
| 41 |
<entry> |
| 42 |
<base>RHSBL_DESCRIPTION</base> |
| 43 |
<trans> |
| 44 |
- RHSBL is an abbreviation for "Right Hand Side Blacklist". |
| 45 |
- It is a list of domain names known to be spammers. |
| 46 |
+ RHSBL is an abbreviation for "Right Hand Side Blacklist". |
| 47 |
</trans> |
| 48 |
</entry> |
| 49 |
|
| 50 |
@@ -115,7 +117,7 @@ |
| 51 |
|
| 52 |
<entry> |
| 53 |
<base>WHITE_TITLE</base> |
| 54 |
- <trans>Use this panel to modify your servers White List settings.</trans> |
| 55 |
+ <trans>Use this panel to modify your servers White List settings. All entries will be enabled by default</trans> |
| 56 |
</entry> |
| 57 |
|
| 58 |
<entry> |
| 59 |
@@ -185,4 +187,24 @@ |
| 60 |
will be rejected by spamassassin. |
| 61 |
</trans> |
| 62 |
</entry> |
| 63 |
+ <entry> |
| 64 |
+ <base>SBLLIST_LABEL</base> |
| 65 |
+ <trans>RHSBL (qpsmtpd SBLList)</trans> |
| 66 |
+ </entry> |
| 67 |
+ <entry> |
| 68 |
+ <base>SBLLIST_DESCRIPTION</base> |
| 69 |
+ <trans>RHS block list - 'right hand side' of senders host/domain will be checked against the following servers</trans> |
| 70 |
+ </entry> |
| 71 |
+ <entry> |
| 72 |
+ <base>RBLLIST_LABEL</base> |
| 73 |
+ <trans>DNSBL Zones (qpsmtpd RBLList)</trans> |
| 74 |
+ </entry> |
| 75 |
+ <entry> |
| 76 |
+ <base>RBLLIST_DESCRIPTION</base> |
| 77 |
+ <trans>DNS Block List - senders IP address will be checked against the following servers</trans> |
| 78 |
+ </entry> |
| 79 |
+ <entry> |
| 80 |
+ <base>RBL_TITLE</base> |
| 81 |
+ <trans>Real-time Blackhole Lists are disabled by default. To help reduce spam you can enable RBLs here.</trans> |
| 82 |
+ </entry> |
| 83 |
</lexicon> |
| 84 |
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 |
| 85 |
--- smeserver-wbl-0.3.0.bz9092.old/root/etc/e-smith/web/functions/wbl 2015-10-13 00:30:41.316390108 +0200 |
| 86 |
+++ smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/web/functions/wbl 2015-10-13 23:38:47.352374175 +0200 |
| 87 |
@@ -26,12 +26,10 @@ |
| 88 |
<description>FORM_DESCRIPTION</description> |
| 89 |
|
| 90 |
</page> |
| 91 |
- |
| 92 |
- <page name="WBL_PAGE_BLACK" |
| 93 |
+ <page name="WBL_PAGE_RBL" |
| 94 |
pre-event="turn_off_buttons()" |
| 95 |
- post-event="create_modify_black" > |
| 96 |
- |
| 97 |
- <description>BLACK_TITLE</description> |
| 98 |
+ post-event="create_modify_rbl" > |
| 99 |
+ <description>RBL_TITLE</description> |
| 100 |
|
| 101 |
<field |
| 102 |
type="select" |
| 103 |
@@ -43,7 +41,15 @@ |
| 104 |
<label>DNSBL_LABEL</label> |
| 105 |
<description>DNSBL_DESCRIPTION</description> |
| 106 |
</field> |
| 107 |
- |
| 108 |
+ <field |
| 109 |
+ type="textarea" |
| 110 |
+ id="rbllist" |
| 111 |
+ size="80" |
| 112 |
+ value="get_rbllist()" |
| 113 |
+ validation=""> |
| 114 |
+ <label>RBLLIST_LABEL</label> |
| 115 |
+ <description>RBLLIST_DESCRIPTION</description> |
| 116 |
+ </field> |
| 117 |
<field |
| 118 |
type="select" |
| 119 |
id="rhsbl" |
| 120 |
@@ -54,6 +60,24 @@ |
| 121 |
<label>RHSBL_LABEL</label> |
| 122 |
<description>RHSBL_DESCRIPTION</description> |
| 123 |
</field> |
| 124 |
+ <field |
| 125 |
+ type="textarea" |
| 126 |
+ id="sbllist" |
| 127 |
+ size="80" |
| 128 |
+ value="get_sbllist()" |
| 129 |
+ validation=""> |
| 130 |
+ <label>SBLLIST_LABEL</label> |
| 131 |
+ <description>SBLLIST_DESCRIPTION</description> |
| 132 |
+ </field> |
| 133 |
+ |
| 134 |
+ <subroutine src="print_button('SAVE')" /> |
| 135 |
+ </page> |
| 136 |
+ |
| 137 |
+ <page name="WBL_PAGE_BLACK" |
| 138 |
+ pre-event="turn_off_buttons()" |
| 139 |
+ post-event="create_modify_black" > |
| 140 |
+ |
| 141 |
+ <description>BLACK_TITLE</description> |
| 142 |
|
| 143 |
<field |
| 144 |
type="textarea" |
| 145 |
@@ -92,16 +116,6 @@ |
| 146 |
<description>WHITE_TITLE</description> |
| 147 |
|
| 148 |
<field |
| 149 |
- type="select" |
| 150 |
- id="rrfh" |
| 151 |
- options="'yes' => 'ENABLED', |
| 152 |
- 'no' => 'DISABLED'" |
| 153 |
- value="get_rrfh()" |
| 154 |
- validation="nonblank"> |
| 155 |
- <label>RRFH_LABEL</label> |
| 156 |
- </field> |
| 157 |
- |
| 158 |
- <field |
| 159 |
type="textarea" |
| 160 |
id="whitelisthosts" |
| 161 |
value="get_whitelisthosts()" |
| 162 |
diff -Nur smeserver-wbl-0.3.0.bz9092.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm smeserver-wbl-0.3.0.bz9092.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm |
| 163 |
--- smeserver-wbl-0.3.0.bz9092.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm 2015-10-13 00:30:41.317390175 +0200 |
| 164 |
+++ smeserver-wbl-0.3.0.bz9092.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm 2015-10-13 23:19:41.505562719 +0200 |
| 165 |
@@ -31,6 +31,20 @@ |
| 166 |
return ($db->get_prop('qpsmtpd', 'RHSBL') || 'disabled'); |
| 167 |
} |
| 168 |
|
| 169 |
+sub get_sbllist |
| 170 |
+{ |
| 171 |
+my $sbllistform = $db->get_prop('qpsmtpd', 'SBLList') || ''; |
| 172 |
+$sbllistform =~ s/:/\n/g; |
| 173 |
+return $sbllistform; |
| 174 |
+} |
| 175 |
+ |
| 176 |
+sub get_rbllist |
| 177 |
+{ |
| 178 |
+my $rbllistform = $db->get_prop('qpsmtpd', 'RBLList') || ''; |
| 179 |
+$rbllistform =~ s/:/\n/g; |
| 180 |
+return $rbllistform; |
| 181 |
+} |
| 182 |
+ |
| 183 |
sub get_badhelo |
| 184 |
{ |
| 185 |
my %list = $wdb->get('badhelo')->props; |
| 186 |
@@ -71,13 +85,6 @@ |
| 187 |
return join "\n", sort(@badmailfrom); |
| 188 |
} |
| 189 |
|
| 190 |
-sub get_rrfh |
| 191 |
-{ |
| 192 |
- return 'yes'; |
| 193 |
- # always yes for SME8 |
| 194 |
- #return ($db->get_prop('qpsmtpd', 'RequireResolvableFromHost') || 'no'); |
| 195 |
-} |
| 196 |
- |
| 197 |
sub get_whitelisthosts |
| 198 |
{ |
| 199 |
my %list = $wdb->get('whitelisthosts')->props; |
| 200 |
@@ -163,12 +170,6 @@ |
| 201 |
my $fm = shift; |
| 202 |
my $q = $fm->{'cgi'}; |
| 203 |
|
| 204 |
- my $dnsbl = $q->param('dnsbl'); |
| 205 |
- $db->set_prop('qpsmtpd', 'DNSBL', "$dnsbl"); |
| 206 |
- |
| 207 |
- my $rhsbl = $q->param('rhsbl'); |
| 208 |
- $db->set_prop('qpsmtpd', 'RHSBL', "$rhsbl"); |
| 209 |
- |
| 210 |
# qmail badhelo |
| 211 |
my %list = $wdb->get('badhelo')->props; |
| 212 |
my $parameter = ""; |
| 213 |
@@ -240,10 +241,6 @@ |
| 214 |
my $fm = shift; |
| 215 |
my $q = $fm->{'cgi'}; |
| 216 |
|
| 217 |
- my $rrfh = $q->param("rrfh"); |
| 218 |
- # SME8 no longer use this key, always on |
| 219 |
- #$db->set_prop('qpsmtpd', 'RequireResolvableFromHost', "$rrfh"); |
| 220 |
- |
| 221 |
# qpsmtpd whitelisthosts |
| 222 |
my %list = $wdb->get('whitelisthosts')->props; |
| 223 |
my $parameter = ""; |
| 224 |
@@ -366,5 +363,42 @@ |
| 225 |
|
| 226 |
return join "\n", sort(@blacklistfrom); |
| 227 |
} |
| 228 |
+sub create_modify_rbl |
| 229 |
+{ |
| 230 |
+ my $fm = shift; |
| 231 |
+ my $q = $fm->{'cgi'}; |
| 232 |
|
| 233 |
+ my $dnsbl = $q->param('dnsbl'); |
| 234 |
+ $db->set_prop('qpsmtpd', 'DNSBL', "$dnsbl"); |
| 235 |
+ |
| 236 |
+ my $rhsbl = $q->param('rhsbl'); |
| 237 |
+ $db->set_prop('qpsmtpd', 'RHSBL', "$rhsbl"); |
| 238 |
+ |
| 239 |
+ |
| 240 |
+ my $sbllistcgi = $q->param('sbllist'); |
| 241 |
+ my @sbllistcgi = split /\s+/, $sbllistcgi; |
| 242 |
+ my $sbllistdb = ''; |
| 243 |
+ foreach (@sbllistcgi) { $sbllistdb = $sbllistdb . ':' . $_; } |
| 244 |
+ $sbllistdb =~ s/^://; |
| 245 |
+ |
| 246 |
+ $db->set_prop('qpsmtpd', 'SBLList', "$sbllistdb"); |
| 247 |
+ |
| 248 |
+ |
| 249 |
+ my $rbllistcgi = $q->param('rbllist'); |
| 250 |
+ my @rbllistcgi = split /\s+/, $rbllistcgi; |
| 251 |
+ my $rbllistdb = ''; |
| 252 |
+ foreach (@rbllistcgi) { $rbllistdb = $rbllistdb . ':' . $_; } |
| 253 |
+ $rbllistdb =~ s/^://; |
| 254 |
+ |
| 255 |
+ $db->set_prop('qpsmtpd', 'RBLList', "$rbllistdb"); |
| 256 |
+ |
| 257 |
+ ##Update email settings |
| 258 |
+ |
| 259 |
+ unless ( system ("/sbin/e-smith/signal-event", "email-update") == 0 ){ |
| 260 |
+ $fm->error('ERROR_UPDATING'); |
| 261 |
+ return undef; |
| 262 |
+ } |
| 263 |
+ |
| 264 |
+ $fm->success('SUCCESS'); |
| 265 |
+} |
| 266 |
1; |
Parent Directory
| 
Revision Log
| 
Revision Graph
