From 5f8183276dd17ac43c895efc8c2686bd6b2380fd Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 29 Jun 2016 11:36:47 +0200 Subject: [PATCH] More generic matching --- appinfo/app.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/app.php b/appinfo/app.php index fc34a06..a2e38a0 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -45,8 +45,8 @@ OC_User::useBackend($userBackend); OC_User::handleApacheAuth(); // Redirect all requests to the login page to the SAML login -$currentUrl = explode('?', $_SERVER['REQUEST_URI'], 2)[0]; -if($currentUrl === '/server/index.php/login' && !OC_User::isLoggedIn()) { +$currentUrl = substr(explode('?', $_SERVER['REQUEST_URI'], 2)[0], strlen(\OC::$WEBROOT)); +if($currentUrl === '/index.php/login' && !OC_User::isLoggedIn()) { $csrfToken = \OC::$server->getCsrfTokenManager()->getToken(); header('Location: '.$urlGenerator->linkToRouteAbsolute('user_saml.SAML.login') .'?requesttoken='. urlencode($csrfToken->getEncryptedValue())); exit();