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

46
www/analytics/plugins/VisitFrequency/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
@ -11,18 +11,31 @@ namespace Piwik\Plugins\VisitFrequency;
use Piwik\API\Request;
use Piwik\Common;
use Piwik\Piwik;
use Piwik\Translation\Translator;
use Piwik\View;
/**
*
*/
class Controller extends \Piwik\Plugin\Controller
{
function index()
/**
* @var Translator
*/
private $translator;
public function __construct(Translator $translator)
{
$this->translator = $translator;
parent::__construct();
}
public function index()
{
$view = new View('@VisitFrequency/index');
$view->graphEvolutionVisitFrequency = $this->getEvolutionGraph(array('nb_visits_returning'));
$this->setGeneralVariablesView($view);
$view->graphEvolutionVisitFrequency = $this->getEvolutionGraph(array(), array('nb_visits_returning'));
$this->setSparklinesAndNumbers($view);
return $view->render();
}
@ -33,16 +46,18 @@ class Controller extends \Piwik\Plugin\Controller
return $view->render();
}
public function getEvolutionGraph(array $columns = array())
public function getEvolutionGraph(array $columns = array(), array $defaultColumns = array())
{
if (empty($columns)) {
$columns = Common::getRequestVar('columns');
$columns = Piwik::getArrayFromApiParameter($columns);
$columns = Common::getRequestVar('columns', false);
if (false !== $columns) {
$columns = Piwik::getArrayFromApiParameter($columns);
}
}
$documentation = Piwik::translate('VisitFrequency_ReturningVisitsDocumentation') . '<br />'
. Piwik::translate('General_BrokenDownReportDocumentation') . '<br />'
. Piwik::translate('VisitFrequency_ReturningVisitDocumentation');
$documentation = $this->translator->translate('VisitFrequency_ReturningVisitsDocumentation') . '<br />'
. $this->translator->translate('General_BrokenDownReportDocumentation') . '<br />'
. $this->translator->translate('VisitFrequency_ReturningVisitDocumentation');
// Note: if you edit this array, maybe edit the code below as well
$selectableColumns = array(
@ -74,6 +89,10 @@ class Controller extends \Piwik\Plugin\Controller
$view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, __FUNCTION__, $columns,
$selectableColumns, $documentation);
if (empty($view->config->columns_to_display) && !empty($defaultColumns)) {
$view->config->columns_to_display = $defaultColumns;
}
return $this->renderView($view);
}
@ -92,8 +111,7 @@ class Controller extends \Piwik\Plugin\Controller
$view->nbActionsReturning = $dataRow->getColumn('nb_actions_returning');
$view->nbActionsPerVisitReturning = $dataRow->getColumn('nb_actions_per_visit_returning');
$view->avgVisitDurationReturning = $dataRow->getColumn('avg_time_on_site_returning');
$nbBouncedReturningVisits = $dataRow->getColumn('bounce_count_returning');
$view->bounceRateReturning = Piwik::getPercentageSafe($nbBouncedReturningVisits, $nbVisitsReturning);
$view->bounceRateReturning = $dataRow->getColumn('bounce_rate_returning');
}
protected function getSummary()