hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Pre Merge pull request !460 from F4nniu (FastAdmin开源框架)/php8_compatibily

pull/460/MERGE
F4nniu (FastAdmin开源框架) 2024-02-15 14:00:40 +00:00 committed by Gitee
parent 879554d5a8 1c7d0b710e
commit be18be7752
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/common.php
View File

@ -18,8 +18,8 @@ if (!function_exists('build_select')) {
*/ */
function build_select($name, $options, $selected = [], $attr = []) function build_select($name, $options, $selected = [], $attr = [])
{ {
$options = is_array($options) ? $options : explode(',', $options); $options = is_array($options) ? $options : explode(',', $options ?? '');
$selected = is_array($selected) ? $selected : explode(',', $selected); $selected = is_array($selected) ? $selected : explode(',', $selected ?? '');
return Form::select($name, $options, $selected, $attr); return Form::select($name, $options, $selected, $attr);
} }
} }

5
application/admin/controller/Addon.php
View File

@ -319,9 +319,8 @@ class Addon extends Backend
{ {
$offset = (int)$this->request->get("offset"); $offset = (int)$this->request->get("offset");
$limit = (int)$this->request->get("limit"); $limit = (int)$this->request->get("limit");
$filter = $this->request->get("filter"); $filter = $this->request->get("filter", '');
$search = $this->request->get("search"); $search = $this->request->get("search", '', 'strip_tags,htmlspecialchars');
$search = htmlspecialchars(strip_tags($search));
$onlineaddons = $this->getAddonList(); $onlineaddons = $this->getAddonList();
$filter = (array)json_decode($filter, true); $filter = (array)json_decode($filter, true);
$addons = get_addon_list(); $addons = get_addon_list();

2
application/common.php
View File

@ -10,7 +10,7 @@ if (!function_exists('__')) {
/** /**
* 获取语言变量值 * 获取语言变量值
* @param string $name 语言变量名 * @param string $name 语言变量名
* @param array $vars 动态变量值 * @param string | array $vars 动态变量值
* @param string $lang 语言 * @param string $lang 语言
* @return mixed * @return mixed
*/ */

2
application/common/behavior/Common.php
View File

@ -63,7 +63,7 @@ class Common
} }
// 切换多语言 // 切换多语言
if (Config::get('lang_switch_on')) { if (Config::get('lang_switch_on')) {
$lang = $request->get('lang'); $lang = $request->get('lang', '');
if (preg_match("/^([a-zA-Z\-_]{2,10})\$/i", $lang)) { if (preg_match("/^([a-zA-Z\-_]{2,10})\$/i", $lang)) {
\think\Cookie::set('think_var', $lang); \think\Cookie::set('think_var', $lang);
} }

1
application/common/library/token/Driver.php
View File

@ -76,6 +76,7 @@ abstract class Driver
protected function getEncryptedToken($token) protected function getEncryptedToken($token)
{ {
$config = \think\Config::get('token'); $config = \think\Config::get('token');
$token = $token ?? ''; // 为兼容 php8
return hash_hmac($config['hashalgo'], $token, $config['key']); return hash_hmac($config['hashalgo'], $token, $config['key']);
} }

1
application/common/library/token/driver/Redis.php
View File

@ -60,6 +60,7 @@ class Redis extends Driver
protected function getEncryptedToken($token) protected function getEncryptedToken($token)
{ {
$config = \think\Config::get('token'); $config = \think\Config::get('token');
$token = $token ?? ''; // 为兼容 php8
return $this->options['tokenprefix'] . hash_hmac($config['hashalgo'], $token, $config['key']); return $this->options['tokenprefix'] . hash_hmac($config['hashalgo'], $token, $config['key']);
} }

7
composer.json
View File

@ -17,7 +17,7 @@
"require": { "require": {
"php": ">=7.2.0", "php": ">=7.2.0",
"topthink/framework": "dev-master", "topthink/framework": "dev-master",
"topthink/think-captcha": "^1.0", "topthink/think-captcha": "^1.0.9",
"topthink/think-installer": "^1.0.14", "topthink/think-installer": "^1.0.14",
"topthink/think-queue": "1.1.6", "topthink/think-queue": "1.1.6",
"topthink/think-helper": "^1.0.7", "topthink/think-helper": "^1.0.7",
@ -25,7 +25,6 @@
"overtrue/pinyin": "^3.0", "overtrue/pinyin": "^3.0",
"phpoffice/phpspreadsheet": "1.19", "phpoffice/phpspreadsheet": "1.19",
"overtrue/wechat": "^4.6", "overtrue/wechat": "^4.6",
"nelexa/zip": "^3.3",
"ext-json": "*", "ext-json": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-pdo": "*", "ext-pdo": "*",
@ -39,6 +38,10 @@
{ {
"type": "git", "type": "git",
"url": "https://gitee.com/fastadminnet/framework.git" "url": "https://gitee.com/fastadminnet/framework.git"
},
{
"type": "git",
"url": "https://gitee.com/fastadminnet/think-captcha.git"
} }
] ]
} }