Skip to content

Commit 0df8afe

Browse files
committed
Model, Query and Form Validationn Fixes
1 parent 8ae9132 commit 0df8afe

3 files changed

Lines changed: 18 additions & 6 deletions

File tree

core/db/modelquery.class.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ protected function whereCore(...$clauses): IQuery
182182
else
183183
$this->clause.="$data[0] not in ('".implode("','", $data[2])."')";
184184
}
185+
}
186+
else if ($data[1] === 'between')
187+
{
188+
$data[0] = $this->getColumn($data[0]);
189+
$this->clause .= "$data[0] between '".$data[2][0]."' and '".$data[2][1]."'";
185190
}
186191
else
187192
{

core/db/query.class.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ protected function whereCore(...$clauses): IQuery
289289
$this->clause.="`$data[0]` in ('".implode("','", $data[2])."')";
290290
else
291291
$this->clause.="`$data[0]` not in ('".implode("','", $data[2])."')";
292+
}
293+
else if ($data[1] === 'between')
294+
{
295+
$this->clause .= "$data[0] between '".$data[2][0]."' and '".$data[2][1]."'";
292296
}
293297
else
294298
{

core/validator.class.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,15 @@ public static function validateField(string $fieldName, array $rules, $val) : \s
8585
{
8686
switch($key)
8787
{
88-
case 'Required':
89-
if((empty($val) && $val != 0) || (is_array($val) ? (count($val) < 1) : strlen(str_replace(" ","",$val))<1))
90-
{
91-
$result->status=false;
92-
$result->message=$fieldName." is required";
93-
}
88+
case 'Required':
89+
if($data === true)
90+
{
91+
if((empty($val) && $val != 0) || (is_array($val) ? (count($val) < 1) : strlen(str_replace(" ","",$val))<1))
92+
{
93+
$result->status=false;
94+
$result->message=$fieldName." is required";
95+
}
96+
}
9497
break;
9598
case 'Max':
9699
if((($rules['Type'] ?? 'String') == 'Int' && $val > $data) || (($rules['Type'] ?? 'String') != 'Int' && strlen($val) > $data))

0 commit comments

Comments
 (0)