update Piwik to version 2.16 (fixes #91)

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

View file

@ -1,16 +1,15 @@
<?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
*
*/
namespace Piwik\Plugins\VisitsSummary;
use Piwik\Menu\MenuMain;
use Piwik\Piwik;
use Piwik\WidgetsList;
use Piwik\DataTable;
use Piwik\Plugins\CoreHome\Columns\UserId;
use Piwik\Plugins\VisitsSummary\Reports\Get;
/**
* Note: This plugin does not hook on Daily and Period Archiving like other Plugins because it reports the
@ -22,40 +21,48 @@ use Piwik\WidgetsList;
class VisitsSummary extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'API.getReportMetadata' => 'getReportMetadata',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.Reporting.addItems' => 'addMenu',
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'API.API.getProcessedReport.end' => 'enrichProcessedReportIfVisitsSummaryGet',
);
}
public function getReportMetadata(&$reports)
private function isRequestingVisitsSummaryGet($module, $method)
{
$reports[] = array(
'category' => Piwik::translate('VisitsSummary_VisitsSummary'),
'name' => Piwik::translate('VisitsSummary_VisitsSummary'),
'module' => 'VisitsSummary',
'action' => 'get',
'metrics' => array(
'nb_uniq_visitors',
'nb_visits',
'nb_actions',
'nb_actions_per_visit',
'bounce_rate',
'avg_time_on_site' => Piwik::translate('General_VisitDuration'),
'max_actions' => Piwik::translate('General_ColumnMaxActions'),
// Used to process metrics, not displayed/used directly
// 'sum_visit_length',
// 'nb_visits_converted',
),
'processedMetrics' => false,
'order' => 1
);
return ($module === 'VisitsSummary' && $method === 'get');
}
public function enrichProcessedReportIfVisitsSummaryGet(&$response, $infos)
{
if (empty($infos['parameters'][4]) || empty($response['reportData'])) {
return;
}
$params = $infos['parameters'];
$idSites = array($params[0]);
$period = $params[1];
$date = $params[2];
$module = $params[3];
$method = $params[4];
if (!$this->isRequestingVisitsSummaryGet($module, $method)) {
return;
}
$userId = new UserId();
/** @var DataTable|DataTable\Map $dataTable */
$dataTable = $response['reportData'];
if (!$userId->hasDataTableUsers($dataTable) &&
!$userId->isUsedInAtLeastOneSite($idSites, $period, $date)) {
$report = new Get();
$report->removeUsersFromProcessedReport($response);
}
}
public function getStylesheetFiles(&$stylesheets)
@ -63,18 +70,5 @@ class VisitsSummary extends \Piwik\Plugin
$stylesheets[] = "plugins/VisitsSummary/stylesheets/datatable.less";
}
function addWidgets()
{
WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetLastVisits', 'VisitsSummary', 'getEvolutionGraph', array('columns' => array('nb_visits')));
WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetVisits', 'VisitsSummary', 'getSparklines');
WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetOverviewGraph', 'VisitsSummary', 'index');
}
function addMenu()
{
MenuMain::getInstance()->add('General_Visitors', '', array('module' => 'VisitsSummary', 'action' => 'index'), true, 10);
MenuMain::getInstance()->add('General_Visitors', 'General_Overview', array('module' => 'VisitsSummary', 'action' => 'index'), true, 1);
}
}