update Piwik to version 2.16 (fixes #91)

www/analytics/plugins/UserCountry/Columns/Region.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserCountry\Columns;
+
+use Piwik\Piwik;
+use Piwik\Plugins\UserCountry\LocationProvider;
+use Piwik\Plugins\UserCountry\Segment;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class Region extends Base
+{
+    protected $columnName = 'location_region';
+    protected $columnType = 'char(2) DEFAULT NULL';
+
+    protected function configureSegments()
+    {
+        $segment = new Segment();
+        $segment->setSegment('regionCode');
+        $segment->setName('UserCountry_Region');
+        $segment->setAcceptedValues('01 02, OR, P8, etc.<br/>eg. region=A1;country=fr');
+        $this->addSegment($segment);
+    }
+
+    public function getName()
+    {
+        return Piwik::translate('UserCountry_Region');
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        $value = $this->getUrlOverrideValueIfAllowed('region', $request);
+
+        if ($value !== false) {
+            return $value;
+        }
+
+        $userInfo = $this->getUserInfo($request, $visitor);
+
+        return $this->getLocationDetail($userInfo, LocationProvider::REGION_CODE_KEY);
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return int
+     */
+    public function onExistingVisit(Request $request, Visitor $visitor, $action)
+    {
+        return $this->getUrlOverrideValueIfAllowed('region', $request);
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onAnyGoalConversion(Request $request, Visitor $visitor, $action)
+    {
+        return $visitor->getVisitorColumn($this->columnName);
+    }
+}