SH/PHP_SMART_HOME_V3
SH
/
PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Network Setting

This commit is contained in:
JonatanRek 2019-11-28 14:34:32 +01:00
parent b2e4da37bf
commit 563999e92d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api.php
View File

@ -190,6 +190,8 @@ if ($values != null || $values != "") {
'device' => [ 'device' => [
'hostname' => $hostname, 'hostname' => $hostname,
'ipAddress' => $device['ip_address'], 'ipAddress' => $device['ip_address'],
'subnet' => $device['subnet'],
'gateway' => $device['gateway'],
], ],
'state' => 'succes', 'state' => 'succes',
]; ];
@ -225,6 +227,8 @@ if ($values != null || $values != "") {
'hostname' => $device['name'], 'hostname' => $device['name'],
'sleepTime' => $device['sleep_time'], 'sleepTime' => $device['sleep_time'],
'ipAddress' => $device['ip_address'], 'ipAddress' => $device['ip_address'],
'subnet' => $device['subnet'],
'gateway' => $device['gateway'],
], ],
'state' => 'succes', 'state' => 'succes',
'value' => $subDeviceLastReordValue 'value' => $subDeviceLastReordValue

4
app/class/RoomManager.php
View File

@ -3,8 +3,8 @@ class RoomManager{
public static $rooms; public static $rooms;
function getDefaultRoomId() { function getDefaultRoomId() {
$defaultRoom = Db::loadOne("SELECT id FROM rooms WHERE default = 1"); $defaultRoom = Db::loadOne("SELECT room_id FROM rooms WHERE 'default' = 1");
return $defaultRoom['id']; return $defaultRoom['room_id'];
} }
function getAllRooms () { function getAllRooms () {

2
app/views/Home.php
View File

@ -158,6 +158,8 @@ class Home extends Template
'token' => $deviceData['token'], 'token' => $deviceData['token'],
'type' => $deviceData['type'], 'type' => $deviceData['type'],
'ip' => $deviceData['ip_address'], 'ip' => $deviceData['ip_address'],
'subnet' => $deviceData['subnet'],
'gateway' => $deviceData['gateway'],
'sleepTime' => $deviceData['sleep_time'], 'sleepTime' => $deviceData['sleep_time'],
'approved' => $deviceData['approved'], 'approved' => $deviceData['approved'],
'permission' => $permissionArray, 'permission' => $permissionArray,