Merge pull request #8 from devzero84/master

looks good, merged.
xkonni · Jul 16, 2015 · 366127c · 366127c
2 parents 68be96c + aef4541
commit 366127c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/webinterface/config.php b/webinterface/config.php
@@ -10,7 +10,6 @@
 /*
  * define ip address and port here
  */
-$source = $_SERVER['SERVER_ADDR'];
 $target = '192.168.11.124';
 $port = 11337;
 

diff --git a/webinterface/index.php b/webinterface/index.php
@@ -7,11 +7,26 @@
  *
 */
 
+
+function daemon_send($target, $port, $output)
+{
+    $fp = fsockopen($target, $port, $errno, $errstr, 30) or die("$errstr ($errno)\n");
+    fwrite($fp, $output);
+    $state = "";
+    while(!feof($fp))
+    {
+        $state .= fgets($fp, 2);
+    }
+    fclose($fp);
+    return $state;
+}
+
+
 /*
  * get configuration
  * don't forget to edit config.php
  */
-include("config.php");
+require 'config.php';
 
 /*
  * get parameters
@@ -33,12 +48,9 @@
  */
 $output = $nGroup.$nSwitch.$nAction.$nDelay;
 if (strlen($output) >= 8) {
-  $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP) or die("Could not create socket\n");
-  socket_bind($socket, $source) or die("Could not bind to socket\n");
-  socket_connect($socket, $target, $port) or die("Could not connect to socket\n");
-  socket_write($socket, $output, strlen ($output)) or die("Could not write output\n");
-  socket_close($socket);
+  daemon_send($target, $port, $output);
   header("Location: index.php?delay=$nDelay");
+  exit();
 }
 ?>
 <html>
@@ -93,13 +105,8 @@
 
     if ($index%2 == 0) echo "<TR>\n";
 
-    $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP) or die("Could not create socket\n");
-    socket_bind($socket, $source) or die("Could not bind to socket\n");
-    socket_connect($socket, $target, $port) or die("Could not connect to socket\n");
-
     $output = $ig.$is."2";
-    socket_write($socket, $output, strlen ($output)) or die("Could not write output\n");
-    $state = socket_read($socket, 2048);
+    $state = daemon_send($target, $port, $output);
     if ($state == 0) {
       $color=" BGCOLOR=\"#C00000\"";
       $ia = 1;
@@ -123,7 +130,6 @@
     echo "</TD>";
     echo "</TR></TABLE>\n";
     echo "</TD>\n";
-    socket_close($socket);
   }
   else {
     echo "<TD></TD>\n";