fixed getCallingURL

This commit is contained in:
Roland Gruber 2014-01-12 19:52:14 +00:00
parent f558f1f545
commit 9d76d03b5e
1 changed files with 5 additions and 5 deletions

View File

@ -4,7 +4,7 @@ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2006 Tilo Lutz Copyright (C) 2003 - 2006 Tilo Lutz
2009 - 2013 Roland Gruber 2009 - 2014 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -1208,16 +1208,16 @@ function getDefaultLDAPErrorString($server) {
*/ */
function getCallingURL() { function getCallingURL() {
$url = null; $url = null;
if (!empty($_SERVER['HTTP_REFERER'])) { if (!empty($_SERVER['HTTP_HOST']) && !empty($_SERVER['REQUEST_URI'])) {
$url = $_SERVER['HTTP_REFERER'];
}
else {
$proto = 'http://'; $proto = 'http://';
if (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) { if (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) {
$proto = 'https://'; $proto = 'https://';
} }
$url = $proto . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; $url = $proto . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
} }
elseif (!empty($_SERVER['HTTP_REFERER'])) {
$url = $_SERVER['HTTP_REFERER'];
}
logNewMessage(LOG_DEBUG, 'Calling URL detected as ' . $url); logNewMessage(LOG_DEBUG, 'Calling URL detected as ' . $url);
return $url; return $url;
} }