diff --git a/install/sql/incremental/upd_0018.sql b/install/sql/incremental/upd_0018.sql
new file mode 100644
index 0000000000000000000000000000000000000000..191f03123aca06825ad215e921344cf881d57b67
--- /dev/null
+++ b/install/sql/incremental/upd_0018.sql
@@ -0,0 +1,2 @@
+alter table client_template add column web_php_options varchar(255) not null default 'no' after limit_web_quota;
+alter table client_template add column ssh_chroot varchar(255) not null default 'no' after limit_shell_user;
\ No newline at end of file
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index d38fdd55207347b4d2a191340eb3faa5f8bbb580..0f93fcb0951a920e1c8e833aa968c4a4f6c0b1ca 100644
--- a/interface/web/client/form/client_template.tform.php
+++ b/interface/web/client/form/client_template.tform.php
@@ -325,6 +325,14 @@ $form["tabs"]['limits'] = array (
'rows' => '',
'cols' => ''
),
+ 'web_php_options' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOXARRAY',
+ 'default' => '',
+ 'separator' => ',',
+ 'valuelimit' => 'client:web_php_options',
+ 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP')
+ ),
'limit_web_aliasdomain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -381,6 +389,14 @@ $form["tabs"]['limits'] = array (
'rows' => '',
'cols' => ''
),
+ 'ssh_chroot' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOXARRAY',
+ 'default' => '',
+ 'separator' => ',',
+ 'valuelimit' => 'client:ssh_chroot',
+ 'value' => array('no' => 'None', 'jailkit' => 'Jailkit')
+ ),
'limit_webdav_user' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng
index c6d99770ecb97fbb82dc2dd7fcbcc0f01bb2df6c..a79cb038f33453454bcc6352e3ad53ddb895f82e 100644
--- a/interface/web/client/lib/lang/en_client_template.lng
+++ b/interface/web/client/lib/lang/en_client_template.lng
@@ -67,4 +67,6 @@ $wb["template_del_aborted_txt"] = 'Delete aborted. There is still a client which
$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["ssh_chroot_txt"] = 'SSH-Chroot Options';
+$wb["web_php_options_txt"] = 'PHP Options';
?>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 12fba84e45c42f6ee00b610acb3d3cb8e2a59cb5..ac62a7c6f19bdd4fdf307fde2a3233248458a3ff 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -69,6 +69,12 @@
MB
+
+
{tmpl_var name='web_php_options_txt'}
+
+ {tmpl_var name='web_php_options'}
+
+
@@ -85,6 +91,12 @@
+
+
{tmpl_var name='ssh_chroot_txt'}
+
+ {tmpl_var name='ssh_chroot'}
+
+
diff --git a/interface/web/client/tools.inc.php b/interface/web/client/tools.inc.php
index a6cd5256ac33450bd4a146a7b52e4a7ee1d09716..abc85ae9bdd0015f1f80af225f7ee15451a88135 100644
--- a/interface/web/client/tools.inc.php
+++ b/interface/web/client/tools.inc.php
@@ -59,16 +59,57 @@ function applyClientTemplates($clientId){
/* maybe the template is deleted in the meantime */
if (is_array($addLimits)){
foreach($addLimits as $k => $v){
- if($k == 'limit_cron_type') {
- $limits[$k] = $v;
- } elseif($k == 'limit_cron_frequency') {
- if($v < $limits[$k]) $limits[$k] = $v;
- } else {
- if ($limits[$k] > -1){
- if ($v == -1) {
- $limits[$k] = -1;
- } else {
- $limits[$k] += $v;
+ /* we can remove this condition, but it is easier to debug with it (don't add ids and other non-limit values) */
+ if (strpos($k, 'limit') !== false){
+ /* process the numerical limits */
+ if (is_numeric($v)){
+ /* switch for special cases */
+ switch ($k){
+ case 'limit_cron_frequency':
+ if ($v < $limits[$k]) $limits[$k] = $v;
+ /* silent adjustment of the minimum cron frequency to 1 minute */
+ /* maybe this control test should be done via validator definition in tform.php file, but I don't know how */
+ if ($limits[$k] < 1) $limits[$k] = 1;
+ break;
+
+ default:
+ if ($limits[$k] > -1){
+ if ($v == -1){
+ $limits[$k] = -1;
+ }
+ else {
+ $limits[$k] += $v;
+ }
+ }
+ }
+ }
+ /* process the string limits (CHECKBOXARRAY, SELECT etc.) */
+ elseif (is_string($v)){
+ switch ($app->tform->formDef["tabs"]["limits"]["fields"][$k]['formtype']){
+ case 'CHECKBOXARRAY':
+ if (!isset($limits[$k])){
+ $limits[$k] = array();
+ }
+
+ $limits_values = $limits[$k];
+ if (is_string($limits[$k])){
+ $limits_values = explode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$limits[$k]);
+ }
+ $additional_values = explode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$v);
+
+ /* unification of limits_values (master template) and additional_values (additional template) */
+ $limits_unified = array();
+ foreach($app->tform->formDef["tabs"]["limits"]["fields"][$k]["value"] as $key => $val){
+ if (in_array($key,$limits_values) || in_array($key,$additional_values)) $limits_unified[] = $key;
+ }
+ $limits[$k] = implode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$limits_unified);
+ break;
+
+ case 'SELECT':
+ $limit_values = array_keys($app->tform->formDef["tabs"]["limits"]["fields"][$k]["value"]);
+ /* choose the lower index of the two SELECT items */
+ $limits[$k] = $limit_values[min(array_search($limits[$k], $limit_values), array_search($v, $limit_values))];
+ break;
}
}
}
@@ -82,7 +123,7 @@ function applyClientTemplates($clientId){
*/
$update = '';
foreach($limits as $k => $v){
- if (strpos($k, 'limit') !== false && !is_array($v)){
+ if ((strpos($k, 'limit') !== false or $k == 'ssh_chroot' or $k == 'web_php_options') && !is_array($v)){
if ($update != '') $update .= ', ';
$update .= '`' . $k . "`='" . $v . "'";
}