Changeset 17023 for trunk/FACT++/www

Timestamp:

08/19/13 16:32:16 (11 years ago)

Author:

tbretz

Message:

Added the possibility to send interrupts to the dim server.

Location:

trunk/FACT++/www/smartfact

Files:

• index.js (modified) (3 diffs)
• index.php (modified) (3 diffs)

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

@@ -203 +203 @@
 
 
-function submit(script)
+function submit(script, isIrq)
 {
     var inputs = document.getElementsByTagName("input");
 
-    var args = "start="+script+".js";
+    var args = isIrq ? "interrupt="+script : "start="+script+".js";
+
     for (var i=0; i<inputs.length; i++)
         args += "&"+inputs[i].name+"="+inputs[i].value;
@@ -241 +242 @@
 
     var title  = lines[0];
-    var is_cmd = title[0]=='*';
+    var is_cmd = title[0]=='*' || title[0]=='!';
+    var is_irq = title[0]=='!';
     var script = title.split('|');
     if (is_cmd)
@@ -347 +349 @@
     if (is_cmd)
     {
-        sp1.onclick = function () { this.style.backgroundColor='rgba(0,0,0,0.77)'; submit(script); this.style.backgroundColor=''; };
+        sp1.onclick = function () { this.style.backgroundColor='rgba(0,0,0,0.77)'; submit(script, is_irq); this.style.backgroundColor=''; };
     }
     else

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

@@ -169 +169 @@
 // --------------------------------------------------------------------
 
-if (!isset($_GET['start']) && !isset($_GET['stop']))
+if (!isset($_GET['start']) && !isset($_GET['stop']) && !isset($_GET['interrupt']))
     return header('HTTP/1.0 400 Command not supported');
 
@@ -217 +217 @@
     if (isset($_GET['msg']))
     {
-        if ($_GET['msg']>=0)
-            $msg = $_GET['msg'];
+        $msg = $_GET['msg'];
         unset($_GET['msg']);
     }
@@ -271 +270 @@
 }
 
+if (isset($_GET['interrupt']))
+{
+    unset($_GET['interrupt']);
+
+    $irq = "";
+    if (isset($_GET['interrupt']))
+    {
+        $irq = $_GET['irq'];
+        unset($_GET['interrupt']);
+    }
+
+    $args = "";
+    foreach ($_GET as $key => $value)
+        $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);
+}
+
 if ($rc>1)
     return header('HTTP/1.0 500 Execution failed [rc='.$rc."]");