diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-07-23 11:52:15 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-07-23 11:52:15 +0400 |
commit | 5104d94f3b2250f766b9c520e2da8da9b4cab2e9 (patch) | |
tree | 5f30daf7bc14373fb1bbd0504ce11a771dafc02f /plugins/CustomVariables | |
parent | ae4b1f4e38077b174e4df5b7d4513d63fe026a24 (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/CustomVariables')
-rw-r--r-- | plugins/CustomVariables/Archiver.php | 10 | ||||
-rw-r--r-- | plugins/CustomVariables/Controller.php | 11 | ||||
-rw-r--r-- | plugins/CustomVariables/CustomVariables.php | 5 |
3 files changed, 16 insertions, 10 deletions
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index 654cf22835..198f7a8889 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -3,6 +3,8 @@ use Piwik\Common; use Piwik\Config; use Piwik\DataAccess\LogAggregator; use Piwik\Metrics; +use Piwik\DataArray; +use Piwik\Tracker; use Piwik\PluginsArchiver; /** @@ -21,7 +23,7 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver const CUSTOM_VARIABLE_RECORD_NAME = 'CustomVariables_valueByName'; /** - * @var Piwik_DataArray + * @var DataArray */ protected $dataArray; protected $maximumRowsInDataTableLevelZero; @@ -37,9 +39,9 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver public function archiveDay() { - $this->dataArray = new Piwik_DataArray(); + $this->dataArray = new DataArray(); - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { $this->aggregateCustomVariable($i); } @@ -190,7 +192,7 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver $dataArray = &$this->dataArray->getDataArray(); foreach ($dataArray as $key => &$row) { if (!self::isReservedKey($key) - && Piwik_DataArray::isRowActions($row) + && DataArray::isRowActions($row) ) { unset($row[Metrics::INDEX_NB_UNIQ_VISITORS]); unset($row[Metrics::INDEX_NB_VISITS]); diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php index 867988a79b..6c6054f418 100644 --- a/plugins/CustomVariables/Controller.php +++ b/plugins/CustomVariables/Controller.php @@ -8,22 +8,25 @@ * @category Piwik_Plugins * @package Piwik_CustomVariables */ +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * @package Piwik_CustomVariables */ -class Piwik_CustomVariables_Controller extends Piwik_Controller +class Piwik_CustomVariables_Controller extends Controller { public function index($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('CustomVariables_CustomVariables'), $this->getCustomVariables(true), $fetch); } public function getCustomVariables($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, "CustomVariables.getCustomVariables", "getCustomVariablesValuesFromNameId"); $this->setPeriodVariablesView($view); @@ -39,7 +42,7 @@ class Piwik_CustomVariables_Controller extends Piwik_Controller public function getCustomVariablesValuesFromNameId($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'CustomVariables.getCustomVariablesValuesFromNameId'); $this->configureView($view); diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php index 971a967b8e..362d453aa2 100644 --- a/plugins/CustomVariables/CustomVariables.php +++ b/plugins/CustomVariables/CustomVariables.php @@ -9,6 +9,7 @@ * @package Piwik_CustomVariables */ use Piwik\ArchiveProcessor; +use Piwik\Tracker; use Piwik\Plugin; /** @@ -42,7 +43,7 @@ class Piwik_CustomVariables extends Plugin public function addWidgets() { - Piwik_AddWidget('General_Visitors', 'CustomVariables_CustomVariables', 'CustomVariables', 'getCustomVariables'); + WidgetsList::add('General_Visitors', 'CustomVariables_CustomVariables', 'CustomVariables', 'getCustomVariables'); } public function addMenus() @@ -79,7 +80,7 @@ class Piwik_CustomVariables extends Plugin public function getSegmentsMetadata(&$segments) { - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { $segments[] = array( 'type' => 'dimension', 'category' => 'CustomVariables_CustomVariables', |