From df9f156ff3732f13fc98934edc4c95d058eb52db Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 30 Oct 2020 00:39:20 +0900
Subject: [PATCH] Fix #1446 and other incorrect code in module module

---
 modules/module/module.admin.model.php | 20 ++++++++++----------
 modules/module/module.model.php       |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php
index 63c24860d..179991cc8 100644
--- a/modules/module/module.admin.model.php
+++ b/modules/module/module.admin.model.php
@@ -35,9 +35,10 @@ class moduleAdminModel extends module
 			$list[$val->module_srl] = array('module_srl'=>$val->module_srl,'mid'=>$val->mid,'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
 		}
 		$modules = explode(',',$args->module_srls);
-		for($i=0;$i<count($modules);$i++)
+		$module_list = [];
+		foreach ($modules as $module_srl)
 		{
-			$module_list[$modules[$i]] = $list[$modules[$i]];
+			$module_list[$module_srl] = $list[$module_srl];
 		}
 
 		$this->add('id', Context::get('id'));
@@ -154,7 +155,7 @@ class moduleAdminModel extends module
 		$grant_list->access = new stdClass();
 		$grant_list->access->title = lang('grant_access');
 		$grant_list->access->default = 'guest';
-		if(count($source_grant_list))
+		if($source_grant_list)
 		{
 			foreach($source_grant_list as $key => $val)
 			{
@@ -191,11 +192,10 @@ class moduleAdminModel extends module
 		Context::set('default_grant', $default_grant);
 		Context::set('module_srl', $module_srl);
 		// Extract admin ID set in the current module
-		$admin_member = $oModuleModel->getAdminId($module_srl);
+		$admin_member = ModuleModel::getAdminId($module_srl) ?: [];
 		Context::set('admin_member', $admin_member);
 		// Get a list of groups
-		$oMemberModel = getModel('member');
-		$group_list = $oMemberModel->getGroups($module_info->site_srl);
+		$group_list = MemberModel::getGroups($module_info->site_srl);
 		Context::set('group_list', $group_list);
 
 		//Security			
@@ -223,15 +223,14 @@ class moduleAdminModel extends module
 			return new BaseObject();
 		}
 
-		$oModuleModel = getModel('module');
-		$xmlInfo = $oModuleModel->getModuleActionXml($targetModule);
+		$xmlInfo = ModuleModel::getModuleActionXml($targetModule);
 
 		// Grant virtual permission for access and manager
 		$grantList = new stdClass();
 		$grantList->access = new stdClass();
 		$grantList->access->title = lang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($xmlInfo->grant))
+		if($xmlInfo->grant)
 		{
 			foreach($xmlInfo->grant as $key => $val)
 			{
@@ -245,6 +244,7 @@ class moduleAdminModel extends module
 		$grantList->manager->default = 'manager';
 
 		// Get a permission group granted to the current module
+		$selectedGroup = new stdClass();
 		$defaultGrant = new stdClass();
 		$args = new stdClass();
 		$args->module_srl = $moduleSrl;
@@ -355,7 +355,7 @@ class moduleAdminModel extends module
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
 		}
 
-		if(count($skin_info->extra_vars)) 
+		if($skin_info->extra_vars)
 		{
 			foreach($skin_info->extra_vars as $key => $val) 
 			{
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index ac0c01791..b573f35e7 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1353,8 +1353,8 @@ class moduleModel extends module
 
 			if(!isset($info)) continue;
 			$info->module = $module_name;
-			$info->created_table_count = $created_table_count;
-			$info->table_count = $table_count;
+			$info->created_table_count = null; //$created_table_count;
+			$info->table_count = null; //$table_count;
 			$info->path = $path;
 			$info->admin_index_act = $info->admin_index_act;
 			$list[] = $info;