Berechnung in Zahlenfelder: Erlaubte Zeichen auf Klammern ausgeweitet

diff --git a/SL/Form.pm b/SL/Form.pm
index 4db9e4bd478f69b02fc569f6852a5f3878d1f60a..582d2aff8edc33ee04ca949fd389de145558d644 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1172,17 +1172,12 @@ sub parse_amount {
   }
 
   $amount =~ s/,//g;
   }
 
   $amount =~ s/,//g;

-  # make shure no code wich is not a math expression ends in eval()
-
-  $amount =~ s/\s//g; 
-
-  unless($amount =~ /^[-\+]?\d+\.?\d*([-\+\*\/][-\+]?\d+\.?\d*)*$/){
-    return 0;
-  }

 
   $main::lxdebug->leave_sub(2);
 
 
   $main::lxdebug->leave_sub(2);
 

-  return (eval $amount) * 1 ;
+  # Make sure no code wich is not a math expression ends up in eval().
+  return 0 unless $amount =~ /^ [\s \d \( \) \- \+ \* \/ \. ]* $/x;
+  return scalar(eval($amount)) * 1 ;

 }
 
 sub round_amount {
 }
 
 sub round_amount {

diff --git a/js/common.js b/js/common.js
index 279ff8dae9213555994a496f89fce2815c9075f8..298d5a2cbee2fe4cdf2e36ef1c9d0618e0e2a48f 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -58,7 +58,7 @@ function check_right_number_format(input_name) {
   if(decpoint && decpoint == ','){
     test_val = test_val.replace(/,/g, '.');
   }
   if(decpoint && decpoint == ','){
     test_val = test_val.replace(/,/g, '.');
   }

-  var forbidden = test_val.match(/[^-\+\/\*\.0-9\ ]/g );
+  var forbidden = test_val.match(/[^\s\d\(\)\-\+\*\/\.]/g);

   if (forbidden && forbidden.length > 0 ){
     return show_alert_and_focus(input_name, wrongNumberFormat);
   } 
   if (forbidden && forbidden.length > 0 ){
     return show_alert_and_focus(input_name, wrongNumberFormat);
   }