From a903455ee011d0aa7fbd86620e652246e569b1d5 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 27 Mar 2013 08:34:59 +0100 Subject: [PATCH] only show 'SSL redirect' checkbox for customers when there really is a ip/port combination for SSL; fixes #1179 Signed-off-by: Michael Kaufmann (d00p) --- customer_domains.php | 20 +++++++++++++------ .../domains/formfield.domains_add.php | 4 ++-- .../domains/formfield.domains_edit.php | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/customer_domains.php b/customer_domains.php index ddb8c196..4c3380bb 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -396,7 +396,13 @@ elseif($page == 'domains') } } - //$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']); + // check if we at least have one ssl-ip/port, #1179 + $ssl_ipsandports = ''; + $resultX = $db->query_first("SELECT COUNT(*) as countSSL FROM `panel_ipsandports` WHERE `ssl`='1'"); + if (isset($resultX['countSSL']) && (int)$resultX['countSSL'] > 0) { + $ssl_ipsandports = 'notempty'; + } + $openbasedir = makeoption($lng['domain']['docroot'], 0, NULL, true) . makeoption($lng['domain']['homedir'], 1, NULL, true); $pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']); @@ -602,11 +608,13 @@ elseif($page == 'domains') } } - /* - $ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']); - $iswildcarddomain = makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']); - $isemaildomain = makeyesno('isemaildomain', '1', '0', $result['isemaildomain']); - */ + // check if we at least have one ssl-ip/port, #1179 + $ssl_ipsandports = ''; + $resultX = $db->query_first("SELECT COUNT(*) as countSSL FROM `panel_ipsandports` WHERE `ssl`='1'"); + if (isset($resultX['countSSL']) && (int)$resultX['countSSL'] > 0) { + $ssl_ipsandports = 'notempty'; + } + $openbasedir = makeoption($lng['domain']['docroot'], 0, $result['openbasedir_path'], true) . makeoption($lng['domain']['homedir'], 1, $result['openbasedir_path'], true); $result_ipandport = $db->query_first("SELECT `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` WHERE `id`='".(int)$result['ipandport']."'"); diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index 46b6138c..4462cb07 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -61,13 +61,13 @@ return array( 'select_var' => isset($redirectcode) ? $redirectcode : null ), 'ssl_redirect' => array( - 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), + 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'label' => 'SSL Redirect', 'type' => 'checkbox', 'values' => array( array ('label' => $lng['panel']['yes'], 'value' => '1') ), - 'value' => array($result['ssl_redirect']) + 'value' => array() ), 'openbasedir_path' => array( 'label' => $lng['domain']['openbasedirpath'], diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php index 86aaf255..82009ccf 100644 --- a/lib/formfields/customer/domains/formfield.domains_edit.php +++ b/lib/formfields/customer/domains/formfield.domains_edit.php @@ -79,7 +79,7 @@ return array( 'value' => array($result['isemaildomain']) ), 'ssl_redirect' => array( - 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), + 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'label' => 'SSL Redirect', 'type' => 'checkbox', 'values' => array(