From 5d0839d47aec89202ccd45b434f36d0eb1ff7e6e Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 18 Sep 2012 10:13:55 -0400
Subject: [PATCH] Bugfix: Limits where processed the wrong way ('n', 'y' checkboxes)
---
interface/lib/classes/client_templates.inc.php | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/client_templates.inc.php b/interface/lib/classes/client_templates.inc.php
index 7aae92d..c2ef0bb 100644
--- a/interface/lib/classes/client_templates.inc.php
+++ b/interface/lib/classes/client_templates.inc.php
@@ -44,11 +44,14 @@
if (trim($item) != ''){
$sql = "SELECT * FROM client_template WHERE template_id = " . $app->functions->intval($item);
$addLimits = $app->db->queryOneRecord($sql);
+ $app->log('Template processing subtemplate ' . $item . ' for client ' . $clientId, LOGLEVEL_DEBUG);
/* maybe the template is deleted in the meantime */
if (is_array($addLimits)){
foreach($addLimits as $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){
+ if (strpos($k, 'limit') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec'){
+ $app->log('Template processing key ' . $k . ' for client ' . $clientId, LOGLEVEL_DEBUG);
+
/* process the numerical limits */
if (is_numeric($v)){
/* switch for special cases */
@@ -84,7 +87,7 @@
$limits_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"],$limits[$k]);
}
$additional_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"],$v);
-
+ $app->log('Template processing key ' . $k . ' type CHECKBOXARRAY, lim / add: ' . implode(',', $limits_values) . ' / ' . implode(',', $additional_values) . ' for client ' . $clientId, LOGLEVEL_DEBUG);
/* unification of limits_values (master template) and additional_values (additional template) */
$limits_unified = array();
foreach($form["tabs"]["limits"]["fields"][$k]["value"] as $key => $val){
@@ -92,7 +95,21 @@
}
$limits[$k] = implode($form["tabs"]["limits"]["fields"][$k]["separator"],$limits_unified);
break;
-
+ case 'CHECKBOX':
+ if($k == 'force_suexec') {
+ // 'n' is less limited than y
+ if (!isset($limits[$k])){
+ $limits[$k] = 'y';
+ }
+ if($limits[$k] == 'n' || $v == 'n') $limits[$k] = 'n';
+ } else {
+ // 'y' is less limited than n
+ if (!isset($limits[$k])){
+ $limits[$k] = 'n';
+ }
+ if($limits[$k] == 'y' || $v == 'y') $limits[$k] = 'y';
+ }
+ break;
case 'SELECT':
$limit_values = array_keys($form["tabs"]["limits"]["fields"][$k]["value"]);
/* choose the lower index of the two SELECT items */
@@ -116,6 +133,7 @@
$update .= '`' . $k . "`='" . $v . "'";
}
}
+ $app->log('Template processed for client ' . $clientId . ', update string: ' . $update, LOGLEVEL_DEBUG);
if($update != '') {
$sql = 'UPDATE client SET ' . $update . " WHERE client_id = " . $app->functions->intval($clientId);
$app->db->query($sql);
--
Gitblit v1.9.1