mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-24 03:57:22 +08:00
token permission config + fix getLogFile()
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.9.0');
|
||||
defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-05-01');
|
||||
defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-05-02');
|
||||
defined('IN_TRACKER') || define('IN_TRACKER', false);
|
||||
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
|
||||
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
|
||||
|
||||
@@ -46,7 +46,6 @@ function get_langfile_path($script_name ="", $target = false, $lang_folder = "")
|
||||
$lang_folder = $CURLANGDIR;
|
||||
}
|
||||
$result = "lang/" . ($target == false ? $lang_folder : "_target") ."/lang_". ( $script_name == "" ? substr(strrchr($_SERVER['SCRIPT_NAME'],'/'),1) : $script_name);
|
||||
do_log($result);
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
@@ -242,19 +242,23 @@ function getLogFile($append = '')
|
||||
if (isset($logFiles[$append])) {
|
||||
return $logFiles[$append];
|
||||
}
|
||||
$config = nexus_config('nexus');
|
||||
if (!empty($config['log_file']) && in_array($config['log_file'], ["php://stdout", "php://stderr"])) {
|
||||
return $logFiles[$append] = $config['log_file'];
|
||||
$std = ["php://stdout", "php://stderr"];
|
||||
$logFileFromDotEnv = nexus_env('LOG_FILE');
|
||||
if ($logFileFromDotEnv && in_array($logFileFromDotEnv, $std)) {
|
||||
return $logFiles[$append] = $logFileFromDotEnv;
|
||||
}
|
||||
$path = getenv('NEXUS_LOG_DIR', true);
|
||||
if (in_array($path, $std)) {
|
||||
return $logFiles[$append] = $path;
|
||||
}
|
||||
$fromEnv = true;
|
||||
if ($path === false) {
|
||||
$fromEnv = false;
|
||||
$path = sys_get_temp_dir();
|
||||
}
|
||||
$logFile = rtrim($path, '/') . '/nexus.log';
|
||||
if (!$fromEnv && !empty($config['log_file'])) {
|
||||
$logFile = $config['log_file'];
|
||||
if (!$fromEnv && $logFileFromDotEnv) {
|
||||
$logFile = $logFileFromDotEnv;
|
||||
}
|
||||
$lastDotPos = strrpos($logFile, '.');
|
||||
if ($lastDotPos !== false) {
|
||||
|
||||
Reference in New Issue
Block a user