mhpf

5 files changed, 39 insertions, 39 deletions

diff --git a/apis/debugrequest.php b/apis/debugrequest.php
index f8e728e7..8558de67 100644
--- a/apis/debugrequest.php
+++ b/apis/debugrequest.php
@@ -1,11 +1,11 @@
 <?php
-$debug_settings = Property::getRemoteDebuggingConfig();
+$debug_settings = Property::getRemoteDebugConfig();
 if ($debug_settings["enabled"] !== true) {
   http_response_code(403);
   exit;
 }
 
-$debug_request = split(":", file_get_contents("php://input"), 2);
+$debug_request = explode(":", file_get_contents("php://input"), 2);
 
 $uuid = $debug_request[0];
 $port = 5900 + $debug_request[1];
@@ -17,7 +17,8 @@ if ($validclient == false) {
 } else {
   http_response_code(200);
   $data = json_encode(array("hosts" => array($_SERVER["REMOTE_ADDR"], $debug_settings["debugServer"]), 
-	"ports" => array($port, $debug_settings["port"])));
-  Taskmanager::submit('DispatchRelay', $data, true);
+	"ports" => array($port, intval($debug_settings["port"])), "descs" => array("bwlpclient", "debugserver")));
+  $taskstruct = Taskmanager::submit('DispatchRelay', $data, true);
+  Property::setDebugTaskStruct($taskstruct);
 }
 
diff --git a/inc/property.inc.php b/inc/property.inc.php
index dc11d88c..636a2bce 100644
--- a/inc/property.inc.php
+++ b/inc/property.inc.php
@@ -200,4 +200,14 @@ class Property
 	{
 		return self::set('remote-debug-config', json_encode($value));
 	}
+
+	public static function getDebugTaskStruct()
+	{
+		return json_decode(self::get('debug-task-struct'), true);
+	}
+
+	public static function setDebugTaskStruct($value)
+	{
+		return self::set('debug-task-struct'), json_encode($value));
+	}
 }
diff --git a/modules-available/debugconfig/page.inc.php b/modules-available/debugconfig/page.inc.php
index ea78e3c5..00698d26 100644
--- a/modules-available/debugconfig/page.inc.php
+++ b/modules-available/debugconfig/page.inc.php
@@ -3,7 +3,7 @@
 class Page_debugConfig extends Page
 {
 
-	const DEFAULT_CONFIG = array("enabled" => false, "debugServer" => "127.0.0.1", "port" => 5900);
+	const DEFAULT_CONFIG = array("enabled" => false, "debugServer" => "127.0.0.1", "port" => 5500);
 
 	protected function doPreprocess()
 	{
@@ -24,9 +24,11 @@ class Page_debugConfig extends Page
 	{
 		$debug_config = $this->getConfig();
 		Render::addTemplate('debugconfig', array("debugEnabled" => $debug_config["enabled"], "debugServer" => $debug_config["debugServer"], "port" => $debug_config["port"]));
-		$taskid = Taskmanager::isTask("DispatchRelay");
-		if ($taskid !== Null )
-			Render::addTemplate('relaystatus', array("taskid" => $taskid))
+		if (gettype($taskstatus) == 'array') {
+			error_log(count($taskstatus));
+		}
+
+		//Render::addTemplate('relaystatus', array("taskid" => $taskstatus));
 	}
 	
 	private function getConfig()
@@ -39,7 +41,6 @@ class Page_debugConfig extends Page
 	
 	private function setConfig()
 	{
-		error_log(request::post('toggleDebug'));
 		$enabled = isset($_POST['toggleDebug']) ? true : false;
 		Property::setRemoteDebugConfig(array('enabled' => $enabled, 'debugServer' => Request::post('debugServer'), 'port' => Request::post('port')));
 	}	
diff --git a/modules-available/debugconfig/templates/_page.html b/modules-available/debugconfig/templates/_page.html
deleted file mode 100644
index 2823d77c..00000000
--- a/modules-available/debugconfig/templates/_page.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<form action="?do=DebugConfig" method="post">
-	<input type="hidden" name="token" value="{{token}}">
-	<input type="hidden" name="action" value="debugconfig">
-	<div class="panel panel-default">
-		<div class="panel-heading">{{lang_debugConfig}}</div>
-		<div class="panel-body">
-			<p>{{lang_debugDescription}}</p>
-			{{^debugEnabled}}
-			<p>{{lang_debuggingIsDisabled}}</p>
-			{{/debugEnabled}}
-			{{#debugEnabled}}
-			<div class="input-group" onclick="$('#doff').prop('checked', true);">
-				<span class="input-group-addon"><input id="doff" type="radio" name="mode" value="off"></span>
-				<span class="form-control">
-					{{lang_debugOff}}
-				</span>
-			</div>
-			{{/debugEnabled}}
-			<div class="input-group" onclick="$('#don').prop('checked', true);">
-				<span class="input-group-addon"><input id="don" type="radio" name="mode" value="random"></span>
-				<span class="form-control">
-					{{lang_debugOn}}
-				</span>
-			</div>
-			<div class="pull-right">
-				<button type="submit" class="btn btn-primary">{{lang_save}}</button>
-			</div>
-		</div>
-	</div>
-</form>
diff --git a/modules-available/debugconfig/templates/relaystatus.html b/modules-available/debugconfig/templates/relaystatus.html
new file mode 100644
index 00000000..1e9221c7
--- /dev/null
+++ b/modules-available/debugconfig/templates/relaystatus.html
@@ -0,0 +1,18 @@
+
+<div class="panel panel-default">
+	<div class="panel-heading">Relay Status</div>
+	<div class="panel-body">
+		<div data-tm-id="{{taskid}}" data-tm-log="messages"></div>
+	</div>
+</div>
+
+<!-- <script type="text/javascript">
+	function restartCb(task)
+	{
+		console.log("here");
+		if (!task)
+			console.log("nothing");
+		else
+			console.log("something");
+	}
+</script> -->
\ No newline at end of file