From 18ad4f7f04d01b90fb9fc1d623585b5033092ed8 Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@piwik.org>
Date: Fri, 4 May 2018 07:15:12 +0200
Subject: GeoIP2 implementation as a plugin (#12699)

* require geoip2/geoip2 composer package

* Determine region name based on Location Provider

* Adds empty GeoIp2 plugin

* move location_region column definition to GeoIp2 plugin
so it's get changed as soon as the plugin is activated

* Adds GeoIP2 location providers

* ignore GeoIP2 mmdb files

* Adds script to generate GeoIP2 test databases

* Adds Command to convert region codes from FIPS to ISO for old log table records

* Adds GeoIP2 AutoUpdater

* Use GeoIP2 in tests

* update test files

* code fixes

* adds tests

* rename old GeoIP providers to Legacy

* Let GeoIP autoupdater UI handle GeoIp2 as well

* convert region codes to ISO in API after switch to GeoIP2

* do not show GeoIP providers if GeoIP2 plugin is enabled an no GeoIP Legacy provider is still in use

* small fixes

* review changes

* Use correct region translations

* Show correct message if no database can be found

* if log tables have been converted, use archive date to check if region codes still need to be converted to iso

* fix tests

* Improves extracting GeoIP2 databases

* Adjust GeoLocation diagnostics

* readds old taiwan fixes

* Assume all third party location providers as 'recommended'

* Download database over HTTPS

* remove outdated comment (see https://github.com/matomo-org/matomo/issues/12411)

* Remove indication that Geoip2 may be slow, since we found it should be quite fast and this should not be an issue in theory

* skip detection if IP is empty & do not try convert IP to IPv4

* remove downloaded file if an error occurs while extracting

* command should be runnable multiple times

* use ISO codes for suggested region codes

* reload after wizard success

* Drop table if exists.

* Fix two translation keys.

* add special region handling for UK

* update system test

* update UI files

* submodule update

* update test files
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 6121e1a060..dfef0d84fe 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,8 @@
         "tecnickcom/tcpdf": "~6.0",
         "piwik/piwik-php-tracker": "^1.0",
         "composer/semver": "~1.3.0",
-        "szymach/c-pchart": "^2.0"
+        "szymach/c-pchart": "^2.0",
+        "geoip2/geoip2": "^2.8"
     },
     "require-dev": {
         "aws/aws-sdk-php": "2.7.1",
-- 
cgit v1.2.3