From 25a69891f48736f567aa5e87f9b9515345e04ed0 Mon Sep 17 00:00:00 2001
From: xiaomlove <353856593@qq.com>
Date: Wed, 3 Mar 2021 11:42:05 +0800
Subject: [PATCH] do_log() add uid and passkey

---
 include/core.php            | 6 +-----
 include/globalfunctions.php | 5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/core.php b/include/core.php
index 92e5eb76..c92a7beb 100644
--- a/include/core.php
+++ b/include/core.php
@@ -6,11 +6,7 @@ define('ROOT_PATH', $rootpath);
 define('VERSION_NUMBER', '1.6.0');
 define('CURRENT_SCRIPT', strstr(basename($_SERVER['SCRIPT_FILENAME']), '.', true));
 define('IS_ANNOUNCE', CURRENT_SCRIPT == 'announce');
-if (!empty($_SERVER['HTTP_X_REQUEST_ID'])) {
-    define('REQUEST_ID', $_SERVER['HTTP_X_REQUEST_ID']);
-} else {
-    define('REQUEST_ID', intval(NEXUS_START * 10000));
-}
+define('REQUEST_ID', $_SERVER['HTTP_X_REQUEST_ID'] ?? $_SERVER['REQUEST_ID'] ?? intval(NEXUS_START * 10000));
 if (!file_exists($rootpath . '.env')) {
     $installScriptRelativePath = 'install/install.php';
     $installScriptFile = $rootpath . "public/$installScriptRelativePath";
diff --git a/include/globalfunctions.php b/include/globalfunctions.php
index ae03fe9a..906ab429 100644
--- a/include/globalfunctions.php
+++ b/include/globalfunctions.php
@@ -147,14 +147,17 @@ function dd($vars)
 
 function do_log($log, $level = 'info')
 {
+    global $CURUSER;
     $logFile = getLogFile();
 	if (($fd = fopen($logFile, 'a')) !== false) {
 		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
 		$content = sprintf(
-			"[%s] [%s] [%s] %s:%s %s%s%s %s%s",
+			"[%s] [%s] [%s] [%s] [%s] %s:%s %s%s%s %s%s",
 			date('Y-m-d H:i:s'),
 			$level,
             defined('REQUEST_ID') ? REQUEST_ID : '',
+            $CURUSER['id'] ?? 0,
+            $CURUSER['passkey'] ?? $_REQUEST['passkey'] ?? '',
 			$backtrace[0]['file'] ?? '',
 			$backtrace[0]['line'] ?? '',
 			$backtrace[1]['class'] ?? '',