From 72e6f475d7c657a35a8acc7233cb780855f3169a Mon Sep 17 00:00:00 2001
From: GamerClassN7 <gamerclassn7@gmail.com>
Date: Sun, 1 Nov 2020 21:20:05 +0100
Subject: [PATCH] Database Backup Plugin Fix + Record Fix

---
 app/models/managers/RecordManager.php |  3 +--
 app/plugins/DatabaseBackup.php        | 12 +++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/models/managers/RecordManager.php b/app/models/managers/RecordManager.php
index b0bb5ce..3da36d4 100644
--- a/app/models/managers/RecordManager.php
+++ b/app/models/managers/RecordManager.php
@@ -26,10 +26,9 @@ class RecordManager{
 		};
 
 		//Ochrana proti duplicitním hodnotám zapisují se jen změny
-		if (self::getLastRecord($subDeviceId, 1)['value'] === $value){
+		if (self::getLastRecord($subDeviceId, 1)['value'] == $value){
 			return false;
 		}
-		
 
 		try {
 			$record = [
diff --git a/app/plugins/DatabaseBackup.php b/app/plugins/DatabaseBackup.php
index a0ab3a9..c31996f 100644
--- a/app/plugins/DatabaseBackup.php
+++ b/app/plugins/DatabaseBackup.php
@@ -8,8 +8,8 @@ class DatabaseBackup
 			$backupWorker = new 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);
+			//$filenames[] = $_SERVER['DOCUMENT_ROOT'] . '/config/config.php'; //Backup Configuration File
+			$backupWorker->compress($_SERVER['DOCUMENT_ROOT'] . BASEDIR . 'backup/' . date("Y-m-d", time()) . '.zip', $filenames);
 			return 'sucessful';
 		} catch (Exception $e) {
 			return 'exception: ' . $e->getMessage();
@@ -18,7 +18,7 @@ class DatabaseBackup
 
 	private function scheme()
 	{
-		$backupfile = $_SERVER['DOCUMENT_ROOT'] . BASEDIR . "/backup/" . DBNAME . '_scheme_' . 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-create-info -h localhost -u " . DBUSER . " -p" . DBPASS . " " . DBNAME . " -r $backupfile 2>&1";
 		$this->executeCommand($command);
 		return $backupfile;
@@ -26,7 +26,7 @@ class DatabaseBackup
 
 	private function data()
 	{
-		$backupfile = $_SERVER['DOCUMENT_ROOT'] . BASEDIR . "/backup/" . DBNAME . '_data_' . 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-data -h localhost -u " . DBUSER . " -p" . DBPASS . " " . DBNAME . " -r $backupfile 2>&1";
 		$this->executeCommand($command);
 		return $backupfile;
@@ -43,7 +43,9 @@ class DatabaseBackup
 		$zip = new ZipArchive();
 		if ($zip->open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
 			foreach ($files as $file) {
-				$zip->addFile($file);
+				$filename = explode('/', $file);
+				$filename = end($filename);
+				$zip->addFile($file, $filename);
 			}
 			$zip->close();
 			foreach ($files as $file) {