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

Little Tweeks

Browse Source
This commit is contained in:
JonatanRek 2020-09-02 19:44:40 +02:00
parent 50bd53561e
commit 5647bb21a7
3 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/api/UpdatesApi.php
View File

@ -12,7 +12,7 @@ class UpdatesApi {
private function validateHeader($headers){ private function validateHeader($headers){
if ( if (
isset($_SERVER['HTTP_X_ESP8266_STA_MAC']) && isset($_SERVER['HTTP_X_ESP8266_STA_MAC']) &&
isset($_SERVER['HTTP_X_ESP8266_SKETCH_MD5']) isset($_SERVER['HTTP_X_ESP8266_SKETCH_MD5'])
) { ) {
return true; return true;
} }
@ -23,9 +23,14 @@ class UpdatesApi {
$logManager = new LogManager('../logs/ota/'. date("Y-m-d").'.log'); $logManager = new LogManager('../logs/ota/'. date("Y-m-d").'.log');
$logManager->setLevel(LOGLEVEL); $logManager->setLevel(LOGLEVEL);
$logManager->write("[Updater] Client Connected", LogRecordTypes::INFO); $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); header('Content-type: text/plain; charset=utf8', true);
//Filtrování IP adress //Filtrování IP adress
if (DEBUGMOD != 1) { if (DEBUGMOD != 1) {
if (!in_array($_SERVER['REMOTE_ADDR'], HOMEIP)) { if (!in_array($_SERVER['REMOTE_ADDR'], HOMEIP)) {

12
app/controllers/deviceController.php
View File

@ -5,11 +5,13 @@ if (!empty ($_POST)){
$file = $_FILES['deviceFirmware']; $file = $_FILES['deviceFirmware'];
$deviceMac = $deviceManager->getDeviceById ($_POST['deviceId'])['mac']; $deviceMac = $deviceManager->getDeviceById ($_POST['deviceId'])['mac'];
$fileName = (!empty ($deviceMac) ? str_replace (":", "", $deviceMac) . ".bin" : ""); $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 != "") { if ($fileName != "") {
copy ($file['tmp_name'], "../app/updater/" . $fileName); echo 'coping file'.$fileName .copy ($file['tmp_name'], "../updater/" . $fileName);;
} else { } else {
} }
@ -18,6 +20,6 @@ if (!empty ($_POST)){
$deviceManager = new DeviceManager (); $deviceManager = new DeviceManager ();
$deviceManager->edit ($_POST['deviceId'], array ('command' => $_POST['deviceCommand'])); $deviceManager->edit ($_POST['deviceId'], array ('command' => $_POST['deviceCommand']));
} }
header('Location: ./'); //header('Location: ./');
die(); //die();
} }

63
app/views/templates/device.phtml
View File

@ -15,8 +15,8 @@
<?php <?php
$partial = new Partial('menu'); $partial = new Partial('menu');
$partial->prepare('item', 'device'); $partial->prepare('item', 'device');
$partial->prepare('langMng',$LANGMNG); $partial->prepare('langMng', $LANGMNG);
$partial->prepare('debugMod',$DEBUGMOD); $partial->prepare('debugMod', $DEBUGMOD);
$partial->render(); $partial->render();
?> ?>
</div> </div>
@ -26,41 +26,41 @@
<tr> <tr>
<th>#</th> <th>#</th>
<th>Name</th> <th>Name</th>
<th>Room</th>
<th>Firmware</th> <th>Firmware</th>
<th>Mac</th> <th>IP Address<br>(Mac)</th>
<th>IP Address</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php if (!empty ($DEVICES)): ?> <?php if (!empty($DEVICES)) : ?>
<?php foreach ($DEVICES as $device): ?> <?php foreach ($DEVICES as $device) : ?>
<tr> <tr>
<td><i class="fa">&#x<?php echo (!empty ($device['icon']) ? $device['icon'] : ""); ?></i></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><?php echo (!empty($device['name']) ? $device['name'] : ""); ?></td>
<td>Room</td>
<td> <td>
<?php if (!empty ($device['mac'])): ?> <?php if (!empty($device['mac'])) : ?>
<i <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>
class="fa <?php echo (!empty ($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "fa-check-circle" : "fa-circle") : "fa-times-circle"); ?>" <?php echo $device['firmware_hash'] ?>
style="float: center; <?php echo (!empty ($device['firmware_hash']) ? ($device['firmware_hash'] != "need" ? "color: green;" : "color: yellow;") : "color: red;"); ?>" <button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware-<?php echo $device['device_id']?>').click();">&#xf0ee;</button>
></i>
<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware').click();" >&#xf0ee;</button>
<form style="display: none;" method="post" action="" enctype="multipart/form-data"> <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="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="file" onchange="this.form.submit();" name="deviceFirmware" id="deviceFirmware-<?php echo $device['device_id']?>" value="">
</form> </form>
<?php endif; ?> <?php endif; ?>
<div type="float: clear;"></div> <div type="float: clear;"></div>
</td> </td>
<td><?php echo (!empty ($device['mac']) ? $device['mac'] : ""); ?></td> <td><?php echo (!empty($device['mac']) ? $device['mac'] : ""); ?><br><?php echo (!empty($device['ip_address']) ? $device['ip_address'] : ""); ?></td>
<td><?php echo (!empty ($device['ip_address']) ? $device['ip_address'] : ""); ?></td>
<td> <td>
<form method="post" action=""> <?php if (!empty($device['mac'])) : ?>
<input type="hidden" name="deviceId" value="<?php echo (!empty ($device['device_id']) ? $device['device_id'] : ""); ?>"> <form method="post" action="">
<button class="fa custom-file-input" type="submit" name="deviceCommand" value="reset" title="Reset">&#xf01e;</button> <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="config" title="Config">&#xf013;</button> <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>
<div style="float: clear;"></div> <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>
</form> <div style="float: clear;"></div>
</form>
<?php endif; ?>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
@ -69,11 +69,12 @@
</table> </table>
</div> </div>
<?php <?php
$partial = new Partial('footer'); $partial = new Partial('footer');
$partial->prepare('baseDir', BASEDIR); $partial->prepare('baseDir', BASEDIR);
$partial->render(); $partial->render();
//TODO js do main.js //TODO js do main.js
?> ?>
</body> </body>
</html> </html>