update Piwik to version 2.16 (fixes #91)
This commit is contained in:
oliver
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -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
|
||||
|
|
@ -10,11 +10,11 @@ namespace Piwik\Plugins\VisitsSummary;
|
|||
|
||||
use Piwik\API\Request;
|
||||
use Piwik\Common;
|
||||
use Piwik\DataTable\Row;
|
||||
use Piwik\DataTable;
|
||||
use Piwik\DataTable\Row;
|
||||
use Piwik\Piwik;
|
||||
use Piwik\Plugins\Actions\API as APIActions;
|
||||
use Piwik\Site;
|
||||
use Piwik\Translation\Translator;
|
||||
use Piwik\View;
|
||||
|
||||
/**
|
||||
|
|
@ -22,15 +22,35 @@ use Piwik\View;
|
|||
*/
|
||||
class Controller extends \Piwik\Plugin\Controller
|
||||
{
|
||||
/**
|
||||
* @var Translator
|
||||
*/
|
||||
private $translator;
|
||||
|
||||
public function __construct(Translator $translator)
|
||||
{
|
||||
$this->translator = $translator;
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
public function index()
|
||||
{
|
||||
$view = new View('@VisitsSummary/index');
|
||||
$this->setPeriodVariablesView($view);
|
||||
$view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(array('nb_visits'));
|
||||
$view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(array(), array('nb_visits'), 'getIndexGraph');
|
||||
$this->setSparklinesAndNumbers($view);
|
||||
return $view->render();
|
||||
}
|
||||
|
||||
// sparkline.js:81 dataTable.trigger('reload', …); does not remove the old headline,
|
||||
// so when updating this graph (such as when selecting a different metric)
|
||||
// ONLY the graph should be returned
|
||||
public function getIndexGraph()
|
||||
{
|
||||
return $this->getEvolutionGraph(array(), array(), __FUNCTION__);
|
||||
}
|
||||
|
||||
public function getSparklines()
|
||||
{
|
||||
$view = new View('@VisitsSummary/getSparklines');
|
||||
|
|
@ -39,32 +59,38 @@ class Controller extends \Piwik\Plugin\Controller
|
|||
return $view->render();
|
||||
}
|
||||
|
||||
public function getEvolutionGraph(array $columns = array())
|
||||
public function getEvolutionGraph(array $columns = array(), array $defaultColumns = array(), $callingAction = __FUNCTION__)
|
||||
{
|
||||
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('VisitsSummary_VisitsSummaryDocumentation') . '<br />'
|
||||
. Piwik::translate('General_BrokenDownReportDocumentation') . '<br /><br />'
|
||||
$documentation = $this->translator->translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />'
|
||||
. $this->translator->translate('General_BrokenDownReportDocumentation') . '<br /><br />'
|
||||
|
||||
. '<b>' . Piwik::translate('General_ColumnNbVisits') . ':</b> '
|
||||
. Piwik::translate('General_ColumnNbVisitsDocumentation') . '<br />'
|
||||
. '<b>' . $this->translator->translate('General_ColumnNbVisits') . ':</b> '
|
||||
. $this->translator->translate('General_ColumnNbVisitsDocumentation') . '<br />'
|
||||
|
||||
. '<b>' . Piwik::translate('General_ColumnNbUniqVisitors') . ':</b> '
|
||||
. Piwik::translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />'
|
||||
. '<b>' . $this->translator->translate('General_ColumnNbUniqVisitors') . ':</b> '
|
||||
. $this->translator->translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />'
|
||||
|
||||
. '<b>' . Piwik::translate('General_ColumnNbActions') . ':</b> '
|
||||
. Piwik::translate('General_ColumnNbActionsDocumentation') . '<br />'
|
||||
. '<b>' . $this->translator->translate('General_ColumnNbActions') . ':</b> '
|
||||
. $this->translator->translate('General_ColumnNbActionsDocumentation') . '<br />'
|
||||
|
||||
. '<b>' . Piwik::translate('General_ColumnActionsPerVisit') . ':</b> '
|
||||
. Piwik::translate('General_ColumnActionsPerVisitDocumentation');
|
||||
. '<b>' . $this->translator->translate('General_ColumnNbUsers') . ':</b> '
|
||||
. $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />'
|
||||
|
||||
. '<b>' . $this->translator->translate('General_ColumnActionsPerVisit') . ':</b> '
|
||||
. $this->translator->translate('General_ColumnActionsPerVisitDocumentation');
|
||||
|
||||
$selectableColumns = array(
|
||||
// columns from VisitsSummary.get
|
||||
'nb_visits',
|
||||
'nb_uniq_visitors',
|
||||
'nb_users',
|
||||
'avg_time_on_site',
|
||||
'bounce_rate',
|
||||
'nb_actions_per_visit',
|
||||
|
|
@ -87,26 +113,31 @@ class Controller extends \Piwik\Plugin\Controller
|
|||
$selectableColumns[] = 'nb_searches';
|
||||
$selectableColumns[] = 'nb_keywords';
|
||||
}
|
||||
|
||||
$view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, __FUNCTION__, $columns,
|
||||
// $callingAction may be specified to distinguish between
|
||||
// "VisitsSummary_WidgetLastVisits" and "VisitsSummary_WidgetOverviewGraph"
|
||||
$view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, $callingAction, $columns,
|
||||
$selectableColumns, $documentation);
|
||||
|
||||
if (empty($view->config->columns_to_display) && !empty($defaultColumns)) {
|
||||
$view->config->columns_to_display = $defaultColumns;
|
||||
}
|
||||
|
||||
return $this->renderView($view);
|
||||
}
|
||||
|
||||
static public function getVisitsSummary()
|
||||
public static function getVisitsSummary()
|
||||
{
|
||||
$requestString = "method=VisitsSummary.get" .
|
||||
"&format=original" .
|
||||
$result = Request::processRequest("VisitsSummary.get", array(
|
||||
// we disable filters for example "search for pattern", in the case this method is called
|
||||
// by a method that already calls the API with some generic filters applied
|
||||
"&disable_generic_filters=1";
|
||||
$request = new Request($requestString);
|
||||
$result = $request->process();
|
||||
'disable_generic_filters' => 1,
|
||||
'columns' => false
|
||||
));
|
||||
|
||||
return empty($result) ? new DataTable() : $result;
|
||||
}
|
||||
|
||||
static public function getVisits()
|
||||
public static function getVisits()
|
||||
{
|
||||
$requestString = "method=VisitsSummary.getVisits" .
|
||||
"&format=original" .
|
||||
|
|
@ -118,6 +149,7 @@ class Controller extends \Piwik\Plugin\Controller
|
|||
protected function setSparklinesAndNumbers($view)
|
||||
{
|
||||
$view->urlSparklineNbVisits = $this->getUrlSparkline('getEvolutionGraph', array('columns' => $view->displayUniqueVisitors ? array('nb_visits', 'nb_uniq_visitors') : array('nb_visits')));
|
||||
$view->urlSparklineNbUsers = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_users')));
|
||||
$view->urlSparklineNbPageviews = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_pageviews', 'nb_uniq_pageviews')));
|
||||
$view->urlSparklineNbDownloads = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_downloads', 'nb_uniq_downloads')));
|
||||
$view->urlSparklineNbOutlinks = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_outlinks', 'nb_uniq_outlinks')));
|
||||
|
|
@ -136,22 +168,26 @@ class Controller extends \Piwik\Plugin\Controller
|
|||
|
||||
$dataTableVisit = self::getVisitsSummary();
|
||||
$dataRow = $dataTableVisit->getRowsCount() == 0 ? new Row() : $dataTableVisit->getFirstRow();
|
||||
|
||||
|
||||
$view->nbUniqVisitors = (int)$dataRow->getColumn('nb_uniq_visitors');
|
||||
$view->nbUsers = (int)$dataRow->getColumn('nb_users');
|
||||
$nbVisits = (int)$dataRow->getColumn('nb_visits');
|
||||
$view->nbVisits = $nbVisits;
|
||||
|
||||
$view->averageVisitDuration = $dataRow->getColumn('avg_time_on_site');
|
||||
$nbBouncedVisits = $dataRow->getColumn('bounce_count');
|
||||
$view->bounceRate = Piwik::getPercentageSafe($nbBouncedVisits, $nbVisits);
|
||||
$view->bounceRate = $dataRow->getColumn('bounce_rate');
|
||||
$view->maxActions = (int)$dataRow->getColumn('max_actions');
|
||||
$view->nbActionsPerVisit = $dataRow->getColumn('nb_actions_per_visit');
|
||||
|
||||
if(Common::isActionsPluginEnabled()) {
|
||||
if (Common::isActionsPluginEnabled()) {
|
||||
$view->showActionsPluginReports = true;
|
||||
$dataTableActions = APIActions::getInstance()->get($idSite, Common::getRequestVar('period'), Common::getRequestVar('date'),
|
||||
\Piwik\API\Request::getRawSegmentFromRequest());
|
||||
|
||||
$dataTableActions = Request::processRequest("Actions.get", array(
|
||||
'idSite' => $idSite,
|
||||
'period' => Common::getRequestVar('period'),
|
||||
'date' => Common::getRequestVar('date'),
|
||||
'segment' => Request::getRawSegmentFromRequest()
|
||||
), $defaultParams = array());
|
||||
|
||||
$dataActionsRow =
|
||||
$dataTableActions->getRowsCount() == 0 ? new Row() : $dataTableActions->getFirstRow();
|
||||
|
||||
|
|
@ -163,7 +199,6 @@ class Controller extends \Piwik\Plugin\Controller
|
|||
$view->nbUniqueOutlinks = (int)$dataActionsRow->getColumn('nb_uniq_outlinks');
|
||||
$view->averageGenerationTime = $dataActionsRow->getColumn('avg_time_generation');
|
||||
|
||||
|
||||
if ($displaySiteSearch) {
|
||||
$view->nbSearches = (int)$dataActionsRow->getColumn('nb_searches');
|
||||
$view->nbKeywords = (int)$dataActionsRow->getColumn('nb_keywords');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue