From 0732d32f508045da40fe9df607b9ef20ce2d198f Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Tue, 06 Mar 2012 10:03:23 -0500
Subject: [PATCH] join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use
---
interface/lib/classes/validate_cron.inc.php | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/validate_cron.inc.php b/interface/lib/classes/validate_cron.inc.php
index c42e06d..e551af3 100644
--- a/interface/lib/classes/validate_cron.inc.php
+++ b/interface/lib/classes/validate_cron.inc.php
@@ -55,6 +55,14 @@
if(preg_match("'^([a-z0-9][a-z0-9-]{0,62}\.)+([a-z]{2,30})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']);
}
}
+
+ function run_month_format($field_name, $field_value, $validator) {
+ global $app;
+ //* allow value @reboot in month field
+ if($field_value != '@reboot') {
+ return $this->run_time_format($field_name, $field_value, $validator);
+ }
+ }
/*
Validator function to check if a given cron time is in correct form.
@@ -70,7 +78,7 @@
if(preg_match("'^[0-9\-\,\/\*]+$'", $field_value) == false) return $this->get_error($validator['errmsg']); // allowed characters are 0-9, comma, *, -, /
elseif(preg_match("'[\-\,\/][\-\,\/]'", $field_value) == true) return $this->get_error($validator['errmsg']); // comma, - and / never stand together
//* now split list and check each entry. store used values in array for later limit-check
- $time_list = split(",", $field_value);
+ $time_list = explode(",", $field_value);
if(count($time_list) < 1) return $this->get_error($validator['errmsg']);
$max_entry = 0;
--
Gitblit v1.9.1