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

34
www/analytics/plugins/VisitorInterest/API.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
@ -33,18 +33,18 @@ class API extends \Piwik\Plugin\API
public function getNumberOfVisitsPerVisitDuration($idSite, $period, $date, $segment = false)
{
$dataTable = $this->getDataTable(Archiver::TIME_SPENT_RECORD_NAME, $idSite, $period, $date, $segment);
$dataTable->queueFilter('Sort', array('label', 'asc', true));
$dataTable->queueFilter('Sort', array('label', 'asc', true, false));
$dataTable->queueFilter('BeautifyTimeRangeLabels', array(
Piwik::translate('VisitorInterest_BetweenXYSeconds'),
Piwik::translate('VisitorInterest_OneMinute'),
Piwik::translate('VisitorInterest_PlusXMin')));
Piwik::translate('Intl_OneMinuteShort'),
Piwik::translate('Intl_NMinutesShort')));
return $dataTable;
}
public function getNumberOfVisitsPerPage($idSite, $period, $date, $segment = false)
{
$dataTable = $this->getDataTable(Archiver::PAGES_VIEWED_RECORD_NAME, $idSite, $period, $date, $segment);
$dataTable->queueFilter('Sort', array('label', 'asc', true));
$dataTable->queueFilter('Sort', array('label', 'asc', true, false));
$dataTable->queueFilter('BeautifyRangeLabels', array(
Piwik::translate('VisitorInterest_OnePage'),
Piwik::translate('VisitorInterest_NPages')));
@ -65,7 +65,7 @@ class API extends \Piwik\Plugin\API
{
$dataTable = $this->getDataTable(
Archiver::DAYS_SINCE_LAST_RECORD_NAME, $idSite, $period, $date, $segment, Metrics::INDEX_NB_VISITS);
$dataTable->queueFilter('BeautifyRangeLabels', array(Piwik::translate('General_OneDay'), Piwik::translate('General_NDays')));
$dataTable->queueFilter('BeautifyRangeLabels', array(Piwik::translate('Intl_OneDay'), Piwik::translate('Intl_NDays')));
return $dataTable;
}
@ -87,28 +87,6 @@ class API extends \Piwik\Plugin\API
$dataTable->queueFilter('BeautifyRangeLabels', array(
Piwik::translate('General_OneVisit'), Piwik::translate('General_NVisits')));
// add visit percent column
self::addVisitsPercentColumn($dataTable);
return $dataTable;
}
/**
* Utility function that adds a visit percent column to a data table,
* regardless of whether the data table is an data table array or just
* a data table.
*
* @param DataTable $dataTable The data table to modify.
*/
private static function addVisitsPercentColumn($dataTable)
{
if ($dataTable instanceof DataTable\Map) {
foreach ($dataTable->getDataTables() as $table) {
self::addVisitsPercentColumn($table);
}
} else {
$totalVisits = array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS));
$dataTable->queueFilter('ColumnCallbackAddColumnPercentage', array('nb_visits_percentage', 'nb_visits', $totalVisits));
}
}
}