Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-06 08:15:31 +02:00
Code Issues Packages Projects Releases Activity

Fixed bad redirection after successful admin login in subdirectory multisite [#1487]

Browse Source
This commit is contained in:
Matias Griese
2020-08-31 22:59:22 +03:00
parent 6bcc5f7636
commit 8a6f98b7bf
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/plugin/Admin.php
View File

@@ -609,7 +609,9 @@ class Admin
$this->setMessage(static::translate($message), $event->getMessageType());
}
$redirect = $event->getRedirect();
/** @var Pages $pages */
$pages = $this->grav['pages'];
$redirect = $pages->baseRoute() . $event->getRedirect();
$this->grav->redirect($redirect, $event->getRedirectCode());
}
@@ -619,6 +621,10 @@ class Admin
*/
public function twoFa($data, $post)
{
/** @var Pages $pages */
$pages = $this->grav['pages'];
$baseRoute = $pages->baseRoute();
/** @var Login $login */
$login = $this->grav['login'];
@@ -635,14 +641,16 @@ class Admin
$this->grav['session']->setFlashCookieObject(Admin::TMP_COOKIE_NAME, ['message' => $this->translate('PLUGIN_ADMIN.2FA_FAILED'), 'status' => 'error']);
$this->grav->redirect($this->uri->route(), 303);
$this->grav->redirect($baseRoute . $this->uri->route(), 303);
}
$this->setMessage($this->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info');
$user->authorized = true;
$this->grav->redirect($post['redirect']);
$redirect = $baseRoute . $post['redirect'];
$this->grav->redirect($redirect);
}
/**