Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2013-08-02 17:59:33 +0400
committermattab <matthieu.aubry@gmail.com>2013-08-02 17:59:33 +0400
commita96ec40e983a8b64f4c25def541a519ff3670e6a (patch)
treebef2a5f7b1e9532dc96161334e23a553cdff7ea1 /plugins/VisitsSummary
parent61997f45e4c39360000e815c9e0853ae04e2f56f (diff)
Refs #4059 Converting dozens of plugins/* classes to use Namespaces, \Piwik\Plugins\*
Added namespaces to functions.php files in the five plugins that had one Work in progress
Diffstat (limited to 'plugins/VisitsSummary')
-rw-r--r--plugins/VisitsSummary/API.php10
-rw-r--r--plugins/VisitsSummary/Controller.php16
-rw-r--r--plugins/VisitsSummary/VisitsSummary.php9
3 files changed, 20 insertions, 15 deletions
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index 7dbabcf6d9..57e81115ef 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -6,8 +6,10 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik_Plugins
- * @package Piwik_VisitsSummary
+ * @package VisitsSummary
*/
+namespace Piwik\Plugins\VisitsSummary;
+
use Piwik\Archive;
use Piwik\Piwik;
@@ -15,14 +17,14 @@ use Piwik\Piwik;
* VisitsSummary API lets you access the core web analytics metrics (visits, unique visitors,
* count of actions (page views & downloads & clicks on outlinks), time on site, bounces and converted visits.
*
- * @package Piwik_VisitsSummary
+ * @package VisitsSummary
*/
-class Piwik_VisitsSummary_API
+class API
{
static private $instance = null;
/**
- * @return Piwik_VisitsSummary_API
+ * @return \Piwik\Plugins\VisitsSummary\API
*/
static public function getInstance()
{
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 4bc553a94d..2594a9689c 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -6,23 +6,25 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik_Plugins
- * @package Piwik_VisitsSummary
+ * @package VisitsSummary
*/
+namespace Piwik\Plugins\VisitsSummary;
+
use Piwik\API\Request;
use Piwik\DataTable\Row;
use Piwik\Piwik;
use Piwik\Common;
use Piwik\DataTable;
-use Piwik\Controller;
+use Piwik\Plugins\Actions\API;
use Piwik\ViewDataTable;
use Piwik\View;
use Piwik\Site;
/**
*
- * @package Piwik_VisitsSummary
+ * @package VisitsSummary
*/
-class Piwik_VisitsSummary_Controller extends Controller
+class Controller extends \Piwik\Controller
{
public function index()
{
@@ -126,7 +128,7 @@ class Piwik_VisitsSummary_Controller extends Controller
$view->urlSparklineMaxActions = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('max_actions')));
$view->urlSparklineActionsPerVisit = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_actions_per_visit')));
$view->urlSparklineBounceRate = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('bounce_rate')));
- $view->urlSparklineAvgGenerationTime = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('avg_time_generation')));
+ $view->urlSparklineAvgGenerationTime = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('avg_time_generation')));
$idSite = Common::getRequestVar('idSite');
$displaySiteSearch = Site::isSiteSearchEnabledFor($idSite);
@@ -138,7 +140,7 @@ class Piwik_VisitsSummary_Controller extends Controller
$dataTableVisit = self::getVisitsSummary();
$dataRow = $dataTableVisit->getRowsCount() == 0 ? new Row() : $dataTableVisit->getFirstRow();
- $dataTableActions = Piwik_Actions_API::getInstance()->get($idSite, Common::getRequestVar('period'), Common::getRequestVar('date'),
+ $dataTableActions = API::getInstance()->get($idSite, Common::getRequestVar('period'), Common::getRequestVar('date'),
\Piwik\API\Request::getRawSegmentFromRequest());
$dataActionsRow =
$dataTableActions->getRowsCount() == 0 ? new Row() : $dataTableActions->getFirstRow();
@@ -157,7 +159,7 @@ class Piwik_VisitsSummary_Controller extends Controller
$view->bounceRate = Piwik::getPercentageSafe($nbBouncedVisits, $nbVisits);
$view->maxActions = (int)$dataRow->getColumn('max_actions');
$view->nbActionsPerVisit = $dataRow->getColumn('nb_actions_per_visit');
- $view->averageGenerationTime = $dataActionsRow->getColumn('avg_time_generation');
+ $view->averageGenerationTime = $dataActionsRow->getColumn('avg_time_generation');
if ($displaySiteSearch) {
$view->nbSearches = (int)$dataActionsRow->getColumn('nb_searches');
diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php
index 91e4a65661..3ef1a89f0d 100644
--- a/plugins/VisitsSummary/VisitsSummary.php
+++ b/plugins/VisitsSummary/VisitsSummary.php
@@ -6,9 +6,10 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik_Plugins
- * @package Piwik_VisitsSummary
+ * @package VisitsSummary
*/
-use Piwik\Plugin;
+namespace Piwik\Plugins\VisitsSummary;
+
use Piwik\WidgetsList;
/**
@@ -17,9 +18,9 @@ use Piwik\WidgetsList;
* Day class directly.
* These metrics can be used by other Plugins so they need to be processed up front.
*
- * @package Piwik_VisitsSummary
+ * @package VisitsSummary
*/
-class Piwik_VisitsSummary extends Plugin
+class VisitsSummary extends \Piwik\Plugin
{
/**
* @see Piwik_Plugin::getListHooksRegistered