mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 00:54:49 +02:00
Code Issues Releases Wiki Activity

refactoring toNumber() into e_parse class

Browse Source
This commit is contained in:
Achim Ennenbach
2018-05-04 19:27:00 +02:00
parent 2a1a6d4118
commit d01a97816f
4 changed files with 50 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
e107_handlers/model_class.php
View File

@@ -1792,6 +1792,7 @@ class e_model extends e_object
* @param string $value
* @return integer|float
*/
// moved to e_parse
// public function toNumber($value)
// {
// $larr = localeconv();
@@ -1807,23 +1808,6 @@ class e_model extends e_object
// return str_replace($search, $replace, $value);
// }
public function toNumber($value)
{
// adapted from: https://secure.php.net/manual/en/function.floatval.php#114486
$dotPos = strrpos($value, '.');
$commaPos = strrpos($value, ',');
$sep = (($dotPos > $commaPos) && $dotPos) ? $dotPos :
((($commaPos > $dotPos) && $commaPos) ? $commaPos : false);
if (!$sep) {
return preg_replace("/[^-0-9]/", "", $value);
}
return (
preg_replace("/[^-0-9]/", "", substr($value, 0, $sep)) . '.' .
preg_replace("/[^0-9]/", "", substr($value, $sep+1, strlen($value)))
);
}
/**
* Convert object data to a string
@@ -2721,7 +2705,8 @@ class e_front_model extends e_model
{
case 'int':
case 'integer':
return intval($this->toNumber($value));
//return intval($this->toNumber($value));
return intval($tp->toNumber($value));
break;
case 'safestr':
@@ -2748,7 +2733,8 @@ class e_front_model extends e_model
break;
case 'float':
return $this->toNumber($value);
// return $this->toNumber($value);
return $tp->toNumber($value);
break;
case 'bool':