Changeset 220

Timestamp:

Dec 18, 2006 7:18:55 AM (17 years ago)

Author:

quinn

Message:

Q - fixed bug relating to strtotime usage.

Location:

tags/2.0.2/lib

Files:

• FormValidator.inc.php (modified) (1 diff)
• Upload.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (1 diff)

tags/2.0.2/lib/FormValidator.inc.php

@@ -491 +491 @@
     function validateStrDate($form_name, $msg='')
     {
-        if (($timestamp = strtotime(getFormData($form_name, '0'))) === -1) {
+        $timestamp = strtotime(getFormData($form_name, '0'));
+        if ($timestamp === -1 || $timestamp === false) {
             $this->addError($form_name, $msg);
             App::logMsg(sprintf('The string date %s is not valid.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);

tags/2.0.2/lib/Upload.inc.php

@@ -60 +60 @@
             // Enforce valid upload_path parameter.
             if (isset($params['upload_path'])) {
-                $params['upload_path'] = realpath($params['upload_path']);
+                // $params['upload_path'] = realpath($params['upload_path']);
+                $params['upload_path'] = $params['upload_path'];
                 // Must be directory.
                 if (!is_dir($params['upload_path'])) {

tags/2.0.2/lib/Utilities.inc.php

@@ -494 +494 @@
 {
     // Translate the human string date into SQL-safe date format.
-    if (empty($date) || '0000-00-00' == $date || strtotime($date) === -1) {
-        $sql_date = '0000-00-00';
-    } else {
-        $sql_date = date($format, strtotime($date));
-    }
-
-    return $sql_date;
+    if (empty($date) || strpos($date, '0000-00-00') !== false || strtotime($date) === -1 || strtotime($date) === false) {
+        return '0000-00-00';
+    } else {
+        return date($format, strtotime($date));
+    }
 }