Allow usage in a subdir of a host.

[phorkie.git] / www / login.php

diff --git a/www/login.php b/www/login.php
index fb396b9a8b1a2f496a75de6cb0818d481a68f42f..e141b65b4e8eeeff0bd667cd48d7a5a505cfb86b 100644 (file)
--- a/www/login.php
+++ b/www/login.php
@@ -6,7 +6,7 @@ require_once 'www-header.php';
 if (isset($_REQUEST['logout'])) {
     unset($_SESSION);
     session_destroy();
-    header('Location: ' . Tools::fullUrl('/'));
+    header('Location: ' . Tools::fullUrl());
     exit();
 }
 
@@ -34,8 +34,8 @@ if (isset($_POST['openid_url'])) {
     $openid_url = null;
 }
 
-$realm    = Tools::fullUrl('/');
-$returnTo = Tools::fullUrl('/login');
+$realm    = Tools::fullUrl();
+$returnTo = Tools::fullUrl('login');
 
 try {
     $o = new \OpenID_RelyingParty($returnTo, $realm, $openid_url);
@@ -158,11 +158,11 @@ $_SESSION['identity'] = $openid['openid.identity'];
 
 setcookie('lastopenid', $_SESSION['identity'], time() + 84600 * 60, '/login');
 
+$url = '';
 if (isset($_SESSION['REQUEST_URI'])) {
-    $redirect = Tools::fullUrl($_SESSION['REQUEST_URI']);
-} else {
-    $redirect = Tools::fullUrl('/');
+    $url = substr($_SESSION['REQUEST_URI'], 1);
 }
+$redirect = Tools::fullUrl($url);
 header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL));
 exit;
 ?>