Use Access::doAsSuperUser() instead of Piwik::setUserHasSuperUSerAcce…

…ss which is deprecated.
matomo-org · Oct 1, 2014 · 5d6355f · 5d6355f
1 parent 2e17878
commit 5d6355f
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 34 deletions.
diff --git a/Commands/GenerateAnnotation.php b/Commands/GenerateAnnotation.php
@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\VisitorGenerator\Commands;
 
+use Piwik\Access;
 use Piwik\Piwik;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Plugins\VisitorGenerator\Generator\Annotations;
@@ -29,16 +30,16 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        Piwik::setUserHasSuperUserAccess();
-
         $idSite = (int) $input->getOption('idsite');
 
-        if (!Site::getSite($idSite)) {
-            throw new \InvalidArgumentException('idsite is not a valid, no such site found');
-        }
+        Access::doAsSuperUser(function () use ($idSite) {
+            if (!Site::getSite($idSite)) {
+                throw new \InvalidArgumentException('idsite is not a valid, no such site found');
+            }
 
-        $annotations = new Annotations();
-        $annotations->generate($idSite);
+            $annotations = new Annotations();
+            $annotations->generate($idSite);
+        });
 
         $this->writeSuccessMessage($output, array('1 Annotation for today generated'));
     }

diff --git a/Commands/GenerateGoals.php b/Commands/GenerateGoals.php
@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\VisitorGenerator\Commands;
 
+use Piwik\Access;
 use Piwik\Piwik;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Plugins\VisitorGenerator\Generator\Goals;
@@ -29,16 +30,16 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        Piwik::setUserHasSuperUserAccess();
-
         $idSite = (int) $input->getOption('idsite');
 
-        if (!Site::getSite($idSite)) {
-            throw new \InvalidArgumentException('idsite is not a valid, no such site found');
-        }
+        $goalIds = Access::doAsSuperUser(function () use ($idSite) {
+            if (!Site::getSite($idSite)) {
+                throw new \InvalidArgumentException('idsite is not a valid, no such site found');
+            }
 
-        $goalsGenerator = new Goals();
-        $goalIds = $goalsGenerator->generate($idSite);
+            $goalsGenerator = new Goals();
+            return $goalsGenerator->generate($idSite);
+        });
 
         $this->writeSuccessMessage($output, array(
             sprintf('idsite=%d, %d goals generated (idgoal from %d to %d)', $idSite, count($goalIds), reset($goalIds), end($goalIds))

diff --git a/Commands/GenerateUsers.php b/Commands/GenerateUsers.php
@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\VisitorGenerator\Commands;
 
+use Piwik\Access;
 use Piwik\Piwik;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Plugins\VisitorGenerator\Generator\Users;
@@ -28,12 +29,12 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        Piwik::setUserHasSuperUserAccess();
-
         $limit = $input->getOption('limit');
 
-        $websiteGenerator = new Users();
-        $userLogins       = $websiteGenerator->generate((int) $limit);
+        $userLogins = Access::doAsSuperUser(function () use ($limit) {
+            $websiteGenerator = new Users();
+            return $websiteGenerator->generate((int) $limit);
+        });
 
         $this->writeSuccessMessage($output, array(count($userLogins) . ' Users generated'));
     }

diff --git a/Commands/GenerateVisits.php b/Commands/GenerateVisits.php
@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\VisitorGenerator\Commands;
 
+use Piwik\Access;
 use Piwik\Date;
 use Piwik\Piwik;
 use Piwik\Plugin\ConsoleCommand;
@@ -36,8 +37,6 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        Piwik::setUserHasSuperUserAccess();
-
         $timer  = new Timer();
         $days   = $this->checkDays($input);
         $idSite = $this->checkIdSite($input);
@@ -52,13 +51,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             if (!$input->getOption('no-fake')) {
                 $limit = $this->getLimitFakeVisits($input);
-                $fakeVisits = new VisitsFake();
-                $nbActionsTotal += $fakeVisits->generate($time, $idSite, $limit);
+                Access::doAsSuperUser(function () use ($time, $idSite, $limit, &$nbActionsTotal) {
+                    $fakeVisits = new VisitsFake();
+                    $nbActionsTotal += $fakeVisits->generate($time, $idSite, $limit);
+                });
             }
 
             if (!$input->getOption('no-logs')) {
-                $fromLogs = new VisitsFromLogs();
-                $nbActionsTotal += $fromLogs->generate($time, $idSite);
+                Access::doAsSuperUser(function () use ($time, $idSite, &$nbActionsTotal) {
+                    $fromLogs = new VisitsFromLogs();
+                    $nbActionsTotal += $fromLogs->generate($time, $idSite);
+                });
             }
 
             $time += 86400;
@@ -96,11 +99,12 @@ private function checkIdSite(InputInterface $input)
     {
         $idSite = (int)$input->getOption('idsite');
 
-        if (!Site::getSite($idSite)) {
-            throw new \InvalidArgumentException('idsite is not a valid, no such site found');
-        }
+        return Access::doAsSuperUser(function () use ($idSite) {
+            if (!Site::getSite($idSite)) {
+                throw new \InvalidArgumentException('idsite is not a valid, no such site found');
+            }
 
-        return $idSite;
+            return $idSite;
+        });
     }
-
-}
+}
diff --git a/Commands/GenerateWebsites.php b/Commands/GenerateWebsites.php
@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\VisitorGenerator\Commands;
 
+use Piwik\Access;
 use Piwik\Piwik;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Plugins\VisitorGenerator\Generator\Websites;
@@ -28,12 +29,12 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        Piwik::setUserHasSuperUserAccess();
-
         $limit = $input->getOption('limit');
 
-        $websiteGenerator = new Websites();
-        $siteIds = $websiteGenerator->generate($limit);
+        $siteIds = Access::doAsSuperUser(function () use ($limit) {
+            $websiteGenerator = new Websites();
+            return $websiteGenerator->generate($limit);
+        });
 
         $this->writeSuccessMessage($output, array(
             sprintf('%d Websites generated (idsite from %d to %d)', count($siteIds), reset($siteIds), end($siteIds))