DTux/moha
1
0
Fork 0
Code Activity

debugging api and add notify command

Browse Source
This commit is contained in:
daniel Tartavel
2022-02-02 21:18:44 +01:00
parent 85db4e3ff4
commit 18d5b74a96
9 changed files with 100 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
db_functions.php
View File

@ -55,7 +55,7 @@ function mkDevicesDB($topic, $json, $group=false)
}
$dbInit += 1;
fwrite($logFh, "################################START##################################################");
fwrite($logFh, print_r($devices, true));
fwrite($logFh, var_export($devices, true));
fwrite($logFh, "################################END##################################################");
logger(DEBUG, _("Devices DB made"), __FILE__ . ":" . __LINE__);
@ -122,6 +122,8 @@ function changeDevice($topic, $fn, &$device, $payloadArray)
//print_r($payloadArray);
if (!empty($payloadArray))
{
//echo "==================== New ChangeDevice =====================" .EOL;
iterateDevice($topic, $fn, $device, $device, $payloadArray);
}else
{
@ -134,8 +136,8 @@ function iterateDevice($topic, $fn, $parentDevice, &$device, $payloadArray, $pro
{
global $changed, $mohaDB, $testMode;
$deviceType = (gettype($device) == "object"); // = true if object
//echo "==================== New iterate =====================" .EOL;
//echo "devicetype = "; var_dump($deviceType); echo EOL;
//print_r($payloadArray);
//echo "device =>";print_r($device);echo EOL;
//echo "PropertyTree ==============> " . $propertyTree . EOL;
foreach($payloadArray as $key => $value)
@ -145,17 +147,22 @@ function iterateDevice($topic, $fn, $parentDevice, &$device, $payloadArray, $pro
//echo "value =>"; print_r($value); echo EOL;
//echo "type : " . gettype($value) .EOL;
$valueType = gettype($value);
if ( $valueType == "object")
if ($valueType == "object")
{
$propertyTree .= $key . "/";
//echo "PropertyTree " . $propertyTree . EOL;
//echo " is Object" . EOL;
if ($deviceType === true )
{
//echo "deviceType = true" . EOL;
if (!property_exists($device, $key))
{
//echo "Property do not exists" . EOL;
$device->{$key} = new stdClass;
}
//echo "iterating" . EOL;
//echo "===============>";
iterateDevice($topic, $fn, $parentDevice, $device->$key, $value, $propertyTree);
}else
{
@ -183,6 +190,7 @@ function iterateDevice($topic, $fn, $parentDevice, &$device, $payloadArray, $pro
}else
{
//var_dump($device);echo EOL;
//if (empty($device->$key) or $value != null)
//{
if (property_exists($device, $key))