From 96c34b9b294753f15424232ecc745d6721153f8a Mon Sep 17 00:00:00 2001 From: "Andreas Burchert (scarya)" Date: Wed, 18 May 2011 13:18:41 +0200 Subject: [PATCH] Fix issue with SSL and SSL redirect, fixes #778 Thanks to mnaumann. --- admin_domains.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/admin_domains.php b/admin_domains.php index 06df3fcb..8b3644a2 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -376,12 +376,15 @@ if($page == 'domains' if($settings['system']['use_ssl'] == "1" && isset($_POST['ssl']) - && isset($_POST['ssl_redirect']) + /*&& isset($_POST['ssl_redirect'])*/ && isset($_POST['ssl_ipandport']) && $_POST['ssl'] != '0') { $ssl = (int)$_POST['ssl']; - $ssl_redirect = (int)$_POST['ssl_redirect']; + $ssl_redirect = 0; + if (isset($_POST['ssl_redirect'])) { + $ssl_redirect = (int)$_POST['ssl_redirect']; + } $ssl_ipandport = (int)$_POST['ssl_ipandport']; $ssl_ipandport_check = $db->query_first("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = '" . $db->escape($ssl_ipandport) . "' AND `ssl` = '1'" . $additional_ip_condition); @@ -892,12 +895,15 @@ if($page == 'domains' if($settings['system']['use_ssl'] == "1" && isset($_POST['ssl']) - && isset($_POST['ssl_redirect']) + /*&& isset($_POST['ssl_redirect'])*/ && isset($_POST['ssl_ipandport']) && $_POST['ssl'] != '0') { $ssl = (int)$_POST['ssl']; - $ssl_redirect = (int)$_POST['ssl_redirect']; + $ssl_redirect = 0; + if (isset($_POST['ssl_redirect'])) { + $ssl_redirect = (int)$_POST['ssl_redirect']; + } $ssl_ipandport = (int)$_POST['ssl_ipandport']; $ssl_ipandport_check = $db->query_first("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = '" . $db->escape($ssl_ipandport) . "' AND `ssl` = '1'" . $additional_ip_condition);