Changeset 17373 for trunk

Timestamp:

11/25/13 19:49:20 (11 years ago)

Author:

tbretz

Message:

Unified all exec calls, suppress logging (actually only a warning message) when dimctrl is called

File:

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

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

@@ -67 +67 @@
     return "Sorry, your credentials don't match!";
 }
+
+function execute($cmd, $out)
+{
+    // Execute
+    $str = exec($cmd, $out, $rc);
+
+        // Logging (mainly for debugging)
+    $d = date("Y/m");
+    $path = "log/".$d;
+
+    if (!file_exists($path))
+        mkdir($path, 0777, true);
+
+    $file = fopen($path."/exec.log", "a");
+
+    fwrite($file, $cmd);
+    fwrite($file, "\n");
+    if ($rc>0)
+        fwrite($file, print_r($out,true)."\n");
+    fwrite($file, "\n");
+
+    fclose($file);
+
+    return $rc;
+}
+
 // --------------------------------------------------------------------
 
@@ -190 +216 @@
 
 if (isset($_GET['stop']))
-    $str = exec($path."/dimctrl --user '".$_SERVER['PHP_AUTH_USER']."' --stop", $out, $rc);
+{
+    unset($_GET['stop']);
+
+    $cmd = $path."/dimctrl --no-log --user '".$_SERVER['PHP_AUTH_USER']."' --stop 2>&1";
+
+    $rc = execute($cmd, $out);
+}
 
 if (isset($_GET['start']))
@@ -232 +264 @@
 
         // $args = "filename":label --arg:"key1=value" --arg:"key2=value"
-        $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --start '.escapeshellarg($script.$args);
-
-        // Execute
-        $str = exec($cmd, $out, $rc);
-
-        // Logging (mainly for debugging)
-        $d = date("Y/m");
-        $path = "log/".$d;
-        if (!file_exists($path))
-            mkdir($path, 0777, true);
-        $file = fopen($path."/exec.log", "a");
-        fwrite($file, $cmd."\n".$str."\n\n");
-        fclose($file);
+        $cmd = $path.'/dimctrl --no-log --user "'.$_SERVER['PHP_AUTH_USER'].'"  --start '.escapeshellarg($script.$args). " 2>&1";
+
+        $rc = execute($cmd, $out);
     }
 
@@ -252 +274 @@
 
         // $args = "filename":label --arg:"key1=value" --arg:"key2=value"
-        $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --msg '.escapeshellarg($msg);
-
-        // Execute
-        $str = exec($cmd, $out, $rc);
-
-        // Logging (mainly for debugging)
-        $d = date("Y/m");
-        $path = "log/".$d;
-        if (!file_exists($path))
-            mkdir($path, 0777, true);
-        $file = fopen($path."/exec.log", "a");
-        fwrite($file, $cmd."\n".$str."\n\n");
-        fclose($file);
+        $cmd = $path.'/dimctrl --no-log --user "'.$_SERVER['PHP_AUTH_USER'].'"  --msg '.escapeshellarg($msg)." 2>&1";
+
+        $rc = execute($cmd, $out);
     }
 
@@ -285 +297 @@
         $args .= ' "'.$key.'"="'.$value.'"';
 
-    $cmd = $path.'/dimctrl --user "'.$_SERVER['PHP_AUTH_USER'].'"  --interrupt '.escapeshellarg($irq.$args);
-
-    // Execute
-    $str = exec($cmd, $out, $rc);
-
-    // Logging (mainly for debugging)
-    $d = date("Y/m");
-    $path = "log/".$d;
-    if (!file_exists($path))
-        mkdir($path, 0777, true);
-    $file = fopen($path."/exec.log", "a");
-    fwrite($file, $cmd."\n".$str."\n\n");
-    fclose($file);
+    $cmd = $path.'/dimctrl --no-log --user "'.$_SERVER['PHP_AUTH_USER'].'"  --interrupt '.escapeshellarg($irq.$args)." 2>&1";
+
+    $rc = execute($cmd, $out);
 }