coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
Download patch file Download diff file Expand all files Collapse all files

69
www/analytics/plugins/UserCountry/Controller.php
View file

@ -1,6 +1,6 @@
<?php
/**
* Piwik - Open source web analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -14,13 +14,12 @@ use Piwik\DataTable\Renderer\Json;
use Piwik\Http;
use Piwik\IP;
use Piwik\Piwik;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\ServerBased;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Pecl;
use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\ServerBased;
use Piwik\View;
use Piwik\ViewDataTable\Factory;
/**
*
@ -34,10 +33,10 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
$view->urlSparklineCountries = $this->getUrlSparkline('getLastDistinctCountriesGraph');
$view->numberDistinctCountries = $this->getNumberOfDistinctCountries(true);
$view->dataTableCountry = $this->getCountry(true);
$view->dataTableContinent = $this->getContinent(true);
$view->dataTableRegion = $this->getRegion(true);
$view->dataTableCity = $this->getCity(true);
$view->dataTableCountry = $this->renderReport('getCountry');
$view->dataTableContinent = $this->renderReport('getContinent');
$view->dataTableRegion = $this->renderReport('getRegion');
$view->dataTableCity = $this->renderReport('getCity');
return $view->render();
}
@ -132,9 +131,9 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
$result['next_screen'] = $this->getGeoIpUpdaterManageScreen();
}
return Common::json_encode($result);
return json_encode($result);
} catch (Exception $ex) {
return Common::json_encode(array('error' => $ex->getMessage()));
return json_encode(array('error' => $ex->getMessage()));
}
}
}
@ -204,15 +203,15 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
// the browser so it can download it next
$info = $this->getNextMissingDbUrlInfo();
if ($info !== false) {
return Common::json_encode($info);
return json_encode($info);
} else {
$view = new View("@UserCountry/_updaterNextRunTime");
$view->nextRunTime = GeoIPAutoUpdater::getNextRunTime();
$nextRunTimeHtml = $view->render();
return Common::json_encode(array('nextRunTime' => $nextRunTimeHtml));
return json_encode(array('nextRunTime' => $nextRunTimeHtml));
}
} catch (Exception $ex) {
return Common::json_encode(array('error' => $ex->getMessage()));
return json_encode(array('error' => $ex->getMessage()));
}
}
}
@ -267,13 +266,13 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
$info = $this->getNextMissingDbUrlInfo();
if ($info !== false) {
return Common::json_encode($info);
return json_encode($info);
}
}
return Common::json_encode($result);
return json_encode($result);
} catch (Exception $ex) {
return Common::json_encode(array('error' => $ex->getMessage()));
return json_encode(array('error' => $ex->getMessage()));
}
}
}
@ -315,8 +314,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
public function getLocationUsingProvider()
{
$providerId = Common::getRequestVar('id');
$provider = $provider = LocationProvider::getProviderById($providerId);
if ($provider === false) {
$provider = LocationProvider::getProviderById($providerId);
if (empty($provider)) {
throw new Exception("Invalid provider ID: '$providerId'.");
}
@ -329,36 +328,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
return $location;
}
public function getCountry()
{
return $this->renderReport(__FUNCTION__);
}
public function getContinent()
{
return $this->renderReport(__FUNCTION__);
}
/**
* Echo's or returns an HTML view of the visits by region report.
*
* @return string
*/
public function getRegion()
{
return $this->renderReport(__FUNCTION__);
}
/**
* Echo's or returns an HTML view of the visits by city report.
*
* @return string
*/
public function getCity()
{
return $this->renderReport(__FUNCTION__);
}
public function getNumberOfDistinctCountries()
{
return $this->getNumericValue('UserCountry.getNumberOfDistinctCountries');
@ -396,7 +365,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
private function dieIfGeolocationAdminIsDisabled()
{
if(!UserCountry::isGeoLocationAdminEnabled()) {
if (!UserCountry::isGeoLocationAdminEnabled()) {
throw new \Exception('Geo location setting page has been disabled.');
}
}