lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-14 04:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'promotion' into php8

Browse Source
This commit is contained in:
xiaomlove
2021-05-31 21:05:04 +08:00
parent f61992e377 a6f2419c5e
commit 2b65030a38
4 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/globalfunctions.php
View File

@@ -47,7 +47,7 @@ function getip() {
} elseif (isset($_SERVER['HTTP_CLIENT_IP']) && validip($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP'];
} else {
$ip = $_SERVER['REMOTE_ADDR'];
$ip = $_SERVER['REMOTE_ADDR'] ?? '';
}
} else {
if (getenv('HTTP_X_FORWARDED_FOR') && validip(getenv('HTTP_X_FORWARDED_FOR'))) {
@@ -55,7 +55,7 @@ function getip() {
} elseif (getenv('HTTP_CLIENT_IP') && validip(getenv('HTTP_CLIENT_IP'))) {
$ip = getenv('HTTP_CLIENT_IP');
} else {
$ip = getenv('REMOTE_ADDR');
$ip = getenv('REMOTE_ADDR') ?? '';
}
}
@@ -159,8 +159,9 @@ function do_log($log, $level = 'info')
if (($fd = fopen($logFile, 'a')) === false) {
$fd = fopen(sys_get_temp_dir() . '/nexus.log', 'a');
}
static $uid, $passkey, $env;
static $uid, $passkey, $env, $sequence;
if (is_null($uid)) {
$sequence = 0;
if (IN_NEXUS) {
global $CURUSER;
$user = $CURUSER;
@@ -173,14 +174,18 @@ function do_log($log, $level = 'info')
$passkey = $user->passkey ?? $_REQUEST['passkey'] ?? '';
$env = env('APP_ENV');
}
} else {
$sequence++;
}
$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:%s %s%s%s %s%s",
date('Y-m-d H:i:s'),
defined('REQUEST_ID') ? REQUEST_ID : '',
$uid,
$passkey,
$sequence,
sprintf('%.3f', microtime(true) - NEXUS_START),
$env, $level,
$backtrace[0]['file'] ?? '',
$backtrace[0]['line'] ?? '',