From 7d16d9d37f85d370f314d26fb8ce22ce9637e18f Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 30 Jan 2014 00:40:42 +0900
Subject: [PATCH] =?UTF-8?q?NOISSUE=20=EC=82=AC=EC=9D=B4=ED=8A=B8=EB=A7=B5?=
 =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20menu=20type?=
 =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=EC=9D=84=20=EA=B0=80=EC=A0=B8=EC=98=AC=20?=
 =?UTF-8?q?=EB=95=8C=20=EB=AA=A8=EB=93=88=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=B2=B4=ED=81=AC=20=EB=93=B1=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EB=8F=99=EC=9E=91=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/menu/menu.admin.model.php | 46 +++++++++++++++++--------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index 7c72a4eb8..08af452f1 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -339,38 +339,42 @@ class menuAdminModel extends menu
 		$oAutoinstallModel = getModel('autoinstall');
 		$this->add('menu_types', $this->getModuleListInSitemap(0));
 
-		$_allModules = $oModuleModel->getModuleList();
+		$_allModules = FileHandler::readDir('./modules', '/^([a-zA-Z0-9_-]+)$/');
+		sort($_allModules);
+
 		$allModules = array();
 
 		Context::loadLang('modules/page/lang');
-		foreach($_allModules as $value)
+
+		foreach($_allModules as $module_name)
 		{
-			//$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
-			$defaultSkin = $oModuleModel->getModuleDefaultSkin($value->module, 'P');
-			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($value->module, 'M');
-			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($value->module), $defaultSkin);
-			$mobileSkinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($value->module), $defaultMobileSkin, 'm.skins');
-			$value->defaultSkin = new stdClass();
-			$value->defaultSkin->skin = $defaultSkin;
-			$value->defaultSkin->title = $skinInfo->title ? $skinInfo->title : $defaultSkin;
-			$value->defaultMobileSkin = new stdClass();
-			$value->defaultMobileSkin->skin = $defaultMobileSkin;
-			$value->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin;
+			$module = new stdClass;
+			//$moduleInfo = $oModuleModel->getModuleInfoXml($module->module);
+			$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
+			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
+			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);
+			$mobileSkinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultMobileSkin, 'm.skins');
+			$module->defaultSkin = new stdClass();
+			$module->defaultSkin->skin = $defaultSkin;
+			$module->defaultSkin->title = $skinInfo->title ? $skinInfo->title : $defaultSkin;
+			$module->defaultMobileSkin = new stdClass();
+			$module->defaultMobileSkin->skin = $defaultMobileSkin;
+			$module->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin;
 
-			$value->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $value->module);
-			$value->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $value->package_srl;
+			$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name);
+			$module->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $module->package_srl;
 
-			if($value->module == 'page')
+			if($module_name == 'page')
 			{
 				$pageTypeName = Context::getLang('page_type_name');
-				$value->title = $pageTypeName['ARTICLE'];
-				$allModules['ARTICLE'] = $value;
-				$wModuleInfo = clone $value;
+				$module->title = $pageTypeName['ARTICLE'];
+				$allModules['ARTICLE'] = $module;
+				$wModuleInfo = clone $module;
 				unset($wModuleInfo->default_skin, $wModuleInfo->default_mskin);
 				$wModuleInfo->title = $pageTypeName['WIDGET'];
 				$wModuleInfo->no_skin = 'Y';
 				$allModules['WIDGET'] = $wModuleInfo;
-				$oModuleInfo = clone $value;
+				$oModuleInfo = clone $module;
 				unset($oModuleInfo->default_skin, $oModuleInfo->default_mskin);
 				$oModuleInfo->title = $pageTypeName['OUTSIDE'];
 				$oModuleInfo->no_skin = 'Y';
@@ -378,7 +382,7 @@ class menuAdminModel extends menu
 			}
 			else
 			{
-				$allModules[$value->module] = $value;
+				$allModules[$module_name] = $module;
 			}
 		}