Skip to content

workaround ?logout urls relogin problem fixes #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
github138 wants to merge 2 commits into from
Closed

workaround ?logout urls relogin problem fixes #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b6280
fix login twice after logout
Mar 9, 2015
647fd11
fix logout url
May 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions wwwroot/inc/auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ function authenticate ()
if (isset ($_SESSION['logout']))
{
unset($_SESSION['logout']);
unset($_SERVER['PHP_AUTH_USER']);
unset($_SERVER['PHP_AUTH_PW']);

if (isset ($user_auth_src) and 'saml' == $user_auth_src)
saml_logout ();
throw new RackTablesError ('', RackTablesError::NOT_AUTHENTICATED); // Reset browser credentials cache.
Expand Down
8 changes: 2 additions & 6 deletions wwwroot/inc/interface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,8 @@ function showLogoutURL ()
{
$https = (isset ($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') ? 's' : '';
$port = (! in_array ($_SERVER['SERVER_PORT'], array (80, 443))) ? ':' . $_SERVER['SERVER_PORT'] : '';
$pathinfo = pathinfo ($_SERVER['REQUEST_URI']);
$dirname = $pathinfo['dirname'];
// add a trailing slash if the installation resides in a subdirectory
if ($dirname != '/')
$dirname .= '/';
printf ('http%s://logout@%s%s?logout', $https, $_SERVER['SERVER_NAME'], $dirname);
$uri = explode('?',$_SERVER['REQUEST_URI']);
printf ('http%s://%s%s?logout', $https, $_SERVER['SERVER_NAME'], $uri[0]);
}

$quick_links = NULL; // you can override this in your local.php, but first initialize it with getConfiguredQuickLinks()
Expand Down