From 55c9922a49341972feb228373e7cb0049bacf1d2 Mon Sep 17 00:00:00 2001 From: zhaoke Date: Thu, 9 Feb 2023 09:14:17 +0000 Subject: [PATCH 1/4] * Fix error for php5.3. --- framework/base/helper.class.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php index acec227494..2450a51965 100644 --- a/framework/base/helper.class.php +++ b/framework/base/helper.class.php @@ -998,3 +998,18 @@ if(!function_exists('array_column')) return $output; } } + +if (!function_exists('getallheaders')) { + function getallheaders() + { + $headers = array(); + foreach ($_SERVER as $name => $value) + { + if (substr($name, 0, 5) == 'HTTP_') + { + $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value; + } + } + return $headers; + } +} \ No newline at end of file From acc714a033c2784a15c777f438535e2104b9e329 Mon Sep 17 00:00:00 2001 From: zhaoke Date: Fri, 10 Feb 2023 00:49:15 +0000 Subject: [PATCH 2/4] * Fix error for php5.3. --- module/zanode/css/{list.css => nodelist.css} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename module/zanode/css/{list.css => nodelist.css} (100%) diff --git a/module/zanode/css/list.css b/module/zanode/css/nodelist.css similarity index 100% rename from module/zanode/css/list.css rename to module/zanode/css/nodelist.css From 591fd063465604509e26a44a9c036040cab3d976 Mon Sep 17 00:00:00 2001 From: zhaoke Date: Fri, 10 Feb 2023 01:14:03 +0000 Subject: [PATCH 3/4] * Fix array_column not support object array. --- framework/base/helper.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php index 2450a51965..b3cc9225c9 100644 --- a/framework/base/helper.class.php +++ b/framework/base/helper.class.php @@ -981,6 +981,11 @@ if(!function_exists('array_column')) $valueSet = true; $value = $row[$columnKey]; } + elseif(\is_object($row) && \property_exists($row, $columnKey)) + { + $valueSet = true; + $value = $row->$columnKey; + } if($valueSet) { From 6e86ba1ecfbad3eafe45dad5999caed80a665f1d Mon Sep 17 00:00:00 2001 From: zhaoke Date: Fri, 10 Feb 2023 02:18:35 +0000 Subject: [PATCH 4/4] * Update action label. --- module/action/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index ede1fbb1ee..8af5daae98 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -416,7 +416,7 @@ $lang->action->label->resume = '恢复了'; $lang->action->label->reboot = '重启了'; $lang->action->label->boot = '启动了'; $lang->action->label->destroy = '关闭了'; -$lang->action->label->getvnc = '远程操控'; +$lang->action->label->getvnc = '远程操控了'; $lang->action->label->synctwins = '同步修改了'; $lang->action->label->relieved = '解除了'; $lang->action->label->switchtolight = '从全生命周期管理模式切换为轻量管理模式';