diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 098d3b54199..8f8cbf98607 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2009-2019 Laurent Destailleur * Copyright (C) 2011-2013 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -36,9 +36,11 @@ $langs->loadLangs(array("admin","errors")); $action = GETPOST('action', 'aZ09'); + /* * Actions */ + if ($action == 'set') { $error=0; @@ -104,7 +106,7 @@ print '\n"; // Lib version -print ''.$langs->trans("GeoIPLibVersion").''; +print ''.$langs->trans("GeoIPLibVersion").''; print ''; $arrayofvalues = array('php' => 'Native PHP functions', '1' => 'Embedded GeoIP v1', '2' => 'Embedded GeoIP v2'); print $form->selectarray('geoipversion', $arrayofvalues, (isset($conf->global->GEOIP_VERSION) ? $conf->global->GEOIP_VERSION : '2')); @@ -119,12 +121,12 @@ if ($conf->global->GEOIP_VERSION == 'php') print ''; // Path to database file -print ''.$langs->trans("PathToGeoIPMaxmindCountryDataFile").''; +print ''.$langs->trans("PathToGeoIPMaxmindCountryDataFile").''; print ''; if ($conf->global->GEOIP_VERSION == 'php') { - print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).' or /usr/share/GeoIP/GeoLite2-Country.mmdb
'; + print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).' or /pathtodatafile/GeoLite2-Country.mmdb
'; } print ''; print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 72721fcb364..da28ec88538 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1934,4 +1934,5 @@ RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always repla AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs. RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access. -BaseOnSabeDavVersion=Based on the library SabreDAV version \ No newline at end of file +BaseOnSabeDavVersion=Based on the library SabreDAV version +NotAPublicIp=Not a public IP \ No newline at end of file