From b58e61c57509db9f0df60156798082f89bd25c57 Mon Sep 17 00:00:00 2001
From: Marc Karassev <markarasev@protonmail.com>
Date: Thu, 18 Oct 2018 19:22:09 +0200
Subject: [PATCH] Handled domain determination when constant APP_URL is defined
but empty.
Now the bahavior matches the comments in config.php:
// Fully qualified domain name of your webserver.
// If this is unset or empty, the servername is determined automatically.
// You *have to set this* if you are running Framadate behind a reverse proxy.
// const APP_URL = '<www.mydomain.fr>';
---
app/classes/Framadate/Utils.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index 24b79594..c7d146c1 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -39,9 +39,11 @@ class Utils {
$dirname = $dirname === '\\' ? '/' : $dirname . '/';
$dirname = str_replace('/admin', '', $dirname);
$dirname = str_replace('/action', '', $dirname);
- $server_name = (defined('APP_URL') ? APP_URL : $serverName) . $port . $dirname;
- return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
+ $appUrlConfig = defined('APP_URL') ? APP_URL : '';
+ $domain = $appUrlConfig === '' ? $serverName : $appUrlConfig;
+
+ return $scheme . '://' . preg_replace('#//+#', '/', $domain . $port . $dirname);
}
/**
--
GitLab