GEOIP is now installed via composer and pointer to autoloader is no l…

…onger needed
GEANT · Mar 22, 2024 · af335aa · af335aa
1 parent 8004851
commit af335aa
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/config/Master-template.php b/config/Master-template.php
@@ -126,7 +126,6 @@ class Master
          */
         const GEOIP = [
             'version' => 2,
-            'geoip2-path-to-autoloader' => '/usr/share/GeoIP2/vendor/autoload.php',
             'geoip2-path-to-db' => '/usr/share/GeoIP2/DB/GeoLite2-City.mmdb',
             'geoip2-license-key' => '',
         ];

diff --git a/core/DeviceLocation.php b/core/DeviceLocation.php
@@ -92,7 +92,6 @@ private static function locateDevice2()
         if (\config\Master::GEOIP['version'] != 2) {
             return ['status' => 'error', 'error' => 'Function for GEOIPv2 called, but config says this is not the version to use!'];
         }
-        include_once \config\Master::GEOIP['geoip2-path-to-autoloader'];
         $reader = new Reader(\config\Master::GEOIP['geoip2-path-to-db']);
         $host = filter_input(INPUT_SERVER, 'REMOTE_ADDR', FILTER_VALIDATE_IP);
         try {