From 65c0a0e591d917e87d54f499f9b25da522746aed Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 13 Oct 2009 04:40:21 -0400
Subject: [PATCH] - Option 'force_https' replaced by 'force_https' plugin - added option 'force_https_port' in 'force_https' plugin (#1486091)
---
index.php | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/index.php b/index.php
index fc5926d..9e32fc7 100644
--- a/index.php
+++ b/index.php
@@ -63,18 +63,10 @@
raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
}
-// 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 || $RCMAIL->config->get('use_https'))) {
- header('Location: https://' . $_SERVER['HTTP_HOST'] . $_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']);
$RCMAIL->action = $startup['action'];
-
// try to log in
if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') {
@@ -160,7 +152,6 @@
$OUTPUT->show_message('invalidrequest', 'error');
$OUTPUT->send($RCMAIL->task);
}
-
// not logged in -> show login page
if (empty($RCMAIL->user->ID)) {
--
Gitblit v1.9.1