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

Scenes/Automation function Fixs

Browse Source
This commit is contained in:
JonatanRek
2019-10-13 10:07:03 +02:00
parent 875fbccd6e
commit 986bcff3c8
7 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/controls/automation.php
View File

@@ -1,6 +1,6 @@
<?php
if (isset($_POST) && !empty($_POST)){
if (isset($_POST['modalFinal']) && $_POST['modalFinal'] == "Next") {
if (isset($_POST['modalFinal']) && $_POST['action'] == "add") {
$doCode = json_encode($_POST['device'], JSON_PRETTY_PRINT);
$ifCode = json_encode([
"type" => $_POST['atSelector'],
@@ -8,11 +8,22 @@ if (isset($_POST) && !empty($_POST)){
], JSON_PRETTY_PRINT);
$onDays = $_POST['atDays'];
//Debug
if (DEBUGMOD == 1) {
echo '<pre>';
echo $permissionsInJson;
echo $deviceId;
var_dump(json_decode ($permissionsInJson));
echo '</pre>';
echo '<a href="' . BASEDIR .'">CONTINUE</a>';
die();
}
AutomationManager::create($_POST['name'], $onDays, $doCode, $ifCode);
header('Location: ' . BASEDIR . strtolower(basename(__FILE__, '.php')), TRUE);
header('Location: ' . BASEDIR . strtolower(basename(__FILE__, '.php')));
die();
} else if (isset($_POST['modalFinal']) && $_POST['modalFinal'] == "Upravit") {
} else if (isset($_POST['modalFinal']) && $_POST['action'] == "edit") {
$doCode = json_encode($_POST['device'], JSON_PRETTY_PRINT);
if (isset ($_POST['atDeviceValue'])) {
@@ -22,9 +33,9 @@ if (isset($_POST) && !empty($_POST)){
$subDeviceMaster = SubDeviceManager::getSubDeviceMaster($subDeviceId,$subDevice['type']);
$json = json_encode([
'deviceID' => $subDeviceMaster['device_id'],
'type'=> $subDevice['type'],
'value'=> $subDeviceValue,
'deviceID' => $subDeviceMaster['device_id'],
'type'=> $subDevice['type'],
'value'=> $subDeviceValue,
]);
}

7
app/controls/scene.php
View File

@@ -1,8 +1,10 @@
<?php
if (isset($_POST) && !empty($_POST)){
if (sset($_POST['devices']) && $_POST['devices'] != '') {
if (isset($_POST['submitFinal']) && $_POST['submitFinal'] != "") {
SceneManager::create($_POST['sceneIcon'], $_POST['sceneName'], json_encode($_POST['devices']));
header('Location: ' . BASEDIR . strtolower(basename(__FILE__, '.php')));
die();
}
//Debug
@@ -13,7 +15,4 @@ if (isset($_POST) && !empty($_POST)){
echo '<a href="/' . BASEDIR . strtolower(basename(__FILE__, '.php')).'">CONTINUE</a>';
die();
}
header('Location: ' . BASEDIR . strtolower(basename(__FILE__, '.php')));
die();
}