/[smecontribs]/rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip-1.0.1-bz10860-license_key.patch
ViewVC logotype

Diff of /rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip-1.0.1-bz10860-license_key.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by michel, Sat Jan 11 07:29:10 2020 UTC Revision 1.2 by michel, Tue Jan 14 14:45:40 2020 UTC
# Line 11  diff -urN smeserver-xt_geoip-1.0.1.old/r Line 11  diff -urN smeserver-xt_geoip-1.0.1.old/r
11  +    </entry>  +    </entry>
12    
13   </lexicon>   </lexicon>
14    diff -urN smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/templates/usr/share/xt_geoip/update_base/10All smeserver-xt_geoip-1.0.1/root/etc/e-smith/templates/usr/share/xt_geoip/update_base/10All
15    --- smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/templates/usr/share/xt_geoip/update_base/10All        2017-09-15 15:05:44.000000000 +0400
16    +++ smeserver-xt_geoip-1.0.1/root/etc/e-smith/templates/usr/share/xt_geoip/update_base/10All    2020-01-12 22:22:08.798000000 +0400
17    @@ -1,3 +1,5 @@
18     cd /usr/share/xt_geoip
19    -/usr/libexec/xtables-addons/xt_geoip_dl
20    -/usr/libexec/xtables-addons/xt_geoip_build GeoIPCountryWhois.csv
21    +if ( /usr/libexec/xtables-addons/xt_geoip_dl )
22    +then
23    +    /usr/libexec/xtables-addons/xt_geoip_build GeoIPCountryWhois.csv
24    +fi
25    \ Pas de fin de ligne à la fin du fichier
26  diff -urN smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.0.1/root/etc/e-smith/web/functions/xt_geoip  diff -urN smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.0.1/root/etc/e-smith/web/functions/xt_geoip
27  --- smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/web/functions/xt_geoip        2020-01-11 09:35:29.000000000 +0400  --- smeserver-xt_geoip-1.0.1.old/root/etc/e-smith/web/functions/xt_geoip        2020-01-11 09:35:29.000000000 +0400
28  +++ smeserver-xt_geoip-1.0.1/root/etc/e-smith/web/functions/xt_geoip    2020-01-11 10:04:19.498000000 +0400  +++ smeserver-xt_geoip-1.0.1/root/etc/e-smith/web/functions/xt_geoip    2020-01-11 10:04:19.498000000 +0400
# Line 30  diff -urN smeserver-xt_geoip-1.0.1.old/r Line 42  diff -urN smeserver-xt_geoip-1.0.1.old/r
42               <description>COUNTRY_LIST_DESCRIPTION</description>               <description>COUNTRY_LIST_DESCRIPTION</description>
43  diff -urN 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  diff -urN 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
44  --- smeserver-xt_geoip-1.0.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm   2020-01-11 09:35:29.000000000 +0400  --- smeserver-xt_geoip-1.0.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm   2020-01-11 09:35:29.000000000 +0400
45  +++ smeserver-xt_geoip-1.0.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm       2020-01-11 10:38:43.843000000 +0400  +++ smeserver-xt_geoip-1.0.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm       2020-01-12 18:05:02.757000000 +0400
46  @@ -25,6 +25,7 @@  @@ -25,6 +25,7 @@
47       get_value       get_value
48       get_badcountries       get_badcountries
# Line 39  diff -urN smeserver-xt_geoip-1.0.1.old/r Line 51  diff -urN smeserver-xt_geoip-1.0.1.old/r
51       get_reverse       get_reverse
52       print_service_table       print_service_table
53       get_stat_geoip       get_stat_geoip
54  @@ -189,6 +190,20 @@  @@ -189,6 +190,23 @@
55          }          }
56   }   }
57    
# Line 51  diff -urN smeserver-xt_geoip-1.0.1.old/r Line 63  diff -urN smeserver-xt_geoip-1.0.1.old/r
63  +sub get_stat_license_key {  +sub get_stat_license_key {
64  +  +
65  +    my $fm = shift;  +    my $fm = shift;
66  +    if ( (get_value( $fm, 'xt_geoip_LicenseKey' ) || '') eq '' ) {  +    if ((get_prop( 'geoip','status' ) || 'disabled') eq 'enabled' ) {
67  +        return $fm->localise('ERROR_LICENSE_KEY');  +       if ( (get_prop( 'geoip','LicenseKey' ) || '') ne '' ) {
68    +           return '';
69    +       }
70  +    }  +    }
71  +    return '';  +    return $fm->localise('ERROR_LICENSE_KEY');
72    +
73  +}  +}
74  +  +
75   =head2 get_date_update   =head2 get_date_update

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed