From bc54e336216450c024c0e6b4f3831f784b2b7dd9 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Thu, 13 Feb 2020 13:32:18 +0100
Subject: [PATCH 1/7] Log Rest api requests

---
 api.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api.php b/api.php
index 4b682b5..6630272 100644
--- a/api.php
+++ b/api.php
@@ -38,6 +38,8 @@ Db::connect (DBHOST, DBUSER, DBPASS, DBNAME);
 //Read API data
 $json = file_get_contents('php://input');
 $obj = json_decode($json, true);
+$logManager->write("[INFO] Rest API request body" . $json, LogRecordType::INFO);
+$logManager->write("[INFO] Rest API request body -> decodet to json" . var_export($obj), LogRecordType::INFO);
 
 //zabespecit proti Ddosu
 if (isset($obj['user']) && $obj['user'] != ''){

From 1b5630215b701faede9c415b834e59b8496cc1b5 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Thu, 13 Feb 2020 13:35:15 +0100
Subject: [PATCH 2/7] API Request

---
 api.php           | 4 ++--
 app/views/Log.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/api.php b/api.php
index 6630272..62d117f 100644
--- a/api.php
+++ b/api.php
@@ -38,8 +38,8 @@ Db::connect (DBHOST, DBUSER, DBPASS, DBNAME);
 //Read API data
 $json = file_get_contents('php://input');
 $obj = json_decode($json, true);
-$logManager->write("[INFO] Rest API request body" . $json, LogRecordType::INFO);
-$logManager->write("[INFO] Rest API request body -> decodet to json" . var_export($obj), LogRecordType::INFO);
+$logManager->write("[API] Rest API request body \n" . $json, LogRecordType::INFO);
+$logManager->write("[API] Rest API request body -> decodet to json \n" . var_export($obj), LogRecordType::INFO);
 
 //zabespecit proti Ddosu
 if (isset($obj['user']) && $obj['user'] != ''){
diff --git a/app/views/Log.php b/app/views/Log.php
index 3e80f29..bd7ca72 100644
--- a/app/views/Log.php
+++ b/app/views/Log.php
@@ -26,6 +26,7 @@ class Log extends Template
 		}
 
 		$template->prepare('baseDir', BASEDIR);
+		$template->prepare('debugMod', DEBUGMOD);
 		$template->prepare('title', 'Logy');
 		$template->prepare('logsFiles', $result);
 		$template->prepare('langMng', $langMng);

From 4ab9ad9c7c1b4934d762b33fe3e2a1e4be990a6e Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Thu, 13 Feb 2020 13:53:58 +0100
Subject: [PATCH 3/7] Log Clean Up "LogKeeper" initial

---
 api.php                  |  6 ++++--
 app/class/LogManager.php | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/api.php b/api.php
index 62d117f..9bfe912 100644
--- a/api.php
+++ b/api.php
@@ -39,7 +39,7 @@ Db::connect (DBHOST, DBUSER, DBPASS, DBNAME);
 $json = file_get_contents('php://input');
 $obj = json_decode($json, true);
 $logManager->write("[API] Rest API request body \n" . $json, LogRecordType::INFO);
-$logManager->write("[API] Rest API request body -> decodet to json \n" . var_export($obj), LogRecordType::INFO);
+//$logManager->write("[API] Rest API request body -> decodet to json \n" . var_dump($obj), LogRecordType::INFO);
 
 //zabespecit proti Ddosu
 if (isset($obj['user']) && $obj['user'] != ''){
@@ -71,9 +71,11 @@ if (DEBUGMOD != 1) {
 
 //automationExecution
 try {
+	AutomationManager::executeAll();
 	$fallbackManager = new FallbackManager(RANGES);
 	$fallbackManager->check();
-	AutomationManager::executeAll();
+	LogKeeper::purge(LOGTIMOUT);
+	die();
 } catch (\Exception $e) {
 	$logManager->write("[Automation] Something happen during automation execution", LogRecordType::ERROR);
 }
diff --git a/app/class/LogManager.php b/app/class/LogManager.php
index 5d2d984..95f82f4 100644
--- a/app/class/LogManager.php
+++ b/app/class/LogManager.php
@@ -9,6 +9,25 @@ class LogRecordType{
 	const INFO = 'info';
 }
 
+class LogKeeper
+{
+	function purge($days){
+		$todayFileName = date("Y-m-d").'.log';
+		$seconds = $days * 86400;
+
+		$logFiles = scandir('./app/logs/');
+		foreach ($logFiles as $key => $file) {
+			if (in_array($file,array(".","..", ".gitkeep", $todayFileName)))
+			{
+				continue;
+			}
+			if (filemtime($file) > $seconds) {
+				unlink('./app/logs/'.$file);
+			}
+		}
+	}
+}
+
 class LogManager
 {
 

From f0e82de775aa90310f5849e85785ec17ec103df8 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Thu, 13 Feb 2020 13:57:22 +0100
Subject: [PATCH 4/7] Log page Fixes

---
 app/templates/log.phtml | 1 +
 app/views/Log.php       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/templates/log.phtml b/app/templates/log.phtml
index c747c83..97b11b5 100644
--- a/app/templates/log.phtml
+++ b/app/templates/log.phtml
@@ -22,6 +22,7 @@
         </div>
         <div class="col-md-9 main-body">
             <div class="col-12 col-sm-9 mx-auto mt-4">
+                <label><?php echo $LANGMNG->get('l_logMaxLiveTime') . " " . $LOGTOLIVETIME . " days";?></label>
                 <form method="post" action="">
                     <div class="field">
                         <select class="input" name="LogFile">
diff --git a/app/views/Log.php b/app/views/Log.php
index bd7ca72..fae038a 100644
--- a/app/views/Log.php
+++ b/app/views/Log.php
@@ -27,6 +27,7 @@ class Log extends Template
 
 		$template->prepare('baseDir', BASEDIR);
 		$template->prepare('debugMod', DEBUGMOD);
+		$template->prepare('logToLiveTime', LOGTIMOUT);
 		$template->prepare('title', 'Logy');
 		$template->prepare('logsFiles', $result);
 		$template->prepare('langMng', $langMng);

From 0b8ad755a09ad006fad6a36847ca107bd58d89aa Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Thu, 13 Feb 2020 17:39:58 +0100
Subject: [PATCH 5/7] BACKGROUND SINC

---
 api.php                    |  4 +-
 app/templates/js/script.js | 99 ++++++++++++++++++++------------------
 app/views/Ajax.php         |  6 +++
 3 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/api.php b/api.php
index 9bfe912..c6082c0 100644
--- a/api.php
+++ b/api.php
@@ -38,8 +38,7 @@ Db::connect (DBHOST, DBUSER, DBPASS, DBNAME);
 //Read API data
 $json = file_get_contents('php://input');
 $obj = json_decode($json, true);
-$logManager->write("[API] Rest API request body \n" . $json, LogRecordType::INFO);
-//$logManager->write("[API] Rest API request body -> decodet to json \n" . var_dump($obj), LogRecordType::INFO);
+$logManager->write("[API] Rest API request body -> decodet to json \n" . json_encode($obj, JSON_PRETTY_PRINT), LogRecordType::INFO);
 
 //zabespecit proti Ddosu
 if (isset($obj['user']) && $obj['user'] != ''){
@@ -75,7 +74,6 @@ try {
 	$fallbackManager = new FallbackManager(RANGES);
 	$fallbackManager->check();
 	LogKeeper::purge(LOGTIMOUT);
-	die();
 } catch (\Exception $e) {
 	$logManager->write("[Automation] Something happen during automation execution", LogRecordType::ERROR);
 }
diff --git a/app/templates/js/script.js b/app/templates/js/script.js
index 335dacb..859613b 100644
--- a/app/templates/js/script.js
+++ b/app/templates/js/script.js
@@ -64,16 +64,16 @@ if ('serviceWorker' in navigator) {
 $('select[name="atSelector"]').change(function(e) {
     console.log($(this).val());
     if( $(this).val() == 'time') {
-        
+
         $('input[name="atTime"]').prop( "disabled", false );
-        
+
         $('select[name="atDeviceValueInt"]').prop( "disabled", true );
         $('input[name="atDeviceValue"]').prop( "disabled", true );
     } else if( $(this).val() == 'atDeviceValue') {
-        
+
         $('select[name="atDeviceValue"]').prop( "disabled", false );
         $('input[name="atDeviceValueInt"]').prop( "disabled", false );
-        
+
         $('input[name="atTime"]').prop( "disabled", true );
     }
 });
@@ -88,7 +88,7 @@ $("div.square-content").on('touchend', function (e){
 $("div.square-content").on('touchstart', function (eTarget) {
     navigator.vibrate([500]);
     var id = '';
-    
+
     var windowLoc = $(location).attr('pathname');
     windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
     console.log(windowLoc);
@@ -99,9 +99,9 @@ $("div.square-content").on('touchstart', function (eTarget) {
     } else if (windowLoc == "/automation") {
         id = $(this).attr('id').replace('automation-', '');
     }
-    
+
     var subId = $(this).attr('data-sub-device-id');
-    
+
     touch++;
     if(touch == 2 && touchSubId == subId){
         console.log("Detail");
@@ -109,7 +109,7 @@ $("div.square-content").on('touchstart', function (eTarget) {
             $("#modal-detail-"+subId).removeClass('modal-container-hiden').show();
             ajaxChart(subId);
         } else if (windowLoc == "/scene") {
-            
+
         } else if (windowLoc == "/automation") {
         }
         touch = 0;
@@ -117,7 +117,7 @@ $("div.square-content").on('touchstart', function (eTarget) {
         return;
     }
     touchSubId = subId;
-    
+
     pressTimer = window.setTimeout(function (e) {
         console.log("Setting");
         $("#modal-setting-"+id).removeClass('modal-container-hiden').show();
@@ -202,14 +202,14 @@ var windowLoc = $(location).attr('pathname');
 windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
 console.log();
 if (windowLoc == "/") {
-    
+
     var selectRoomId = localStorage.getItem("selectedRoomId");
-    
+
     if (selectRoomId == null) {
         selectRoomId = 'all';
     }
-    
-    
+
+
     console.log('Saved Selected Room ID '+ selectRoomId);
     $('[name="room"]').val(selectRoomId);
     $('.device-button').each(function(){
@@ -221,8 +221,8 @@ if (windowLoc == "/") {
             }
         }
     });
-    
-    
+
+
 }
 
 //Room selector
@@ -239,43 +239,46 @@ $( '[name="room"]' ).change(function (e) {
         });
     }
 });
-/*
+
+
 var windowLoc = $(location).attr('pathname');
 windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
 console.log();
 if (windowLoc == "/") {
-var autoUpdate = setInterval(function(){
-if (pending == false) {
-pending = true;
-$.ajax({
-url: 'ajax',
-type: 'POST',
-dataType: 'json',
-data: {
-"action": 'getState'
-},
-success: function(data){
-console.log(data);
-for (const key in data) {
-if (data.hasOwnProperty(key)) {
-const device = data[key];
-$('[data-sub-device-id="'+key+'"]')
-.find('.device-button-value')
-.text(device['value'])
-.attr('title',device['time'])
+    var autoUpdate = setInterval(function(){
+        if (pending == false) {
+            pending = true;
+            $.ajax({
+                url: 'ajax',
+                type: 'POST',
+                dataType: 'json',
+                data: {
+                    "action": 'getState'
+                },
+                success: function(data){
+                    console.log(data);
+                    for (const key in data) {
+                        if (data.hasOwnProperty(key)) {
+                            const device = data[key];
+                            $('[data-sub-device-id="'+key+'"]')
+                            .find('.device-button-value')
+                            .text(device['value'])
+                            .attr('title',device['time'])
+                        }
+                    }
+                },
+                error: function (request, status, error) {
+                    console.log("ERROR ajaxChart():", request, error);
+                },
+                complete: function (){
+                    pending = false;
+                }
+            });
+        }
+    },4000);
 }
-}
-},
-error: function (request, status, error) {
-console.log("ERROR ajaxChart():", request, error);
-},
-complete: function (){
-pending = false;
-}
-});
-}
-},4000);
-}*/
+
+
 
 
 //Graphs
@@ -283,7 +286,7 @@ $('.graph-period').on('click', function (e) {
     var subId = $(this).attr('data-sub-device-id');
     var period = $(this).attr('data-period');
     var groupBy = $(this).attr('data-group');
-    
+
     ajaxChart(subId, period, groupBy);
 });
 
diff --git a/app/views/Ajax.php b/app/views/Ajax.php
index 1a97418..d64815a 100644
--- a/app/views/Ajax.php
+++ b/app/views/Ajax.php
@@ -145,6 +145,12 @@ class Ajax extends Template
 				echo 'no action detected';
 				break;
 			}
+		} else if	(
+			isset($_POST['action']) &&
+			$_POST['action'] != ''
+		) {
+			//TODO: PRO JS VRACET DATA
+			ECHO 'test';
 		}
 	}
 }

From bcd5f52a65955c3e804ada8a378d4e35480a4f3b Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Fri, 14 Feb 2020 17:05:56 +0100
Subject: [PATCH 6/7] Fallback Fix

---
 app/class/FallbackManager.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/class/FallbackManager.php b/app/class/FallbackManager.php
index a775074..31dc53a 100644
--- a/app/class/FallbackManager.php
+++ b/app/class/FallbackManager.php
@@ -13,7 +13,7 @@ class FallbackManager
 
 	function check(){
 		//TODO: FIX IT
-		/*$allDevicesData = DeviceManager::getAllDevices();
+		$allDevicesData = DeviceManager::getAllDevices();
 		foreach ($allDevicesData as $deviceKey => $deviceValue) {
 			$allSubDevicesData = SubDeviceManager::getAllSubDevices($deviceValue['device_id']);
 			foreach ($allSubDevicesData as $subDeviceKey => $subDeviceValue) {
@@ -22,12 +22,15 @@ class FallbackManager
 				}
 
 				$lastRecord = RecordManager::getLastRecord($subDeviceValue['subdevice_id']);
-				$minutes = (time() - $lastRecord['time']) / 60;
-				echo $minutes;
-				if ( $minutes > 2){
+				if ($lastRecord["value"] == $this->deviceDefinitions[$subDeviceValue['type']]["fallBack"]) {
+					return;
+				}
+
+				$minutes = (strtotime($lastRecord['time']) - time()) / 60;
+				if ( $minutes > 3){
 					RecordManager::create($deviceValue['device_id'], $subDeviceValue['type'], $this->deviceDefinitions[$subDeviceValue['type']]["fallBack"]);
 				}
 			}
-		}*/
+		}
 	}
 }

From 15d95dae1d1766044ec10522238bb848dff548c2 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Sat, 15 Feb 2020 14:02:18 +0100
Subject: [PATCH 7/7] Fallback better settings

---
 app/class/FallbackManager.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/class/FallbackManager.php b/app/class/FallbackManager.php
index 31dc53a..cb3fb79 100644
--- a/app/class/FallbackManager.php
+++ b/app/class/FallbackManager.php
@@ -2,6 +2,9 @@
 /**
 *
 */
+
+
+
 class FallbackManager
 {
 	public $deviceDefinitions = "";
@@ -21,13 +24,18 @@ class FallbackManager
 					continue;
 				}
 
-				$lastRecord = RecordManager::getLastRecord($subDeviceValue['subdevice_id']);
-				if ($lastRecord["value"] == $this->deviceDefinitions[$subDeviceValue['type']]["fallBack"]) {
-					return;
+				if (!isset($this->deviceDefinitions[$subDeviceValue['type']]["fallBackTime"])) {
+					continue;
 				}
 
-				$minutes = (strtotime($lastRecord['time']) - time()) / 60;
-				if ( $minutes > 3){
+				$lastRecord = RecordManager::getLastRecord($subDeviceValue['subdevice_id']);
+				if ($lastRecord["value"] == $this->deviceDefinitions[$subDeviceValue['type']]["fallBack"]) {
+					continue;
+				}
+
+				$minutes = (time() - strtotime($lastRecord['time'])) / 60;
+
+				if ( $minutes > $this->deviceDefinitions[$subDeviceValue['type']]["fallBackTime"]){
 					RecordManager::create($deviceValue['device_id'], $subDeviceValue['type'], $this->deviceDefinitions[$subDeviceValue['type']]["fallBack"]);
 				}
 			}