X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/027c801a4dc51db673bcbfcfbd396845f244e357..979fd71983f72991b7b698d0fa57b46213503672:/www/login.php diff --git a/www/login.php b/www/login.php index 77e3953..e141b65 100644 --- a/www/login.php +++ b/www/login.php @@ -6,12 +6,18 @@ require_once 'www-header.php'; if (isset($_REQUEST['logout'])) { unset($_SESSION); session_destroy(); - header('Location: ' . Tools::fullUrl('/')); + header('Location: ' . Tools::fullUrl()); exit(); } if (!count($_GET) && !count($_POST)) { - render('login'); + render( + 'login', + array( + 'openid' => isset($_COOKIE['lastopenid']) + ? $_COOKIE['lastopenid'] : 'http://' + ) + ); exit(); } @@ -28,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); @@ -42,9 +48,6 @@ if (!empty($_POST['disable_associations']) || !empty($_SESSION['disable_associat $_SESSION['disable_associations'] = true; } -$log = new \OpenID_Observer_Log; -\OpenID::attach($log); - if (isset($_POST['openid_url'])) { $_SESSION['openid_url'] = $openid_url; @@ -103,10 +106,12 @@ try { $status = "