mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3114 from SimSync/master

Browse Source 
Closes #3113 parses a string into a db ready number format
This commit is contained in:
Cameron
2018-05-04 11:19:23 -07:00
committed by GitHub
parent 64ffdbf05e d01a97816f
commit 745f9a7c61
4 changed files with 73 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
e107_handlers/e_parse_class.php
View File

@@ -2385,6 +2385,32 @@ class e_parse extends e_parser
} }
/**
* Convert a string to a number (int/float)
*
* @param string $value
* @return int|float
*/
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)))
);
}
/** /**
* Clean and Encode Ampersands '&' for output to browser. * Clean and Encode Ampersands '&' for output to browser.
* @param string $text * @param string $text

35
e107_handlers/model_class.php
View File

@@ -1792,21 +1792,22 @@ class e_model extends e_object
* @param string $value * @param string $value
* @return integer|float * @return integer|float
*/ */
public function toNumber($value) // moved to e_parse
{ // public function toNumber($value)
$larr = localeconv(); // {
$search = array( // $larr = localeconv();
$larr['decimal_point'], // $search = array(
$larr['mon_decimal_point'], // $larr['decimal_point'],
$larr['thousands_sep'], // $larr['mon_decimal_point'],
$larr['mon_thousands_sep'], // $larr['thousands_sep'],
$larr['currency_symbol'], // $larr['mon_thousands_sep'],
$larr['int_curr_symbol'] // $larr['currency_symbol'],
); // $larr['int_curr_symbol']
$replace = array('.', '.', '', '', '', ''); // );
// $replace = array('.', '.', '', '', '', '');
return str_replace($search, $replace, $value); // return str_replace($search, $replace, $value);
} // }
/** /**
* Convert object data to a string * Convert object data to a string
@@ -2704,7 +2705,8 @@ class e_front_model extends e_model
{ {
case 'int': case 'int':
case 'integer': case 'integer':
return intval($this->toNumber($value)); //return intval($this->toNumber($value));
return intval($tp->toNumber($value));
break; break;
case 'safestr': case 'safestr':
@@ -2731,7 +2733,8 @@ class e_front_model extends e_model
break; break;
case 'float': case 'float':
return $this->toNumber($value); // return $this->toNumber($value);
return $tp->toNumber($value);
break; break;
case 'bool': case 'bool':

21
e107_handlers/mysql_class.php
View File

@@ -1301,11 +1301,13 @@ class e_db_mysql
case 'float': case 'float':
// fix - convert localized float numbers // fix - convert localized float numbers
$larr = localeconv(); // $larr = localeconv();
$search = array($larr['decimal_point'], $larr['mon_decimal_point'], $larr['thousands_sep'], $larr['mon_thousands_sep'], $larr['currency_symbol'], $larr['int_curr_symbol']); // $search = array($larr['decimal_point'], $larr['mon_decimal_point'], $larr['thousands_sep'], $larr['mon_thousands_sep'], $larr['currency_symbol'], $larr['int_curr_symbol']);
$replace = array('.', '.', '', '', '', ''); // $replace = array('.', '.', '', '', '', '');
return str_replace($search, $replace, floatval($fieldValue)); // return str_replace($search, $replace, floatval($fieldValue));
return e107::getParser()->toNumber($fieldValue);
break; break;
case 'null': case 'null':
@@ -1360,11 +1362,12 @@ class e_db_mysql
case 'float': case 'float':
// fix - convert localized float numbers // fix - convert localized float numbers
$larr = localeconv(); // $larr = localeconv();
$search = array($larr['decimal_point'], $larr['mon_decimal_point'], $larr['thousands_sep'], $larr['mon_thousands_sep'], $larr['currency_symbol'], $larr['int_curr_symbol']); // $search = array($larr['decimal_point'], $larr['mon_decimal_point'], $larr['thousands_sep'], $larr['mon_thousands_sep'], $larr['currency_symbol'], $larr['int_curr_symbol']);
$replace = array('.', '.', '', '', '', ''); // $replace = array('.', '.', '', '', '', '');
return str_replace($search, $replace, floatval($fieldValue)); // return str_replace($search, $replace, floatval($fieldValue));
return e107::getParser()->toNumber($fieldValue);
break; break;
case 'null': case 'null':
@@ -1436,8 +1439,6 @@ class e_db_mysql
} }
/** /**
* @DEPRECATED * @DEPRECATED
Similar to db_Update(), but splits the variables and the 'WHERE' clause. Similar to db_Update(), but splits the variables and the 'WHERE' clause.

33
e107_handlers/validator_class.php
View File

@@ -577,7 +577,7 @@ class e_validator
break; break;
case 'float': case 'float':
$value = $this->toNumber($value); $value = e107::getParser()->toNumber($value);
if(!is_numeric($value)) if(!is_numeric($value))
{ {
$this->addValidateResult($name, self::ERR_FLOAT_EXPECTED); $this->addValidateResult($name, self::ERR_FLOAT_EXPECTED);
@@ -728,22 +728,23 @@ class e_validator
break; break;
} }
} }
public function toNumber($value) // moved to e_parse
{ // public function toNumber($value)
$larr = localeconv(); // {
$search = array( // $larr = localeconv();
$larr['decimal_point'], // $search = array(
$larr['mon_decimal_point'], // $larr['decimal_point'],
$larr['thousands_sep'], // $larr['mon_decimal_point'],
$larr['mon_thousands_sep'], // $larr['thousands_sep'],
$larr['currency_symbol'], // $larr['mon_thousands_sep'],
$larr['int_curr_symbol'] // $larr['currency_symbol'],
); // $larr['int_curr_symbol']
$replace = array('.', '.', '', '', '', ''); // );
// $replace = array('.', '.', '', '', '', '');
return str_replace($search, $replace, $value); // return str_replace($search, $replace, $value);
} // }
protected function parseMinMax($string) protected function parseMinMax($string)
{ {