diff --git a/webserver/webserver.php b/apiserver/apiserver.php
similarity index 89%
rename from webserver/webserver.php
rename to apiserver/apiserver.php
index f912941..39e89d0 100644
--- a/webserver/webserver.php
+++ b/apiserver/apiserver.php
@@ -18,8 +18,7 @@ for ($m=1; $m<=12; $m++)
require_once $configDir . "/aliases.php";
require_once $configDir . "/dashboard_conf.php";
require_once "class/main.php";
-require_once "webserver/cmd_functions.php";
-//require_once "webserver/display_stats.php";
+require_once "apiserver/cmd_functions.php";
// opening listening server
@@ -45,7 +44,7 @@ function htmlSend($socket, $text, $meta="")
stream_socket_sendto($socket, $response);
}
-function askWebServer($read)
+function apiServer($read)
{
global $topics, $indexDevices, $devices;
$array = array();
@@ -117,14 +116,23 @@ function askWebServer($read)
case "type":
logger(DEBUG, $command . _(" reached"), __FILE__ . ":" . __LINE__);
//htmlSend($spawn, webDisplayByType($argList));
- case "stat":
+ /*case "stats":
logger(DEBUG, $command . _(" reached"), __FILE__ . ":" . __LINE__);
- htmlSend($spawn, displayStats($argList));
+ displayStats($spawn, $argList);*/
default:
if (is_numeric(array_key_first($argList)))
{
webDashboard($spawn, $argList[0]);
+ }else
+ {
+ logger(DEBUG, $command . _(" so default action"), __FILE__ . ":" . __LINE__);
+ if (file_exists("php://temp/". $command))
+ {
+ logger(DEBUG, $command . _(" is a file"), __FILE__ . ":" . __LINE__);
+ htmlSend($spawn, file_get_contents("php://temp/". $command), 'Content-Type: image/png');
+ }
}
+
}
if (array_key_exists("page", $argList))
{
diff --git a/webserver/cmd_functions.php b/apiserver/cmd_functions.php
similarity index 95%
rename from webserver/cmd_functions.php
rename to apiserver/cmd_functions.php
index e0b42d4..433a371 100644
--- a/webserver/cmd_functions.php
+++ b/apiserver/cmd_functions.php
@@ -4,8 +4,8 @@ require_once "events.php";
function webDashboard($socket, $n="Général")
{
global $dashboards, $indexDevices;
- require_once "webserver/javascript.php";
- logger(DEBUG, _("webDashboard function"));
+ require_once "apiserver/javascript.php";
+ logger(DEBUG, _("webDashboard function"), __FILE__ . ":" . __LINE__);
$response = insertJavascript();
if(array_key_exists($n, $dashboards))
@@ -34,6 +34,9 @@ function webDashboard($socket, $n="Général")
{
logger(DEBUG, _("can get value") . ($propertyObject["access"] & 4), __FILE__ . ":" . __LINE__);
$response .= 'friendlyName . "/" . $propertyObject["name"] . '" value="' . _("Update") . "\" onmouseup=\"getPropertyValue('" . $device->topic . "','" . $device->friendlyName . "','" . $propertyObject["name"] . "')\">";
+ }else
+ {
+ $response .= $value;
}
$response .= EOLH;
}else
@@ -99,7 +102,7 @@ function displayChoice($device, $propertyName, $value)
//$formHTML .= $device->friendlyName . aliases($device->friendlyName, $property) . ' => ';
$formHTML = 'friendlyName . "/"
- . $propertyObject["name"] ."/value" . '"'
+ . $propertyObject["name"] . '"'
. ' min="' . $propertyObject["value_min"] . '"'
. ' max="' . $propertyObject["value_max"] . '"'
. $step
@@ -110,7 +113,7 @@ function displayChoice($device, $propertyName, $value)
$formHTML .= ' max="' . $propertyObject["value_max"] . '"';
$formHTML .= ' value="' . $propertyObject["value"] . '"';
$formHTML .= $step;
- $formHTML .= " oninput=\"setPropertyValue('" . $device->topic . "', '" . $device->friendlyName . "', this.value, '" . $propertyObject["name"] . "')\">";
+ $formHTML .= " oninput=\"setPropertyNumberValue('" . $device->topic . "', '" . $device->friendlyName . "', this.value, '" . $propertyObject["name"] . "')\">";
break;
case "enum":
logger(DEBUG, _("type is enum"), __FILE__ . ":" . __LINE__);
@@ -130,7 +133,7 @@ function mkHTML($device, $propertyName, $choice)
logger(DEBUG, "function mkHTML", __FILE__ . ":" . __LINE__);
foreach ($choice as $key => $value)
{
- $html .= 'friendlyName . "/" . $propertyName . "/" . $key . '" value="' . $value . "\" onmouseup=\"setPropertyValue('" . $device->topic . "', '" . $device->friendlyName . "', '" . $value . "', '" . $propertyName . "')\">";
+ $html .= 'friendlyName . "/" . $propertyName . "/" . strtolower($value) . '" value="' . $value . "\" onmouseup=\"setPropertyValue('" . $device->topic . "', '" . $device->friendlyName . "', '" . $value . "', '" . $propertyName . "')\">";
}
return $html;
}
@@ -179,7 +182,7 @@ function webBrowse($socket, $argList, $page="/browse")
if (is_a($device, "device"))
{
- require_once "webserver/javascript.php";
+ require_once "apiserver/javascript.php";
$response .= insertJavascript();
foreach($device->properties as $key => $value)
{
@@ -400,7 +403,7 @@ function webDisplayByType($argList)
{
global $indexTypes, $config;
require_once $config . "porpertiesbytype.php";
- require_once "webserver/javascript.php";
+ require_once "apiserver/javascript.php";
$response .= insertJavascript();
foreach($indexTypes[$argList["type"]] as $device)
diff --git a/webserver/javascript.php b/apiserver/javascript.php
similarity index 62%
rename from webserver/javascript.php
rename to apiserver/javascript.php
index 3c131d4..75252e2 100644
--- a/webserver/javascript.php
+++ b/apiserver/javascript.php
@@ -6,13 +6,20 @@ return '