Compare commits

...

4 Commits

Author SHA1 Message Date
Haitem 599ef47cd9 Repair room creation 2020-06-11 21:36:15 +02:00
JonatanRek c68c051777 Notification Date Fix 2020-05-20 09:13:17 +02:00
JonatanRek c381261a01 Notification time fix 2020-05-20 08:57:20 +02:00
JonatanRek e39efd9176 Quick Fixes 2020-04-24 18:37:43 +02:00
6 changed files with 19 additions and 5 deletions

2
.gitignore vendored
View File

@ -9,3 +9,5 @@ app/logs/*.log
.vscode/
.vscode/sftp.json
app/updater/*.bin
logs/*

11
api.php
View File

@ -19,15 +19,17 @@ $files = array_diff($files, array(
'Ajax.php',
));
foreach($files as $file) {
include './app/class/'. $file;
}
//Allow acces only wia Curl, Ajax ETC
$restAcess = 'XMLHttpRequest' == ( $_SERVER['HTTP_X_REQUESTED_WITH'] ?? '' );
/*$restAcess = 'XMLHttpRequest' == ( $_SERVER['HTTP_X_REQUESTED_WITH'] ?? '' );
if (!$restAcess){
header('Location: ./');
}
}*/
//Log
$logManager = new LogManager();
@ -215,6 +217,11 @@ if ($deviceLogs != null && $deviceLogs != ""){
die();
}
//
if (count($values) == 1){
unset($values["wifi"]);
}
// Subdevices first data!
if ($values != null && $values != "") {

View File

@ -76,7 +76,7 @@ class Notification
}
$this->jsonPayload["data"]["notification"]["title"] = $title;
$this->jsonPayload["data"]["notification"]["body"] = $body;
$this->jsonPayload["data"]["notification"]["body"] = date("h:i") . " - " . $body;
$this->jsonPayload["data"]["notification"]["icon"] = $icon;
$this->jsonPayload["data"]["notification"]["click_action"] = $action;
}

View File

@ -13,6 +13,11 @@ if (isset($_POST) && !empty($_POST)){
UserManager::createUser($userName, $password);
header('Location: ' . BASEDIR . 'setting');
die();
} else if (isset($_POST['submitCreateRoom']) && $_POST['submitCreateRoom'] != "") {
$roomName = $_POST['roomName'];
RoomManager::create($roomName);
header('Location: ' . BASEDIR . 'setting');
die();
} else if (isset($_POST['submitEnableOta']) && $_POST['submitEnableOta'] != "") {
echo $otaCode = $_POST['otaCode'];
echo $otaSecret = $_POST['otaSecret'];

View File

@ -91,7 +91,7 @@
url: 'ajax',
type: 'POST',
//TODO: GET Attribute from ID
data: { subDevice_id : '46', action : 'set', value: this.value},
data: { subDevice_id : '13', action : 'set', value: this.value},
success: function(msg){
console.log("message");
console.log(msg);

View File

@ -183,7 +183,7 @@
<input type="text" class="input" name="roomName" value="">
</div>
<div class="field">
<input type="submit" name="submitCreateUser" class="button" value="<?php $LANGMNG->echo('b_create') ?>">
<input type="submit" name="submitCreateRoom" class="button" value="<?php $LANGMNG->echo('b_create') ?>">
</div>
</form>
</div>