From b6367e1be1e3a5cff882c8001e9621e4f90f2077 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Sat, 12 Oct 2019 14:39:58 +0200
Subject: [PATCH] forgot to add the ssl-default-vhostconf-domain fields in
 ipsandports

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 .../ipsandports/formfield.ipsandports_add.php | 20 ++++++++++++++++
 .../formfield.ipsandports_edit.php            | 23 +++++++++++++++++++
 lng/english.lng.php                           |  1 +
 lng/german.lng.php                            |  1 +
 4 files changed, 45 insertions(+)

diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
index 3f325445..3d10f7c3 100644
--- a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
+++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
@@ -119,6 +119,26 @@ return array(
 						'type' => 'textarea',
 						'cols' => 60,
 						'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()
 					)
 				)
 			),
diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
index 822633bc..b9148678 100644
--- a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
+++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
@@ -124,6 +124,29 @@ return array(
 						'cols' => 60,
 						'rows' => 12,
 						'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']
+						)
 					)
 				)
 			),
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 47e628b9..c07b2493 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -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']['includedefault_sslvhostconf'] = 'Include non-SSL vHost-settings in SSL-vHost';
 $lng['admin']['ownsslvhostsettings'] = 'Own SSL vHost-settings';
+$lng['admin']['ipsandports']['ssl_default_vhostconf_domain'] = 'Default SSL vHost-settings for every domain container';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index bd0cea9a..112ae9a0 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -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']['includedefault_sslvhostconf'] = 'Nicht-SSL vHost-Einstellungen in SSL-vHost inkludieren';
 $lng['admin']['ownsslvhostsettings'] = 'Eigene SSL vHost-Einstellungen';
+$lng['admin']['ipsandports']['ssl_default_vhostconf_domain'] = 'Standard SSL vHost-Einstellungen für jeden Domain-Container';