From 855e12a5dea60a7924a1c619dca2d8f3bed99b39 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 13 Dec 2020 21:21:10 +0900 Subject: [PATCH] Fix misc warnings in PHP 8.0 --- classes/context/Context.class.php | 6 +++--- classes/object/Object.class.php | 4 ++-- classes/template/TemplateHandler.class.php | 15 ++++++++++----- common/framework/router.php | 2 +- modules/autoinstall/autoinstall.model.php | 6 +++--- modules/member/member.model.php | 20 +++++++++++++++----- modules/widget/widget.view.php | 7 ++++++- 7 files changed, 40 insertions(+), 20 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index fc7a580d2..b467ed6e4 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -1616,7 +1616,7 @@ class Context } // If $args_list contains one array, reset existing parameters and use keys & values from $args_list. - if (is_array($args_list[0]) && count($args_list) == 1) + if (count($args_list) == 1 && is_array($args_list[0])) { $get_vars = array(); foreach ($args_list[0] as $key => $val) @@ -1653,14 +1653,14 @@ class Context unset($get_vars['vid']); // for compatibility to lower versions - $act = $get_vars['act']; + $act = $get_vars['act'] ?? null; $act_alias = array( 'dispMemberFriend' => 'dispCommunicationFriend', 'dispMemberMessages' => 'dispCommunicationMessages', 'dispDocumentAdminManageDocument' => 'dispDocumentManageDocument', 'dispModuleAdminSelectList' => 'dispModuleSelectList' ); - if(isset($act_alias[$act])) + if($act && isset($act_alias[$act])) { $get_vars['act'] = $act_alias[$act]; } diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php index 5f123a672..4eb90f709 100644 --- a/classes/object/Object.class.php +++ b/classes/object/Object.class.php @@ -248,11 +248,11 @@ class BaseObject * Method to retrieve a corresponding value to a given key * * @param string $key - * @return string Returns value to a given key + * @return mixed Returns value to a given key */ public function get($key) { - return $this->variables[$key]; + return $this->variables[$key] ?? null; } /** diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index ec80ddfd5..c65f7312a 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -161,7 +161,7 @@ class TemplateHandler Rhymix\Framework\Storage::delete($tmpfilename); } - if($__templatehandler_root_tpl == $this->file) + if(isset($__templatehandler_root_tpl) && $__templatehandler_root_tpl == $this->file) { $__templatehandler_root_tpl = null; } @@ -816,13 +816,18 @@ class TemplateHandler case 'scss': if($doUnload) { - $result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}','{$attr['media']}');"; + $result = vsprintf("Context::unloadFile('%s', '%s', '%s';", [ + $attr['target'] ?? '', $attr['targetie'] ?? '', $attr['media'] ?? '', + ]); } else { - $metafile = $attr['target']; - $metavars = ($attr['vars'] ? self::_replaceVar($attr['vars']) : ''); - $result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}'," . ($attr['vars'] ? self::_replaceVar($attr['vars']) : 'array()') . ");Context::loadFile(\$__tmp);unset(\$__tmp);"; + $metafile = isset($attr['target']) ? $attr['target'] : ''; + $metavars = isset($attr['vars']) ? ($attr['vars'] ? self::_replaceVar($attr['vars']) : '') : ''; + $result = vsprintf("Context::loadFile(['%s', '%s', '%s', '%s', %s]);", [ + $attr['target'] ?? '', $attr['media'] ?? '', $attr['targetie'] ?? '', $attr['index'] ?? '', + isset($attr['vars']) ? ($attr['vars'] ? self::_replaceVar($attr['vars']) : '[]') : '[]', + ]); } break; } diff --git a/common/framework/router.php b/common/framework/router.php index e9cbd6564..23063f036 100644 --- a/common/framework/router.php +++ b/common/framework/router.php @@ -374,7 +374,7 @@ class Router } // Try the generic mid/act pattern. - if ($prefix_type !== 'module' || !isset(self::$_except_modules[$args[$prefix_type]])) + if (($prefix_type !== 'module' || !isset(self::$_except_modules[$args[$prefix_type]])) && isset($args['act'])) { self::$_route_cache[$rewrite_level][$keys_string] = '$' . $prefix_type . '/$act'; $internal_url = $args['act'] . (count($args2) ? ('?' . http_build_query($args2)) : ''); diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php index b837d9751..c785cf17e 100644 --- a/modules/autoinstall/autoinstall.model.php +++ b/modules/autoinstall/autoinstall.model.php @@ -349,16 +349,16 @@ class autoinstallModel extends autoinstall $path = substr($path, 0, strlen($path) - 1); } - if(!$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path]) + if(!$GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path]) { $args = new stdClass(); $args->path = $path; $output = executeQuery('autoinstall.getPackageSrlByPath', $args); - $GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path] = $output->data->package_srl; + $GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path] = $output->data->package_srl; } - return $GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path]; + return $GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path]; } /** diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 05f529461..940f853e8 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -1067,12 +1067,13 @@ class memberModel extends member { return null; } + + $info = null; $member_group = self::getMemberGroups($member_srl, $site_srl); $groups_info = self::getGroups($site_srl); if(count($member_group) > 0 && is_array($member_group)) { $memberGroups = array_keys($member_group); - foreach($groups_info as $group_srl=>$group_info) { if(in_array($group_srl, $memberGroups)) @@ -1097,11 +1098,20 @@ class memberModel extends member } } } - if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N'; + if (!$info) + { + $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N'; + } + } + + if (isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]) && $GLOBALS['__member_info__']['group_image_mark'][$member_srl] !== 'N') + { + return $GLOBALS['__member_info__']['group_image_mark'][$member_srl]; + } + else + { + return null; } - if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') return null; - - return $GLOBALS['__member_info__']['group_image_mark'][$member_srl]; } /** diff --git a/modules/widget/widget.view.php b/modules/widget/widget.view.php index c911e271c..1d53fe127 100644 --- a/modules/widget/widget.view.php +++ b/modules/widget/widget.view.php @@ -86,7 +86,12 @@ class widgetView extends widget // module_category and module combination if($module_categories) { - foreach($mid_list as $module_srl => $module) { + foreach($mid_list as $module_srl => $module) + { + if(!isset($module_categories[$module->module_category_srl])) + { + $module_categories[$module->module_category_srl] = new stdClass(); + } $module_categories[$module->module_category_srl]->list[$module_srl] = $module; } }