From 9b9b67d01e1d5ffcbee4c72a619dc9c037efc9eb Mon Sep 17 00:00:00 2001 From: Haitem Date: Mon, 31 Aug 2020 22:46:50 +0200 Subject: [PATCH 1/2] view if status is not changed in action --- app/views/templates/device.phtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml index bdc5a9c..a0e5685 100644 --- a/app/views/templates/device.phtml +++ b/app/views/templates/device.phtml @@ -21,10 +21,10 @@ ?>
- +
- + @@ -57,8 +57,8 @@ From 960859087a4c5f17d610d5779ac2d6b1f76326d2 Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Wed, 2 Sep 2020 13:57:41 +0200 Subject: [PATCH 2/2] Some Fixes --- app/api/UpdaterApi.php | 68 -------------------------------- app/api/UpdatesApi.php | 5 +++ app/views/templates/device.phtml | 68 ++++++++++++++++++-------------- 3 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644 app/api/UpdaterApi.php diff --git a/app/api/UpdaterApi.php b/app/api/UpdaterApi.php deleted file mode 100644 index 8bdf753..0000000 --- a/app/api/UpdaterApi.php +++ /dev/null @@ -1,68 +0,0 @@ -setLevel(LOGLEVEL); - - //Filtrování IP adress - /* if (DEBUGMOD != 1) { - if (!in_array($_SERVER['REMOTE_ADDR'], HOMEIP)) { - echo json_encode(array( - 'state' => 'unsuccess', - 'errorMSG' => "Using API from your IP insnt alowed!", - )); - header($_SERVER["SERVER_PROTOCOL"]." 401 Unauthorized"); - $logManager->write("[Updater] acces denied from " . $_SERVER['REMOTE_ADDR'], LogRecordTypes::WARNING); - exit(); - } - }*/ - - $macAddress = $_SERVER['HTTP_X_ESP8266_STA_MAC']; - $localBinary = "../updater/" . str_replace(':', '', $macAddress) . ".bin"; - - $logManager->write("[Updater] url: " . $localBinary, LogRecordTypes::INFO); - $logManager->write("[Updater] version: " . $_SERVER['HTTP_X_ESP8266_SKETCH_MD5'], LogRecordTypes::INFO); - if (file_exists($localBinary)) { - $logManager->write("[Updater] version PHP: \n" . md5_file($localBinary), LogRecordTypes::INFO); - if ($_SERVER['HTTP_X_ESP8266_SKETCH_MD5'] != md5_file($localBinary)) { - $this->sendFile($localBinary); - //get device data - $device = DeviceManager::getDeviceByMac($macAddress); - $deviceName = $device['name']; - $deviceId = $device['device_id']; - //logfile write - $logManager->write("[Device] device_ID " . $deviceId . " was just updated to new version", LogRecordTypes::WARNING); - $logManager->write("[Device] version hash: \n" . md5_file($localBinary), LogRecordTypes::INFO); - //notification - $notificationMng = new NotificationManager; - $notificationData = [ - 'title' => 'Info', - 'body' => $deviceName.' was just updated to new version', - 'icon' => BASEDIR . '/app/templates/images/icon-192x192.png', - ]; - if ($notificationData != []) { - $subscribers = $notificationMng->getSubscription(); - foreach ($subscribers as $key => $subscriber) { - $logManager->write("[NOTIFICATION] SENDING TO " . $subscriber['id'] . " ", LogRecordTypes::INFO); - $answer = $notificationMng->sendSimpleNotification(SERVERKEY, $subscriber['token'], $notificationData); - } - } - } else { - header($_SERVER["SERVER_PROTOCOL"].' 304 Not Modified', true, 304); - } - } else { - header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found"); - } - die(); - } -} diff --git a/app/api/UpdatesApi.php b/app/api/UpdatesApi.php index f44f4dd..11d9933 100644 --- a/app/api/UpdatesApi.php +++ b/app/api/UpdatesApi.php @@ -24,6 +24,11 @@ class UpdatesApi { $logManager->setLevel(LOGLEVEL); $logManager->write("[Updater] Client Connected", LogRecordTypes::INFO); + if($this->validateHeader($_SERVER)){ + header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found"); + die(); + } + header('Content-type: text/plain; charset=utf8', true); //Filtrování IP adress diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml index a0e5685..cccdecd 100644 --- a/app/views/templates/device.phtml +++ b/app/views/templates/device.phtml @@ -1,5 +1,9 @@ +<<<<<<< HEAD +======= + +>>>>>>> 5cb6f0b... Some Fixes <?php echo $TITLE ?> +<<<<<<< HEAD +======= + +>>>>>>> 5cb6f0b... Some Fixes
@@ -15,8 +23,8 @@ prepare('item', 'device'); - $partial->prepare('langMng',$LANGMNG); - $partial->prepare('debugMod',$DEBUGMOD); + $partial->prepare('langMng', $LANGMNG); + $partial->prepare('debugMod', $DEBUGMOD); $partial->render(); ?>
@@ -26,41 +34,40 @@ + - - + - - + + - - + + + - - + @@ -69,11 +76,12 @@
Icon# Name Firmware Mac
"> - - + +
# NameRoom FirmwareMacIP AddressIP Address
(Mac)		 Action
&#x&#xRoom - - " - style="float: center; " - > - + + " style="float: center; "> +
- "> + ">

-
- "> - - -
-
+ +
+ "> + + +
+
+
- prepare('baseDir', BASEDIR); - $partial->render(); - //TODO js do main.js - ?> - + prepare('baseDir', BASEDIR); + $partial->render(); + //TODO js do main.js + ?> + +