Subscribe

Reviewed-on: #2

.gitignore

@@ -2,6 +2,7 @@
 .ftpconfig
 .ftpconfig2
 *.log
+*.bin
 config.php
 
 _nemazat/index.html

app/Routes.php

@@ -19,7 +19,7 @@ $router->any('/logout', 'Logout');
 $router->any('/automation', 'Automation');
 $router->any('/setting', 'Setting');
 $router->any('/device', 'Device');
-$router->get('/device/{sortBy}/{sortType}', 'Device');
+$router->any('/device/{sortBy}/{sortType}', 'Device');
 $router->any('/plugins', 'Plugins');
 $router->any('/ajax', 'Ajax');
 $router->any('/oauth', 'Oauth');
@@ -53,6 +53,7 @@ $router->any('/api/HA', 'GoogleHomeApi@response');
 $router->post('/api/endpoint/', 'EndpointsApi@default');
 $router->any('/api/update/', 'UpdatesApi@default');
 $router->any('/api/users/status', 'UsersApi@status');
+$router->any('/api/users/subscribe', 'UsersApi@subscribe');
 
 // examples
 $router->any('/api/example', 'ExampleApi@example');

app/api/CronApi.php

@@ -12,6 +12,11 @@ class CronApi extends ApiController
 		$backupWorker = new DatabaseBackup();
 		$backupWorker->purge(5);
 
+		//Old Records Cleanup
+		foreach (SubDeviceManager::getAllSubDevices() as $key => $value) {
+			RecordManager::setHistory($value['subdevice_id']);
+		}
+
 		$this->response(['Value' => 'OK']);
 	}
 

app/api/DevicesApi.php

@@ -7,11 +7,9 @@ class DevicesApi extends ApiController{
 		$response = [];
 
 		// TODO: process the request
-
 		$this->response($response);
 	}
 
 	public function getDevicesByRoom($roomId){
-
 	}
 }

app/api/EndpointsApi.php

@@ -62,6 +62,7 @@ class EndpointsApi extends ApiController{
 		}
 
 		$device = DeviceManager::getDeviceByToken($obj['token']);
+		DeviceManager::setHeartbeat($device['device_id']);
 
 		//Diagnostic
 		if (isset($obj['settings'])){

app/api/UsersApi.php

@@ -34,4 +34,14 @@ class UsersApi extends ApiController{
 		}
 		$this->response(['value'=>'OK']);
 	}
+
+	public function subscribe(){
+		//$this->requireAuth();
+		$bearer = $_SERVER['HTTP_AUTHORIZATION'];
+		$authManager = new AuthManager();
+		$userId = $authManager->getUserId($bearer);
+
+		NotificationManager::addSubscriber($userId, $this->input['pushtoken']);
+		$this->response(['value'=>'OK']);
+	}
 }

app/controllers/deviceController.php

