/[smecontribs]/rpms/smeserver-wbl/contribs9/smeserver-wbl-0.3.0.bz9092.RBL_Menu.patch
ViewVC logotype

Diff of /rpms/smeserver-wbl/contribs9/smeserver-wbl-0.3.0.bz9092.RBL_Menu.patch

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

Revision 1.2 by stephdl, Wed Oct 14 19:30:35 2015 UTC Revision 1.3 by stephdl, Thu Oct 15 20:48:22 2015 UTC
# Line 1  Line 1 
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  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  --- 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  +++ 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
4  @@ -35,11 +35,15 @@  @@ -29,22 +29,40 @@
5               <p>E-mail traffic is scanned and may be blocked due to the various screening methods enabled.       </entry>
6              You may use this panel to define e-mail white/black lists.</p>  
7         <entry>
8  +            <p><br>RBL's List is used to adjust DNSBL and RHSBL.</p>  -        <base>FORM_DESCRIPTION</base>
9  +            <p><a class="button-like"  -        <trans>
10  +                    href="wbl?page=0&page_stack=&Next=Next&wherenext=WBL_PAGE_RBL">RBL's List</a></p>  -            <![CDATA[
11  +  -            <p>E-mail traffic is scanned and may be blocked due to the various screening methods enabled.
12               <p>Black lists are used for rejecting e-mail traffic.</p>  -           You may use this panel to define e-mail white/black lists.</p>
13              <p><a class="button-like"  +        <base>WBL_DESCRIPTION</base>
14                       href="wbl?page=0&page_stack=&Next=Next&wherenext=WBL_PAGE_BLACK">Black List</a></p>              +        <trans>E-mail traffic is scanned and may be blocked due to the various screening methods enabled.
15    +            You may use this panel to define e-mail white/black lists.</trans>
16    +    </entry>
17    
18    -            <p>Black lists are used for rejecting e-mail traffic.</p>
19    -           <p><a class="button-like"
20    -                    href="wbl?page=0&page_stack=&Next=Next&wherenext=WBL_PAGE_BLACK">Black List</a></p>            
21    +    <entry>
22    +        <base>RBL_LIST_DESCRIPTION</base>
23    +        <trans>RBL's List is used to adjust DNSBL and RHSBL.</trans>
24    +    </entry>
25    
26  -            <p><br>White lists are used for accepting e-mail traffic.</p>  -            <p><br>White lists are used for accepting e-mail traffic.</p>
27  +            <p>White lists are used for accepting e-mail traffic.</p>  -           <p><a class="button-like"
28              <p><a class="button-like"  -                    href="wbl?page=0&page_stack=&Next=Next&wherenext=WBL_PAGE_WHITE">White List</a></p>
29                       href="wbl?page=0&page_stack=&Next=Next&wherenext=WBL_PAGE_WHITE">White List</a></p>  
30    -            ]]>
31    -        </trans>
32    +    <entry>
33    +        <base>RBL_LIST</base>
34    +        <trans>RBL's List</trans>
35    +    </entry>
36    +
37    +    <entry>
38    +        <base>BLACK_LIST_DESCRIPTION</base>
39    +        <trans>Black lists are used for rejecting e-mail traffic.</trans>
40    +    </entry>
41    +
42    +    <entry>
43    +        <base>BLACK_LIST</base>
44    +        <trans>Black List</trans>
45    +    </entry>
46    +
47    +    <entry>
48    +        <base>WHITE_LIST_DESCRIPTION</base>
49    +        <trans>White lists are used for accepting e-mail traffic.</trans>
50    +    </entry>
51    +
52    +    <entry>
53    +        <base>WHITE_LIST</base>
54    +        <trans>White List</trans>
55         </entry>
56    
57  @@ -53,8 +57,7 @@   # WBL_PAGE_BLACK
58    @@ -52,18 +70,15 @@
59         <entry>
60           <base>BLACK_TITLE</base>           <base>BLACK_TITLE</base>
61           <trans>           <trans>
62               <![CDATA[  -            <![CDATA[
63  -            <p>This server includes built-in support for using two external black list methods,  -            <p>This server includes built-in support for using two external black list methods,
64  -              DNSBL and RHSBL. It also supports the admin defined black lists, badhelo and  -              DNSBL and RHSBL. It also supports the admin defined black lists, badhelo and
65  +            <p>This server includes built-in support for using the admin defined black lists, badhelo and  -               badmailfrom.</p>
66                  badmailfrom.</p>  -            ]]>
67               ]]>  +            This server includes built-in support for using the admin defined black lists, badhelo and
68    +               badmailfrom.
69           </trans>           </trans>
70  @@ -63,7 +66,7 @@       </entry>
71    
72       <entry>       <entry>
73           <base>DNSBL_DESCRIPTION</base>           <base>DNSBL_DESCRIPTION</base>
74           <trans>           <trans>
# Line 37  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 77  diff -Nur smeserver-wbl-0.3.0.bz9092.old
77           </trans>           </trans>
78       </entry>       </entry>
79    
80  @@ -75,8 +78,7 @@  @@ -75,8 +90,7 @@
81       <entry>       <entry>
82           <base>RHSBL_DESCRIPTION</base>           <base>RHSBL_DESCRIPTION</base>
83           <trans>           <trans>
# Line 47  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 87  diff -Nur smeserver-wbl-0.3.0.bz9092.old
87           </trans>           </trans>
88       </entry>       </entry>
89    
90  @@ -115,7 +117,7 @@  @@ -115,7 +129,7 @@
91    
92       <entry>       <entry>
93           <base>WHITE_TITLE</base>           <base>WHITE_TITLE</base>
# Line 56  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 96  diff -Nur smeserver-wbl-0.3.0.bz9092.old
96       </entry>       </entry>
97    
98       <entry>       <entry>
99  @@ -185,4 +187,24 @@  @@ -185,4 +199,24 @@
100           will be rejected by spamassassin.           will be rejected by spamassassin.
101           </trans>           </trans>
102       </entry>       </entry>
# Line 83  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 123  diff -Nur smeserver-wbl-0.3.0.bz9092.old
123   </lexicon>   </lexicon>
124  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  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
125  --- 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.old/root/etc/e-smith/web/functions/wbl   2015-10-13 00:30:41.316390108 +0200
126  +++ smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/web/functions/wbl   2015-10-13 23:38:47.352374175 +0200  +++ smeserver-wbl-0.3.0.bz9092.new/root/etc/e-smith/web/functions/wbl   2015-10-15 22:36:42.341219048 +0200
127  @@ -26,12 +26,10 @@  @@ -23,15 +23,35 @@
128           <description>FORM_DESCRIPTION</description>  
129         <page name="First" pre-event="print_status_message()">
130    
131    -        <description>FORM_DESCRIPTION</description>
132    +        <field type="literal" id="client_label" value="">
133    +            <description>WBL_DESCRIPTION</description>
134    +        </field>
135    
136    -    </page>
137    
      </page>  
 -  
