Fix stupid code in ActionController::redirectToLogin()

refs #8626
Icinga · Mar 11, 2015 · bc1336b · bc1336b
1 parent 4ebfbf8
commit bc1336b
Showing 1 changed file with 14 additions and 23 deletions.
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
@@ -293,35 +293,26 @@ public function disableAutoRefresh()
     }
 
     /**
-     * Redirect to the login path
+     * Redirect to login
      *
-     * @param   Url         $afterLogin   The action to call when the login was successful. Defaults to '/index/welcome'
+     * XHR will always redirect to __SELF__. __SELF__ instructs JavaScript to redirect to the current window's URL
+     * if it's an auto-refresh request or to redirect to the URL which required login if it's not an auto-refreshing
+     * one.
      *
-     * @throws  \Exception
+     * @param   Url|string  $redirect   URL to redirect to after successful login
      */
-    protected function redirectToLogin($afterLogin = null)
+    protected function redirectToLogin($redirect = null)
     {
-        $redir = null;
-        if ($afterLogin !== null) {
-            if (! $afterLogin instanceof Url) {
-                $afterLogin = Url::fromPath($afterLogin);
-            }
-            if ($this->isXhr()) {
-                // __SELF__ instructs JavaScript to redirect to the current window's URL in case it's an auto-refreshing
-                // request or to redirect to the URL which required login in case it's not an auto-refreshing one
-                $redir = '__SELF__';
-            } else {
-                // TODO: Ignore /?
-                $redir = $afterLogin->getRelativeUrl();
+        $login = Url::fromPath('authentication/login');
+        if ($this->isXhr()) {
+            $login->setParam('redirect', '__SELF__');
+        } elseif ($redirect !== null) {
+            if (! $redirect instanceof Url) {
+                $redirect = Url::fromPath($redirect);
             }
+            $login->setParam('redirect', $redirect->getRelativeUrl());
         }
-
-        $url = Url::fromPath('authentication/login');
-
-        if ($redir) {
-            $url->setParam('redirect', $redir);
-        }
-        $this->rerenderLayout()->redirectNow($url);
+        $this->rerenderLayout()->redirectNow($login);
     }
 
     protected function rerenderLayout()