From a6788d81c2173438aee9e11cfa0e8a1df0c3f00a Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
Date: Tue, 23 Jun 2015 22:03:56 +0200
Subject: [PATCH] Host can now force URL, used behind a reverse-proxy
---
app/classes/Framadate/Utils.php | 2 +-
app/inc/config.template.php | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index 04348e2f..5eec8b55 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -28,7 +28,7 @@ class Utils {
$dirname = dirname($_SERVER['SCRIPT_NAME']);
$dirname = $dirname === '\\' ? '/' : $dirname . '/';
$dirname = str_replace('/admin', '', $dirname);
- $server_name = $_SERVER['SERVER_NAME'] . $port . $dirname;
+ $server_name = (defined('APP_URL') ? APP_URL : $_SERVER['SERVER_NAME']) . $port . $dirname;
return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
}
diff --git a/app/inc/config.template.php b/app/inc/config.template.php
index 49481c1e..a29b5730 100644
--- a/app/inc/config.template.php
+++ b/app/inc/config.template.php
@@ -17,6 +17,11 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
+// 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 Framedate behind a reverse proxy.
+// const APP_URL = '<www.mydomain.fr>';
+
// Application name
const NOMAPPLICATION = '<Application name>';
--
GitLab