From 5647bb21a7b81f51667b18d48b86bc222a7630e2 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Wed, 2 Sep 2020 19:44:40 +0200
Subject: [PATCH] Little Tweeks

---
 app/api/UpdatesApi.php               | 11 +++--
 app/controllers/deviceController.php | 12 +++---
 app/views/templates/device.phtml     | 63 ++++++++++++++--------------
 3 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/app/api/UpdatesApi.php b/app/api/UpdatesApi.php
index f44f4dd..2656f44 100644
--- a/app/api/UpdatesApi.php
+++ b/app/api/UpdatesApi.php
@@ -12,7 +12,7 @@ class UpdatesApi {
     private function validateHeader($headers){
         if (
             isset($_SERVER['HTTP_X_ESP8266_STA_MAC']) &&
-            isset($_SERVER['HTTP_X_ESP8266_SKETCH_MD5']) 
+            isset($_SERVER['HTTP_X_ESP8266_SKETCH_MD5'])
         ) {
             return true;
         }
@@ -23,9 +23,14 @@ class UpdatesApi {
         $logManager = new LogManager('../logs/ota/'. date("Y-m-d").'.log');
         $logManager->setLevel(LOGLEVEL);
         $logManager->write("[Updater] Client Connected", LogRecordTypes::INFO);
-        
+
+      //   if($this->validateHeader($_SERVER)){
+      //       header($_SERVER["SERVER_PROTOCOL"]." 400 Bad Header");
+      //       die();
+      //   }
+
         header('Content-type: text/plain; charset=utf8', true);
-        
+
         //Filtrování IP adress
         if (DEBUGMOD != 1) {
             if (!in_array($_SERVER['REMOTE_ADDR'], HOMEIP)) {
diff --git a/app/controllers/deviceController.php b/app/controllers/deviceController.php
index 035b2ab..75c3b00 100644
--- a/app/controllers/deviceController.php
+++ b/app/controllers/deviceController.php
@@ -5,11 +5,13 @@ if (!empty ($_POST)){
 		$file = $_FILES['deviceFirmware'];
 		$deviceMac = $deviceManager->getDeviceById ($_POST['deviceId'])['mac'];
 		$fileName = (!empty ($deviceMac) ? str_replace (":", "", $deviceMac) . ".bin" : "");
-		if ($fileName != "" && file_exists ("../app/updater/" . $fileName)) {
-			unlink("../app/updater/" . $fileName);
+
+		if ($fileName != "" && file_exists ("../updater/" . $fileName)) {
+			unlink("../updater/" . $fileName);
 		}
 		if ($fileName != "") {
-			copy ($file['tmp_name'], "../app/updater/" . $fileName);
+			echo 'coping file'.$fileName .copy ($file['tmp_name'], "../updater/" . $fileName);;
+
 		} else {
 
 		}
@@ -18,6 +20,6 @@ if (!empty ($_POST)){
 		$deviceManager = new DeviceManager ();
 		$deviceManager->edit ($_POST['deviceId'], array ('command' => $_POST['deviceCommand']));
 	}
-	header('Location: ./');
-	die();
+	//header('Location: ./');
+	//die();
 }
diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml
index 011b62d..367f930 100644
--- a/app/views/templates/device.phtml
+++ b/app/views/templates/device.phtml
@@ -15,8 +15,8 @@
 			<?php
 			$partial = new Partial('menu');
 			$partial->prepare('item', 'device');
-			$partial->prepare('langMng',$LANGMNG);
-			$partial->prepare('debugMod',$DEBUGMOD);
+			$partial->prepare('langMng', $LANGMNG);
+			$partial->prepare('debugMod', $DEBUGMOD);
 			$partial->render();
 			?>
 		</div>
@@ -26,41 +26,41 @@
 					<tr>
 						<th>#</th>
 						<th>Name</th>
+						<th>Room</th>
 						<th>Firmware</th>
-						<th>Mac</th>
-						<th>IP Address</th>
+						<th>IP Address<br>(Mac)</th>
 						<th>Action</th>
 					</tr>
 				</thead>
 				<tbody>
-					<?php if (!empty ($DEVICES)): ?>
-						<?php foreach ($DEVICES as $device): ?>
+					<?php if (!empty($DEVICES)) : ?>
+						<?php foreach ($DEVICES as $device) : ?>
 							<tr>
-								<td><i class="fa">&#x<?php echo (!empty ($device['icon']) ? $device['icon'] : ""); ?></i></td>
-								<td><?php echo (!empty ($device['name']) ? $device['name'] : ""); ?></td>
+								<td><i class="fa">&#x<?php echo (!empty($device['icon']) ? $device['icon'] : ""); ?></i></td>
+								<td><?php echo (!empty($device['name']) ? $device['name'] : ""); ?></td>
+								<td>Room</td>
 								<td>
-									<?php if (!empty ($device['mac'])): ?>
-										<i
-											class="fa <?php echo (!empty ($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "fa-check-circle" : "fa-circle") : "fa-times-circle"); ?>"
-											style="float: center; <?php echo (!empty ($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "color: green;" : "color: yellow;") : "color: red;"); ?>"
-										></i>
-										<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware').click();" >&#xf0ee;</button>
+									<?php if (!empty($device['mac'])) : ?>
+										<i class="fa <?php echo (!empty($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "fa-check-circle" : "fa-circle") : "fa-times-circle"); ?>" style="float: center; <?php echo (!empty($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "color: green;" : "color: yellow;") : "color: red;"); ?>"></i>
+										<?php echo $device['firmware_hash'] ?>
+										<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware-<?php echo $device['device_id']?>').click();">&#xf0ee;</button>
 										<form style="display: none;" method="post" action="" enctype="multipart/form-data">
-											<input type="hidden" name="deviceId" value="<?php echo (!empty ($device['device_id']) ? $device['device_id'] : ""); ?>">
-											<input type="file" onchange="this.form.submit();" name="deviceFirmware" id="deviceFirmware" value="">
+											<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
+											<input type="file" onchange="this.form.submit();" name="deviceFirmware" id="deviceFirmware-<?php echo $device['device_id']?>" value="">
 										</form>
 									<?php endif; ?>
 									<div type="float: clear;"></div>
 								</td>
-								<td><?php echo (!empty ($device['mac']) ? $device['mac'] : ""); ?></td>
-								<td><?php echo (!empty ($device['ip_address']) ? $device['ip_address'] : ""); ?></td>
+								<td><?php echo (!empty($device['mac']) ? $device['mac'] : ""); ?><br><?php echo (!empty($device['ip_address']) ? $device['ip_address'] : ""); ?></td>
 								<td>
-									<form method="post" action="">
-										<input type="hidden" name="deviceId" value="<?php echo (!empty ($device['device_id']) ? $device['device_id'] : ""); ?>">
-										<button class="fa custom-file-input" type="submit" name="deviceCommand" value="reset" title="Reset">&#xf01e;</button>
-										<button class="fa custom-file-input" type="submit" name="deviceCommand" value="config" title="Config">&#xf013;</button>
-										<div style="float: clear;"></div>
-									</form>
+									<?php if (!empty($device['mac'])) : ?>
+										<form method="post" action="">
+											<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
+											<button class="fa custom-file-input" <?php echo (!empty($device['command']) && $device['command'] == "reset" ? "style=\"color:red;\"" : ""); ?> type="submit" name="deviceCommand" value="reset" title="Reset">&#xf01e;</button>
+											<button class="fa custom-file-input" <?php echo (!empty($device['command']) && $device['command'] == "config" ? "style=\"color:red;\"" : ""); ?> type="submit" name="deviceCommand" value="config" title="Config">&#xf013;</button>
+											<div style="float: clear;"></div>
+										</form>
+									<?php endif; ?>
 								</td>
 							</tr>
 						<?php endforeach; ?>
@@ -69,11 +69,12 @@
 			</table>
 		</div>
 
-			<?php
-			$partial = new Partial('footer');
-			$partial->prepare('baseDir', BASEDIR);
-			$partial->render();
-			//TODO js do main.js
-			?>
-	</body>
+		<?php
+		$partial = new Partial('footer');
+		$partial->prepare('baseDir', BASEDIR);
+		$partial->render();
+		//TODO js do main.js
+		?>
+</body>
+
 </html>