From 8eb9bd1406f475f628bf78feb49d81660f9f3091 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 8 Mar 2011 21:42:56 +0000
Subject: [PATCH] Fixed: FS#1463 - cron options have to be handled differently.

---
 interface/web/client/tools.inc.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/interface/web/client/tools.inc.php b/interface/web/client/tools.inc.php
index 4f757ccf3..a6cd5256a 100644
--- a/interface/web/client/tools.inc.php
+++ b/interface/web/client/tools.inc.php
@@ -59,12 +59,17 @@ function applyClientTemplates($clientId){
 			/* maybe the template is deleted in the meantime */
 			if (is_array($addLimits)){
 				foreach($addLimits as $k => $v){
-					if ($limits[$k] > -1){
-						if ($v == -1) {
-							$limits[$k] = -1;
-						}
-						else {
-							$limits[$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;
+							}
 						}
 					}
 				}
-- 
GitLab