From f5d61d845f8cfce4c7b559a900df846947e45b00 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 21 Oct 2009 04:47:40 -0400
Subject: [PATCH] Revert r3038 and allow to specify the port as value of force_https
---
index.php | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/index.php b/index.php
index 4ae71e1..e0956b4 100644
--- a/index.php
+++ b/index.php
@@ -63,6 +63,15 @@
raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
}
+// check if https is required (for login) and redirect if necessary
+if (empty($_SESSION['user_id']) && ($force_https = $RCMAIL->config->get('force_https', false))) {
+ $https_port = is_bool($force_https) ? 443 : $force_https;
+ if (!(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == $use_https || $RCMAIL->config->get('use_https'))) {
+ header('Location: https://' . $_SERVER['HTTP_HOST'] . ($https_port != 443 ? ':' . $https_port : '') . $_SERVER['REQUEST_URI']);
+ exit;
+ }
+}
+
// trigger startup plugin hook
$startup = $RCMAIL->plugins->exec_hook('startup', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action));
$RCMAIL->set_task($startup['task']);
--
Gitblit v1.9.1