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

forgot to add the ssl-default-vhostconf-domain fields in ipsandports

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-10-12 14:39:58 +02:00
parent 93aa8bff1e
commit b6367e1be1
4 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
View File

@@ -119,6 +119,26 @@ return array(
'type' => 'textarea', 'type' => 'textarea',
'cols' => 60, 'cols' => 60,
'rows' => 12 'rows' => 12
),
'ssl_default_vhostconf_domain' => array(
'visible' => (\Froxlor\Settings::Get('system.use_ssl') == 1 ? true : false),
'style' => 'align-top',
'label' => $lng['admin']['ipsandports']['ssl_default_vhostconf_domain'],
'desc' => $lng['serversettings']['default_vhostconf_domain']['description'],
'type' => 'textarea',
'cols' => 60,
'rows' => 12
),
'include_default_vhostconf_domain' => array(
'label' => $lng['admin']['include_ownvhostsettings'],
'type' => 'checkbox',
'values' => array(
array(
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
'value' => array()
) )
) )
), ),

23
lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
View File

@@ -124,6 +124,29 @@ return array(
'cols' => 60, 'cols' => 60,
'rows' => 12, 'rows' => 12,
'value' => $result['default_vhostconf_domain'] 'value' => $result['default_vhostconf_domain']
),
'ssl_default_vhostconf_domain' => array(
'visible' => (\Froxlor\Settings::Get('system.use_ssl') == 1 ? true : false),
'style' => 'align-top',
'label' => $lng['admin']['ipsandports']['ssl_default_vhostconf_domain'],
'desc' => $lng['serversettings']['default_vhostconf_domain']['description'],
'type' => 'textarea',
'cols' => 60,
'rows' => 12,
'value' => $result['ssl_default_vhostconf_domain']
),
'include_default_vhostconf_domain' => array(
'label' => $lng['admin']['include_ownvhostsettings'],
'type' => 'checkbox',
'values' => array(
array(
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
'value' => array(
$result['include_default_vhostconf_domain']
)
) )
) )
), ),

1
lng/english.lng.php
View File

@@ -2075,3 +2075,4 @@ $lng['usersettings']['api_allowed']['notice'] = 'API access is not allowed for y
$lng['serversettings']['default_sslvhostconf']['title'] = 'Default SSL vHost-settings'; $lng['serversettings']['default_sslvhostconf']['title'] = 'Default SSL vHost-settings';
$lng['serversettings']['includedefault_sslvhostconf'] = 'Include non-SSL vHost-settings in SSL-vHost'; $lng['serversettings']['includedefault_sslvhostconf'] = 'Include non-SSL vHost-settings in SSL-vHost';
$lng['admin']['ownsslvhostsettings'] = 'Own SSL vHost-settings'; $lng['admin']['ownsslvhostsettings'] = 'Own SSL vHost-settings';
$lng['admin']['ipsandports']['ssl_default_vhostconf_domain'] = 'Default SSL vHost-settings for every domain container';

1
lng/german.lng.php
View File

@@ -1722,3 +1722,4 @@ $lng['usersettings']['api_allowed']['notice'] = 'API Zugriff ist für dieses Kon
$lng['serversettings']['default_sslvhostconf']['title'] = 'Standard SSL vHost-Einstellungen'; $lng['serversettings']['default_sslvhostconf']['title'] = 'Standard SSL vHost-Einstellungen';
$lng['serversettings']['includedefault_sslvhostconf'] = 'Nicht-SSL vHost-Einstellungen in SSL-vHost inkludieren'; $lng['serversettings']['includedefault_sslvhostconf'] = 'Nicht-SSL vHost-Einstellungen in SSL-vHost inkludieren';
$lng['admin']['ownsslvhostsettings'] = 'Eigene SSL vHost-Einstellungen'; $lng['admin']['ownsslvhostsettings'] = 'Eigene SSL vHost-Einstellungen';
$lng['admin']['ipsandports']['ssl_default_vhostconf_domain'] = 'Standard SSL vHost-Einstellungen für jeden Domain-Container';