diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php index acec227494..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) { @@ -998,3 +1003,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 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 = '从全生命周期管理模式切换为轻量管理模式'; 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