From 725b2f5418b044c17a227e341ffcd250c41a854d Mon Sep 17 00:00:00 2001
From: John Crisp <jcrisp@safeandsoundit.co.uk>
Date: Thu, 13 Feb 2025 20:07:42 +0100
Subject: [PATCH] * Thu Feb 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk>
 1.3.1-25.sme - Fix various typos as per bug but more to find [SME: 12472]

---
 .../default/templates/partials/_xtg_services.html.ep     | 2 +-
 .../themes/default/templates/xt_geoip_upds.html.ep       | 2 +-
 .../themes/default/templates/xt_geoip_updt.html.ep       | 4 ++--
 smeserver-xt_geoip.spec                                  | 9 ++++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep
index e354f3a..8092125 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep
@@ -31,7 +31,7 @@
 
 %	foreach my $sv (@services) {
 %		my $svBC = $sv->prop('BadCountries') || ' ';
-%		my $svRev = (( $sv->prop('Xt_geoipRev')|| 'disabled') eq 'disabled' )? '==': '!=';
+%		my $svRev = (( $sv->prop('XTGeoipRev')|| 'disabled') eq 'disabled' )? '==': '!=';
 %		my $color = 'red';
 %		my $deco= "none";
 %		if ($svRev eq '!=' ) { $color = 'green'; }
diff --git a/root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep b/root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep
index 77c0ab4..2d6e4e6 100644
--- a/root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep
@@ -44,7 +44,7 @@
     <br><span class=label>
     %=l 'xtg_LABEL_REVERSE_MATCH'
     </span><span class=data>
-    % param 'Masq_srv_reverse' => $c->get_reverse('','Xt_geoipRev') unless param 'Masq_srv_reverse';
+    % param 'Masq_srv_reverse' => $c->get_reverse('masq','XTGeoipRev') unless param 'Masq_srv_reverse';
     %= select_field 'Masq_srv_reverse' => [['!=' => 'enabled'], ['==' => 'disabled']], class => 'input'
     </span></p>
 
diff --git a/root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep b/root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep
index 3e6b649..eff3869 100644
--- a/root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep
@@ -35,7 +35,7 @@
     <br><span class=label>
     %=l 'xtg_LABEL_REVERSE_MATCH'
     </span><span class=data>
-    % param 'Masq_reverse' => $c->get_reverse('masq','Xt_geoipRev') unless param 'Masq_reverse';
+    % param 'Masq_reverse' => $c->get_reverse('masq','XTGeoipRev') unless param 'Masq_reverse';
     %= select_field 'Masq_reverse' =>  [[ '!=' => 'enabled'], [ '==' => 'disabled']], class => 'input'
     </span></p>
 
@@ -59,7 +59,7 @@
     <br><span class=label>
     %=l 'xtg_LABEL_OTHERS'
     </span><span class=data>
-    % param 'Masq_others' => $c->get_reverse('masq','Xt_geoipOther') unless param 'Masq_others';
+    % param 'Masq_others' => $c->get_reverse('masq','XT_GeoipOther') unless param 'Masq_others';
     %= select_field 'Masq_others' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => 'input'
     </span></p>
 
diff --git a/smeserver-xt_geoip.spec b/smeserver-xt_geoip.spec
index 863fe22..7543cad 100644
--- a/smeserver-xt_geoip.spec
+++ b/smeserver-xt_geoip.spec
@@ -1,6 +1,6 @@
 %define name smeserver-xt_geoip
 %define version 1.3.1
-%define release 24
+%define release 25
 
 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 Name: %{name}
@@ -82,9 +82,12 @@ fi
 
 
 %changelog
+* Thu Feb 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-25.sme
+- Fix various typos as per bug but more to find [SME: 12472]
+
 * Thu Feb 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-24.sme
-- move scriptoig back to /usr/share/geoip
-- Lose the LE/BE (Little/Big Endian) parts as iptables can't seme to read the file in subdirs
+- move scripting back to /usr/share/geoip
+- Lose the LE/BE (Little/Big Endian) parts as iptables can't seem to read the file in subdirs
 - Update ULOG to NFLOG in rules but restricts the number of countries
 
 * Wed Feb 12 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-23.sme