From a046bff7e8c6c35c31125253b576d203f3313386 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 02 Jan 2012 15:57:13 -0500
Subject: [PATCH] Fixed: FS#1947 - Unchecking all PHP options in Limits interface causes problem when client edits website
---
interface/web/client/client_edit.php | 1 -
interface/web/client/form/client.tform.php | 6 ++++++
interface/web/client/lib/lang/en_reseller.lng | 2 ++
interface/web/client/form/reseller.tform.php | 6 ++++++
interface/web/client/lib/lang/en_client.lng | 2 ++
5 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 5896361..d0a5083 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -97,7 +97,6 @@
parent::onSubmit();
}
-
function onShowEnd() {
global $app;
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 7b64147..6e76992 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -604,6 +604,9 @@
'web_php_options' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOXARRAY',
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'web_php_options_notempty'),
+ ),
'default' => '',
'separator' => ',',
'valuelimit' => 'client:web_php_options',
@@ -668,6 +671,9 @@
'ssh_chroot' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOXARRAY',
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'ssh_chroot_notempty'),
+ ),
'default' => '',
'separator' => ',',
'valuelimit' => 'client:ssh_chroot',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index a402bc7..5447070 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -593,6 +593,9 @@
'web_php_options' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOXARRAY',
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'web_php_options_notempty'),
+ ),
'default' => '',
'separator' => ',',
'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP')
@@ -656,6 +659,9 @@
'ssh_chroot' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOXARRAY',
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'ssh_chroot_notempty'),
+ ),
'default' => '',
'separator' => ',',
'value' => array('no' => 'None', 'jailkit' => 'Jailkit')
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index cc7a28c..ce4805e 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -107,4 +107,6 @@
$wb["limit_openvz_vm_txt"] = 'Max. number of virtual servers';
$wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template';
$wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.';
+$wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.';
+$wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.';
?>
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index a553dd7..b93f54e 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -106,4 +106,6 @@
$wb["limit_openvz_vm_txt"] = 'Max. number of virtual servers';
$wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template';
$wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.';
+$wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.';
+$wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.';
?>
--
Gitblit v1.9.1