Merge branch 'dev' of https://git.steelants.cz/JonatanRek/PHP_SMART_HOME_V3 into dev

api.php

@@ -31,6 +31,7 @@ if (!$restAcess){
 
 //Log
 $logManager = new LogManager();
+$apiLogManager = new LogManager('./app/logs/api/'. date("Y-m-d").'.log');
 
 //DB Conector
 Db::connect (DBHOST, DBUSER, DBPASS, DBNAME);
@@ -39,19 +40,23 @@ Db::connect (DBHOST, DBUSER, DBPASS, DBNAME);
 $json = file_get_contents('php://input');
 $obj = json_decode($json, true);
 
-if (defined(DEBUGMOD) && DEBUGMOD == 1) {
+//Log RAW api request
-	$logManager->write("[API] request body\n" . json_encode($obj, JSON_PRETTY_PRINT), LogRecordType::INFO);
+if (API_DEBUGMOD == 1) {
+	$apiLogManager->write("[API] request body\n" . json_encode($obj, JSON_PRETTY_PRINT), LogRecordType::INFO);
 }
 
 //zabespecit proti Ddosu
 if (isset($obj['user']) && $obj['user'] != ''){
 	//user at home
 	$user = UserManager::getUser($obj['user']);
+	$userAtHome = $user['atHome'];
 	if (!empty($user)) {
 		$userId = $user['user_id'];
 		$atHome = $obj['atHome'];
-		UserManager::atHome($userId, $atHome);
+		if($userAtHome != $atHome){
-		$logManager->write("[Record] user " . $userId . " changet his home state to " . $atHome . " " . RECORDTIMOUT , LogRecordType::INFO);
+			UserManager::atHome($userId, $atHome);
+			$logManager->write("[USER] user " . $userId . " changet his home state to " . $atHome , LogRecordType::INFO);
+		}
 		echo 'Saved: ' . $atHome;
 		header($_SERVER["SERVER_PROTOCOL"]." 200 OK");
 		die();
@@ -92,6 +97,7 @@ try {
 $token = $obj['token'];
 $values = null;
 $settings = null;
+$deviceLogs = null;
 $command = "null";
 
 if (isset($obj['values'])) {
@@ -102,6 +108,12 @@ if (isset($obj['settings'])) {
 	$settings = $obj['settings'];
 }
 
+if (isset($obj['logs'])) {
+	$deviceLogs = $obj['logs'];
+}
+
+
+
 //Checks
 if ($token == null || $token == "") {
 	echo json_encode(array(
@@ -162,7 +174,7 @@ if (!DeviceManager::approved($token)) {
 }
 
 // Diagnostic Data Write to DB
-if ($settings != null || $settings != ""){
+if ($settings != null && $settings != ""){
 	$data = ['mac' => $settings["network"]["mac"], 'ip_address' => $settings["network"]["ip"]];
 	if (array_key_exists("firmware_hash", $settings)) {
 		$data['firmware_hash'] = $settings["firmware_hash"];
@@ -175,20 +187,33 @@ if ($command == "null"){
 	$device = DeviceManager::getDeviceByToken($token);
 	$deviceId = $device['device_id'];
 	$deviceCommand = $device["command"];
-	if ($deviceCommand != '' || $deviceCommand != null)
+	if ($deviceCommand != '' && $deviceCommand != null && $deviceCommand != "null")
 	{
 		$command = $deviceCommand;		
+		$data = [
+			'command'=>'null'
+		];
+		DeviceManager::editByToken($token, $data);
+		$logManager->write("[API] Device_ID " . $deviceId . " executing command " . $command, LogRecordType::INFO);
 	} 
+}
 
-	$data = [
+// Diagnostic Logs Write To log File
-		'command'=>'null'
+if ($deviceLogs != null && $deviceLogs != ""){
+	foreach ($deviceLogs as $log) {
+		$logManager->write("[Device Log Msg] Device_ID " . $deviceId . "->" . $log, LogRecordType::ERROR);
+	}
+	$jsonAnswer = [
+		'state' => 'succes',
+		'command' => $command,
 	];
-	DeviceManager::editByToken($token, $data);
+	echo json_encode($jsonAnswer, JSON_PRETTY_PRINT);
-	$logManager->write("[API] Device_ID " . $deviceId . " executing command " . $command, LogRecordType::INFO);
+	header($_SERVER["SERVER_PROTOCOL"]." 200 OK");
+	die();
 }
 
 // Subdevices first data!
-if ($values != null || $values != "") {
+if ($values != null && $values != "") {
 
 	//ZAPIS
 	$device = DeviceManager::getDeviceByToken($token);
@@ -268,7 +293,7 @@ if ($values != null || $values != "") {
 	$subDeviceLastReordValue = $subDeviceLastReord['value'];
 
 	if ($subDeviceLastReord['execuded'] == 0){
-		$logManager->write("[API] subDevice id ".$subDeviceId . " executed comand with value " .$subDeviceLastReordValue . " record id " . $subDeviceLastReord['record_id'] . " executed " . $subDeviceLastReord['execuded']);
+		$logManager->write("[API] subDevice_ID ".$subDeviceId . " executed comand with value " .$subDeviceLastReordValue . " record id " . $subDeviceLastReord['record_id'] . " executed " . $subDeviceLastReord['execuded'], LogRecordType::INFO);
 		RecordManager::setExecuted($subDeviceLastReord['record_id']);
 	}
 

app/class/LogManager.php

@@ -46,7 +46,9 @@ class LogManager
 
 	function write($value, $type = LogRecordType::ERROR){
 		$record = "[".date("H:m:s")."][".$type."]" . $value . "\n";
-		$record = Utilities::stringInsert($record,"\n",65);
+		if (strlen($record) > 65 ) {
+			$record = Utilities::stringInsert($record,"\n",65);
+		} 
 		fwrite($this->logFile, $record);
 	}
 

update.php

@@ -61,8 +61,14 @@ if (file_exists($localBinary)) {
 	$logManager->write("[Updater] version PHP: " . md5_file($localBinary), LogRecordType::INFO);
 	if ($_SERVER['HTTP_X_ESP8266_SKETCH_MD5'] != md5_file($localBinary)) {
 		sendFile($localBinary);
+		//get device data
+		$device = DeviceManager::getDeviceByMac($macAddress);
+		$deviceName = $device['name'];
+		$deviceId = $device['device_id'];
+		//logfile write
+		$logManager->write("[Device] device_ID " . $deviceId . "was just updated to new version", LogRecordType::WARNING);
+		$logManager->write("[Device] version hash:" . md5_file($localBinary), LogRecordType::INFO);
 		//notification
-		$deviceName = DeviceManager::getDeviceByMac($macAddress)['name'];
 		$notificationMng = new NotificationManager;
 		$notificationData = [
 			'title' => 'Info',