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

Compare commits

base: SH:cb45cf9e22c3717dc3ee51848459270b857d6ce8
Branches Tags
SH:master
SH:remastering
SH:3.0
SH:feature/configurations
SH:dev
SH:v0.0.1
SH:alfa
..
compare: SH:1642ece7f4db5852790b9419e2b19cc0ef1480f6
Branches Tags
SH:remastering
SH:3.0
SH:feature/configurations
SH:master
SH:dev
SH:v0.0.1
SH:alfa

No commits in common. "cb45cf9e22c3717dc3ee51848459270b857d6ce8" and "1642ece7f4db5852790b9419e2b19cc0ef1480f6" have entirely different histories.
cb45cf9e22 ... 1642ece7f4

2 changed files with 3 additions and 17 deletions
Show Stats Expand all files Collapse all files

19
app/views/Device.php
View File

@ -5,21 +5,6 @@ class Device extends Template
{ {
function __construct($sortBy = null, $sortType = null) function __construct($sortBy = null, $sortType = null)
{ {
// //Notification data setup
// $notificationMng = new NotificationManager;
// $notificationData = [
// 'title' => 'Info',
// 'body' => 'New device Detected Found',
// 'icon' => 'http://dev.steelants.cz/projekty/simplehome-client/img/icons/favicon-16x16.png',
// ];
// //Notification for newly added Device
// if ($notificationData != []) {
// $subscribers = $notificationMng::getSubscription();
// foreach ($subscribers as $key => $subscriber) {
// $notificationMng::sendSimpleNotification(SERVERKEY, $subscriber['token'], $notificationData);
// }
// }
$userManager = new UserManager(); $userManager = new UserManager();
$deviceManager = new DeviceManager(); $deviceManager = new DeviceManager();
$subDeviceManager = new SubDeviceManager(); $subDeviceManager = new SubDeviceManager();
@ -69,8 +54,8 @@ class Device extends Template
//Signal Stenght //Signal Stenght
$subdevice = $subDeviceManager->getSubDeviceByMasterAndType($device['device_id'], "wifi"); $subdevice = $subDeviceManager->getSubDeviceByMasterAndType($device['device_id'], "wifi");
$subdeviceLocal = $subDeviceManager->getSubDeviceByMaster($device['device_id']); $subdeviceLocal = $subDeviceManager->getSubDeviceByMaster($device['device_id']);
if (!empty($subdeviceLocal)) { if (!empty ($subdeviceLocal)) {
$devices[$key]['history'] = (!empty($subdeviceLocal['history']) ? $subdeviceLocal['history'] : 0); $devices[$key]['history'] = (!empty ($subdeviceLocal['history']) ? $subdeviceLocal['history'] : 0);
} else { } else {
$devices[$key]['history'] = "null"; $devices[$key]['history'] = "null";
} }

1
config/config_sample.php
View File

@ -60,6 +60,7 @@ const UNITS = [
//Notifications //Notifications
define('SERVERKEY',''); define('SERVERKEY','');
define('SERVERVAIPKEY','');
//TODO: Po registraci vzít výchozí hodnoty //TODO: Po registraci vzít výchozí hodnoty
//Default network Setting //Default network Setting