maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fix issue with SSL and SSL redirect, fixes #778

Browse Source 
Thanks to mnaumann.
This commit is contained in:
Andreas Burchert (scarya)
2011-05-18 13:18:41 +02:00
parent ec7c19cceb
commit 96c34b9b29
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
admin_domains.php
View File

@@ -376,12 +376,15 @@ if($page == 'domains'
if($settings['system']['use_ssl'] == "1" if($settings['system']['use_ssl'] == "1"
&& isset($_POST['ssl']) && isset($_POST['ssl'])
&& isset($_POST['ssl_redirect']) /*&& isset($_POST['ssl_redirect'])*/
&& isset($_POST['ssl_ipandport']) && isset($_POST['ssl_ipandport'])
&& $_POST['ssl'] != '0') && $_POST['ssl'] != '0')
{ {
$ssl = (int)$_POST['ssl']; $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 = (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); $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" if($settings['system']['use_ssl'] == "1"
&& isset($_POST['ssl']) && isset($_POST['ssl'])
&& isset($_POST['ssl_redirect']) /*&& isset($_POST['ssl_redirect'])*/
&& isset($_POST['ssl_ipandport']) && isset($_POST['ssl_ipandport'])
&& $_POST['ssl'] != '0') && $_POST['ssl'] != '0')
{ {
$ssl = (int)$_POST['ssl']; $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 = (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); $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);