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-07-23 11:52:15 +0400
committermattab <matthieu.aubry@gmail.com>2013-07-23 11:52:15 +0400
commit5104d94f3b2250f766b9c520e2da8da9b4cab2e9 (patch)
tree5f30daf7bc14373fb1bbd0504ce11a771dafc02f /plugins/VisitsSummary
parentae4b1f4e38077b174e4df5b7d4513d63fe026a24 (diff)
Refs #4059 Work in progress: Conversion to use Namespaces of dozen more classes
Removed many Piwik_ functions, in Piwik 2 it is best practise to use the methods calls instead Todo: finish converting core/ classes + convert plugins/ classes to use \Piwik\Plugin namespace + fix build + Merge master
Diffstat (limited to 'plugins/VisitsSummary')
-rw-r--r--plugins/VisitsSummary/Controller.php16
-rw-r--r--plugins/VisitsSummary/VisitsSummary.php6
2 files changed, 13 insertions, 9 deletions
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index bc30a1e6aa..fc32e77e9e 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -8,21 +8,25 @@
* @category Piwik_Plugins
* @package Piwik_VisitsSummary
*/
+use Piwik\API\Request;
use Piwik\DataTable\Row;
use Piwik\Piwik;
use Piwik\Common;
use Piwik\DataTable;
+use Piwik\Controller;
+use Piwik\ViewDataTable;
+use Piwik\View;
use Piwik\Site;
/**
*
* @package Piwik_VisitsSummary
*/
-class Piwik_VisitsSummary_Controller extends Piwik_Controller
+class Piwik_VisitsSummary_Controller extends Controller
{
public function index()
{
- $view = new Piwik_View('@VisitsSummary/index');
+ $view = new View('@VisitsSummary/index');
$this->setPeriodVariablesView($view);
$view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(true, array('nb_visits'));
$this->setSparklinesAndNumbers($view);
@@ -31,7 +35,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
public function getSparklines()
{
- $view = new Piwik_View('@VisitsSummary/getSparklines');
+ $view = new View('@VisitsSummary/getSparklines');
$this->setPeriodVariablesView($view);
$this->setSparklinesAndNumbers($view);
echo $view->render();
@@ -98,7 +102,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
// 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 Piwik_API_Request($requestString);
+ $request = new Request($requestString);
$result = $request->process();
return empty($result) ? new DataTable() : $result;
}
@@ -108,7 +112,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
$requestString = "method=VisitsSummary.getVisits" .
"&format=original" .
"&disable_generic_filters=1";
- $request = new Piwik_API_Request($requestString);
+ $request = new Request($requestString);
return $request->process();
}
@@ -134,7 +138,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_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'), Piwik_ViewDataTable::getRawSegmentFromRequest());
+ $dataTableActions = Piwik_Actions_API::getInstance()->get($idSite, Common::getRequestVar('period'), Common::getRequestVar('date'), ViewDataTable::getRawSegmentFromRequest());
$dataActionsRow =
$dataTableActions->getRowsCount() == 0 ? new Row() : $dataTableActions->getFirstRow();
diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php
index fec9352492..70da748a5e 100644
--- a/plugins/VisitsSummary/VisitsSummary.php
+++ b/plugins/VisitsSummary/VisitsSummary.php
@@ -58,9 +58,9 @@ class Piwik_VisitsSummary extends Plugin
function addWidgets()
{
- Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetLastVisits', 'VisitsSummary', 'getEvolutionGraph', array('columns' => array('nb_visits')));
- Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetVisits', 'VisitsSummary', 'getSparklines');
- Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetOverviewGraph', 'VisitsSummary', 'index');
+ WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetLastVisits', 'VisitsSummary', 'getEvolutionGraph', array('columns' => array('nb_visits')));
+ WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetVisits', 'VisitsSummary', 'getSparklines');
+ WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetOverviewGraph', 'VisitsSummary', 'index');
}
function addMenu()