aboutsummaryrefslogtreecommitdiff
path: root/h-source/Library/Array/Validate
diff options
context:
space:
mode:
Diffstat (limited to 'h-source/Library/Array/Validate')
-rw-r--r--h-source/Library/Array/Validate/Base.php106
-rw-r--r--h-source/Library/Array/Validate/Soft.php76
-rw-r--r--h-source/Library/Array/Validate/Strong.php90
-rw-r--r--h-source/Library/Array/Validate/Values.php36
4 files changed, 126 insertions, 182 deletions
diff --git a/h-source/Library/Array/Validate/Base.php b/h-source/Library/Array/Validate/Base.php
index f1a242e..fb4a66c 100644
--- a/h-source/Library/Array/Validate/Base.php
+++ b/h-source/Library/Array/Validate/Base.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -26,7 +26,6 @@ if (!defined('EG')) die('Direct access not allowed!');
class Array_Validate_Base
{
- public $strength;
public $errorString = null; //string containing the list fields not found
public $errorsNumb = null; //numbers of errors
@@ -45,40 +44,7 @@ class Array_Validate_Base
$this->_resultString = new $stringClass();
}
- public function checkNotEmpty($associativeArray,$keyString)
- {
- $errorString = null;
- $keyArray = explode(',',$keyString);
- $numb = 0;
- for ($i = 0; $i < count($keyArray); $i++)
- {
- if (array_key_exists($keyArray[$i],$associativeArray))
- {
- if (is_array($associativeArray[$keyArray[$i]]))
- {
- $errorString .= $this->_resultString->getNotDefinedResultString($keyArray[$i]);
- $numb++;
- }
- else
- {
- if (strcmp(trim($associativeArray[$keyArray[$i]]),'') === 0)
- {
- $errorString .= $this->_resultString->getNotDefinedResultString($keyArray[$i]);
- $numb++;
- }
- }
- }
- else
- {
- $errorString .= $this->_resultString->getNotDefinedResultString($keyArray[$i]);
- $numb++;
- }
- }
- $this->errorString = $errorString;
- $this->errorNumb = $numb;
- return $numb === 0 ? true : false;
- }
-
+
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are not '' and are equal (===) to each other
public function checkEqual($associativeArray,$keyString)
{
@@ -150,13 +116,6 @@ class Array_Validate_Base
}
- //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are integer strings
- //$strength: hard or soft. If $strength is set equal to soft than non check is made upon array values equalt to '' or null
- public function checkInteger($associativeArray,$keyString,$strength = 'strong')
- {
- return $this->checkGeneric($associativeArray,$keyString,$strength,'checkInteger','getNotIntegerFormatResultString');
- }
-
//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
//$strength: hard or soft. If $strength is set equal to soft than non check is made upon array values equalt to '' or null
public function checkNumeric($associativeArray,$keyString,$strength = 'strong')
@@ -164,12 +123,6 @@ class Array_Validate_Base
return $this->checkGeneric($associativeArray,$keyString,$strength,'is_numeric','getNotNumericResultString');
}
- //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are an ISO date.
- //$strength: hard or soft. If $strength is set equal to soft than non check is made upon array values equalt to '' or null
- public function checkIsoDate($associativeArray,$keyString,$strength = 'strong')
- {
- return $this->checkGeneric($associativeArray,$keyString,$strength,'checkIsoDate','getNotDateResultString');
- }
//apply a generic check function
//$strength: hard or soft. If $strength is set equal to soft than non check is made upon array values equalt to '' or null
@@ -186,7 +139,7 @@ class Array_Validate_Base
{
if (array_key_exists($keyArray[$i],$associativeArray))
{
- if (strcmp($associativeArray[$keyArray[$i]],'') !== 0 or $this->strength === 'strong')
+ if (strcmp($associativeArray[$keyArray[$i]],'') !== 0 or $strength === 'strong')
{
if (!call_user_func($func,$associativeArray[$keyArray[$i]]))
{
@@ -264,7 +217,7 @@ class Array_Validate_Base
{
if (array_key_exists($keyArray[$i],$associativeArray))
{
- if (strcmp($associativeArray[$keyArray[$i]],'') !== 0 or $this->strength === 'strong')
+ if (strcmp($associativeArray[$keyArray[$i]],'') !== 0 or $strength === 'strong')
{
if (!in_array($associativeArray[$keyArray[$i]],$stringsArray))
{
@@ -281,50 +234,25 @@ class 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 = '/./',$strength = 'strong')
{
- $errorString = null;
- $keyArray = explode(',',$keyString);
- $numb = 0;
- for ($i = 0; $i < count($keyArray); $i++)
- {
- if (array_key_exists($keyArray[$i],$associativeArray))
- {
- if (strcmp($associativeArray[$keyArray[$i]],'') !== 0 or $this->strength === 'strong')
- {
- if (!preg_match($regExp,$associativeArray[$keyArray[$i]]))
- {
- $numb++;
- $errorString .= $this->_resultString->getDoesntMatchResultString($keyArray[$i],$regExp);
- }
- }
- }
- }
- $this->errorString = $errorString;
- return $numb === 0 ? true : false;
- }
-
- //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are decimal with the format indicated in $format
- //$format: M,D M is the maximum number of digits, D is the number of digits to the right of the decimal point
- public function checkDecimal($associativeArray,$keyString,$format = '10,2')
- {
- $errorString = null;
- $keyArray = explode(',',$keyString);
- $numb = 0;
- for ($i = 0; $i < count($keyArray); $i++)
- {
- if (array_key_exists($keyArray[$i],$associativeArray))
+ $errorString = null;
+ $keyArray = explode(',',$keyString);
+ $numb = 0;
+ for ($i = 0; $i < count($keyArray); $i++)
{
- if (strcmp($associativeArray[$keyArray[$i]],'') !== 0 or $this->strength === 'strong')
+ if (array_key_exists($keyArray[$i],$associativeArray))
{
- if (!checkDecimal($associativeArray[$keyArray[$i]],$format))
+ if (strcmp($associativeArray[$keyArray[$i]],'') !== 0 or $strength === 'strong')
{
- $numb++;
- $errorString .= $this->_resultString->getNotDecimalResultString($keyArray[$i],$format);
+ if (!preg_match($regExp,$associativeArray[$keyArray[$i]]))
+ {
+ $numb++;
+ $errorString .= $this->_resultString->getDoesntMatchResultString($keyArray[$i],$regExp);
+ }
}
}
}
- }
- $this->errorString = $errorString;
- return $numb === 0 ? true : false;
+ $this->errorString = $errorString;
+ return $numb === 0 ? true : false;
}
} \ No newline at end of file
diff --git a/h-source/Library/Array/Validate/Soft.php b/h-source/Library/Array/Validate/Soft.php
index d790652..b348bdc 100644
--- a/h-source/Library/Array/Validate/Soft.php
+++ b/h-source/Library/Array/Validate/Soft.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -26,11 +26,77 @@ if (!defined('EG')) die('Direct access not allowed!');
class Array_Validate_Soft extends Array_Validate_Base
{
- public function __construct($lang = 'En')
+ public function __construct($lang = 'Eng')
{
parent::__construct($lang);
-
- $this->strength = "soft";
+ }
+
+
+ //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are not '' and are equal (===) to each other
+ public function checkEqual($associativeArray,$keyString)
+ {
+ return parent::checkEqual($associativeArray,$keyString);
+ }
+
+ //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are alphabetic values
+ public function checkAlpha($associativeArray,$keyString)
+ {
+ 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)
+ {
+ 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)
+ {
+ 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)
+ {
+ 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)
+ {
+ return parent::checkNumeric($associativeArray,$keyString,'soft');
+ }
+
+
+ //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) have a number of chars smaller than $maxLenght
+ public function checkLength($associativeArray,$keyString,$maxLength = 10)
+ {
+ return parent::checkLength($associativeArray,$keyString,$maxLength);
+ }
+
+
+ //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are different from the values indicated in the argument $strings (a comma-separated list of words)
+ public function checkIsNotStrings($associativeArray,$keyString,$strings = '')
+ {
+ return parent::checkIsNotStrings($associativeArray,$keyString,$strings);
+ }
+
+
+ //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 = '')
+ {
+ 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 = '/./')
+ {
+ 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 d907d1d..ccdce74 100644
--- a/h-source/Library/Array/Validate/Strong.php
+++ b/h-source/Library/Array/Validate/Strong.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -22,17 +22,42 @@
if (!defined('EG')) die('Direct access not allowed!');
-//class to validate associative arrays
+//class to manage arrays
class Array_Validate_Strong extends Array_Validate_Base
{
- public function __construct($lang = 'En')
+ public function __construct($lang = 'Eng')
{
parent::__construct($lang);
-
- $this->strength = "strong";
}
+
+ public function checkNotEmpty($associativeArray,$keyString)
+ {
+ $errorString = null;
+ $keyArray = explode(',',$keyString);
+ $numb = 0;
+ for ($i = 0; $i < count($keyArray); $i++)
+ {
+ if (array_key_exists($keyArray[$i],$associativeArray))
+ {
+ if (strcmp(trim($associativeArray[$keyArray[$i]]),'') === 0)
+ {
+ $errorString .= $this->_resultString->getNotDefinedResultString($keyArray[$i]);
+ $numb++;
+ }
+ }
+ else
+ {
+ $errorString .= $this->_resultString->getNotDefinedResultString($keyArray[$i]);
+ $numb++;
+ }
+ }
+ $this->errorString = $errorString;
+ $this->errorNumb = $numb;
+ return $numb === 0 ? true : false;
+ }
+
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are not '' and are equal (===) to each other
public function checkEqual($associativeArray,$keyString)
{
@@ -47,7 +72,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,$strength = 'strong')
+ public function checkAlpha($associativeArray,$keyString)
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -61,7 +86,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,$strength = 'strong')
+ public function checkAlphaNum($associativeArray,$keyString)
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -75,7 +100,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,$strength = 'strong')
+ public function checkDigit($associativeArray,$keyString)
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -89,7 +114,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,$strength = 'strong')
+ public function checkMail($associativeArray,$keyString)
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -102,21 +127,8 @@ class Array_Validate_Strong extends Array_Validate_Base
}
- //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are an ISO date.
- public function checkIsoDate($associativeArray,$keyString,$strength = 'strong')
- {
- if ($this->checkNotEmpty($associativeArray,$keyString))
- {
-
- return parent::checkIsoDate($associativeArray,$keyString,'strong');
-
- } else {
- return false;
- }
- }
-
//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,$strength = 'strong')
+ public function checkNumeric($associativeArray,$keyString)
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -128,18 +140,6 @@ class Array_Validate_Strong extends Array_Validate_Base
}
}
- //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) is an integer string.
- public function checkInteger($associativeArray,$keyString,$strength = 'strong')
- {
- if ($this->checkNotEmpty($associativeArray,$keyString))
- {
-
- return parent::checkInteger($associativeArray,$keyString,'strong');
-
- } else {
- return false;
- }
- }
//verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) have a number of chars smaller than $maxLenght
public function checkLength($associativeArray,$keyString,$maxLength = 10)
@@ -170,7 +170,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 = '',$strength = 'strong')
+ public function checkIsStrings($associativeArray,$keyString,$strings = '')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -183,7 +183,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 = '/./',$strength = 'strong')
+ public function checkMatch($associativeArray,$keyString,$regExp = '/./')
{
if ($this->checkNotEmpty($associativeArray,$keyString))
{
@@ -194,18 +194,4 @@ class Array_Validate_Strong extends Array_Validate_Base
return false;
}
}
-
- //verify that the values of the associative array ($associativeArray) indicated by the key string ($keyString) are decimal with the format indicated in $format
- //$format: M,D M is the maximum number of digits, D is the number of digits to the right of the decimal point
- public function checkDecimal($associativeArray,$keyString,$format = '10,2')
- {
- if ($this->checkNotEmpty($associativeArray,$keyString))
- {
-
- return parent::checkDecimal($associativeArray,$keyString,$format);
-
- } else {
- return false;
- }
- }
-}
+} \ No newline at end of file
diff --git a/h-source/Library/Array/Validate/Values.php b/h-source/Library/Array/Validate/Values.php
deleted file mode 100644
index 9355949..0000000
--- a/h-source/Library/Array/Validate/Values.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-// EasyGiant is a PHP framework for creating and managing dynamic content
-//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
-// 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!');
-
-//class to validate associative arrays
-class Array_Validate_Values extends Array_Validate_Soft
-{
-
- public function __construct($lang = 'En')
- {
- parent::__construct($lang);
-
- $this->strength = "strong";
- }
-
-}