| 1 |
michel |
1.1 |
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 |
| 2 |
|
|
--- 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 |
| 3 |
|
|
+++ smeserver-xt_geoip-1.3.1/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm 2022-03-09 20:28:29.690000000 +0400 |
| 4 |
|
|
@@ -225,7 +225,7 @@ |
| 5 |
|
|
my $badc = $cdb->get_prop("masq", "BadCountries") || ""; |
| 6 |
|
|
return $badc unless $full ; |
| 7 |
|
|
|
| 8 |
|
|
- my $rev = (($cdb->get_prop("masq", "Xt_geoipRev")||"disabled") eq "enabled") ? "!=" : "=="; |
| 9 |
|
|
+ my $rev = (($cdb->get_prop("masq", "XTGeoipRev")||"disabled") eq "enabled") ? "!=" : "=="; |
| 10 |
|
|
return "$rev $badc "; |
| 11 |
|
|
} |
| 12 |
|
|
|
| 13 |
|
|
@@ -310,7 +310,7 @@ |
| 14 |
|
|
my $badc = $cdb->get_prop($name, "BadCountries")||""; |
| 15 |
|
|
return $badc unless $full ; |
| 16 |
|
|
|
| 17 |
|
|
- my $rev = (($cdb->get_prop($name, "Xt_geoipRev")||"disabled") eq "enabled") ? "!=" : "=="; |
| 18 |
|
|
+ my $rev = (($cdb->get_prop($name, "XTGeoipRev")||"disabled") eq "enabled") ? "!=" : "=="; |
| 19 |
|
|
return "$rev $badc "; |
| 20 |
|
|
} |
| 21 |
|
|
|
| 22 |
|
|
@@ -433,8 +433,8 @@ |
| 23 |
|
|
my $mq_bc = get_badcountries(); |
| 24 |
|
|
my $mq_gp = get_geoip(); |
| 25 |
|
|
my $masq = $cdb->get('masq') || "disabled"; |
| 26 |
|
|
- my $mq_rv = $masq->prop('Xt_geoipRev') || 'disabled'; |
| 27 |
|
|
- my $mq_ot = $masq->prop('Xt_geoipOther') || 'disabled'; |
| 28 |
|
|
+ my $mq_rv = $masq->prop('XTGeoipRev') || 'disabled'; |
| 29 |
|
|
+ my $mq_ot = $masq->prop('XTGeoipOther') || 'disabled'; |
| 30 |
|
|
|
| 31 |
|
|
my $n_mq_bc = $c->param("Masq_badcountries"); |
| 32 |
|
|
my $n_mq_gp = $c->param("Masq_geoip") || $mq_gp; |
| 33 |
|
|
@@ -448,8 +448,8 @@ |
| 34 |
|
|
|
| 35 |
|
|
$cdb->set_prop("masq", "BadCountries", $n_mq_bc); |
| 36 |
|
|
$cdb->set_prop("masq", "GeoIP", $n_mq_gp); |
| 37 |
|
|
- $cdb->set_prop("masq", "Xt_geoipRev", $n_mq_rv); |
| 38 |
|
|
- $cdb->set_prop("masq", "Xt_geoipOther", $n_mq_ot); |
| 39 |
|
|
+ $cdb->set_prop("masq", "XTGeoipRev", $n_mq_rv); |
| 40 |
|
|
+ $cdb->set_prop("masq", "XTGeoipOther", $n_mq_ot); |
| 41 |
|
|
|
| 42 |
|
|
my $eventloc = "xt_geoip-modify"; |
| 43 |
|
|
$eventloc = "xt_geoip-update" if $n_upd_gp eq 'YES'; |
| 44 |
|
|
@@ -500,7 +500,7 @@ |
| 45 |
|
|
my $servBC = $serv->prop('BadCountries') || ''; |
| 46 |
|
|
if ($servBC ne '') { |
| 47 |
|
|
my $tps = $cdb->get_prop_and_delete($name, "BadCountries"); |
| 48 |
|
|
- $tps = $cdb->get_prop_and_delete($name, "Xt_geoipRev"); |
| 49 |
|
|
+ $tps = $cdb->get_prop_and_delete($name, "XTGeoipRev"); |
| 50 |
|
|
|
| 51 |
|
|
unless (system ("/sbin/e-smith/signal-event", "xt_geoip-service") == 0) { |
| 52 |
|
|
return $c->l("xtg_ERROR_WHILE_DELETING_SERVICE").' '.$name; |
| 53 |
|
|
@@ -523,7 +523,7 @@ |
| 54 |
|
|
|
| 55 |
|
|
if (my $serv = $cdb->get($name)) { |
| 56 |
|
|
my $servBC = $serv->prop('BadCountries') || ''; |
| 57 |
|
|
- my $servRev = $serv->prop('Xt_geoipRev') || 'disabled'; |
| 58 |
|
|
+ my $servRev = $serv->prop('XTGeoipRev') || 'disabled'; |
| 59 |
|
|
|
| 60 |
|
|
my $n_servBC = $c->param("Masq_srv_badcountries"); |
| 61 |
|
|
my $n_servRev = $c->param("Masq_srv_reverse") || $servRev; |
| 62 |
|
|
@@ -533,7 +533,7 @@ |
| 63 |
|
|
} |
| 64 |
|
|
|
| 65 |
|
|
$cdb->set_prop($name, "BadCountries", $n_servBC); |
| 66 |
|
|
- $cdb->set_prop($name, "Xt_geoipRev", $n_servRev); |
| 67 |
|
|
+ $cdb->set_prop($name, "XTGeoipRev", $n_servRev); |
| 68 |
|
|
|
| 69 |
|
|
unless (system ( "/sbin/e-smith/signal-event", "xt_geoip-service" ) == 0 ) { |
| 70 |
|
|
return $c->l("xtg_ERROR_UPDATING").' '.$name; |
Parent Directory
| 
Revision Log
| 
Revision Graph