138  -    <page name="WBL_PAGE_BLACK"  -    <page name="WBL_PAGE_BLACK"
139  +    <page name="WBL_PAGE_RBL"  -            pre-event="turn_off_buttons()"
              pre-event="turn_off_buttons()"  
140  -            post-event="create_modify_black" >  -            post-event="create_modify_black" >
141  -  +        <field type="literal" id="client_label" value="">
142    +            <description>RBL_LIST_DESCRIPTION</description>
143    +        </field>
144    
145  -        <description>BLACK_TITLE</description>  -        <description>BLACK_TITLE</description>
146    +        <subroutine src="print_custom_button('RBL_LIST', 'WBL_PAGE_RBL')"/>
147    +
148    +        <field type="literal" id="client_label" value="">
149    +            <description>BLACK_LIST_DESCRIPTION</description>
150    +        </field>
151    +
152    +        <subroutine src="print_custom_button('BLACK_LIST', 'WBL_PAGE_BLACK')"/>
153    +
154    +        <field type="literal" id="client_label" value="">
155    +            <description>WHITE_LIST_DESCRIPTION</description>
156    +        </field>
157    +
158    +        <subroutine src="print_custom_button('WHITE_LIST', 'WBL_PAGE_WHITE')"/>
159    +
160    +
161    +    </page>
162    +    <page name="WBL_PAGE_RBL"
163    +            pre-event="turn_off_buttons()"
164  +            post-event="create_modify_rbl" >  +            post-event="create_modify_rbl" >
165  +        <description>RBL_TITLE</description>  +        <description>RBL_TITLE</description>
166    
167           <field           <field
168               type="select"               type="select"
169  @@ -43,7 +41,15 @@  @@ -43,7 +63,15 @@
170               <label>DNSBL_LABEL</label>               <label>DNSBL_LABEL</label>
171               <description>DNSBL_DESCRIPTION</description>               <description>DNSBL_DESCRIPTION</description>
172           </field>           </field>
# Line 117  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 183  diff -Nur smeserver-wbl-0.3.0.bz9092.old
183           <field           <field
184               type="select"               type="select"
185               id="rhsbl"               id="rhsbl"
186  @@ -54,6 +60,24 @@  @@ -54,6 +82,24 @@
187               <label>RHSBL_LABEL</label>               <label>RHSBL_LABEL</label>
188               <description>RHSBL_DESCRIPTION</description>               <description>RHSBL_DESCRIPTION</description>
189           </field>           </field>
# Line 142  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 208  diff -Nur smeserver-wbl-0.3.0.bz9092.old
208    
209           <field           <field
210               type="textarea"               type="textarea"
211  @@ -92,16 +116,6 @@  @@ -92,16 +138,6 @@
212           <description>WHITE_TITLE</description>           <description>WHITE_TITLE</description>
213    
214           <field           <field
# Line 161  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 227  diff -Nur smeserver-wbl-0.3.0.bz9092.old
227              value="get_whitelisthosts()"              value="get_whitelisthosts()"
228  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  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
229  --- 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  --- 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
230  +++ 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  +++ smeserver-wbl-0.3.0.bz9092.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm      2015-10-15 22:40:24.211253297 +0200
231  @@ -31,6 +31,20 @@  @@ -31,6 +31,20 @@
232       return ($db->get_prop('qpsmtpd', 'RHSBL') || 'disabled');       return ($db->get_prop('qpsmtpd', 'RHSBL') || 'disabled');
233   }   }
# Line 221  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 287  diff -Nur smeserver-wbl-0.3.0.bz9092.old
287       # qpsmtpd whitelisthosts       # qpsmtpd whitelisthosts
288       my %list = $wdb->get('whitelisthosts')->props;       my %list = $wdb->get('whitelisthosts')->props;
289       my $parameter = "";       my $parameter = "";
290  @@ -366,5 +363,42 @@  @@ -366,5 +363,53 @@
291    
292       return join "\n", sort(@blacklistfrom);       return join "\n", sort(@blacklistfrom);
293   }   }
# Line 263  diff -Nur smeserver-wbl-0.3.0.bz9092.old Line 329  diff -Nur smeserver-wbl-0.3.0.bz9092.old
329  +  +
330  +    $fm->success('SUCCESS');  +    $fm->success('SUCCESS');
331  +}  +}
332    +
333    +#Subroutine to display buttons
334    +sub print_custom_button{
335    +    my ($fm,$desc,$url) = @_;
336    +    my $q = $fm->{cgi};
337    +    $url="wbl?page=0&page_stack=&Next=Next&wherenext=".$url;
338    +    print "  <tr>\n    <td colspan='2'>\n";
339    +    print $q->p($q->a({href => $url, -class => "button-like"},$fm->localise($desc)));
340    +    print qq(</tr>\n);
341    +    return undef;
342    +}
343   1;   1;

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