diff -urN smeserver-xt_geoip-1.0.1-2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.0.1-3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip
--- smeserver-xt_geoip-1.0.1-2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip 2017-10-16 12:54:44.069849885 +0400
+++ smeserver-xt_geoip-1.0.1-3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip 2017-10-16 17:43:02.602175554 +0400
@@ -50,13 +50,18 @@
+ ERROR_STATUS_GEOIP
+ GEOIP filtering is inactive (iptables) ]]>
+
+
+
LABEL_BADCOUNTRIES_STATUS
Current list of banished country codes :
- ERR_COUNTRY_NOT_EXIST
- Country code(s) does not exist on the server.
+ ERR_COUNTRY_NOT_EXIST: {$listerr}
+ Country code(s) does not exist on the server: {$listerr}
diff -urN smeserver-xt_geoip-1.0.1-2/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.0.1-3/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip
--- smeserver-xt_geoip-1.0.1-2/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip 2017-10-16 12:55:00.239673366 +0400
+++ smeserver-xt_geoip-1.0.1-3/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip 2017-10-16 17:43:39.208046829 +0400
@@ -14,6 +14,11 @@
LABEL_GEOIP_STATUS
Filtrage GEOIP actuel :
+
+
+ ERROR_STATUS_GEOIP
+ Filtrage GEOIP inactif (iptables) ]]>
+
LABEL_GEOIP
@@ -50,8 +55,8 @@
- ERR_COUNTRY_NOT_EXIST
- Code(s) pays inexistant(s) sur le serveur.
+ ERR_COUNTRY_NOT_EXIST: {$listerr}
+ Code(s) pays inexistant(s) sur le serveur: {$listerr}
diff -urN smeserver-xt_geoip-1.0.1-2/root/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.0.1-3/root/etc/e-smith/web/functions/xt_geoip
--- smeserver-xt_geoip-1.0.1-2/root/etc/e-smith/web/functions/xt_geoip 2017-09-23 20:41:21.000000000 +0400
+++ smeserver-xt_geoip-1.0.1-3/root/etc/e-smith/web/functions/xt_geoip 2017-10-16 19:32:32.305538075 +0400
@@ -91,6 +91,13 @@
value="get_date_update()">
+
+
+
+
diff -urN smeserver-xt_geoip-1.0.1-2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm smeserver-xt_geoip-1.0.1-3/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm
--- smeserver-xt_geoip-1.0.1-2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm 2017-10-16 12:52:11.329517138 +0400
+++ smeserver-xt_geoip-1.0.1-3/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm 2017-10-16 19:30:37.186412877 +0400
@@ -142,6 +142,21 @@
return $db->get_prop("masq", "GeoIP");
}
+=head2 get_stat_geoip
+
+method to retrieve the status of geoip for the form
+=cut
+
+sub get_stat_geoip
+{
+ my $fm = shift;
+ if ( get_geoip() == 'enabled' && system ( "/sbin/iptables -L -n | grep 'GeoIP' > /dev/null") != 0 ) {
+ return $fm->localise('ERROR_STATUS_GEOIP');
+ } else {
+ return '';
+ }
+}
+
=head2 get_date_update
=cut
@@ -201,7 +216,7 @@
my $file = "/usr/share/xt_geoip/LE/" . $bcs . ".iv4";
if (! -f $file) { $listerr .= $bcs . ","; }
}
- return 'ERR_COUNTRY_NOT_EXIST' if $listerr;
+ return $self->localise('ERR_COUNTRY_NOT_EXIST: {$listerr}', {listerr=> "$listerr"}) if $listerr;
}
return 'OK';
}