mirror of https://tt-rss.org/git/tt-rss.git
login: switch to absolute redirect urls
This commit is contained in:
parent
e8edad377a
commit
5b3a73e574
|
@ -623,7 +623,7 @@ class Handler_Public extends Handler {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
$return = urlencode($_SERVER["REQUEST_URI"])
|
$return = urlencode(make_self_url());
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
@ -712,7 +712,9 @@ class Handler_Public extends Handler {
|
||||||
user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
|
user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (clean($_REQUEST['return'])) {
|
$return = clean($_REQUEST['return']);
|
||||||
|
|
||||||
|
if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
|
||||||
header("Location: " . clean($_REQUEST['return']));
|
header("Location: " . clean($_REQUEST['return']));
|
||||||
} else {
|
} else {
|
||||||
header("Location: " . get_self_url_prefix());
|
header("Location: " . get_self_url_prefix());
|
||||||
|
|
|
@ -61,7 +61,7 @@ function bwLimitChange(elem) {
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<?php $return = urlencode($_SERVER["REQUEST_URI"]) ?>
|
<?php $return = urlencode(make_self_url()) ?>
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,12 @@
|
||||||
* If you come crying when stuff inevitably breaks, you will be mocked and told
|
* If you come crying when stuff inevitably breaks, you will be mocked and told
|
||||||
* to get out. */
|
* to get out. */
|
||||||
|
|
||||||
|
function make_self_url() {
|
||||||
|
$proto = is_server_https() ? 'https' : 'http';
|
||||||
|
|
||||||
|
return $proto . '://' . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
|
||||||
|
}
|
||||||
|
|
||||||
function make_self_url_path() {
|
function make_self_url_path() {
|
||||||
$proto = is_server_https() ? 'https' : 'http';
|
$proto = is_server_https() ? 'https' : 'http';
|
||||||
$url_path = $proto . '://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
|
$url_path = $proto . '://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
|
||||||
|
|
Loading…
Reference in New Issue