Fixed issue PHP versions of EM functions sprintf and trig (sin/cos/ta…

…n/etc.) not working git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12020 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 13, 2012 · 322eb89 · 322eb89
1 parent 2fc9c92
commit 322eb89
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/classes/eval/ExpressionManager.php b/classes/eval/ExpressionManager.php
@@ -2019,7 +2019,15 @@ private function RDP_RunFunction($funcNameToken,$params)
                         return false;
                     }
                     if (!$this->RDP_onlyparse) {
-                        $result = $funcName($params);
+                        switch($funcName) {
+                            case 'sprintf':
+                                // PHP doesn't let you pass array of parameters to sprintf, so must use call_user_func_array
+                                $result = call_user_func_array('sprintf',$params);
+                                break;
+                            default:
+                                $result = $funcName($params);
+                                break;
+                        }
                     }
                 // Call  function with the params passed
                 } elseif (in_array($argsPassed, $numArgsAllowed)) {
@@ -2043,7 +2051,7 @@ private function RDP_RunFunction($funcNameToken,$params)
                                 case 'sin':
                                 case 'sqrt':
                                 case 'tan':
-                                    if (is_float($params[0]))
+                                    if (is_numeric($params[0]))
                                     {
                                         $result = $funcName(floatval($params[0]));
                                     }
@@ -2062,7 +2070,7 @@ private function RDP_RunFunction($funcNameToken,$params)
                         if (!$this->RDP_onlyparse) {
                             switch($funcName) {
                                 case 'atan2':
-                                    if (is_float($params[0]) && is_float($params[1]))
+                                    if (is_numeric($params[0]) && is_numeric($params[1]))
                                     {
                                         $result = $funcName(floatval($params[0]),floatval($params[1]));
                                     }