Fix parsing of fire rates (#22)

* Fix parsing of fire rates * Parse any whitespace between terms instead of only spaces * Parse multiplication of terms
FAForever · Aug 11, 2024 · 2818f31 · 2818f31
1 parent 8f58e74
commit 2818f31
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/www/res/scripts/luaToPhp.php b/www/res/scripts/luaToPhp.php
@@ -31,6 +31,14 @@ function trimval(string)
 function trimval($str)
 {
   $str = trim($str);
+
+  // Evaluated numbers used in fire rates like '10/10'
+  if (preg_match('/^((?:[0-9\.]+\w*[\*\/+-]\w*)*[0-9\.]+),?$/', $str, $matches))
+  {
+    eval('$str = ' . $matches[1] . ';');
+    return (float)$str == (int)$str ? (int)$str : (float)$str;
+  }
+
   if (substr($str,0,1)=="\""){
 
     $str  = trim(substr($str,1,strlen($str)));