mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

closes e107inc/e107#3113 parses a string into a db ready number format

Browse Source 
value returned works also with floatval()
This commit is contained in:
Achim Ennenbach
2018-05-01 23:29:50 +02:00
parent 9726a70d2d
commit 2a1a6d4118
2 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
e107_handlers/model_class.php
View File

@@ -1792,20 +1792,37 @@ class e_model extends e_object
* @param string $value * @param string $value
* @return integer|float * @return integer|float
*/ */
// public function toNumber($value)
// {
// $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']
// );
// $replace = array('.', '.', '', '', '', '');
// return str_replace($search, $replace, $value);
// }
public function toNumber($value) public function toNumber($value)
{ {
$larr = localeconv(); // adapted from: https://secure.php.net/manual/en/function.floatval.php#114486
$search = array( $dotPos = strrpos($value, '.');
$larr['decimal_point'], $commaPos = strrpos($value, ',');
$larr['mon_decimal_point'], $sep = (($dotPos > $commaPos) && $dotPos) ? $dotPos :
$larr['thousands_sep'], ((($commaPos > $dotPos) && $commaPos) ? $commaPos : false);
$larr['mon_thousands_sep'],
$larr['currency_symbol'],
$larr['int_curr_symbol']
);
$replace = array('.', '.', '', '', '', '');
return str_replace($search, $replace, $value); 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)))
);
} }
/** /**

42
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 $this->_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 $this->_toNumber($fieldValue);
break; break;
case 'null': case 'null':
@@ -1436,6 +1439,29 @@ class e_db_mysql
} }
/**
* 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)))
);
}
/** /**