refs #4565 do not allow logme for any super user

matomo-org · Jan 26, 2014 · 56bddb5 · 56bddb5
1 parent 8f4e45e
commit 56bddb5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -1223,7 +1223,7 @@
         "PasswordChanged": "Your password has been changed.",
         "ContactAdmin": "Possible reason: your host may have disabled the mail() function. <br \/>Please contact your Piwik administrator.",
         "ExceptionPasswordMD5HashExpected": "The password parameter is expected to be a MD5 hash of the password.",
-        "ExceptionInvalidConfigSuperUserAuthenticationMethod": "The Super User defined in the config cannot be authenticated using the '%s' mechanism.",
+        "ExceptionInvalidSuperUserAccessAuthenticationMethod": "A user with Super User access cannot be authenticated using the '%s' mechanism.",
         "ResetPasswordInstructions": "Enter a new password for your account."
     },
     "Mobile": {

diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
@@ -138,8 +138,8 @@ function logme()
         }
 
         $login = Common::getRequestVar('login', null, 'string');
-        if ($login == Piwik::getConfigSuperUserLogin()) {
-            throw new Exception(Piwik::translate('Login_ExceptionInvalidConfigSuperUserAuthenticationMethod', array("logme")));
+        if (Piwik::hasTheUserSuperUserAccess($login)) {
+            throw new Exception(Piwik::translate('Login_ExceptionInvalidSuperUserAccessAuthenticationMethod', array("logme")));
         }
 
         $currentUrl = 'index.php';