diff --git a/apiserver/apiserver.php b/apiserver/apiserver.php index 3f0c3a7..65025bb 100644 --- a/apiserver/apiserver.php +++ b/apiserver/apiserver.php @@ -139,6 +139,10 @@ function apiServer($read) logger(DEBUG, $command . _(" reached"), __FILE__ . ":" . __LINE__); htmlSend($spawn, PropertiesDashboard($argList)); break; + case "deleteDevice": + logger(DEBUG, $command . _(" reached"), __FILE__ . ":" . __LINE__); + htmlSend($spawn, deleteDevice($argList)); + break; default: if (is_numeric(array_key_first($argList))) { @@ -152,7 +156,6 @@ function apiServer($read) htmlSend($spawn, file_get_contents("php://temp/". $command), 'Content-Type: image/png'); } } - } if (array_key_exists("page", $argList)) { diff --git a/apiserver/cmd_functions.php b/apiserver/cmd_functions.php index b398bc0..68c3eca 100644 --- a/apiserver/cmd_functions.php +++ b/apiserver/cmd_functions.php @@ -29,6 +29,7 @@ function apiDashboard($socket, $n="Général") { logger(DEBUG, _("Write Access OK ") . ($propertyObject["access"] & 2), __FILE__ . ":" . __LINE__); $response .= "     " . displayChoice($device, $property, $value); + $response .= "   " . displayMethod($device, $property); } if(($propertyObject["access"] & 4)) { @@ -124,9 +125,16 @@ function displayChoice($device, $propertyName, $value) default: logger(DEBUG, "type of property not recognized:" . $propertyObject["type"] , __FILE__ . ":" . __LINE__); } + return $formHTML; } +function displayMethod($device, $property) +{ + $html = 'friendlyName . "/" . $propertyName . "/" . strtolower($value) . '" method="' . IDLE . "\" onmouseup=\"setPropertyMethod('" . $device->topic . "', '" . $device->friendlyName . "', '" . IDLE . "', '" . $propertyName . "')\">"; + $html = 'friendlyName . "/" . $propertyName . "/" . strtolower($value) . '" method="' . AUTO . "\" onmouseup=\"setPropertyMethod('" . $device->topic . "', '" . $device->friendlyName . "', '" . AUTO . "', '" . $propertyName . "')\">"; + $html = 'friendlyName . "/" . $propertyName . "/" . strtolower($value) . '" method="' . MANUAL . "\" onmouseup=\"setPropertyMethod('" . $device->topic . "', '" . $device->friendlyName . "', '" . MANUAL . "', '" . $propertyName . "')\">"; +} function mkHTML($device, $propertyName, $choice) { $html = ""; @@ -184,6 +192,7 @@ function apiBrowse($socket, $argList, $page="/browse") { require_once "apiserver/javascript.php"; $response .= insertJavascript(); + foreach($device->properties as $key => $value) { $response = displayProperty($device, $key, $value, $response); @@ -527,7 +536,13 @@ function apiHookActive($argList, $status) { return _("Hook does not exists"); } +} +function deleteDevice($argList) +{ + global $indexFriendlyNames; + logger(DEBUG, _("removing ") . $indexFriendlyNames[$argList["fn"]]->friendlyname , __FILE__ . ":" . __LINE__); + //unset($indexFriendlyNames[$argList["fn"]]); } /* function apiDisplayByType($argList) diff --git a/apiserver/javascript.php b/apiserver/javascript.php index 75252e2..febc4f9 100644 --- a/apiserver/javascript.php +++ b/apiserver/javascript.php @@ -20,6 +20,13 @@ return ''; }