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

only show 'SSL redirect' checkbox for customers when there really is a ip/port combination for SSL; fixes #1179

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-03-27 08:34:59 +01:00
parent c986c08cfb
commit a903455ee0
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/formfields/customer/domains/formfield.domains_add.php
View File

@@ -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'],

2
lib/formfields/customer/domains/formfield.domains_edit.php
View File

@@ -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(