Index: /trunk/FACT++/www/smartfact/index.php
===================================================================
--- /trunk/FACT++/www/smartfact/index.php	(revision 14322)
+++ /trunk/FACT++/www/smartfact/index.php	(revision 14323)
@@ -177,8 +177,8 @@
         $args = "";
         foreach ($_GET as $key => $value)
-            $args .= ' '.$key.'="'.escape($value).'"';
+            $args .= ' "'.$key.'"="'.$value.'"';
 
         // $args = "filename":label --arg:"key1=value" --arg:"key2=value"
-        $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --start "'.$script.escape($args).'"';
+        $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --start '.escapeshellarg($script.$args);
 
         // Execute
@@ -200,5 +200,5 @@
 
         // $args = "filename":label --arg:"key1=value" --arg:"key2=value"
-        $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --msg "'.$msg.'"';
+        $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --msg '.escapeshellarg($msg);
 
         // Execute