mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

Version 1.3.6

Browse Source
This commit is contained in:
trendschau
2020-04-30 08:48:29 +02:00
parent 2abef9bc72
commit a20adbadf6
16 changed files with 260 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/Models/ProcessImage.php
View File

@@ -333,6 +333,8 @@ class ProcessImage extends ProcessAssets
# generate images from live folder to 'tmthumbs'
$liveImages = scandir($this->liveFolder);
$result = false;
foreach ($liveImages as $key => $name)
{
if (!in_array($name, array(".","..")))

34
system/Models/Validation.php
View File

@@ -342,7 +342,7 @@ class Validation
*/
public function objectField($fieldName, $fieldValue, $objectName, $fieldDefinitions, $skiprequired = NULL)
{
{
$v = new Validator(array($fieldName => $fieldValue));
if(isset($fieldDefinitions['required']) && !$skiprequired)
@@ -412,8 +412,16 @@ class Validation
# $v->rule('regex', $fieldName, '/^[\pL0-9_ \-\.\?\!\/\:]*$/u');
break;
case "textarea":
$v->rule('noHTML', $fieldName);
$v->rule('lengthMax', $fieldName, 1000);
# it understands array, json, yaml
if(is_array($fieldValue))
{
$v = $this->checkArray($fieldValue, $v);
}
else
{
$v->rule('noHTML', $fieldName);
$v->rule('lengthMax', $fieldName, 1000);
}
break;
case "paragraph":
$v->rule('noHTML', $fieldName);
@@ -422,9 +430,13 @@ class Validation
case "password":
$v->rule('lengthMax', $fieldName, 100);
break;
case "image":
$v->rule('noHTML', $fieldName);
$v->rule('lengthMax', $fieldName, 1000);
break;
default:
$v->rule('lengthMax', $fieldName, 1000);
$v->rule('regex', $fieldName, '/^[\pL0-9_ \-]*$/u');
$v->rule('regex', $fieldName, '/^[\pL0-9_ \-]*$/u');
}
return $this->validationResult($v, $objectName);
}
@@ -435,6 +447,20 @@ class Validation
* @param obj $v the validation object.
* @return bool
*/
public function checkArray($arrayvalues, $v)
{
foreach($arrayvalues as $key => $value)
{
if(is_array($value))
{
$this->checkArray($value, $v);
}
$v->rule('noHTML', $value);
$v->rule('lengthMax', $value, 1000);
}
return $v;
}
public function validationResult($v, $name = false)
{