--- rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip-1.0.1-bz10760-per_serv2.patch	2019/07/23 01:29:45	1.1
+++ rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip-1.0.1-bz10760-per_serv2.patch	2019/07/23 22:45:49	1.3
@@ -326,113 +326,8 @@ diff -Nur smeserver-xt_geoip-1.0.1.old/r
  	    <label>LABEL_SERV_BADCOUNTRIES_STATUS</label>
  	</field>
  
-diff -Nur smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/web/panels/manager/cgi-bin/xt_geoip smeserver-xt_geoip-1.0.1/root/etc/e-smith/web/panels/manager/cgi-bin/xt_geoip
---- smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/web/panels/manager/cgi-bin/xt_geoip	2019-07-23 03:16:53.279411436 +0200
-+++ smeserver-xt_geoip-1.0.1/root/etc/e-smith/web/panels/manager/cgi-bin/xt_geoip	2019-07-23 02:18:09.000000000 +0200
-@@ -81,7 +81,7 @@
- 	<field
- 	    type="literal"
- 	    id="badcountries"
--	    value="get_badcountries()">
-+	    value="get_badcountries(1)">
- 	    <label>LABEL_BADCOUNTRIES_STATUS</label>
- 	</field>	
- 
-@@ -102,7 +102,6 @@
-         <field type="literal" id="service_label" value="">
-             <description>SERVICE_DESCRIPTION</description>
-         </field>
--
-         <subroutine src="print_custom_button('PER_SERVICE_GEOIP', 'Service', '')"/>
- 
-         <field type="literal" id="stats_label" value="">
-@@ -128,10 +127,20 @@
-             <description>DESC_GEOIP</description>
-         </field>
- 
-+        <field
-+            type="select"
-+            id="masq_reverse"
-+            options="'enabled' => '!=', 'disabled' => '=='"
-+            value="get_reverse('masq','XTGeoipRev')">
-+            <label>LABEL_REVERSE_MATCH</label>
-+            <description>DESC_REVERSE_MATCH</description>
-+        </field>
-+
- 	<field
- 	    type="text"
- 	    id="masq_badcountries"
- 	    size="64"
-+            value="get_badcountries(0)"
- 	    validation="must_exist()">
- 	    <label>LABEL_BADCOUNTRIES</label>
- 	    <description>DESC_BADCOUNTRIES</description>
-@@ -140,9 +149,18 @@
- 	<field
- 	    type="literal"
- 	    id="badcountries"
--	    value="get_badcountries()">
-+	    value="get_badcountries(1)">
- 	    <label>LABEL_BADCOUNTRIES_STATUS</label>
- 	</field>	
-+
-+        <field
-+            type="select"
-+            id="masq_others"
-+            options="'enabled' => 'enabled', 'disabled' => 'disabled'"
-+            value="get_reverse('masq','XTGeoipOther')">
-+            <label>LABEL_OTHERS</label>
-+            <description>DESC_OTHERS</description>
-+        </field>
- 	
- 	<field
-             type="select"
-@@ -163,7 +181,7 @@
- 	<field
- 	    type="literal"
- 	    id="badcountries"
--	    value="get_badcountries()">
-+	    value="get_badcountries(1)">
- 	    <label>LABEL_BADCOUNTRIES_STATUS</label>
- 	</field>	
-         <subroutine src="print_service_table()" />
-@@ -187,14 +205,24 @@
- 	<field
- 	    type="literal"
- 	    id="badcountries"
--	    value="get_badcountries()">
-+	    value="get_badcountries(1)">
- 	    <label>LABEL_BADCOUNTRIES_STATUS</label>
- 	</field>	
- 
-+        <field
-+            type="select"
-+            id="masq_srv_reverse"
-+            options="'enabled' => '!=', 'disabled' => '=='"
-+            value="get_reverse('','XTGeoipRev')">
-+            <label>LABEL_REVERSE_MATCH</label>
-+            <description>DESC_REVERSE_MATCH</description>
-+        </field>
-+
- 	<field
- 	    type="text"
- 	    id="masq_srv_badcountries"
- 	    size="64"
-+            value="get_srv_badcountries(0)"
- 	    validation="srv_must_exist()">
- 	    <label>LABEL_BADCOUNTRIES</label>
- 	    <description>DESC_BADCOUNTRIES</description>
-@@ -203,7 +231,7 @@
- 	<field
- 	    type="literal"
- 	    id="srv_badcountries"
--	    value="get_srv_badcountries()">
-+	    value="get_srv_badcountries(1)">
- 	    <label>LABEL_SERV_BADCOUNTRIES_STATUS</label>
- 	</field>
- 
 diff -Nur smeserver-xt_geoip-1.0.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm smeserver-xt_geoip-1.0.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm
---- smeserver-xt_geoip-1.0.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm	2019-07-23 03:16:53.284411435 +0200
+--- smeserver-xt_geoip-1.0.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm	2019-07-24 00:42:22.094158127 +0200
 +++ smeserver-xt_geoip-1.0.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm	2019-07-23 02:49:15.000000000 +0200
 @@ -23,6 +23,7 @@
      get_value