lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19836 from atm-john/15.0_fix_validate_lang_and_test

Browse Source 
FIX :  lang load in validate class and fix test for numeric values
This commit is contained in:
Laurent Destailleur 2022-01-23 18:24:11 +01:00 committed by GitHub
commit 307338e3f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commonobject.class.php
View File

@ -7595,7 +7595,7 @@ abstract class CommonObject
} else { return true; } } else { return true; }
} elseif (in_array($type, array('double', 'real', 'price'))) { } elseif (in_array($type, array('double', 'real', 'price'))) {
// is numeric // is numeric
if (!$validate->isDuration($fieldValue)) { if (!$validate->isNumeric($fieldValue)) {
$this->setFieldError($fieldKey, $validate->error); $this->setFieldError($fieldKey, $validate->error);
return false; return false;
} else { return true; } } else { return true; }

22
htdocs/core/class/validate.class.php
View File

@ -55,18 +55,17 @@ class Validate
{ {
global $langs; global $langs;
if ($outputLang) { if (empty($outputLang)) {
$this->outputLang = $langs; $this->outputLang = $langs;
} else { } else {
$this->outputLang = $outputLang; $this->outputLang = $outputLang;
} }
if (!is_object($this->outputLang) || !method_exists($outputLang, 'load')) { if (!is_object($this->outputLang) || !method_exists($this->outputLang, 'load')) {
return false; return false;
} }
/** @var Translate $outputLang */ $this->outputLang->loadLangs(array('validate', 'errors'));
$outputLang->load('validate');
$this->db = $db; $this->db = $db;
} }
@ -229,6 +228,21 @@ class Validate
return true; return true;
} }
/**
* Check numeric validity
*
* @param mixed $string to validate
* @return boolean Validity is ok or not
*/
public function isNumeric($string)
{
if (!is_numeric($string)) {
$this->error = $this->outputLang->trans('RequireValidNumeric');
return false;
}
return true;
}
/** /**
* Check for boolean validity * Check for boolean validity
* *

1
htdocs/langs/en_US/errors.lang
View File

@ -315,6 +315,7 @@ RequireAtLeastXString = Requires at least %s character(s)
RequireXStringMax = Requires %s character(s) max RequireXStringMax = Requires %s character(s) max
RequireAtLeastXDigits = Requires at least %s digit(s) RequireAtLeastXDigits = Requires at least %s digit(s)
RequireXDigitsMax = Requires %s digit(s) max RequireXDigitsMax = Requires %s digit(s) max
RequireValidNumeric = Requires a numeric value
RequireValidEmail = Email address is not valid RequireValidEmail = Email address is not valid
RequireMaxLength = Length must be less than %s chars RequireMaxLength = Length must be less than %s chars
RequireMinLength = Length must be more than %s char(s) RequireMinLength = Length must be more than %s char(s)