@@ -1,6 +1,7 @@
 <?php
 if (!empty ($_POST)){
 	$deviceManager = new DeviceManager ();
+	$subDeviceManager = new SubDeviceManager ();
 	if (!empty ($_FILES['deviceFirmware']) && !empty ($_FILES['deviceFirmware']['tmp_name']) && !empty ($_POST['deviceId'])) {
 		$file = $_FILES['deviceFirmware'];
 		$deviceMac = $deviceManager->getDeviceById ($_POST['deviceId'])['mac'];
@@ -27,6 +28,9 @@ if (!empty ($_POST)){
 	if (!empty ($_POST['deviceName'])  && !empty ($_POST['deviceId'])) {
 		$deviceManager->edit ($_POST['deviceId'], array ('name' => $_POST['deviceName']));
 	}
-	header('Location: ./device');
+	if (isset ($_POST['deviceHistory']) && !empty ($_POST['deviceId'])) {
+		$subDeviceManager->editSubDevicesByDevice($_POST['deviceId'], array ('history' => $_POST['deviceHistory']));
+	}
+	header('Location: ' . BASEURL . str_replace(BASEDIR, "", $_SERVER['REQUEST_URI']));
 	die();
 }

app/controllers/settingController.php

@@ -28,6 +28,17 @@ if (isset($_POST) && !empty($_POST)){
 		die();
 	} else if (isset ($_POST['userPermission']) && !empty ($_POST['userID'])) {
 		$userManager->setUserDataAdmin("permission", $_POST['userPermission'], $_POST['userID']);
+		header('Location: ' . BASEURL . 'setting');
+		die();
+	} else {
+		foreach ($_POST as $key => $value) {
+			if ($key == 'submit') continue;
+			$settingMng = new SettingsManager();
+			if ($settingMng->getByName($key)) {
+				$settingMng->update($key, $value);
+			}
+		}
+
 		header('Location: ' . BASEURL . 'setting');
 		die();
 	}

app/models/GoogleHome.php

@@ -26,7 +26,7 @@ class GoogleHome {
 					}
 				}
 
-				if ($traids < 0){
+				if ($traids < 1){
 					continue;
 				}
 

app/models/Utilities.php

@@ -187,20 +187,31 @@ class Utilities
 	 * @param string $operator ('asc'/'desc')
 	 * @return void
 	 */
-	static function sortArrayByKey($data = [], $key, $operator = "asc"){
-		if ($operator == "asc")
+	static function sortArrayByKey($data = [], $key, $operator = "asc")
 	{
-			uasort($data, function($a, $b) use ($key){
-				if ($a[$key] == $b[$key]) return 0;
-				return ($a[$key] < $b[$key]) ? -1 : 1;
+		if ($operator == "asc") {
+			uasort($data, function ($a, $b) use ($key) {
+				$SortA = $a[$key];
+				$SortB = $b[$key];
+				if ($key == "room_id") {
+					$SortA = RoomManager::getRoomName($SortA);
+					$SortB = RoomManager::getRoomName($SortB);
+				}
+				if ($SortA == $SortB) return 0;
+				return ($SortA < $SortB) ? -1 : 1;
 			});
-		} else{
-			uasort($data, function($a, $b) use ($key){
-				if ($a[$key] == $b[$key]) return 0;
-				return ($a[$key] > $b[$key]) ? -1 : 1;
+		} else {
+			uasort($data, function ($a, $b) use ($key) {
+				$SortA = $a[$key];
+				$SortB = $b[$key];
+				if ($key == "room_id") {
+					$SortA = RoomManager::getRoomName($SortA);
+					$SortB = RoomManager::getRoomName($SortB);
+				}
+				if ($SortA == $SortB) return 0;
+				return ($SortA > $SortB) ? -1 : 1;
 			});
 		}
 		return $data;
-		
 	}
 }

app/models/managers/AuthManager.php

@@ -61,4 +61,10 @@ class AuthManager {
 		};
 		return false;
 	}
+
+	public function getUserId($bearer){
+		$token = explode(' ',  $bearer)[1];
+		$userid = Db::loadOne('SELECT user_id FROM tokens WHERE token = ? AND expire >= CURRENT_TIMESTAMP AND blocked = 0;', array($token))['user_id'];
+		return $userid;
+	}
 }

app/models/managers/DeviceManager.php

@@ -7,7 +7,9 @@ class DeviceManager{
 		WHERE approved != ?", Array(2));
 	}
 
-
+	static function setHeartbeat($deviceId){
+		self::edit($deviceId, ['heartbeat' => date("Y-m-d H:i:s", time())]);
+	}
 
 	static function getAllDevicesInRoom ($roomId = "") {
 		return Db::loadAll ("SELECT * FROM devices WHERE room_id = ? AND approved != ?", Array($roomId, 2));

app/models/managers/RecordManager.php

@@ -102,7 +102,7 @@ class RecordManager{
 
 	public static function clean ($day) {
 		if (isset($day)) {
-			Db::command ('DELETE FROM records WHERE `time` < ADDDATE(NOW(), INTERVAL -? DAY);', array($day));
+			Db::command ('DELETE FROM records WHERE `time` < ADDDATE(NOW(), INTERVAL ? DAY);', array($day));
 		}
 	}
 
@@ -110,5 +110,10 @@ class RecordManager{
 	public static function cleanSubdeviceRecords ($subDeviceId) {
 		Db::command ('DELETE FROM records WHERE subdevice_id = ?);', array($subDeviceId));
 	}
+
+	public static function setHistory($subDeviceId){
+		$history = SubDeviceManager::getSubDevice($subDeviceId)['history'];
+		if ($history > 0) self::clean(-abs($history));
+	} 
 }
 ?>

app/models/managers/RoomManager.php

@@ -19,6 +19,12 @@ class RoomManager{
 		return $allRoom;
 	}
 
+	public static function getRoomName ($room_id) {
+		//TODO: ignore Widgets withoud data
+		$allRoom = Db::loadAlone ("SELECT name FROM rooms WHERE room_id=?", array ($room_id));
+		return $allRoom;
+	}
+
 	public static function create ($name) {
 		$room = array (
 			'name' => $name,

app/models/managers/SettingsManager.php

@@ -14,6 +14,7 @@ class SettingsManager{
 	}
 
 	public static function create ($name, $value, $type = '') {
+		if (!self::getByName($name)){
 			$setting = array (
 				'name' => $name,
 				'value' => $value,
@@ -26,9 +27,10 @@ class SettingsManager{
 				die();
 			}
 		}
+	}
 
 	public static function update ($name, $value, $type = '') {
-		if (self::getByName($name)){
+		if (!self::getByName($name)){
 			self::create($name, $value, $type);
 		} else {
 			try {

app/models/managers/SubDeviceManager.php

@@ -50,7 +50,7 @@ class SubDeviceManager
 	}
 
 	//check if dubdevice exist
-
+	//Add History to be set in Creation
 	public static function create($deviceId, $type, $unit)
 	{
 		$record = array(
@@ -66,6 +66,10 @@ class SubDeviceManager
 		}
 	}
 
+	public static function editSubDevicesByDevice ($deviceId, $subDeviceParameters) {
+		DB::edit('subdevices', $subDeviceParameters, 'WHERE device_id=?', array ($deviceId));
+	}
+
 	public static function remove($subDeviceId)
 	{
 		RecordManager::cleanSubdeviceRecords($subDeviceId);

app/plugins/AirQuality.php

@@ -9,6 +9,14 @@ class AirQuality extends VirtualDeviceManager
 
 	function make()
 	{
+		//Register the settings
+		$settingMng = new SettingsManager();
+		if (!($settingField = $settingMng->getByName("airquality"))) {
+			$settingMng->create("token", "", "airquality");
+		} else {
+			$app_id = $settingField['value'];
+		}
+
 		try {
 			if (DeviceManager::registeret($this->virtual_device_name)) {
 				$deviceId = DeviceManager::getDeviceByToken($this->virtual_device_name)['device_id'];

app/plugins/DatabaseBackup.php

@@ -9,24 +9,24 @@ class DatabaseBackup
 			$filenames[] = $backupWorker->scheme(); //Backup Database scheme
 			$filenames[] = $backupWorker->data(); //Backup Database Data
 			//$filenames[] = $_SERVER['DOCUMENT_ROOT'] . '/config/config.php'; //Backup Configuration File
-			$backupWorker->compress($_SERVER['DOCUMENT_ROOT'] . BASEDIR . 'backup/' . date("Y-m-d", time()) . '.zip', $filenames);
+			$backupWorker->compress($_SERVER['DOCUMENT_ROOT'] . BASEDIR . '/backup/' . date("Y-m-d", time()) . '.zip', $filenames);
 			return 'sucessful';
 		} catch (Exception $e) {
 			return 'exception: ' . $e->getMessage();
 		}
 	}
 
-	private function scheme()
+	private function data()
 	{
-		$backupfile = $_SERVER['DOCUMENT_ROOT'] . BASEDIR . "backup/" . DBNAME . '_scheme_' . date("Y-m-d", time()) . '.sql';
+		$backupfile = $_SERVER['DOCUMENT_ROOT'] . BASEDIR . "/backup/" . DBNAME . '_data_' . date("Y-m-d", time()) . '.sql';
 		$command = "mysqldump --skip-comments --no-create-info -h localhost -u " . DBUSER . " -p" . DBPASS . " " . DBNAME . " -r $backupfile 2>&1";
 		$this->executeCommand($command);
 		return $backupfile;
 	}
 
-	private function data()
+	private function scheme()
 	{
-		$backupfile = $_SERVER['DOCUMENT_ROOT'] . BASEDIR . "backup/" . DBNAME . '_data_' . date("Y-m-d", time()) . '.sql';
+		$backupfile = $_SERVER['DOCUMENT_ROOT'] . BASEDIR . "/backup/" . DBNAME . '_scheme_' . date("Y-m-d", time()) . '.sql';
 		$command = "mysqldump --skip-comments --no-data -h localhost -u " . DBUSER . " -p" . DBPASS . " " . DBNAME . " -r $backupfile 2>&1";
 		$this->executeCommand($command);
 		return $backupfile;
@@ -43,9 +43,7 @@ class DatabaseBackup
 		$zip = new ZipArchive();
 		if ($zip->open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
 			foreach ($files as $file) {
-				$filename = explode('/', $file);
-				$filename = end($filename);
-				$zip->addFile($file, $filename);
+				$zip->addFile($file);
 			}
 			$zip->close();
 			foreach ($files as $file) {

app/plugins/OpenWeatherMap.php

@@ -33,4 +33,8 @@ class OpenWeatherMap extends VirtualDeviceManager
 			return 'exception: ' . $e->getMessage();
 		}
 	}
+
+	function enable(){
+		(new SettingsManager)->create('open_weather_api_token', '', 'open_weather');
+	}
 }

app/views/Device.php

@@ -28,7 +28,8 @@ class Device extends Template
 			"token" => "token",
 			"signal" => "signal",
 			"firmware" => "firmware_hash",
-			"icon" => "icon"
+			"icon" => "icon",
+			"history" => "history",
 		];
 
 		$sortIcons = [
@@ -47,12 +48,17 @@ class Device extends Template
 			$sortBy = "id";
 			$sortType = "DESC";
 		}
-
 		$template->prepare('sortIcon', [$sortBy => $sortIcons[$sortType]]);
 
 		foreach ($devices as $key => $device) {
 			//Signal Stenght
 			$subdevice = $subDeviceManager->getSubDeviceByMasterAndType($device['device_id'], "wifi");
+			$subdeviceLocal = $subDeviceManager->getSubDeviceByMaster($device['device_id']);
+			if (!empty ($subdeviceLocal)) {
+				$devices[$key]['history'] = (!empty ($subdeviceLocal['history']) ? $subdeviceLocal['history'] : 0);
+			} else {
+				$devices[$key]['history'] = "null";
+			}
 			$devices[$key]['signal'] = "";
 			if (!empty($subdevice['subdevice_id'])) {
 				$record = $recordManager->getLastRecord($subdevice['subdevice_id']);

app/views/Setting.php

@@ -70,6 +70,8 @@ class Setting extends Template
 				$result = $settingsManager->getSettingGroup($plugins[$key]['slug']);
 				if (count ($result) > 0) {
 					$plugins[$key]['settings'] = $result;
+				} else {
+					unset($plugins[$key]);
 				}
 			}
 		}

app/views/templates/device.phtml

@@ -36,6 +36,7 @@
 						<a href="device/mac/<?php echo $SORTTYPE; ?>">(Mac)</a><i class="fa"><?php echo (!empty($SORTICON['mac']) ? $SORTICON['mac'] : ""); ?></i><br>
 						<a href="device/token/<?php echo $SORTTYPE; ?>">Token</a><i class="fa"><?php echo (!empty($SORTICON['token']) ? $SORTICON['token'] : ""); ?></i>
 					</th>
+					<th><a href="device/history/<?php echo $SORTTYPE; ?>">Historie</a><i class="fa"><?php echo (!empty($SORTICON['history']) ? $SORTICON['history'] : ""); ?></i></th>
 					<th>Action
 						<form method="post" action="">
 							<button class="fa custom-file-input" type="submit" name="deviceCommand" value="reset" title="Reset All"><b>&#xf01e;</b></button>
@@ -100,6 +101,14 @@
 							<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 (isset($device['history']) && $device['history'] != "null"): ?>
+									<form method="post" action="">
+										<input type="hidden" name="deviceId" value="<?php echo (!empty($device['device_id']) ? $device['device_id'] : ""); ?>">
+										<input class="input" type="number" onchange="this.form.submit();" name="deviceHistory" value="<?php echo (!empty($device['history']) ? $device['history'] : 0); ?>">
+									</form>
+								<?php endif; ?>
+							</td>
 							<td>
 								<?php if (!empty($device['mac'])) : ?>
 									<form method="post" action="">
@@ -122,12 +131,6 @@
 		$partial->render();
 		//TODO js do main.js
 		?>
-		<script>
-			$(function() {
-				$("#sortable").sortable();
-				$("#sortable").disableSelection();
-			});
-		</script>
 </body>
 
 </html>

app/views/templates/setting.phtml

@@ -202,7 +202,23 @@ $partial = new Partial('head');
 				</form>
 			</div>
 
-
+			<!--Plugins Settings-->
+			<?php foreach ($PLUGINSSETTINGS as $key => $pluginSeting) { ?>
+				<div class="col-12 col-sm-9 mx-auto mt-4">
+					<h4 class="mb-4"><?php echo $pluginSeting['name'] ?></h4>
+					<form method="post">
+						<?php foreach ($pluginSeting['settings'] as $key => $pluginSetingField) { ?>
+							<div class="field">
+								<div class="label"><?php echo $pluginSetingField['name'] ?>:</div>
+								<input type="text" class="input" name="<?php echo $pluginSetingField['name'] ?>" value="<?php echo $pluginSetingField['value'] ?>">
+							</div>
+						<?php } ?>
+						<div class="field">
+							<input type="submit" name="submitPlugins<?php echo $pluginSeting['name'] ?>Settings" class="button" value="<?php $LANGMNG->echo('b_save') ?>">
+						</div>
+					</form>
+				</div>
+			<?php } ?>
 		</div>
 
 

app/views/templates/template.phtml

@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title><?php echo $this->title ?></title>
+	<title><?php echo $this->title; ?></title>
 </head>
 <body>
 	<?php echo $this->content(); ?>

core/Configuration/ConfigurationLoader.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Core\Configuration;
-
-class ConfigurationLoader
-{
-	private const CONFIGURATIONS_DIRECTORY = __DIR__ . DIRECTORY_SEPARATOR
-														  . '..' . DIRECTORY_SEPARATOR
-														  . '..' . DIRECTORY_SEPARATOR . 'config'
-														  . DIRECTORY_SEPARATOR;
-
-	public function load(): array
-	{
-		return [];
-	}
-
-	/**
-	 * Concerns
-	 * 	 -> Loading configuration files
-	 * 		- Scan directory for files.
-	 * 		- Filtering none config / php files.
-	 * 		- Creating assoc array.
-	 */
-}

core/Configuration/Configurations.php

@@ -8,18 +8,4 @@ namespace Core\Configuration;
  * @author Romano Schoonheim https://github.com/romano1996
  */
 class Configurations
-{
-	/** @var array */
-	private $configurations;
-
-	public function __construct(ConfigurationLoader $configurationLoader)
-	{
-		// Concern: Storing assoc array to this object.
-		$this->configurations = $configurationLoader->load();
-	}
-
-	public function get(string $path)
-	{
-		// Concern: Accessing configurations based on "paths" application.something For example.
-	}
-}
+{}

public/css/main.css

@@ -2660,19 +2660,19 @@ html {
 
   @font-face {
 	font-family: 'Metropolis';
-	src: url("../fonts/Metropolis-Regular.ttf");
+	/*src: url("../fonts/Metropolis-Regular.ttf");*/
 	font-weight: 400;
   }
 
   @font-face {
 	font-family: 'Metropolis';
-	src: url("../fonts/Metropolis-Medium.ttf");
+	/*src: url("../fonts/Metropolis-Medium.ttf");*/
 	font-weight: 500;
   }
 
   @font-face {
 	font-family: 'Metropolis';
-	src: url("../fonts/Metropolis-SemiBold.ttf");
+	/*src: url("../fonts/Metropolis-SemiBold.ttf");*/
 	font-weight: 600;
   }