diff -urN smeserver-xt_geoip-1.3.1.old/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm smeserver-xt_geoip-1.3.1/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm --- smeserver-xt_geoip-1.3.1.old/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm 2020-08-17 12:31:30.000000000 +0400 +++ smeserver-xt_geoip-1.3.1/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm 2022-03-09 20:28:29.690000000 +0400 @@ -225,7 +225,7 @@ my $badc = $cdb->get_prop("masq", "BadCountries") || ""; return $badc unless $full ; - my $rev = (($cdb->get_prop("masq", "Xt_geoipRev")||"disabled") eq "enabled") ? "!=" : "=="; + my $rev = (($cdb->get_prop("masq", "XTGeoipRev")||"disabled") eq "enabled") ? "!=" : "=="; return "$rev $badc "; } @@ -310,7 +310,7 @@ my $badc = $cdb->get_prop($name, "BadCountries")||""; return $badc unless $full ; - my $rev = (($cdb->get_prop($name, "Xt_geoipRev")||"disabled") eq "enabled") ? "!=" : "=="; + my $rev = (($cdb->get_prop($name, "XTGeoipRev")||"disabled") eq "enabled") ? "!=" : "=="; return "$rev $badc "; } @@ -433,8 +433,8 @@ my $mq_bc = get_badcountries(); my $mq_gp = get_geoip(); my $masq = $cdb->get('masq') || "disabled"; - my $mq_rv = $masq->prop('Xt_geoipRev') || 'disabled'; - my $mq_ot = $masq->prop('Xt_geoipOther') || 'disabled'; + my $mq_rv = $masq->prop('XTGeoipRev') || 'disabled'; + my $mq_ot = $masq->prop('XTGeoipOther') || 'disabled'; my $n_mq_bc = $c->param("Masq_badcountries"); my $n_mq_gp = $c->param("Masq_geoip") || $mq_gp; @@ -448,8 +448,8 @@ $cdb->set_prop("masq", "BadCountries", $n_mq_bc); $cdb->set_prop("masq", "GeoIP", $n_mq_gp); - $cdb->set_prop("masq", "Xt_geoipRev", $n_mq_rv); - $cdb->set_prop("masq", "Xt_geoipOther", $n_mq_ot); + $cdb->set_prop("masq", "XTGeoipRev", $n_mq_rv); + $cdb->set_prop("masq", "XTGeoipOther", $n_mq_ot); my $eventloc = "xt_geoip-modify"; $eventloc = "xt_geoip-update" if $n_upd_gp eq 'YES'; @@ -500,7 +500,7 @@ my $servBC = $serv->prop('BadCountries') || ''; if ($servBC ne '') { my $tps = $cdb->get_prop_and_delete($name, "BadCountries"); - $tps = $cdb->get_prop_and_delete($name, "Xt_geoipRev"); + $tps = $cdb->get_prop_and_delete($name, "XTGeoipRev"); unless (system ("/sbin/e-smith/signal-event", "xt_geoip-service") == 0) { return $c->l("xtg_ERROR_WHILE_DELETING_SERVICE").' '.$name; @@ -523,7 +523,7 @@ if (my $serv = $cdb->get($name)) { my $servBC = $serv->prop('BadCountries') || ''; - my $servRev = $serv->prop('Xt_geoipRev') || 'disabled'; + my $servRev = $serv->prop('XTGeoipRev') || 'disabled'; my $n_servBC = $c->param("Masq_srv_badcountries"); my $n_servRev = $c->param("Masq_srv_reverse") || $servRev; @@ -533,7 +533,7 @@ } $cdb->set_prop($name, "BadCountries", $n_servBC); - $cdb->set_prop($name, "Xt_geoipRev", $n_servRev); + $cdb->set_prop($name, "XTGeoipRev", $n_servRev); unless (system ( "/sbin/e-smith/signal-event", "xt_geoip-service" ) == 0 ) { return $c->l("xtg_ERROR_UPDATING").' '.$name;