Merge branch 'new_validation_method_for_common_object' of github.com:atm-john/dolibarr into new_validation_method_for_common_object

This commit is contained in:
ATM john 2021-06-21 21:54:53 +02:00
commit b8244edb89

View File

@ -51,7 +51,7 @@ class Validate
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param Translate $outputLang * @param Translate $outputLang
*/ */
public function __construct($db,$outputLang = false) public function __construct($db, $outputLang = false)
{ {
global $langs; global $langs;
@ -121,7 +121,7 @@ class Validate
*/ */
public function isTimestamp($stamp) public function isTimestamp($stamp)
{ {
if (!is_numeric($stamp) && (int)$stamp == $stamp) { if (!is_numeric($stamp) && (int) $stamp == $stamp) {
$this->error = $this->outputLang->trans('RequireValidDate'); $this->error = $this->outputLang->trans('RequireValidDate');
return false; return false;
} }
@ -229,7 +229,7 @@ class Validate
*/ */
public function isBool($bool) public function isBool($bool)
{ {
if(!(is_null($bool) || is_bool($bool) || preg_match('/^[0|1]{1}$/ui', $bool))){ if (!(is_null($bool) || is_bool($bool) || preg_match('/^[0|1]{1}$/ui', $bool))) {
$this->error = $this->outputLang->trans('RequireValidBool'); $this->error = $this->outputLang->trans('RequireValidBool');
return false; return false;
} }
@ -258,7 +258,7 @@ class Validate
return false; return false;
} }
foreach ($value_arr as $val){ foreach ($value_arr as $val) {
$sql = 'SELECT ' . $col . ' FROM ' . MAIN_DB_PREFIX . $table . " WHERE " . $col ." = '" . $this->db->escape($val) . "'"; // nore quick than count(*) to check existing of a row $sql = 'SELECT ' . $col . ' FROM ' . MAIN_DB_PREFIX . $table . " WHERE " . $col ." = '" . $this->db->escape($val) . "'"; // nore quick than count(*) to check existing of a row
$resql = $this->db->getRow($sql); $resql = $this->db->getRow($sql);
if ($resql) { if ($resql) {