From 7d8a546b64f81c612fb17fc3e90a4d51b2ae67bd Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 30 Nov 2020 21:56:15 +0900 Subject: [PATCH] Fix #1470 misc errors in PHP 8.0 --- classes/xml/XmlJsFilter.class.php | 10 +++------- modules/admin/admin.admin.controller.php | 2 +- modules/menu/menu.admin.controller.php | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php index ca723338b..59404479f 100644 --- a/classes/xml/XmlJsFilter.class.php +++ b/classes/xml/XmlJsFilter.class.php @@ -348,20 +348,16 @@ class XmlJsFilter extends XeXmlParser } // generates the response script - $response_count = count($response_tag); $responses = array(); - for($i = 0; $i < $response_count; $i++) + foreach ($response_tag ?: [] as $val) { - $attrs = $response_tag[$i]->attrs; - $name = $attrs->name; + $name = $val->attrs->name; $responses[] = "'{$name}'"; } // writes lang values of the form field - $target_count = count($target_list); - for($i = 0; $i < $target_count; $i++) + foreach ($target_list ?: [] as $target) { - $target = $target_list[$i]; if(!$lang->{$target}) { $lang->{$target} = $target; diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index a30c38745..53d7c6217 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -838,7 +838,7 @@ class adminAdminController extends admin // Languages and time zone $enabled_lang = $vars->enabled_lang; - if (!in_array($vars->default_lang, $enabled_lang)) + if (!in_array($vars->default_lang, $enabled_lang ?: [])) { $enabled_lang[] = $vars->default_lang; } diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index b9aa4e054..dd427da6d 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -128,7 +128,7 @@ class menuAdminController extends menu { // 'unlinked' menu 존재여부 확인 $oModuleModel = getModel('module'); - $moduleConfig = $oModuleModel->getModuleConfig('menu'); + $moduleConfig = $oModuleModel->getModuleConfig('menu') ?: new stdClass; if($moduleConfig->unlinked_menu_srl) { @@ -1745,7 +1745,7 @@ class menuAdminController extends menu } } - if(count($grant)) + if(countobj($grant)) { $oModuleController = getController('module'); $oModuleController->insertModuleGrants($moduleInfo->module_srl, $grant);