From 36d487012c4f4eb3d31beb4cb38d3923c820f46b Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 18 Sep 2012 11:27:57 -0400
Subject: [PATCH] Added: second decimal count to separate internal view from client view
---
interface/lib/classes/functions.inc.php | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index e109650..b0e1f3b 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -34,7 +34,7 @@
class functions {
- public function mail($to, $subject, $text, $from, $filepath = '', $filetype = 'application/pdf', $filename = '', $cc = '', $bcc = '') {
+ public function mail($to, $subject, $text, $from, $filepath = '', $filetype = 'application/pdf', $filename = '', $cc = '', $bcc = '', $from_name = '') {
global $app,$conf;
if($conf['demo_mode'] == true) $app->error("Mail sending disabled in demo mode.");
@@ -45,7 +45,7 @@
$mail_config['use_smtp'] = true;
$app->ispcmail->setOptions($mail_config);
}
- $app->ispcmail->setSender($from);
+ $app->ispcmail->setSender($from, $from_name);
$app->ispcmail->setSubject($subject);
$app->ispcmail->setMailText($text);
@@ -117,9 +117,11 @@
return $out;
}
- public function currency_format($number) {
+ public function currency_format($number, $view = '') {
global $app;
- $number_format_decimals = (int)$app->lng('number_format_decimals');
+ if($view != '') $number_format_decimals = (int)$app->lng('number_format_decimals_'.$view);
+ if(!$number_format_decimals) $number_format_decimals = (int)$app->lng('number_format_decimals');
+
$number_format_dec_point = $app->lng('number_format_dec_point');
$number_format_thousands_sep = $app->lng('number_format_thousands_sep');
if($number_format_thousands_sep == 'number_format_thousands_sep') $number_format_thousands_sep = '';
@@ -299,7 +301,15 @@
return $result_array;
}
-
+ public function intval($string, $force_numeric = false) {
+ if(intval($string) == 2147483647) {
+ if($force_numeric == true) return floatval($string);
+ elseif(preg_match('/^([-]?)[0]*([1-9][0-9]*)([^0-9].*)*$/', $string, $match)) return $match[1].$match[2];
+ else return 0;
+ } else {
+ return intval($string);
+ }
+ }
}
--
Gitblit v1.9.1