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

45
www/analytics/plugins/Transitions/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
@ -14,9 +14,8 @@ use Piwik\ArchiveProcessor;
use Piwik\Common;
use Piwik\DataAccess\LogAggregator;
use Piwik\DataArray;
use Piwik\DataTable\Manager;
use Piwik\DataTable\Row;
use Piwik\DataTable;
use Piwik\DataTable\Row;
use Piwik\Metrics;
use Piwik\Period;
use Piwik\Piwik;
@ -24,7 +23,7 @@ use Piwik\Plugins\Actions\Actions;
use Piwik\Plugins\Actions\ArchivingHelper;
use Piwik\RankingQuery;
use Piwik\Segment;
use Piwik\SegmentExpression;
use Piwik\Segment\SegmentExpression;
use Piwik\Site;
use Piwik\Tracker\Action;
use Piwik\Tracker\PageUrl;
@ -73,13 +72,13 @@ class API extends \Piwik\Plugin\API
// prepare log aggregator
$segment = new Segment($segment, $idSite);
$site = new Site($idSite);
$period = Period::factory($period, $date);
$period = Period\Factory::build($period, $date);
$params = new ArchiveProcessor\Parameters($site, $period, $segment);
$logAggregator = new LogAggregator($params);
// prepare the report
$report = array(
'date' => Period::factory($period->getLabel(), $date)->getLocalizedShortString()
'date' => Period\Factory::build($period->getLabel(), $date)->getLocalizedShortString()
);
$partsArray = explode(',', $parts);
@ -128,7 +127,6 @@ class API extends \Piwik\Plugin\API
*/
private function deriveIdAction($actionName, $actionType)
{
$actionsPlugin = new Actions;
switch ($actionType) {
case 'url':
$originalActionName = $actionName;
@ -173,7 +171,6 @@ class API extends \Piwik\Plugin\API
*/
private function addInternalReferrers($logAggregator, &$report, $idaction, $actionType, $limitBeforeGrouping)
{
$data = $this->queryInternalReferrers($idaction, $actionType, $logAggregator, $limitBeforeGrouping);
if ($data['pageviews'] == 0) {
@ -199,7 +196,6 @@ class API extends \Piwik\Plugin\API
*/
private function addFollowingActions($logAggregator, &$report, $idaction, $actionType, $limitBeforeGrouping, $includeLoops = false)
{
$data = $this->queryFollowingActions(
$idaction, $actionType, $logAggregator, $limitBeforeGrouping, $includeLoops);
@ -226,7 +222,7 @@ class API extends \Piwik\Plugin\API
if ($actionType != 'title') {
// specific setup for page urls
$types[Action::TYPE_PAGE_URL] = 'followingPages';
$dimension = 'IF( idaction_url IS NULL, idaction_name, idaction_url )';
$dimension = 'if ( idaction_url IS NULL, idaction_name, idaction_url )';
// site search referrers are logged with url=NULL
// when we find one, we have to join on name
$joinLogActionColumn = $dimension;
@ -409,7 +405,7 @@ class API extends \Piwik\Plugin\API
if ($dimension == 'idaction_url_ref') {
// site search referrers are logged with url_ref=NULL
// when we find one, we have to join on name_ref
$dimension = 'IF( idaction_url_ref IS NULL, idaction_name_ref, idaction_url_ref )';
$dimension = 'if ( idaction_url_ref IS NULL, idaction_name_ref, idaction_url_ref )';
$joinLogActionOn = $dimension;
} else {
$joinLogActionOn = $dimension;
@ -492,7 +488,7 @@ class API extends \Piwik\Plugin\API
}
private $limitBeforeGrouping = 5;
private $totalTransitionsToFollowingActions = 0;
private $totalTransitionsToFollowingPages = 0;
/**
* Get the sum of all transitions to following actions (pages, outlinks, downloads).
@ -500,7 +496,7 @@ class API extends \Piwik\Plugin\API
*/
protected function getTotalTransitionsToFollowingActions()
{
return $this->totalTransitionsToFollowingActions;
return $this->totalTransitionsToFollowingPages;
}
/**
@ -515,7 +511,6 @@ class API extends \Piwik\Plugin\API
*/
private function addExternalReferrers($logAggregator, &$report, $idaction, $actionType, $limitBeforeGrouping)
{
$data = $this->queryExternalReferrers(
$idaction, $actionType, $logAggregator, $limitBeforeGrouping);
@ -527,8 +522,8 @@ class API extends \Piwik\Plugin\API
if ($visits) {
// load details (i.e. subtables)
$details = array();
if ($idSubTable = $row->getIdSubDataTable()) {
$subTable = Manager::getInstance()->getTable($idSubTable);
$subTable = $row->getSubtable();
if ($subTable) {
foreach ($subTable->getRows() as $subRow) {
$details[] = array(
'label' => $subRow->getColumn('label'),
@ -582,7 +577,7 @@ class API extends \Piwik\Plugin\API
protected function makeDataTablesFollowingActions($types, $data)
{
$this->totalTransitionsToFollowingActions = 0;
$this->totalTransitionsToFollowingPages = 0;
$dataTables = array();
foreach ($types as $type => $recordName) {
$dataTable = new DataTable;
@ -595,11 +590,25 @@ class API extends \Piwik\Plugin\API
Metrics::INDEX_NB_ACTIONS => $actions
)
)));
$this->totalTransitionsToFollowingActions += $actions;
$this->processTransitionsToFollowingPages($type, $actions);
}
}
$dataTables[$recordName] = $dataTable;
}
return $dataTables;
}
protected function processTransitionsToFollowingPages($type, $actions)
{
// Downloads and Outlinks are not included as these actions count towards a Visit Exit
$actionTypesNotExitActions = array(
Action::TYPE_SITE_SEARCH,
Action::TYPE_PAGE_TITLE,
Action::TYPE_PAGE_URL
);
if(in_array($type, $actionTypesNotExitActions)) {
$this->totalTransitionsToFollowingPages += $actions;
}
}
}