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/views/templates/device.phtml b/app/views/templates/device.phtml index 367f930..28b18e2 100644 --- a/app/views/templates/device.phtml +++ b/app/views/templates/device.phtml @@ -1,5 +1,9 @@ +<<<<<<< HEAD +======= + +>>>>>>> 5cb6f0b... Some Fixes