Changeset 457 for trunk/lib/Validator.inc.php

Timestamp:

Jan 20, 2014 9:42:13 PM (10 years ago)

Author:

anonymous

Message:

Removed use of requireAccessClearance(). Adjusted sequence of sslOn() and requireLogin(). Added ACL::requireAllow() method. Added arguments to SortOrder::set(). Changed behavior of Validator::validateStrDate(). Added use of Validator::validateStrDate() to module maker templates.

File:

• trunk/lib/Validator.inc.php (modified) (10 diffs)

trunk/lib/Validator.inc.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -24 +24 @@
  * Validator.inc.php
  *
- * The Validator class provides a methods for validating input against different criteria. 
+ * The Validator class provides a methods for validating input against different criteria.
  * All functions return true if the input passes the test.
  *
@@ -192 +192 @@
             return VALIDATE_EMAIL_REGEX_FAIL;
         }
-        
+
         // We have a match! Here are the captured subpatterns, on which further tests are run.
-        // The part before the @. 
+        // The part before the @.
         $local = $e_parts[2];
 
-        // The part after the @. 
+        // The part after the @.
         // If domain is an IP [XXX.XXX.XXX.XXX] strip off the brackets.
         $domain = $e_parts[3]{0} == '[' ? mb_substr($e_parts[3], 1, -1) : $e_parts[3];
@@ -225 +225 @@
     {
         $app =& App::getInstance();
-        
-        if ('' == trim($val)) {
+
+        if (is_string($val) && '' === trim($val)) {
             // Don't be too bothered about empty strings.
             return true;
@@ -232 +232 @@
 
         $timestamp = strtotime($val);
-        // Return values change between php4 and php5.
-        if ('' != trim($val) && ($timestamp === -1 || $timestamp === false)) {
+        if (!$timestamp || $timestamp < 1) {
             return false;
         } else {
@@ -239 +238 @@
         }
     }
-
 
     /**
@@ -279 +277 @@
                  break;
          }
-         
+
          if ('' != $regex && !preg_match($regex, $cc_num)) {
              // Invalid format.
@@ -324 +322 @@
             return false;
         }
-        
+
         if (is_array($_FILES[$form_name]['name'])) {
             foreach($_FILES[$form_name]['name'] as $f) {
@@ -336 +334 @@
             }
         }
-        
+
         return true;
     }