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

fix creating of ssl-redirect without ssl-ip/port, fixes #1303

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-21 08:01:43 +01:00
parent 254672f2dd
commit b8952259ba
6 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,8 @@ return array(
),
'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => 'SSL Redirect',
'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')

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

@@ -77,8 +77,9 @@ return array(
'value' => array($result['isemaildomain'])
),
'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => 'SSL Redirect',
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? (domainHasSslIpPort($result['id']) ? true : false) : false) : false),
'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')