Merge pull request #8807 from Joey3000/fixHardcodedLogin

Fix hardcoded Login module references

core/Plugin/Controller.php

@@ -879,7 +879,7 @@ abstract class Controller
             $currentLogin = Piwik::getCurrentUserLogin();
             $emails = implode(',', Piwik::getAllSuperUserAccessEmailAddresses());
             $errorMessage  = sprintf(Piwik::translate('CoreHome_NoPrivilegesAskPiwikAdmin'), $currentLogin, "<br/><a href='mailto:" . $emails . "?subject=Access to Piwik for user $currentLogin'>", "</a>");
-            $errorMessage .= "<br /><br />&nbsp;&nbsp;&nbsp;<b><a href='index.php?module=" . StaticContainer::get('Piwik\Auth')->getName() . "&amp;action=logout'>&rsaquo; " . Piwik::translate('General_Logout') . "</a></b><br />";
+            $errorMessage .= "<br /><br />&nbsp;&nbsp;&nbsp;<b><a href='index.php?module=" . Piwik::getLoginPluginName() . "&amp;action=logout'>&rsaquo; " . Piwik::translate('General_Logout') . "</a></b><br />";
 
             $ex = new NoPrivilegesException($errorMessage);
             $ex->setIsHtmlMessage();

plugins/Login/Controller.php

@@ -176,7 +176,7 @@ class Controller extends \Piwik\Plugin\Controller
             </div>',
             Piwik::translate('General_Error'),
             htmlentities($errorMessage, Common::HTML_ENCODING_QUOTE_STYLE, 'UTF-8', $doubleEncode = false),
-            'index.php?module=Login',
+            'index.php?module=' . Piwik::getLoginPluginName(),
             Piwik::translate('Login_LogIn')
         );
     }

plugins/Login/Login.php

@@ -57,11 +57,11 @@ class Login extends \Piwik\Plugin
         $frontController = FrontController::getInstance();
 
         if (Common::isXmlHttpRequest()) {
-            echo $frontController->dispatch('Login', 'ajaxNoAccess', array($exception->getMessage()));
+            echo $frontController->dispatch(Piwik::getLoginPluginName(), 'ajaxNoAccess', array($exception->getMessage()));
             return;
         }
 
-        echo $frontController->dispatch('Login', 'login', array($exception->getMessage()));
+        echo $frontController->dispatch(Piwik::getLoginPluginName(), 'login', array($exception->getMessage()));
     }
 
     /**