Merge branch 'remastering' of https://git.steelants.cz/SImple-Home/PHP_SMART_HOME_V3 into remastering
This commit is contained in:
JonatanRek
commit
a70caca58d
@ -1,9 +1,9 @@
|
||||
RewriteEngine On
|
||||
|
||||
# require https
|
||||
RewriteCond %{HTTPS} off
|
||||
RewriteCond %{REQUEST_URI} !^/api/update
|
||||
RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
|
||||
#RewriteCond %{HTTPS} off
|
||||
#RewriteCond %{REQUEST_URI} !^/api/update
|
||||
#RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
|
||||
|
||||
#token to HTTP_AUTHORIZATION
|
||||
RewriteCond %{HTTP:Authorization} ^(.*)
|
||||
|
||||
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
//Debug
|
||||
error_reporting(E_ALL);
|
||||
ini_set( 'display_errors','1');
|
||||
|
||||
//setup
|
||||
ini_set ('session.cookie_httponly', '1');
|
||||
ini_set('session.cookie_domain', $_SERVER['HTTP_HOST']);
|
||||
ini_set('session.cookie_path', str_replace("login", "", str_replace('https://' . $_SERVER['HTTP_HOST'], "", $_SERVER['REQUEST_URI'])));
|
||||
ini_set('session.cookie_secure', '1');
|
||||
mb_internal_encoding ("UTF-8");
|
||||
|
||||
session_start();
|
||||
|
||||
// import configs
|
||||
@ -75,16 +86,7 @@ $apiLogManager->write("[API] request body\n" . json_encode($obj, JSON_PRETTY_PRI
|
||||
$apiLogManager->write("[API] POST body\n" . json_encode($_POST, JSON_PRETTY_PRINT), LogRecordTypes::INFO);
|
||||
$apiLogManager->write("[API] GET body\n" . json_encode($_GET, JSON_PRETTY_PRINT), LogRecordTypes::INFO);
|
||||
|
||||
//Debug
|
||||
error_reporting(E_ALL);
|
||||
ini_set( 'display_errors','1');
|
||||
|
||||
//setup
|
||||
ini_set ('session.cookie_httponly', '1');
|
||||
ini_set('session.cookie_domain', $_SERVER['HTTP_HOST']);
|
||||
ini_set('session.cookie_path', str_replace("login", "", str_replace('https://' . $_SERVER['HTTP_HOST'], "", $_SERVER['REQUEST_URI'])));
|
||||
ini_set('session.cookie_secure', '1');
|
||||
mb_internal_encoding ("UTF-8");
|
||||
|
||||
Debugger::flag('dbconnect');
|
||||
//D B Conector
|
||||
|
||||
@ -76,7 +76,7 @@ class EndpointsApi extends ApiController{
|
||||
|
||||
//Log Data Save
|
||||
if (isset($obj['logs'])){
|
||||
foreach ($deviceLogs as $log) {
|
||||
foreach ($obj['logs'] as $log) {
|
||||
$logManager = new LogManager('../logs/devices/'. date("Y-m-d").'.log');
|
||||
$logManager->setLevel(LOGLEVEL);
|
||||
$logManager->write("[Device Log Msg] Device_ID " . $deviceId . "->" . $log, LogRecordTypes::ERROR);
|
||||
|
||||
@ -17,6 +17,7 @@ class UpdatesApi {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
public function default(){
|
||||
@ -31,18 +32,18 @@ class UpdatesApi {
|
||||
|
||||
header('Content-type: text/plain; charset=utf8', true);
|
||||
|
||||
//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::INFO);
|
||||
exit();
|
||||
}
|
||||
}
|
||||
// //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::INFO);
|
||||
// exit();
|
||||
// }
|
||||
// }
|
||||
|
||||
$macAddress = $_SERVER['HTTP_X_ESP8266_STA_MAC'];
|
||||
$localBinary = "../updater/" . str_replace(':', '', $macAddress) . ".bin";
|
||||
|
||||
@ -12,7 +12,7 @@ class WidgetApi extends ApiController{
|
||||
$subDeviceData = SubDeviceManager::getSubDevice($subDeviceId);
|
||||
if ($subDeviceData['type'] == 'on/off'){
|
||||
$lastValue = RecordManager::getLastRecord($subDeviceData['subdevice_id'])['value'];
|
||||
RecordManager::create($subDeviceData['device_id'], 'on/off', !$lastValue);
|
||||
RecordManager::create($subDeviceData['device_id'], 'on/off', (int) !$lastValue);
|
||||
$response = !$lastValue;
|
||||
} else {
|
||||
throw new Exception("Bad Request", 403);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
if (!empty ($_POST)){
|
||||
if (!empty ($_FILES['deviceFirmware']) && !empty ($_FILES['deviceFirmware']['tmp_name']) && !empty ($_POST['deviceId'])) {
|
||||
$deviceManager = new DeviceManager ();
|
||||
if (!empty ($_FILES['deviceFirmware']) && !empty ($_FILES['deviceFirmware']['tmp_name']) && !empty ($_POST['deviceId'])) {
|
||||
$file = $_FILES['deviceFirmware'];
|
||||
$deviceMac = $deviceManager->getDeviceById ($_POST['deviceId'])['mac'];
|
||||
$fileName = (!empty ($deviceMac) ? str_replace (":", "", $deviceMac) . ".bin" : "");
|
||||
@ -10,15 +10,22 @@ if (!empty ($_POST)){
|
||||
unlink("../updater/" . $fileName);
|
||||
}
|
||||
if ($fileName != "") {
|
||||
echo 'coping file'.$fileName .copy ($file['tmp_name'], "../updater/" . $fileName);;
|
||||
|
||||
} else {
|
||||
|
||||
copy ($file['tmp_name'], "../updater/" . $fileName);
|
||||
}
|
||||
}
|
||||
if (isset ($_POST['deviceCommand']) && !empty ($_POST['deviceId'])) {
|
||||
$deviceManager = new DeviceManager ();
|
||||
$deviceManager->edit ($_POST['deviceId'], array ('command' => $_POST['deviceCommand']));
|
||||
} else if (!empty ($_POST['deviceCommand'])) {
|
||||
$devices = $deviceManager->getAllDevices();
|
||||
foreach ($devices as $key => $device) {
|
||||
$deviceManager->edit ($device['device_id'], array ('command' => $_POST['deviceCommand']));
|
||||
}
|
||||
}
|
||||
if (!empty ($_POST['deviceRoomId']) && !empty ($_POST['deviceId'])) {
|
||||
$deviceManager->edit ($_POST['deviceId'], array ('room_id' => $_POST['deviceRoomId']));
|
||||
}
|
||||
if (!empty ($_POST['deviceName']) && !empty ($_POST['deviceId'])) {
|
||||
$deviceManager->edit ($_POST['deviceId'], array ('name' => $_POST['deviceName']));
|
||||
}
|
||||
header('Location: ./device');
|
||||
die();
|
||||
|
||||
@ -3,7 +3,8 @@ class DeviceManager{
|
||||
public static $devices;
|
||||
|
||||
static function getAllDevices () {
|
||||
return Db::loadAll ("SELECT * FROM devices WHERE approved != ?", Array(2));
|
||||
return Db::loadAll ("SELECT devices.* FROM devices
|
||||
WHERE approved != ?", Array(2));
|
||||
}
|
||||
|
||||
static function getAllDevicesInRoom ($roomId = "") {
|
||||
@ -26,6 +27,12 @@ class DeviceManager{
|
||||
return Db::loadOne("SELECT * FROM devices WHERE device_id = ?", array($deviceId));
|
||||
}
|
||||
|
||||
static function getAllDevicesSorted ($sort, $sortType = "ASC") {
|
||||
return Db::loadAll ("SELECT devices.* FROM devices
|
||||
LEFT JOIN rooms ON (devices.room_id = rooms.room_id)
|
||||
WHERE devices.approved != ? ORDER BY $sort $sortType", Array(2));
|
||||
}
|
||||
|
||||
public static function create ($name, $token) {
|
||||
$defaultRoom = RoomManager::getDefaultRoomId();
|
||||
$device = array (
|
||||
|
||||
@ -35,7 +35,7 @@ class LogManager
|
||||
}
|
||||
|
||||
public function __destruct(){
|
||||
if (isset($this->logFile)) {
|
||||
if (isset($this->logFile) && $this->logFile != "Unable to open file!") {
|
||||
fclose($this->logFile);
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,6 +6,9 @@ class Device extends Template
|
||||
function __construct () {
|
||||
$userManager = new UserManager ();
|
||||
$deviceManager = new DeviceManager ();
|
||||
$subDeviceManager = new SubDeviceManager ();
|
||||
$recordManager = new RecordManager ();
|
||||
$roomManager = new RoomManager ();
|
||||
$langMng = new LanguageManager ('en');
|
||||
|
||||
if (!$userManager->isLogin ()) {
|
||||
@ -15,9 +18,73 @@ class Device extends Template
|
||||
$template = new Template ('device');
|
||||
$template->prepare ('title', $langMng->get ("m_devices"));
|
||||
|
||||
if (!empty ($_GET['sort']) && !empty ($_SESSION['sort']) && $_SESSION['sort'] != $_GET['sort']) {
|
||||
unset($_SESSION['sort']);
|
||||
header('Location: device?sort=' . $_GET["sort"] . "&sortType=ASC");
|
||||
die();
|
||||
}
|
||||
|
||||
if (isset ($_GET['sortType'])) {
|
||||
switch ($_GET['sortType']) {
|
||||
case "DESC":
|
||||
$sortType = "";
|
||||
$sortIcon = "";
|
||||
break;
|
||||
case "ASC":
|
||||
$sortType = "DESC";
|
||||
$sortIcon = "";
|
||||
break;
|
||||
case "":
|
||||
unset($_GET["sort"]);
|
||||
unset($_GET["sortType"]);
|
||||
header('Location: device');
|
||||
die();
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
$sortType = "ASC";
|
||||
}
|
||||
|
||||
if (!empty ($_GET['sort']) && !empty ($_GET['sortType'])) {
|
||||
$template->prepare ('sortIcon', array ($_GET['sort'] => $sortIcon));
|
||||
$actualSort = "devices.device_id";
|
||||
switch ($_GET['sort']) {
|
||||
case "name":
|
||||
$actualSort = "devices.name";
|
||||
break;
|
||||
case "room":
|
||||
$actualSort = "rooms.name";
|
||||
break;
|
||||
case "ip":
|
||||
$actualSort = "devices.ip_address";
|
||||
break;
|
||||
case "mac":
|
||||
$actualSort = "devices.mac";
|
||||
break;
|
||||
case "token":
|
||||
$actualSort = "devices.token";
|
||||
break;
|
||||
}
|
||||
$devices = $deviceManager->getAllDevicesSorted ($actualSort, $_GET['sortType']);
|
||||
} else {
|
||||
$devices = $deviceManager->getAllDevices ();
|
||||
}
|
||||
|
||||
if (!empty ($_GET['sort'])) {
|
||||
$_SESSION['sort'] = $_GET['sort'];
|
||||
}
|
||||
|
||||
foreach ($devices as $key => $device) {
|
||||
$subdevice = $subDeviceManager->getSubDeviceByMasterAndType ($device['device_id'], "wifi");
|
||||
if (!empty ($subdevice['subdevice_id'])) {
|
||||
$record = $recordManager->getLastRecord($subdevice['subdevice_id']);
|
||||
if (!empty ($record)) {
|
||||
$devices[$key]['signal'] = $record['value'] . " " . $subdevice['unit'];
|
||||
}
|
||||
}
|
||||
if (empty ($devices[$key]['signal'])) {
|
||||
$devices[$key]['signal'] = "";
|
||||
}
|
||||
$localBinary = "../updater/" . str_replace (':', '', $device['mac']) . ".bin";
|
||||
if (file_exists ($localBinary)) {
|
||||
$hash = md5_file ($localBinary);
|
||||
@ -29,11 +96,40 @@ class Device extends Template
|
||||
} else {
|
||||
$devices[$key]['firmware_hash'] = "false";
|
||||
}
|
||||
if (empty ($device['mac'])) {
|
||||
$devices[$key]['firmware_hash'] = "";
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty ($_GET['sort']) && !empty ($_GET['sortType']) && $_GET['sort'] == "firmware") {
|
||||
if ($_GET['sortType'] == "DESC") {
|
||||
usort($devices, function($a, $b) {
|
||||
return $a['firmware_hash'] <=> $b['firmware_hash'];
|
||||
});
|
||||
} else if ($_GET['sortType'] == "ASC") {
|
||||
usort($devices, function($a, $b) {
|
||||
return $b['firmware_hash'] <=> $a['firmware_hash'];
|
||||
});
|
||||
}
|
||||
} else if (!empty ($_GET['sort']) && !empty ($_GET['sortType']) && $_GET['sort'] == "signal") {
|
||||
if ($_GET['sortType'] == "DESC") {
|
||||
usort($devices, function($a, $b) {
|
||||
return $a['signal'] <=> $b['signal'];
|
||||
});
|
||||
} else if ($_GET['sortType'] == "ASC") {
|
||||
usort($devices, function($a, $b) {
|
||||
return $b['signal'] <=> $a['signal'];
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
$rooms = $roomManager->getAllRooms();
|
||||
|
||||
$template->prepare ('baseDir', BASEDIR);
|
||||
$template->prepare ('debugMod', DEBUGMOD);
|
||||
$template->prepare ('logToLiveTime', LOGTIMOUT);
|
||||
$template->prepare ('rooms', $rooms);
|
||||
$template->prepare ('sortType', $sortType);
|
||||
$template->prepare ('devices', $devices);
|
||||
$template->prepare ('langMng', $langMng);
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ class Logout extends Template
|
||||
{
|
||||
function __construct()
|
||||
{
|
||||
global $userManager;
|
||||
$userManager = new UserManager ();
|
||||
$userManager->logout();
|
||||
header('Location: ' . BASEURL . 'login');
|
||||
die();
|
||||
|
||||
@ -3,7 +3,7 @@ class Oauth extends Template
|
||||
{
|
||||
function __construct()
|
||||
{
|
||||
global $userManager;
|
||||
$userManager = new UserManager ();
|
||||
$langMng = new LanguageManager('en');
|
||||
|
||||
$template = new Template('oauth');
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<?php
|
||||
$partial = new Partial('head');
|
||||
@ -8,6 +9,7 @@
|
||||
?>
|
||||
<title><?php echo $TITLE ?></title>
|
||||
</head>
|
||||
|
||||
<body class="no-transitions">
|
||||
<div class="row no-gutters main">
|
||||
<div class="col-md-3 d-sm-none"></div>
|
||||
@ -22,36 +24,81 @@
|
||||
</div>
|
||||
<div class="col-md-9 main-body">
|
||||
<table class="table is-fluid">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Name</th>
|
||||
<th>Room</th>
|
||||
<th>Firmware</th>
|
||||
<th>IP Address<br>(Mac)</th>
|
||||
<th>Action</th>
|
||||
<th><a href="device">#</a></th>
|
||||
<th><a href="device?sort=name&sortType=<?php echo $SORTTYPE; ?>">Name</a><i class="fa"><?php echo (!empty($SORTICON['name']) ? $SORTICON['name'] : ""); ?></i></th>
|
||||
<th><a href="device?sort=room&sortType=<?php echo $SORTTYPE; ?>">Room</a><i class="fa"><?php echo (!empty($SORTICON['room']) ? $SORTICON['room'] : ""); ?></i></th>
|
||||
<th><a href="device?sort=signal&sortType=<?php echo $SORTTYPE; ?>">Signal</a><i class="fa"><?php echo (!empty($SORTICON['signal']) ? $SORTICON['signal'] : ""); ?></i></th>
|
||||
<th><a href="device?sort=firmware&sortType=<?php echo $SORTTYPE; ?>">Firmware</a><i class="fa"><?php echo (!empty($SORTICON['firmware']) ? $SORTICON['firmware'] : ""); ?></i></th>
|
||||
<th>
|
||||
<a href="device?sort=ip&sortType=<?php echo $SORTTYPE; ?>">IP Address</a><i class="fa"><?php echo (!empty($SORTICON['ip']) ? $SORTICON['ip'] : ""); ?></i><br>
|
||||
<a href="device?sort=mac&sortType=<?php echo $SORTTYPE; ?>">(Mac)</a><i class="fa"><?php echo (!empty($SORTICON['mac']) ? $SORTICON['mac'] : ""); ?></i><br>
|
||||
<a href="device?sort=token&sortType=<?php echo $SORTTYPE; ?>">Token</a><i class="fa"><?php echo (!empty($SORTICON['token']) ? $SORTICON['token'] : ""); ?></i>
|
||||
</th>
|
||||
<th>Action
|
||||
<form method="post" action="">
|
||||
<button class="fa custom-file-input" type="submit" name="deviceCommand" value="reset" title="Reset All"><b></b></button>
|
||||
<div style="float: clear;"></div>
|
||||
</form>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?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>Room</td>
|
||||
<td>
|
||||
<form method="post" action="">
|
||||
<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
|
||||
<input class="input" type="text" onchange="this.form.submit();" name="deviceName" value="<?php echo (!empty($device['name']) ? $device['name'] : ""); ?>">
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
<form method="post" action="">
|
||||
<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
|
||||
<select class="input" name="deviceRoomId" onchange="this.form.submit();">
|
||||
<?php
|
||||
if (!empty($ROOMS)) {
|
||||
foreach ($ROOMS as $key => $room) {
|
||||
echo '<option value="' . $room['room_id'] . '" ' . ($device['room_id'] == $room['room_id'] ? 'selected' : '') . '>' . $room['name'] . '</option>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
</form>
|
||||
</td>
|
||||
<td><?php echo (!empty($device['signal']) ? $device['signal'] : ""); ?></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>
|
||||
<?php
|
||||
$icon = "fa-circle";
|
||||
$color = "yellow";
|
||||
if (!empty($device['firmware_hash'])) {
|
||||
if ($device['firmware_hash'] == "true") {
|
||||
$icon = "fa-check-circle";
|
||||
$color = "green";
|
||||
} else if ($device['firmware_hash'] == "need") {
|
||||
$icon = "fa-arrow-circle-up";
|
||||
$color = "#6495ED";
|
||||
} else {
|
||||
$icon = "fa-times-circle";
|
||||
$color = "red";
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
<i class="fa <?php echo $icon; ?>" style="color: <?php echo $color; ?>;"></i>
|
||||
<?php echo $device['firmware_hash'] ?>
|
||||
<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware-<?php echo $device['device_id']?>').click();"></button>
|
||||
<button class="fa custom-file-input" type="button" onclick="document.getElementById('deviceFirmware-<?php echo $device['device_id'] ?>').click();"></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-<?php echo $device['device_id']?>" value="">
|
||||
<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'] : ""); ?><br><?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'] : ""); ?><br>
|
||||
<?php echo (!empty($device['token']) ? $device['token'] : ""); ?></td>
|
||||
<td>
|
||||
<?php if (!empty($device['mac'])) : ?>
|
||||
<form method="post" action="">
|
||||
@ -65,7 +112,6 @@
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
<tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@ -75,6 +121,12 @@
|
||||
$partial->render();
|
||||
//TODO js do main.js
|
||||
?>
|
||||
<script>
|
||||
$(function() {
|
||||
$("#sortable").sortable();
|
||||
$("#sortable").disableSelection();
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user