Fix a notice when running archive.php

matomo-org · Oct 8, 2014 · 8700fe9 · 8700fe9
1 parent 29fed0e
commit 8700fe9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
@@ -397,7 +397,12 @@ public function getUsersHavingSuperUserAccess()
     {
         Piwik::checkUserIsNotAnonymous();
 
-        return $this->model->getUsersHavingSuperUserAccess();
+        $users = $this->model->getUsersHavingSuperUserAccess();
+        foreach($users as &$user) {
+            // remove token_auth in API response
+            unset($user['token_auth']);
+        }
+        return $users;
     }
 
     /**

diff --git a/plugins/UsersManager/Model.php b/plugins/UsersManager/Model.php
@@ -190,9 +190,14 @@ public function setSuperUserAccess($userLogin, $hasSuperUserAccess)
         );
     }
 
+    /**
+     * Note that this returns the token_auth which is as private as the password!
+     *
+     * @return returns login, email and token_auth
+     */
     public function getUsersHavingSuperUserAccess()
     {
-        $users = $this->getDb()->fetchAll("SELECT login, email
+        $users = $this->getDb()->fetchAll("SELECT login, email, token_auth
                                            FROM " . Common::prefixTable("user") . "
                                            WHERE superuser_access = 1
                                            ORDER BY date_registered ASC");