From 03ba127faba918f49792f7aeab1d9d994781dc9d Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Wed, 16 Oct 2013 16:23:10 +0200
Subject: [PATCH] use new directory-validator 'confdir'; fix if last ssl-ipport
 got deactivated and a security question is being asked

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 actions/admin/settings/130.webserver.php | 4 ++--
 actions/admin/settings/135.fcgid.php     | 2 +-
 actions/admin/settings/136.phpfpm.php    | 4 ++--
 admin_domains.php                        | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php
index ece28bf4..a2a49ad3 100644
--- a/actions/admin/settings/130.webserver.php
+++ b/actions/admin/settings/130.webserver.php
@@ -81,7 +81,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'apacheconf_htpasswddir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/etc/apache2/htpasswd/',
 					'save_method' => 'storeSettingField',
 					),
@@ -99,7 +99,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'customer_ssl_path',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/etc/ssl/froxlor-custom/',
 					'save_method' => 'storeSettingField',
 					),
diff --git a/actions/admin/settings/135.fcgid.php b/actions/admin/settings/135.fcgid.php
index 6f10a217..0659fe08 100644
--- a/actions/admin/settings/135.fcgid.php
+++ b/actions/admin/settings/135.fcgid.php
@@ -36,7 +36,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_configdir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/var/www/php-fcgi-scripts/',
 					'plausibility_check_method' => 'checkPathConflicts',
 					'save_method' => 'storeSettingField',
diff --git a/actions/admin/settings/136.phpfpm.php b/actions/admin/settings/136.phpfpm.php
index eae398b4..f5281268 100644
--- a/actions/admin/settings/136.phpfpm.php
+++ b/actions/admin/settings/136.phpfpm.php
@@ -79,7 +79,7 @@ return array(
 					'settinggroup' => 'phpfpm',
 					'varname' => 'configdir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/etc/php-fpm.d/',
 					'save_method' => 'storeSettingField',
 					),
@@ -88,7 +88,7 @@ return array(
 					'settinggroup' => 'phpfpm',
 					'varname' => 'aliasconfigdir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/var/www/php-fpm/',
 					'save_method' => 'storeSettingField',
 					),
diff --git a/admin_domains.php b/admin_domains.php
index 04f8944b..6ac99a16 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -1065,6 +1065,8 @@ if($page == 'domains'
 					if (isset($_POST['ssl_ipandport']) && is_array($_POST['ssl_ipandport'])) {
 						foreach ($_POST['ssl_ipandport'] as $ssl_ipandport) {
 							if (trim($ssl_ipandport) == "") continue;
+							// fix if ip/port got de-checked and it was the last one
+							if (trim($ssl_ipandport) < 1) continue;
 							$ssl_ipandport = intval($ssl_ipandport);
 							$ssl_ipandport_check = $db->query_first("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = '" . $db->escape($ssl_ipandport) . "' ");
 							if (!isset($ssl_ipandport_check['id'])