diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-08-02 17:59:33 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-08-02 17:59:33 +0400 |
commit | a96ec40e983a8b64f4c25def541a519ff3670e6a (patch) | |
tree | bef2a5f7b1e9532dc96161334e23a553cdff7ea1 /plugins/VisitorGenerator | |
parent | 61997f45e4c39360000e815c9e0853ae04e2f56f (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/VisitorGenerator')
-rw-r--r-- | plugins/VisitorGenerator/Controller.php | 20 | ||||
-rw-r--r-- | plugins/VisitorGenerator/VisitorGenerator.php | 9 |
2 files changed, 17 insertions, 12 deletions
diff --git a/plugins/VisitorGenerator/Controller.php b/plugins/VisitorGenerator/Controller.php index f0275b3348..bf344be4f3 100644 --- a/plugins/VisitorGenerator/Controller.php +++ b/plugins/VisitorGenerator/Controller.php @@ -6,8 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik_Plugins - * @package Piwik_VisitorGenerator + * @package VisitorGenerator */ +namespace Piwik\Plugins\VisitorGenerator; + use Piwik\ArchiveProcessor\Rules; use Piwik\Controller\Admin; use Piwik\Piwik; @@ -19,23 +21,25 @@ use Piwik\View; use Piwik\Url; use Piwik\Timer; use Piwik\Site; +use Piwik\Plugins\CoreAdminHome\API as CoreAdminHomeAPI; +use Piwik\Plugins\SitesManager\API as SitesManagerAPI; /** * - * @package Piwik_VisitorGenerator + * @package VisitorGenerator */ -class Piwik_VisitorGenerator_Controller extends Admin +class Controller extends Admin { public function index() { Piwik::checkUserIsSuperUser(); - $sitesList = Piwik_SitesManager_API::getInstance()->getSitesWithAdminAccess(); + $sitesList = SitesManagerAPI::getInstance()->getSitesWithAdminAccess(); $view = new View('@VisitorGenerator/index'); $this->setBasicVariablesView($view); $view->assign('sitesList', $sitesList); - $view->nonce = Nonce::getNonce('Piwik_VisitorGenerator.generate'); + $view->nonce = Nonce::getNonce('VisitorGenerator.generate'); $view->countActionsPerRun = count($this->getAccessLog()); $view->accessLogPath = $this->getAccessLogPath(); echo $view->render(); @@ -57,11 +61,11 @@ class Piwik_VisitorGenerator_Controller extends Admin Piwik::checkUserIsSuperUser(); $nonce = Common::getRequestVar('form_nonce', '', 'string', $_POST); if (Common::getRequestVar('choice', 'no') != 'yes' || - !Nonce::verifyNonce('Piwik_VisitorGenerator.generate', $nonce) + !Nonce::verifyNonce('VisitorGenerator.generate', $nonce) ) { Piwik::redirectToModule('VisitorGenerator', 'index'); } - Nonce::discardNonce('Piwik_VisitorGenerator.generate'); + Nonce::discardNonce('VisitorGenerator.generate'); $daysToCompute = Common::getRequestVar('daysToCompute', 1, 'int'); @@ -83,7 +87,7 @@ class Piwik_VisitorGenerator_Controller extends Admin $nbActionsTotal += $nbActionsTotalThisDay; } - $api = Piwik_CoreAdminHome_API::getInstance(); + $api = CoreAdminHomeAPI::getInstance(); $api->invalidateArchivedReports($idSite, implode($dates, ",")); $browserArchiving = Rules::isBrowserTriggerEnabled(); diff --git a/plugins/VisitorGenerator/VisitorGenerator.php b/plugins/VisitorGenerator/VisitorGenerator.php index 9ad4fa3d66..4e3c13e677 100644 --- a/plugins/VisitorGenerator/VisitorGenerator.php +++ b/plugins/VisitorGenerator/VisitorGenerator.php @@ -6,16 +6,17 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik_Plugins - * @package Piwik_VisitorGenerator + * @package VisitorGenerator */ +namespace Piwik\Plugins\VisitorGenerator; + use Piwik\Piwik; -use Piwik\Plugin; /** * - * @package Piwik_VisitorGenerator + * @package VisitorGenerator */ -class Piwik_VisitorGenerator extends Plugin +class VisitorGenerator extends \Piwik\Plugin { /** * @see Piwik_Plugin::getListHooksRegistered |