Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ add zin and zui3 files.

Browse Source
This commit is contained in:
sunhao
2023-07-25 17:42:27 +08:00
parent b92acecc1a
commit e97ab9686b
234 changed files with 82310 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/router.class.php
+43 -17
View File
@@ -356,6 +356,14 @@ class baseRouter
*/
public $siteCode;
/**
* zin 请求时发生的错误信息。
* The errors occurred when zin request.
*
* @var array
*/
public $zinErrors = array();
/**
* 构造方法, 设置路径，类，超级变量等。注意：
* 1.应该使用createApp()方法实例化router类；
@@ -2891,7 +2899,7 @@ class baseRouter
* @access public
* @return void
*/
public function saveError($level, $message, $file, $line)
public function saveError(int $level, string $message, string $file, int $line)
{
if(empty($this->config->debug)) return true;
if(!is_dir($this->logRoot)) return true;
@@ -2901,9 +2909,9 @@ class baseRouter
* 删除设定时间之前的日志。
* Delete the log before the set time.
**/
if(mt_rand(0, 10) == 1)
if(random_int(0, 10) == 1)
{
$logDays = isset($this->config->framework->logDays) ? $this->config->framework->logDays : 14;
$logDays = $this->config->framework->logDays ?? 14;
$dayTime = time() - $logDays * 24 * 3600;
foreach(glob($this->getLogRoot() . '*') as $logFile)
{
@@ -2915,7 +2923,7 @@ class baseRouter
* 忽略该错误：Redefining already defined constructor。
* Skip the error: Redefining already defined constructor.
**/
if(strpos($message, 'Redefining') !== false) return true;
if(str_contains($message, 'Redefining')) return true;
/*
* 设置错误信息。
@@ -2924,8 +2932,8 @@ class baseRouter
if(preg_match('/[^\x00-\x80]/', $message)) $message = helper::convertEncoding($message, 'gbk');
$errorLog = "\n" . date('H:i:s') . " $message in <strong>$file</strong> on line <strong>$line</strong> ";
$URI = $this->getURI();
$errorLog .= "when visiting <strong>" . (empty($URI) ? '' : htmlspecialchars($URI)) . "</strong>\n";
$uri = $this->getURI();
$errorLog .= "when visiting <strong>" . (empty($uri) ? '' : htmlspecialchars($uri)) . "</strong>\n";
/*
* 为了安全起见，对公网环境隐藏脚本路径。
@@ -2942,18 +2950,29 @@ class baseRouter
if(!is_file($errorFile)) file_put_contents($errorFile, "<?php\n die();\n?" . ">\n");
$fh = fopen($errorFile, 'a');
if($fh) fwrite($fh, strip_tags($errorLog)) and fclose($fh);
if($fh) fwrite($fh, strip_tags(htmlspecialchars_decode($errorLog))) and fclose($fh);
/*
* 如果debug > 1，显示warning, notice级别的错误。
* If the debug > 1, show warning, notice error.
* 如果debug > 1，直接在页面显示非严重错误。
* If the debug > 1, show non-serious errors on page directly.
**/
if($level == E_NOTICE or $level == E_WARNING or $level == E_STRICT or $level == 8192) // 8192: E_DEPRECATED
if(!empty($this->config->debug) && $this->config->debug > 1)
{
if(!empty($this->config->debug) and $this->config->debug > 1)
/* Send non-serious errors to page in zin mode. */
$isZinRequest = isset($this->config->zin) || isset($_SERVER['HTTP_X_ZIN_OPTIONS']);
$isNonSeriousError = $level !== E_ERROR && $level !== E_PARSE && $level !== E_CORE_ERROR && $level !== E_COMPILE_ERROR;
if($isZinRequest && $isNonSeriousError)
{
$this->zinErrors[] = array('file' => $file, 'line' => $line, 'message' => $message, 'level' => $level);
return;
}
/* Show non-serious errors to classic page. */
if($level == E_NOTICE or $level == E_WARNING or $level == E_STRICT or $level == 8192)
{
$cmd = "vim +$line $file";
$size = strlen($cmd);
echo "<pre class='alert alert-danger'>$message: ";
echo "<input type='text' value='$cmd' size='$size' style='border:none; background:none;' onclick='this.select();' /></pre>";
}
@@ -2963,14 +2982,21 @@ class baseRouter
* 如果是严重错误，停止程序。
* If error level is serious, die.
* */
if($level == E_ERROR or $level == E_PARSE or $level == E_CORE_ERROR or $level == E_COMPILE_ERROR or $level == E_USER_ERROR)
if(in_array($level, array(E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR)))
{
if(empty($this->config->debug)) die();
if(PHP_SAPI == 'cli') die($errorLog);
if(empty($this->config->debug)) helper::end();
$htmlError = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head>";
$htmlError .= "<body>" . nl2br($errorLog) . "</body></html>";
die($htmlError);
if(PHP_SAPI == 'cli')
{
echo $errorLog;
}
else
{
$htmlError = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head>";
$htmlError .= "<body>" . nl2br($errorLog) . "</body></html>";
echo $htmlError;
helper::end();
}
}
}