Changeset 447 for branches/eli_branch/lib/Validator.inc.php

Timestamp:

Dec 13, 2013 11:24:08 PM (11 years ago)

Author:

anonymous

Message:

Changed some global constants to class constants (in cases where backwards compatability wouldn't break).

File:

• branches/eli_branch/lib/Validator.inc.php (modified) (13 diffs)

branches/eli_branch/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.
  *
@@ -31 +31 @@
  */
 
-// Known credit card types.
-define('CC_TYPE_VISA', 1);
-define('CC_TYPE_MASTERCARD', 2);
-define('CC_TYPE_AMEX', 3);
-define('CC_TYPE_DISCOVER', 4);
-define('CC_TYPE_DINERS', 5);
-define('CC_TYPE_JCB', 6);
-
-// validateEmail return types.
-define('VALIDATE_EMAIL_SUCCESS', 0);
-define('VALIDATE_EMAIL_REGEX_FAIL', 1);
-define('VALIDATE_EMAIL_LENGTH_FAIL', 2);
-define('VALIDATE_EMAIL_MX_FAIL', 3);
-
 class Validator {
+
+    // Known credit card types.
+    const CC_TYPE_VISA = 1;
+    const CC_TYPE_MASTERCARD = 2;
+    const CC_TYPE_AMEX = 3;
+    const CC_TYPE_DISCOVER = 4;
+    const CC_TYPE_DINERS = 5;
+    const CC_TYPE_JCB = 6;
+
+    // Validator::validateEmail() return types.
+    const EMAIL_SUCCESS = 0;
+    const EMAIL_REGEX_FAIL = 1;
+    const EMAIL_LENGTH_FAIL = 2;
+    const EMAIL_MX_FAIL = 3;
 
     /**
@@ -180 +180 @@
      * @access  public
      * @param   string  $val    The input data to validate..
-     * @return  const           One of the constant values: VALIDATE_EMAIL_SUCCESS|VALIDATE_EMAIL_REGEX_FAIL|VALIDATE_EMAIL_LENGTH_FAIL|VALIDATE_EMAIL_MX_FAIL
+     * @return  const           One of the constant values: Validate::EMAIL_SUCCESS|Validate::EMAIL_REGEX_FAIL|Validate::EMAIL_LENGTH_FAIL|Validate::EMAIL_MX_FAIL
      * @author  Quinn Comendant <quinn@strangecode.com>
      */
@@ -190 +190 @@
         // Test email address format.
         if (!preg_match($e->getParam('regex'), $val, $e_parts)) {
-            return VALIDATE_EMAIL_REGEX_FAIL;
-        }
-        
+            return self::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];
@@ -203 +203 @@
         // Test length.
         if (mb_strlen($local) > 64 || mb_strlen($domain) > 191) {
-            return VALIDATE_EMAIL_LENGTH_FAIL;
+            return self::EMAIL_LENGTH_FAIL;
         }
 
@@ -210 +210 @@
         if ((ip2long($domain) == '-1' || ip2long($domain) === false) && function_exists('checkdnsrr') && !checkdnsrr($domain . '.', 'MX') && gethostbyname($domain) == $domain) {
             // FIXME: Do we care?
-            // return VALIDATE_EMAIL_MX_FAIL;
-        }
-
-        return VALIDATE_EMAIL_SUCCESS;
+            // return self::EMAIL_MX_FAIL;
+        }
+
+        return self::EMAIL_SUCCESS;
     }
 
@@ -225 +225 @@
     {
         $app =& App::getInstance();
-        
+
         if ('' == trim($val)) {
             // Don't be too bothered about empty strings.
@@ -257 +257 @@
          // Perform card-specific checks, if applicable
          switch ($cc_type) {
-             case CC_TYPE_VISA :
+             case self::CC_TYPE_VISA :
                  $regex = '/^4\d{15}$|^4\d{12}$/';
                  break;
-             case CC_TYPE_MASTERCARD :
+             case self::CC_TYPE_MASTERCARD :
                  $regex = '/^5[1-5]\d{14}$/';
                  break;
-             case CC_TYPE_AMEX :
+             case self::CC_TYPE_AMEX :
                  $regex = '/^3[47]\d{13}$/';
                  break;
-             case CC_TYPE_DISCOVER :
+             case self::CC_TYPE_DISCOVER :
                  $regex = '/^6011\d{12}$/';
                  break;
-             case CC_TYPE_DINERS :
+             case self::CC_TYPE_DINERS :
                  $regex = '/^30[0-5]\d{11}$|^3[68]\d{12}$/';
                  break;
-             case CC_TYPE_JCB :
+             case self::CC_TYPE_JCB :
                  $regex = '/^3\d{15}$|^2131|1800\d{11}$/';
                  break;
@@ -279 +279 @@
                  break;
          }
-         
+
          if ('' != $regex && !preg_match($regex, $cc_num)) {
              // Invalid format.
@@ -324 +324 @@
             return false;
         }
-        
+
         if (is_array($_FILES[$form_name]['name'])) {
             foreach($_FILES[$form_name]['name'] as $f) {
@@ -336 +336 @@
             }
         }
-        
+
         return true;
     }