From e03d8e7333363d9310c9983096d38c35db3ec264 Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Tue, 21 Mar 2017 17:49:06 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EB=8A=94=20root=EB=A5=BC=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=20=ED=8D=BC=EB=AF=B8=EC=85=98=EC=9C=BC=EB=A1=9C...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/module/ModuleHandler.class.php | 4 ++--
 classes/module/ModuleObject.class.php  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index e0eec9d44..9883e7d31 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -697,7 +697,7 @@ class ModuleHandler extends Handler
 				if($kind == 'admin')
 				{
 					$grant = $oModuleModel->getGrant($this->module_info, $logged_info);
-					if(!$grant->manager)
+					if(!$grant->root)
 					{
 						self::_setInputErrorToContext();
 						$this->error = 'admin.msg_is_not_administrator';
@@ -709,7 +709,7 @@ class ModuleHandler extends Handler
 					}
 					else
 					{
-						if(!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager')
+						if(!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'root')
 						{
 							self::_setInputErrorToContext();
 							$this->error = 'admin.msg_is_not_administrator';
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index cae73b822..1c87afa4f 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -322,10 +322,10 @@ class ModuleObject extends Object
 		// get permission types(guest, member, manager, root) of the currently requested action
 		$permission = $xml_info->permission->{$this->act};
 		
-		// check manager if a permission in module.xml otherwise action if no permission
-		if(!$permission && substr_count($this->act, 'Admin'))
+		// If admin action, default permission
+		if(!$permission && stripos($this->act, 'admin') !== false)
 		{
-			$permission = 'manager';
+			$permission = 'root';
 		}
 		
 		// Check permissions