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

Few Fixes After infrastructure migration

Browse Source
This commit is contained in:
Václav Španinger
2020-09-14 15:15:47 +02:00
parent 32521d0ed3
commit 30da6e162b
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.htaccess
View File

@@ -1,9 +1,9 @@
RewriteEngine On RewriteEngine On
# require https # require https
RewriteCond %{HTTPS} off #RewriteCond %{HTTPS} off
RewriteCond %{REQUEST_URI} !^/api/update #RewriteCond %{REQUEST_URI} !^/api/update
RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] #RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
#token to HTTP_AUTHORIZATION #token to HTTP_AUTHORIZATION
RewriteCond %{HTTP:Authorization} ^(.*) RewriteCond %{HTTP:Authorization} ^(.*)

20
app/Bootstrap.php
View File

@@ -1,4 +1,15 @@
<?php <?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(); session_start();
// import configs // 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] 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); $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'); Debugger::flag('dbconnect');
//D B Conector //D B Conector

2
app/api/WidgetApi.php
View File

@@ -12,7 +12,7 @@ class WidgetApi extends ApiController{
$subDeviceData = SubDeviceManager::getSubDevice($subDeviceId); $subDeviceData = SubDeviceManager::getSubDevice($subDeviceId);
if ($subDeviceData['type'] == 'on/off'){ if ($subDeviceData['type'] == 'on/off'){
$lastValue = RecordManager::getLastRecord($subDeviceData['subdevice_id'])['value']; $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; $response = !$lastValue;
} else { } else {
throw new Exception("Bad Request", 403); throw new Exception("Bad Request", 403);

6
app/views/Device.php
View File

@@ -30,6 +30,12 @@ class Device extends Template
} else { } else {
$devices[$key]['firmware_hash'] = "false"; $devices[$key]['firmware_hash'] = "false";
} }
$wifi = SubDeviceManager::getSubDeviceByMaster($device['device_id'], 'wifi');
if ($wifi) {
$signalStrenght = RecordManager::getLastRecordNotNull($wifi['subdevice_id']);
$devices[$key]['signal'] = (!$signalStrenght ? 0 : $signalStrenght['value']);
}
} }
$rooms = $roomManager->getAllRooms(); $rooms = $roomManager->getAllRooms();

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

@@ -26,6 +26,7 @@
<tr> <tr>
<th>#</th> <th>#</th>
<th>Name</th> <th>Name</th>
<th>Signal</th>
<th>Room</th> <th>Room</th>
<th>Firmware</th> <th>Firmware</th>
<th>IP Address<br>(Mac)<br>Token</th> <th>IP Address<br>(Mac)<br>Token</th>
@@ -43,6 +44,7 @@
<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><?php echo (!empty($device['signal']) ? $device['signal'] : ""); ?></td>
<td> <td>
<select class="input" id="device-<?php echo $device['device_id']?>-roomId"> <select class="input" id="device-<?php echo $device['device_id']?>-roomId">
<?php <?php