Changeset 2915 for branches

Timestamp:

Nov 30, 2008, 1:53:43 PM (16 years ago)

Author:

patdenice

Message:

merge -c2914 from trunk to branch 2.0.

• Bug in eval_syntax function in LocalFiles Editor function... Come back to previous function (svn 2588)

File:

• branches/2.0/plugins/LocalFilesEditor/functions.inc.php (modified) (1 diff)

branches/2.0/plugins/LocalFilesEditor/functions.inc.php

@@ -31 +31 @@
 {
   $code = str_replace(array('<?php', '?>'), '', $code);
-  if (!@eval('return true;' . $code))
+  if (function_exists('token_get_all'))
   {
-    return false;
+    $b = 0;
+    foreach (token_get_all($code) as $token)
+    {
+      if ('{' == $token) ++$b;
+      else if ('}' == $token) --$b;
+    }
+    if ($b) return false;
+    else
+    {
+      ob_start();
+      $eval = eval('if(0){' . $code . '}');
+      ob_end_clean();
+      if ($eval === false) return false;
+    }
   }
   return '<?php' . $code . '?>';