From c719dc0b1dd696e0cd6b51f09ee13c8263375f7c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Sep 2011 05:57:38 -0400
Subject: [PATCH] Fixed a warning in maildrop plugin.
---
interface/web/client/tools.inc.php | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/interface/web/client/tools.inc.php b/interface/web/client/tools.inc.php
index 4f757cc..a6cd525 100644
--- a/interface/web/client/tools.inc.php
+++ b/interface/web/client/tools.inc.php
@@ -59,12 +59,17 @@
/* 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;
+ }
}
}
}
--
Gitblit v1.9.1