|
|
@@ -217,7 +217,12 @@ class Organizr
|
|
|
}
|
|
|
if ($group !== null) {
|
|
|
if ((isset($_SERVER['HTTP_X_FORWARDED_SERVER']) && $_SERVER['HTTP_X_FORWARDED_SERVER'] == 'traefik') || $this->config['traefikAuthEnable']) {
|
|
|
- $redirect = 'Location: ' . $this->getServerPath();
|
|
|
+ if (isset($_SERVER['HTTP_X_FORWARDED_HOST']) && isset($_SERVER['HTTP_X_FORWARDED_URI']) && isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
|
|
|
+ $return = '?return=' . $_SERVER['HTTP_X_FORWARDED_PROTO'] . '://' . $_SERVER['HTTP_X_FORWARDED_HOST'] . $_SERVER['HTTP_X_FORWARDED_URI'];
|
|
|
+ } else {
|
|
|
+ $return = '';
|
|
|
+ }
|
|
|
+ $redirect = 'Location: ' . $this->getServerPath() . $return;
|
|
|
}
|
|
|
if ($this->qualifyRequest($group) && $unlocked) {
|
|
|
header("X-Organizr-User: $currentUser");
|