Few Fixes in Database backup Plugin

Reviewed-on: #2

.gitignore

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

app/Routes.php

@@ -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/UsersApi.php

@@ -34,4 +34,13 @@ class UsersApi extends ApiController{
 		}
 		$this->response(['value'=>'OK']);
 	}
+
+	public function subscribe(){
+		//$this->requireAuth();
+
+		$subscriptionToken = $this->input['token'];
+		$subscriptionUserId = $this->input['user_id'];
+		NotificationManager::addSubscriber($subscriptionUserId, $subscriptionToken);
+		$this->response(['value'=>'OK']);
+	}
 }

app/controllers/settingController.php

@@ -21,13 +21,24 @@ if (isset($_POST) && !empty($_POST)){
 
 		$ga = new PHPGangsta_GoogleAuthenticator();
 		$checkResult = $ga->verifyCode($otaSecret, $otaCode, 2);    // 2 = 2*30sec clock tolerance
-		 if ($checkResult) {
+		if ($checkResult) {
-			 $userManager->setOta($otaCode, $otaSecret);
+			$userManager->setOta($otaCode, $otaSecret);
-		 }
+		}
 		header('Location: ' . BASEURL . 'setting');
 		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/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/SettingsManager.php

@@ -14,21 +14,23 @@ class SettingsManager{
 	}
 
 	public static function create ($name, $value, $type = '') {
-		$setting = array (
+		if (!self::getByName($name)){
-			'name' => $name,
+			$setting = array (
-			'value' => $value,
+				'name' => $name,
-			'type' => $type,
+				'value' => $value,
-		);
+				'type' => $type,
-		try {
+			);
-			Db::add ('settings', $setting);
+			try {
-		} catch(PDOException $error) {
+				Db::add ('settings', $setting);
-			echo $error->getMessage();
+			} catch(PDOException $error) {
-			die();
+				echo $error->getMessage();
+				die();
+			}
 		}
 	}
 
 	public static function update ($name, $value, $type = '') {
-		if (self::getByName($name)){
+		if (!self::getByName($name)){
 			self::create($name, $value, $type);
 		} else {
 			try {

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);
+				$zip->addFile($file);
-				$filename = end($filename);
-				$zip->addFile($file, $filename);
 			}
 			$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/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/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>