gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-10-05 16:09:53 +02:00
commit 500bbb552b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SeedDMS_Core/Core/inc.ClassAttribute.php
View File

@ -879,21 +879,19 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
return false; return false;
} }
$success = true;
switch((string) $this->getType()) { switch((string) $this->getType()) {
case self::type_int: case self::type_int:
$success = true;
foreach($values as $value) { foreach($values as $value) {
$success &= preg_match('/^[0-9]*$/', $value) ? true : false; $success &= preg_match('/^[0-9]*$/', $value) ? true : false;
} }
break; break;
case self::type_float: case self::type_float:
$success = true;
foreach($values as $value) { foreach($values as $value) {
$success &= is_numeric($value); $success &= is_numeric($value);
} }
break; break;
case self::type_string: case self::type_string:
$success = true;
if(trim($this->getRegex()) != '') { if(trim($this->getRegex()) != '') {
foreach($values as $value) { foreach($values as $value) {
$success &= preg_match($this->getRegex(), $value) ? true : false; $success &= preg_match($this->getRegex(), $value) ? true : false;
@ -903,20 +901,17 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
$this->_validation_error = 3; $this->_validation_error = 3;
break; break;
case self::type_boolean: case self::type_boolean:
$success = true;
foreach($values as $value) { foreach($values as $value) {
$success &= preg_match('/^[01]$/', $value); $success &= preg_match('/^[01]$/', $value);
} }
break; break;
case self::type_email: case self::type_email:
$success = true;
foreach($values as $value) { foreach($values as $value) {
} }
if(!$success) if(!$success)
$this->_validation_error = 5; $this->_validation_error = 5;
break; break;
case self::type_url: case self::type_url:
$success = true;
foreach($values as $value) { foreach($values as $value) {
$success &= preg_match('/^http(s)?:\/\/[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(\/.*)?$/i', $value); $success &= preg_match('/^http(s)?:\/\/[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(\/.*)?$/i', $value);
} }