From ddfbbd8dbad65a439dfcd25b8fc4e23459c56b1c Mon Sep 17 00:00:00 2001
From: LEVEILLE Cédric <leveille.cedric@oricom.org>
Date: Tue, 19 Jan 2016 13:36:10 -0500
Subject: [PATCH] update sql file for ftp_stats
---
interface/lib/classes/tform_base.inc.php | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index 6de1cee..bc995c1 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -98,7 +98,7 @@
var $errorMessage = '';
var $dateformat = "d.m.Y";
- var $datetimeformat = 'd.m.Y H:i';
+ var $datetimeformat = 'd.m.Y H:i'; // is set to the correct value in loadFormDef
var $formDef = array();
var $wordbook;
var $module;
@@ -803,8 +803,16 @@
}
} else {*/
if($record[$key] != '' && $record[$key] != '0000-00-00 00:00:00') {
- $tmp = strtotime($record[$key]);
- $new_record[$key] = date($this->datetimeformat, $tmp);
+ //$tmp = strtotime($record[$key]);
+ //$new_record[$key] = date($this->datetimeformat, $tmp);
+ $parsed_date = date_parse_from_format($this->datetimeformat,$record[$key]);
+ if($parsed_date['error_count'] > 0 || ($parsed_date['year'] == 1899 && $parsed_date['month'] == 12 && $parsed_date['day'] == 31)) {
+ // There was an error, set the date to 0
+ $new_record[$key] = '0000-00-00 00:00:00';
+ } else {
+ // Date parsed successfully. Convert it to database format
+ $new_record[$key] = date( 'Y-m-d H:i:s', mktime($parsed_date['hour'], $parsed_date['minute'], $parsed_date['second'], $parsed_date['month'], $parsed_date['day'], $parsed_date['year']) );
+ }
} else {
$new_record[$key] = '0000-00-00 00:00:00';
}
@@ -979,6 +987,7 @@
break;
case 'ISINT':
if(function_exists('filter_var') && $field_value < 2147483647) {
+ //if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT, array("options" => array('min_range'=>0))) === false) {
if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT) === false) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
@@ -1099,6 +1108,25 @@
}
}
break;
+
+ case 'ISDATETIME':
+ /* Checks a datetime value against the date format of the current language */
+ if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
+ if($validator['allowempty'] == 'y' && $field_value == '') {
+ //* Do nothing
+ } else {
+ $parsed_date = date_parse_from_format($this->datetimeformat,$field_value);
+ if($parsed_date['error_count'] > 0 || ($parsed_date['year'] == 1899 && $parsed_date['month'] == 12 && $parsed_date['day'] == 31)) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."<br />\r\n";
+ }
+ }
+ }
+ break;
+
case 'RANGE':
//* Checks if the value is within the given range or above / below a value
//* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:".
--
Gitblit v1.9.1