Changeset 14232 for trunk

Timestamp:

06/25/12 22:17:38 (12 years ago)

Author:

tbretz

Message:

With the current dim version arguments are not passed as --arg but just with the --start / --exec option

File:

• trunk/FACT++/www/smartfact/index.php (modified) (3 diffs)

trunk/FACT++/www/smartfact/index.php

@@ -142 +142 @@
 {
     // Filename
-    $args = '"scripts/'.$_GET['start'].'"';
+    $script = '"scripts/'.$_GET['start'].'"';
 
     unset($_GET['start']);
@@ -157 +157 @@
     {
         if ($_GET['label']>=0)
-            $args .= ":".$_GET['label'];
+            $script .= ":".$_GET['label'];
         unset($_GET['label']);
     }
@@ -170 +170 @@
 
     // Arguments
-    foreach ($_GET as $key => $value)
-        $args .= ' --arg:"'.$key.'='.escape($value).'"';
-
-    if (!empty($args) && empty($msg))
-    {
+    if (!empty($script) && empty($msg))
+    {
+        //foreach ($_GET as $key => $value)
+        //    $args .= ' --arg:"'.$key.'='.escape($value).'"';
+
+        $args = "";
+        foreach ($_GET as $key => $value)
+            $args .= ' '.$key.'="'.escape($value).'"';
+
         // $args = "filename":label --arg:"key1=value" --arg:"key2=value"
-        $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --start '.$args;
+        $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --start "'.$script.escape($args).'"';
 
         // Execute