aboutsummaryrefslogtreecommitdiff
path: root/h-source/Library/Array
diff options
context:
space:
mode:
Diffstat (limited to 'h-source/Library/Array')
-rw-r--r--h-source/Library/Array/Validate/Soft.php35
-rw-r--r--h-source/Library/Array/Validate/Strong.php35
2 files changed, 18 insertions, 52 deletions
diff --git a/h-source/Library/Array/Validate/Soft.php b/h-source/Library/Array/Validate/Soft.php
index b348bdc..d0c7646 100644
--- a/h-source/Library/Array/Validate/Soft.php
+++ b/h-source/Library/Array/Validate/Soft.php
@@ -1,24 +1,7 @@
<?php
-// EasyGiant is a PHP framework for creating and managing dynamic content
-//
-// Copyright (C) 2009 - 2011 Antonio Gallo
+// All EasyGiant code is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// See COPYRIGHT.txt and LICENSE.txt.
-//
-// This file is part of EasyGiant
-//
-// EasyGiant is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// EasyGiant 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 EasyGiant. If not, see <http://www.gnu.org/licenses/>.
if (!defined('EG')) die('Direct access not allowed!');
@@ -39,35 +22,35 @@ class Array_Validate_Soft extends Array_Validate_Base
}
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are alphabetic values
- public function checkAlpha($associativeArray,$keyString)
+ public function checkAlpha($associativeArray,$keyString,$strength = 'soft')
{
return parent::checkAlpha($associativeArray,$keyString,'soft');
}
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are alphanumeric values
- public function checkAlphaNum($associativeArray,$keyString)
+ public function checkAlphaNum($associativeArray,$keyString,$strength = 'soft')
{
return parent::checkAlphaNum($associativeArray,$keyString,'soft');
}
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are decimal digits
- public function checkDigit($associativeArray,$keyString)
+ public function checkDigit($associativeArray,$keyString,$strength = 'soft')
{
return parent::checkDigit($associativeArray,$keyString,'soft');
}
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) have mail format
- public function checkMail($associativeArray,$keyString)
+ public function checkMail($associativeArray,$keyString,$strength = 'soft')
{
return parent::checkMail($associativeArray,$keyString,'soft');
}
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) is a number (integer or number). It makes use of the is_numeric PHP built-in function
- public function checkNumeric($associativeArray,$keyString)
+ public function checkNumeric($associativeArray,$keyString,$strength = 'soft')
{
return parent::checkNumeric($associativeArray,$keyString,'soft');
}
@@ -88,15 +71,15 @@ class Array_Validate_Soft extends Array_Validate_Base
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are one of the values indicated in the argument $strings (a comma-separated list of words)
- public function checkIsStrings($associativeArray,$keyString,$strings = '')
+ public function checkIsStrings($associativeArray,$keyString,$strings = '',$strength = 'soft')
{
return parent::checkIsStrings($associativeArray,$keyString,$strings,'soft');
}
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) match the regular expression $regExp
- public function checkMatch($associativeArray,$keyString,$regExp = '/./')
+ public function checkMatch($associativeArray,$keyString,$regExp = '/./',$strength = 'soft')
{
return parent::checkMatch($associativeArray,$keyString,$regExp,'soft');
}
-} \ No newline at end of file
+}
diff --git a/h-source/Library/Array/Validate/Strong.php b/h-source/Library/Array/Validate/Strong.php
index ccdce74..d105319 100644
--- a/h-source/Library/Array/Validate/Strong.php
+++ b/h-source/Library/Array/Validate/Strong.php
@@ -1,24 +1,7 @@
<?php
-// EasyGiant is a PHP framework for creating and managing dynamic content
-//
-// Copyright (C) 2009 - 2011 Antonio Gallo
+// All EasyGiant code is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// See COPYRIGHT.txt and LICENSE.txt.
-//
-// This file is part of EasyGiant
-//
-// EasyGiant is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// EasyGiant 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 EasyGiant. If not, see <http://www.gnu.org/licenses/>.
if (!defined('EG')) die('Direct access not allowed!');
@@ -72,7 +55,7 @@ class Array_Validate_Strong extends Array_Validate_Base
}
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are alphabetic values
- public function checkAlpha($associativeArray,$keyString)
+ public function checkAlpha($associativeArray,$keyString,$strength = 'strong')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -86,7 +69,7 @@ class Array_Validate_Strong extends Array_Validate_Base
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are alphanumeric values
- public function checkAlphaNum($associativeArray,$keyString)
+ public function checkAlphaNum($associativeArray,$keyString,$strength = 'strong')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -100,7 +83,7 @@ class Array_Validate_Strong extends Array_Validate_Base
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are decimal digits
- public function checkDigit($associativeArray,$keyString)
+ public function checkDigit($associativeArray,$keyString,$strength = 'strong')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -114,7 +97,7 @@ class Array_Validate_Strong extends Array_Validate_Base
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) have mail format
- public function checkMail($associativeArray,$keyString)
+ public function checkMail($associativeArray,$keyString,$strength = 'strong')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -128,7 +111,7 @@ class Array_Validate_Strong extends Array_Validate_Base
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) is a number (integer or number). It makes use of the is_numeric PHP built-in function
- public function checkNumeric($associativeArray,$keyString)
+ public function checkNumeric($associativeArray,$keyString,$strength = 'strong')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -170,7 +153,7 @@ class Array_Validate_Strong extends Array_Validate_Base
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are one of the values indicated in the argument $strings (a comma-separated list of words)
- public function checkIsStrings($associativeArray,$keyString,$strings = '')
+ public function checkIsStrings($associativeArray,$keyString,$strings = '',$strength = 'strong')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -183,7 +166,7 @@ class Array_Validate_Strong extends Array_Validate_Base
}
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) match the regular expression $regExp
- public function checkMatch($associativeArray,$keyString,$regExp = '/./')
+ public function checkMatch($associativeArray,$keyString,$regExp = '/./',$strength = 'strong')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -194,4 +177,4 @@ class Array_Validate_Strong extends Array_Validate_Base
return false;
}
}
-} \ No newline at end of file
+}