From f599033a38c6ed8a15d59baa58fa1c6bc2b831a2 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@e-graphics.com>
Date: Fri, 17 Mar 2017 14:50:58 +0900
Subject: [PATCH] Bug fixes for unique per run logging

---
 www/libs/Class.Basic.inc | 4 ++--
 www/libs/Class.Login.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/libs/Class.Basic.inc b/www/libs/Class.Basic.inc
index d185a004..81f5d7ff 100644
--- a/www/libs/Class.Basic.inc
+++ b/www/libs/Class.Basic.inc
@@ -617,8 +617,8 @@
 						if ($GLOBALS['LOG_FILE_UNIQUE_ID'])
 							$this->log_file_unique_id = $GLOBALS['LOG_FILE_UNIQUE_ID'];
 						if (!$this->log_file_unique_id)
-							$GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id = substr(hash('sha1', uniqid(mt_rand(), true)), 0, 8);
-						$rpl_string = !$this->log_print_file_date ? '' : '_'.date('Y-m-d').'_U_'.$this->log_file_unique_id; // add 8 char unique string
+							$GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id = date('Y-m-d_His').'_U_'.substr(hash('sha1', uniqid(mt_rand(), true)), 0, 8);
+						$rpl_string = '_'.$this->log_file_unique_id; // add 8 char unique string
 					}
 					else
 					{
diff --git a/www/libs/Class.Login.inc b/www/libs/Class.Login.inc
index ac98d5bd..fc897f36 100644
--- a/www/libs/Class.Login.inc
+++ b/www/libs/Class.Login.inc
@@ -1015,7 +1015,7 @@ EOM;
 			}
 			$q .= "'".session_id()."', ";
 			$q .= "'".$this->db_escape_string($this->action)."', '".$this->db_escape_string($this->username)."', NULL, '".$this->db_escape_string($this->login_error)."', NULL, NULL, '".$this->db_escape_string($this->permission_okay)."', NULL)";
-			$this->db_exec($q);
+			$this->db_exec($q, 'NULL');
 		}
 
 		// METHOD: login_check_edit_access_id