From 23b05006495db6f1ace4ddcdba397ef94f2673b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@anarcat.ath.cx>
Date: Fri, 26 Sep 2008 02:13:23 +0000
Subject: [PATCH] fix webmail redirection by redirecting to https://FQDN
 instead of the same domain

this is to encourage better security practices by forcing users to use
HTTPS and a canonical URL.

eventually, this is a step towards getting rid of the global /webmail/
alias too.

See #170
See #101
See #1080
---
 .gitattributes                 | 1 -
 bureau/admin/webmail/.htaccess | 0
 bureau/admin/webmail/index.php | 3 ++-
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 bureau/admin/webmail/.htaccess

diff --git a/.gitattributes b/.gitattributes
index 6d3b90cb..4a5a673e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -206,7 +206,6 @@ bureau/admin/stats_members.php -text
 bureau/admin/styles/base.css -text
 bureau/admin/template.php -text
 bureau/admin/web_list.php -text
-bureau/admin/webmail/.htaccess -text
 bureau/admin/webmail/index.php -text
 bureau/class/config.php -text
 bureau/class/config_nochk.php -text
diff --git a/bureau/admin/webmail/.htaccess b/bureau/admin/webmail/.htaccess
deleted file mode 100644
index e69de29b..00000000
diff --git a/bureau/admin/webmail/index.php b/bureau/admin/webmail/index.php
index 2e024f9f..c7a44522 100644
--- a/bureau/admin/webmail/index.php
+++ b/bureau/admin/webmail/index.php
@@ -1,3 +1,4 @@
 <?php
-header ("Location: /webmail/") ;
+include("/var/alternc/bureau/class/local.php");
+header ("Location: https://$L_FQDN/webmail/") ;
 ?>