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

Merge branch release/22.0.beta of zentao/zentaopms (#13424)

Browse Source
This commit is contained in:
刘刚
2026-01-22 11:17:43 +08:00
committed by Gitfox
parent e035a50b89 2d8f92d6d8
commit d1a15ae871
3 changed files with 101 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/helper.class.php
+80 -12
View File
@@ -135,7 +135,7 @@ class baseHelper
if($viewType != 'html') $link .= "&{$config->viewVar}=" . $viewType;
foreach($vars as $key => $value) $link .= "&$key=$value";
return self::processOnlyBodyParam($link, $onlyBody);
return static::processOnlyBodyParam($link, $onlyBody);
}
/**
@@ -150,7 +150,7 @@ class baseHelper
foreach($vars as $value) $link .= "{$config->requestFix}$value";
$link .= '.' . $viewType;
return self::processOnlyBodyParam($link, $onlyBody);
return static::processOnlyBodyParam($link, $onlyBody);
}
/**
@@ -161,7 +161,7 @@ class baseHelper
if($moduleName == $config->default->module)
{
$link .= $config->default->method . '.' . $viewType;
return self::processOnlyBodyParam($link, $onlyBody);
return static::processOnlyBodyParam($link, $onlyBody);
}
/**
@@ -172,7 +172,7 @@ class baseHelper
if($viewType == $app->getViewType())
{
$link .= $moduleName . '.' . $viewType;
return self::processOnlyBodyParam($link, $onlyBody);
return static::processOnlyBodyParam($link, $onlyBody);
}
/**
@@ -181,7 +181,7 @@ class baseHelper
*
*/
$link .= $moduleName . '.' . $viewType;
return self::processOnlyBodyParam($link, $onlyBody);
return static::processOnlyBodyParam($link, $onlyBody);
}
/**
@@ -203,8 +203,8 @@ class baseHelper
$sign = !str_contains($link, '?') ? "?" : "&";
$appendString = '';
if($onlyBody or (self::inOnlyBodyMode() && !self::isAjaxRequest('modal'))) $appendString = $sign . "onlybody=yes";
if(self::isWithTID() and !str_contains($link, 'tid=')) $appendString .= empty($appendString) ? "{$sign}tid={$_GET['tid']}" : "&tid={$_GET['tid']}";
if($onlyBody or (static::inOnlyBodyMode() && !static::isAjaxRequest('modal'))) $appendString = $sign . "onlybody=yes";
if(static::isWithTID() and !str_contains($link, 'tid=')) $appendString .= empty($appendString) ? "{$sign}tid={$_GET['tid']}" : "&tid={$_GET['tid']}";
return $link . $appendString;
}
@@ -247,11 +247,11 @@ class baseHelper
$file = realpath($file);
if($file === false) return false;
if(isset(self::$includedFiles[$file])) return true;
if(isset(static::$includedFiles[$file])) return true;
if(!is_file($file)) return false;
include $file;
self::$includedFiles[$file] = true;
static::$includedFiles[$file] = true;
return true;
}
@@ -699,7 +699,7 @@ class baseHelper
static public function ls($dir, $pattern = '')
{
if(empty($dir)) return array();
if(isset(self::$loadedDirs[$dir][$pattern])) return self::$loadedDirs[$dir][$pattern];
if(isset(static::$loadedDirs[$dir][$pattern])) return static::$loadedDirs[$dir][$pattern];
$files = array();
$dir = realpath($dir);
@@ -708,9 +708,9 @@ class baseHelper
if(is_dir($dir)) $files = glob($dir . DIRECTORY_SEPARATOR . '*' . $pattern);
self::$loadedDirs[$dir][$pattern] = $files ?: array();
static::$loadedDirs[$dir][$pattern] = $files ?: array();
return self::$loadedDirs[$dir][$pattern];
return static::$loadedDirs[$dir][$pattern];
}
/**
@@ -1192,6 +1192,74 @@ class baseHelper
{
return rtrim(rtrim(number_format((float)$hours, $decimals, $characters, ''), '0'), $characters);
}
/**
* 判断当前页面是否需要进行htmlspecialchars_decode解码。
* Check if current page need to decode with htmlspecialchars_decode.
*
* @access public
* @return bool
*/
public static function needDecodeHtmlSpecialChars()
{
/* API模式下，所有页面都需要解码。In API mode, all pages need to be decoded. */
if(defined('RUN_MODE') && RUN_MODE == 'api') return true;
global $app, $config;
/* baseRouter 构造函数中会调用此方法，此时 $app 还未初始化完成。The baseRouter constructor will call this method, at this time $app is not initialized yet. */
if(is_null($app)) return false;
/* 当前请求已经判断过，直接返回结果。 The current request has been judged, return the result directly. */
if(!is_null($app->needDecodeHtmlSpecialChars)) return $app->needDecodeHtmlSpecialChars;
/* 如果是旧页面，则不需要解码。 If it is an old page, no need to decode. */
$moduleName = $app->getModuleName();
$methodName = $app->getMethodName();
if(!isset($config->index->oldPages)) $app->loadConfig('index');
$app->needDecodeHtmlSpecialChars = !in_array("{$moduleName}-{$methodName}", $config->index->oldPages);
return $app->needDecodeHtmlSpecialChars;
}
/**
* 对数据对象或数组中的标题字段进行htmlspecialchars_decode解码。
* Decode the title field in data object or array with htmlspecialchars_decode.
*
* @param string $table
* @param object|array $data
* @access public
* @return bool|object|array
*/
public static function decodeHtmlSpecialChars(string $table, bool|object|array $data): bool|object|array
{
if(empty($data)) return $data;
if(!is_object($data) && !is_array($data)) return $data;
if(!static::needDecodeHtmlSpecialChars()) return $data;
global $app, $config;
$objectType = str_replace(['`', $config->db->prefix], '', $table);
if(in_array($objectType, array('config', 'user'))) return $data;
if(!isset($config->action->objectNameFields)) $app->loadConfig('action');
$titleField = $config->action->objectNameFields[$objectType] ?? '';
if(!$titleField) return $data;
if(is_object($data))
{
if(isset($data->$titleField)) $data->$titleField = htmlspecialchars_decode($data->$titleField, ENT_QUOTES);
return $data;
}
foreach($data as $key => $row)
{
if(is_object($row) && isset($row->$titleField)) $row->$titleField = htmlspecialchars_decode($row->$titleField, ENT_QUOTES);
if(is_array($row) && isset($row[$titleField])) $row[$titleField] = htmlspecialchars_decode($row[$titleField], ENT_QUOTES);
$data[$key] = $row;
}
return $data;
}
}
//------------------------------- 常用函数。Some tool functions.-------------------------------//
framework/base/router.class.php
+8
View File
@@ -471,6 +471,14 @@ class baseRouter
*/
public $cacheModel;
/**
* 是否需要对htmlspecialchars进行解码。
* Whether need to decode htmlspecialchars.
*
* @var bool
*/
public $needDecodeHtmlSpecialChars = null;
/**
* 构造方法, 设置路径，类，超级变量等。注意：
* 1.应该使用createApp()方法实例化router类；
lib/base/dao/dao.class.php
+13 -5
View File
@@ -1303,7 +1303,9 @@ class baseDAO
$result = $this->getCache($key);
if($result === self::CACHE_MISS)
{
$table = $this->table;
$result = $this->query($sql)->fetch(PDO::FETCH_OBJ);
$result = helper::decodeHtmlSpecialChars($table, $result);
$this->setCache($key, $sql, $result);
}
@@ -1389,7 +1391,9 @@ class baseDAO
$rows = $this->getCache($key);
if($rows === self::CACHE_MISS)
{
$rows = $this->query($sql)->fetchAll();
$table = $this->table;
$rows = $this->query($sql)->fetchAll();
$rows = helper::decodeHtmlSpecialChars($table, $rows);
$this->setCache($key, $sql, $rows);
}
@@ -1411,12 +1415,14 @@ class baseDAO
*/
public function fetchGroup($groupField, $keyField = '')
{
$sql = $this->processSQL();
$key = $this->createCacheKey('fetchAll', md5($sql));
$sql = $this->processSQL();
$key = $this->createCacheKey('fetchAll', md5($sql));
$rows = $this->getCache($key);
if($rows === self::CACHE_MISS)
{
$rows = $this->query($sql)->fetchAll();
$table = $this->table;
$rows = $this->query($sql)->fetchAll();
$rows = helper::decodeHtmlSpecialChars($table, $rows);
$this->setCache($key, $sql, $rows);
}
@@ -1447,7 +1453,9 @@ class baseDAO
$rows = $this->getCache($key);
if($rows === self::CACHE_MISS)
{
$rows = $this->query($sql)->fetchAll();
$table = $this->table;
$rows = $this->query($sql)->fetchAll();
$rows = helper::decodeHtmlSpecialChars($table, $rows);
$this->setCache($key, $sql, $rows);
}