refs matomo-org#4564 fixed some permission issues and removed the tod…

…o tags
sabl0r · Jan 23, 2014 · d8a69b1 · d8a69b1
1 parent cae8ff4
commit d8a69b1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/core/Access.php b/core/Access.php
@@ -249,7 +249,6 @@ public function hasSuperUserAccess()
     /**
      * @see Access::hasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     public function isSuperUser()
     {
@@ -345,7 +344,6 @@ public function checkUserHasSuperUserAccess()
     /**
      * @see Access::checkUserHasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     public function checksUserIsSuperUser()
     {

diff --git a/core/Piwik.php b/core/Piwik.php
@@ -288,7 +288,6 @@ static public function hasUserSuperUserAccessOrIsTheUser($theUser)
     /**
      * @see Piwik::hasUserSuperUserAccessOrIsTheUser()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function isUserIsSuperUserOrTheUser($theUser)
     {
@@ -298,7 +297,6 @@ static public function isUserIsSuperUserOrTheUser($theUser)
     /**
      * @see Piwik::checkUserHasSuperUserAccessOrIsTheUser()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function checkUserIsSuperUserOrTheUser($theUser)
     {
@@ -354,7 +352,6 @@ static public function hasTheUserSuperUserAccess($theUser)
     /**
      * @see Piwik::hasUserSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function isUserIsSuperUser()
     {
@@ -420,7 +417,6 @@ static public function setUserHasSuperUserAccess($bool = true)
     /**
      * @see Piwik::setUserHasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function setUserIsSuperUser($bool = true)
     {
@@ -430,7 +426,6 @@ static public function setUserIsSuperUser($bool = true)
     /**
      * @see Piwik::checkUserHasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function checkUserIsSuperUser()
     {

diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
@@ -582,7 +582,7 @@ public function setUserAccess($userLogin, $access, $idSites)
     {
         $this->checkAccessType($access);
         $this->checkUserExists($userLogin);
-        $this->checkUserIsNotConfigSuperUser($userLogin);
+        $this->checkUserHasNotSuperUserAccess($userLogin);
 
         if ($userLogin == 'anonymous'
             && $access == 'admin'
@@ -660,6 +660,13 @@ private function checkUserIsNotAnonymous($userLogin)
         }
     }
 
+    private function checkUserHasNotSuperUserAccess($userLogin)
+    {
+        if (Piwik::hasTheUserSuperUserAccess($userLogin)) {
+            throw new Exception(Piwik::translate("UsersManager_ExceptionSuperUser"));
+        }
+    }
+
     private function checkUserIsNotConfigSuperUser($userLogin)
     {
         if ($userLogin == Piwik::getConfigSuperUserLogin()) {

diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
@@ -88,7 +88,7 @@ function index()
         }
 
         $superUsers = array();
-        if (Piwik::isUserHasSomeAdminAccess()) {
+        if (Piwik::hasUserSuperUserAccess()) {
             $users = APIUsersManager::getInstance()->getUsers();
             foreach ($users as $user) {
                 if ($user['superuser_access']) {

diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php
@@ -54,7 +54,6 @@ public static function checkUserHasSuperUserAccess()
     /**
      * @see FakeAccess::checkUserHasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     public function checksUserIsSuperUser()
     {