- Fix wrong headers for IE on servers without $_SERVER['HTTPS'] (#1485926)

- Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#1485655)

1 files changed, 2 insertions, 1 deletions

diff --git a/index.php b/index.php
index 542a72451..fc5926dcc 100644
--- a/index.php
+++ b/index.php
@@ -64,7 +64,8 @@ if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
 }
 
 // check if https is required (for login) and redirect if necessary
-if ($RCMAIL->config->get('force_https', false) && empty($_SESSION['user_id']) && !(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443)) {
+if ($RCMAIL->config->get('force_https', false) && empty($_SESSION['user_id'])
+    && !(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443 || $RCMAIL->config->get('use_https'))) {
   header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
   exit;
 }