xpressengine / xe-core

modules/member/member.model.php

Doc Comments +1 added lines

@@ -297,6 +297,7 @@
 
 	/**
 	 * @brief Return member information with member_srl
+	 * @param string $member_srl
 	 */
 	function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array())
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  memberModel
- * @author NAVER (developers@xpressengine.com)
- * @brief Model class of the member module
- */
+	 * @class  memberModel
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief Model class of the member module
+	 */
 class memberModel extends member
 {
 	/**

Spacing +176 added lines, -176 removed lines

@@ -26,7 +26,7 @@ 
 	{
 		static $member_config;
 
-		if($member_config)
+		if ($member_config)
 		{
 			return $member_config;
 		}
@@ -35,42 +35,42 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
-		if(!$config->signupForm || !is_array($config->signupForm))
+		if (!$config->signupForm || !is_array($config->signupForm))
 		{
 			$oMemberAdminController = getAdminController('member');
 			$identifier = ($config->identifier) ? $config->identifier : 'email_address';
 			$config->signupForm = $oMemberAdminController->createSignupForm($identifier);
 		}
 		//for multi language
-		foreach($config->signupForm AS $key=>$value)
+		foreach ($config->signupForm AS $key=>$value)
 		{
 			$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
-			if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
-			if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
+			if ($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
+			if ($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
 		}
 
 		// Get terms of user
 		$config->agreement = memberModel::_getAgreement();
 
-		if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
-		if(!$config->image_name_max_width) $config->image_name_max_width = 90;
-		if(!$config->image_name_max_height) $config->image_name_max_height = 20;
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = 20;
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = 90;
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = 90;
-		if(!$config->skin) $config->skin = 'default';
-		if(!$config->colorset) $config->colorset = 'white';
-		if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
-		if(!$config->group_image_mark) $config->group_image_mark = "N";
+		if (!$config->webmaster_name) $config->webmaster_name = 'webmaster';
+		if (!$config->image_name_max_width) $config->image_name_max_width = 90;
+		if (!$config->image_name_max_height) $config->image_name_max_height = 20;
+		if (!$config->image_mark_max_width) $config->image_mark_max_width = 20;
+		if (!$config->image_mark_max_height) $config->image_mark_max_height = 20;
+		if (!$config->profile_image_max_width) $config->profile_image_max_width = 90;
+		if (!$config->profile_image_max_height) $config->profile_image_max_height = 90;
+		if (!$config->skin) $config->skin = 'default';
+		if (!$config->colorset) $config->colorset = 'white';
+		if (!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
+		if (!$config->group_image_mark) $config->group_image_mark = "N";
 
-		if(!$config->identifier) $config->identifier = 'user_id';
+		if (!$config->identifier) $config->identifier = 'user_id';
 
-		if(!$config->max_error_count) $config->max_error_count = 10;
-		if(!$config->max_error_count_time) $config->max_error_count_time = 300;
+		if (!$config->max_error_count) $config->max_error_count = 10;
+		if (!$config->max_error_count_time) $config->max_error_count_time = 300;
 
-		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
-		if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
+		if (!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
+		if (!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
 
 		$member_config = $config;
 
@@ -79,24 +79,24 @@ 
 
 	function _getAgreement()
 	{
-		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
-		if(is_readable($agreement_file))
+		$agreement_file = _XE_PATH_ . 'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+		if (is_readable($agreement_file))
 		{
 			return FileHandler::readFile($agreement_file);
 		}
 
 		$db_info = Context::getDBInfo();
-		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $db_info->lang_type . '.txt';
-		if(is_readable($agreement_file))
+		$agreement_file = _XE_PATH_ . 'files/member_extra_info/agreement_' . $db_info->lang_type . '.txt';
+		if (is_readable($agreement_file))
 		{
 			return FileHandler::readFile($agreement_file);
 		}
 
 		$lang_selected = Context::loadLangSelected();
-		foreach($lang_selected as $key => $val)
+		foreach ($lang_selected as $key => $val)
 		{
-			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $key . '.txt';
-			if(is_readable($agreement_file))
+			$agreement_file = _XE_PATH_ . 'files/member_extra_info/agreement_' . $key . '.txt';
+			if (is_readable($agreement_file))
 			{
 				return FileHandler::readFile($agreement_file);
 			}
@@ -116,12 +116,12 @@ 
 		$logged_info = Context::get('logged_info');
 		$act = Context::get('cur_act');
 		// When click user's own nickname
-		if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
+		if ($member_srl == $logged_info->member_srl) $member_info = $logged_info;
 		// When click other's nickname
 		else $member_info = $this->getMemberInfoByMemberSrl($member_srl);
 
 		$member_srl = $member_info->member_srl;
-		if(!$member_srl) return;
+		if (!$member_srl) return;
 		// List variables
 		$user_id = $member_info->user_id;
 		$user_name = $member_info->user_name;
@@ -130,18 +130,18 @@ 
 
 		$oMemberController = getController('member');
 		// Display member information (Don't display to non-logged user)
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
-			$url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self');
+			$url = getUrl('', 'mid', $mid, 'act', 'dispMemberInfo', 'member_srl', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_view_member_info', $icon_path, 'self');
 		}
 		// When click other's nickname
-		if($member_srl != $logged_info->member_srl && $logged_info->member_srl)
+		if ($member_srl != $logged_info->member_srl && $logged_info->member_srl)
 		{
 			// Get email config
-			foreach($this->module_config->signupForm as $field)
+			foreach ($this->module_config->signupForm as $field)
 			{
-				if($field->name == 'email_address')
+				if ($field->name == 'email_address')
 				{
 					$email_config = $field;
 					break;
@@ -149,36 +149,36 @@ 
 			}
 
 			// Send an email only if email address is public
-			if(($logged_info->is_admin == 'Y' || $email_config->isPublic == 'Y') && $member_info->email_address)
+			if (($logged_info->is_admin == 'Y' || $email_config->isPublic == 'Y') && $member_info->email_address)
 			{
-				$url = 'mailto:'.htmlspecialchars($member_info->email_address, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-				$oMemberController->addMemberPopupMenu($url,'cmd_send_email',$icon_path);
+				$url = 'mailto:' . htmlspecialchars($member_info->email_address, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+				$oMemberController->addMemberPopupMenu($url, 'cmd_send_email', $icon_path);
 			}
 		}
 		// View homepage info
-		if($member_info->homepage)
+		if ($member_info->homepage)
 			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
 		// View blog info
-		if($member_info->blog)
+		if ($member_info->blog)
 			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
 		// Display a menu for editting member info to a top administrator
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
-			$url = getUrl('','module','admin','act','dispMemberAdminInsert','member_srl',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_manage_member_info',$icon_path,'MemberModifyInfo');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_manage_member_info', $icon_path, 'MemberModifyInfo');
 
-			$url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'member_srl', 'search_keyword', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_trace_document', $icon_path, 'TraceMemberDocument');
 
-			$url = getUrl('','module','admin','act','dispCommentAdminList','search_target','member_srl','search_keyword',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_trace_comment',$icon_path,'TraceMemberComment');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'member_srl', 'search_keyword', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_trace_comment', $icon_path, 'TraceMemberComment');
 		}
 		// Change a language of pop-up menu
 		$menus = Context::get('member_popup_menu_list');
 		$menus_count = count($menus);
-		for($i=0;$i<$menus_count;$i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -190,15 +190,15 @@ 
 	 * @brief Check if logged-in
 	 */
 	function isLogged() {
-		if($_SESSION['is_logged'])
+		if ($_SESSION['is_logged'])
 		{
-			if(Mobile::isFromMobilePhone())
+			if (Mobile::isFromMobilePhone())
 			{
 				return true;
 			}
 			else
 			{
-				if(ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
+				if (ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
 				{
 					return true;
 				}
@@ -215,23 +215,23 @@ 
 	function getLoggedInfo()
 	{
 		// Return session info if session info is requested and the user is logged-in
-		if($this->isLogged())
+		if ($this->isLogged())
 		{
 			$logged_info = Context::get('logged_info');
 			// Admin/Group list defined depending on site_module_info
 			$site_module_info = Context::get('site_module_info');
-			if($site_module_info->site_srl)
+			if ($site_module_info->site_srl)
 			{
 				$logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
 				// Add is_site_admin bool variable into logged_info if site_administrator is
 				$oModuleModel = getModel('module');
-				if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
+				if ($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
 				else $logged_info->is_site_admin = false;
 			}
 			else
 			{
 				// Register a default group if the site doesn't have a member group
-				if(count($logged_info->group_list) === 0)
+				if (count($logged_info->group_list) === 0)
 				{
 					$default_group = $this->getDefaultGroup(0);
 					$oMemberController = getController('member');
@@ -254,13 +254,13 @@ 
 	 */
 	function getMemberInfoByUserID($user_id, $columnList = array())
 	{
-		if(!$user_id) return;
+		if (!$user_id) return;
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
 		$output = executeQuery('member.getMemberInfo', $args);
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if (!$output->toBool()) return $output;
+		if (!$output->data) return;
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 
@@ -272,12 +272,12 @@ 
 	 */
 	function getMemberInfoByEmailAddress($email_address)
 	{
-		if(!$email_address) return;
+		if (!$email_address) return;
 
 		$args = new stdClass();
 		
-		$db_info = Context::getDBInfo ();
-		if($db_info->master_db['db_type'] == "cubrid")
+		$db_info = Context::getDBInfo();
+		if ($db_info->master_db['db_type'] == "cubrid")
 		{
 			$args->email_address = strtolower($email_address);
 			$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);
@@ -288,8 +288,8 @@ 
 			$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
 		}
 		
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if (!$output->toBool()) return $output;
+		if (!$output->data) return;
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 		return $member_info;
@@ -300,15 +300,15 @@ 
 	 */
 	function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array())
 	{
-		if(!$member_srl) return;
+		if (!$member_srl) return;
 
 		//columnList size zero... get full member info
-		if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
+		if (!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
 		{
 			$GLOBALS['__member_info__'][$member_srl] = false;
 
 			$oCacheHandler = CacheHandler::getInstance('object');
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$columnList = array();
 				$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
@@ -316,20 +316,20 @@ 
 				$GLOBALS['__member_info__'][$member_srl] = $oCacheHandler->get($cache_key);
 			}
 
-			if($GLOBALS['__member_info__'][$member_srl] === false)
+			if ($GLOBALS['__member_info__'][$member_srl] === false)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
 				$output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
-				if(!$output->data) 
+				if (!$output->data) 
 				{
-					if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
+					if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
 					return;
 				}
 				$this->arrangeMemberInfo($output->data, $site_srl);
 
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
 			}
 		}
 
@@ -341,7 +341,7 @@ 
 	 */
 	function arrangeMemberInfo($info, $site_srl = 0)
 	{
-		if(!$GLOBALS['__member_info__'][$info->member_srl])
+		if (!$GLOBALS['__member_info__'][$info->member_srl])
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
@@ -350,25 +350,25 @@ 
 			$info->profile_image = $this->getProfileImage($info->member_srl);
 			$info->image_name = $this->getImageName($info->member_srl);
 			$info->image_mark = $this->getImageMark($info->member_srl);
-			if($config->group_image_mark=='Y')
+			if ($config->group_image_mark == 'Y')
 			{
-				$info->group_mark = $this->getGroupImageMark($info->member_srl,$site_srl);
+				$info->group_mark = $this->getGroupImageMark($info->member_srl, $site_srl);
 			}
 			$info->signature = $this->getSignature($info->member_srl);
 			$info->group_list = $this->getMemberGroups($info->member_srl, $site_srl);
 
 			$extra_vars = unserialize($info->extra_vars);
 			unset($info->extra_vars);
-			if($extra_vars)
+			if ($extra_vars)
 			{
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
-					if(!$info->{$key}) $info->{$key} = $val;
+					if (!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
+					if (!$info->{$key}) $info->{$key} = $val;
 				}
 			}
 
-			if(strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer))
+			if (strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer))
 			{
 				$info->find_account_answer = null;
 			}
@@ -380,11 +380,11 @@ 
 			$info->homepage = strip_tags($info->homepage);
 			$info->blog = strip_tags($info->blog);
 
-			if($extra_vars)
+			if ($extra_vars)
 			{
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(is_array($val))
+					if (is_array($val))
 					{
 						$oSecurity->encodeHTML($key . '.');
 					}
@@ -397,12 +397,12 @@ 
 
 			// Check format.
 			$oValidator = new Validator();
-			if(!$oValidator->applyRule('url', $info->homepage))
+			if (!$oValidator->applyRule('url', $info->homepage))
 			{
 				$info->homepage = '';
 			}
 
-			if(!$oValidator->applyRule('url', $info->blog))
+			if (!$oValidator->applyRule('url', $info->blog))
 			{
 				$info->blog = '';
 			}
@@ -451,7 +451,7 @@ 
 	 */
 	function getLoggedMemberSrl()
 	{
-		if(!$this->isLogged()) return;
+		if (!$this->isLogged()) return;
 		return $_SESSION['member_srl'];
 	}
 
@@ -460,7 +460,7 @@ 
 	 */
 	function getLoggedUserID()
 	{
-		if(!$this->isLogged()) return;
+		if (!$this->isLogged()) return;
 		$logged_info = Context::get('logged_info');
 		return $logged_info->user_id;
 	}
@@ -475,16 +475,16 @@ 
 		// cache controll
 		$group_list = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_'.$site_srl;
+			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_' . $site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$group_list = $oCacheHandler->get($cache_key);
 		}
 
-		if(!$member_groups[$member_srl][$site_srl] || $force_reload)
+		if (!$member_groups[$member_srl][$site_srl] || $force_reload)
 		{
-			if($group_list === false)
+			if ($group_list === false)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
@@ -492,11 +492,11 @@ 
 				$output = executeQueryArray('member.getMemberGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
 			}
-			if(!$group_list) return array();
+			if (!$group_list) return array();
 
-			foreach($group_list as $group)
+			foreach ($group_list as $group)
 			{
 				$result[$group->group_srl] = $group->title;
 			}
@@ -510,14 +510,14 @@ 
 	 */
 	function getMembersGroups($member_srls, $site_srl = 0)
 	{
-		$args->member_srls = implode(',',$member_srls);
+		$args->member_srls = implode(',', $member_srls);
 		$args->site_srl = $site_srl;
 		$args->sort_index = 'list_order';
 		$output = executeQueryArray('member.getMembersGroups', $args);
-		if(!$output->data) return array();
+		if (!$output->data) return array();
 
 		$result = array();
-		foreach($output->data as $key=>$val)
+		foreach ($output->data as $key=>$val)
 		{
 			$result[$val->member_srl][] = $val->title;
 		}
@@ -531,7 +531,7 @@ 
 	{
 		$default_group = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$columnList = array();
 			$object_key = 'default_group_' . $site_srl;
@@ -539,13 +539,13 @@ 
 			$default_group = $oCacheHandler->get($cache_key);
 		}
 
-		if($default_group === false)
+		if ($default_group === false)
 		{
 			$args = new stdClass();
 			$args->site_srl = $site_srl;
 			$output = executeQuery('member.getDefaultGroup', $args, $columnList);
 			$default_group = $output->data;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $default_group);
 			}
@@ -579,25 +579,25 @@ 
 	 */
 	function getGroups($site_srl = 0)
 	{
-		if(!$GLOBALS['__group_info__'][$site_srl])
+		if (!$GLOBALS['__group_info__'][$site_srl])
 		{
 			$result = array();
 
-			if(!isset($site_srl))
+			if (!isset($site_srl))
 			{
 				$site_srl = 0;
 			}
 
 			$group_list = false;
 			$oCacheHandler = CacheHandler::getInstance('object', null, true);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
-				$object_key = 'member_groups:site_'.$site_srl;
+				$object_key = 'member_groups:site_' . $site_srl;
 				$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 				$group_list = $oCacheHandler->get($cache_key);
 			}
 
-			if($group_list === false)
+			if ($group_list === false)
 			{
 				$args = new stdClass();
 				$args->site_srl = $site_srl;
@@ -606,16 +606,16 @@ 
 				$output = executeQueryArray('member.getGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
 			}
 
-			if(!$group_list)
+			if (!$group_list)
 			{
 				return array();
 			}
 
 
-			foreach($group_list as $val)
+			foreach ($group_list as $val)
 			{
 				$result[$val->group_srl] = $val;
 			}
@@ -646,7 +646,7 @@ 
 		// Set to ignore if a super administrator.
 		$logged_info = Context::get('logged_info');
 
-		if(!$this->join_form_list)
+		if (!$this->join_form_list)
 		{
 			// Argument setting to sort list_order column
 			$args = new stdClass();
@@ -654,11 +654,11 @@ 
 			$output = executeQuery('member.getJoinFormList', $args);
 			// NULL if output data deosn't exist
 			$join_form_list = $output->data;
-			if(!$join_form_list) return NULL;
+			if (!$join_form_list) return NULL;
 			// Need to unserialize because serialized array is inserted into DB in case of default_value
-			if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
+			if (!is_array($join_form_list)) $join_form_list = array($join_form_list);
 			$join_form_count = count($join_form_list);
-			for($i=0;$i<$join_form_count;$i++)
+			for ($i = 0; $i < $join_form_count; $i++)
 			{
 				$join_form_list[$i]->column_name = strtolower($join_form_list[$i]->column_name);
 
@@ -670,10 +670,10 @@ 
 				// Add language variable
 				$lang->extend_vars[$column_name] = $column_title;
 				// unserialize if the data type if checkbox, select and so on
-				if(in_array($column_type, array('checkbox','select','radio')))
+				if (in_array($column_type, array('checkbox', 'select', 'radio')))
 				{
 					$join_form_list[$i]->default_value = unserialize($default_value);
-					if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
+					if (!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
 				}
 				else
 				{
@@ -685,21 +685,21 @@ 
 			$this->join_form_list = $list;
 		}
 		// Get object style if the filter_response is true
-		if($filter_response && count($this->join_form_list))
+		if ($filter_response && count($this->join_form_list))
 		{
-			foreach($this->join_form_list as $key => $val)
+			foreach ($this->join_form_list as $key => $val)
 			{
-				if($val->is_active != 'Y') continue;
+				if ($val->is_active != 'Y') continue;
 				unset($obj);
 				$obj->type = $val->column_type;
 				$obj->name = $val->column_name;
 				$obj->lang = $val->column_title;
-				if($logged_info->is_admin != 'Y') $obj->required = $val->required=='Y'?true:false;
+				if ($logged_info->is_admin != 'Y') $obj->required = $val->required == 'Y' ? true : false;
 				else $obj->required = false;
 				$filter_output[] = $obj;
 
 				unset($open_obj);
-				$open_obj->name = 'open_'.$val->column_name;
+				$open_obj->name = 'open_' . $val->column_name;
 				$open_obj->required = false;
 				$filter_output[] = $open_obj;
 
@@ -721,15 +721,15 @@ 
 		$args->sort_index = "list_order";
 		$output = executeQueryArray('member.getJoinFormList', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return array();
 		}
 
 		$joinFormList = array();
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
-			if($val->is_active != 'Y')
+			if ($val->is_active != 'Y')
 			{
 				continue;
 			}
@@ -746,20 +746,20 @@ 
 	function getCombineJoinForm($member_info)
 	{
 		$extend_form_list = $this->getJoinFormlist();
-		if(!$extend_form_list) return;
+		if (!$extend_form_list) return;
 		// Member info is open only to an administrator and him/herself when is_private is true.
 		$logged_info = Context::get('logged_info');
 
-		foreach($extend_form_list as $srl => $item)
+		foreach ($extend_form_list as $srl => $item)
 		{
 			$column_name = $item->column_name;
 			$value = $member_info->{$column_name};
 
 			// Change values depening on the type of extend form
-			switch($item->column_type)
+			switch ($item->column_type)
 			{
 				case 'checkbox' :
-					if($value && !is_array($value)) $value = array($value);
+					if ($value && !is_array($value)) $value = array($value);
 					break;
 				case 'text' :
 				case 'homepage' :
@@ -773,7 +773,7 @@ 
 
 			$extend_form_list[$srl]->value = $value;
 
-			if($member_info->{'open_'.$column_name}=='Y') $extend_form_list[$srl]->is_opened = true;
+			if ($member_info->{'open_' . $column_name} == 'Y') $extend_form_list[$srl]->is_opened = true;
 			else $extend_form_list[$srl]->is_opened = false;
 		}
 		return $extend_form_list;
@@ -787,12 +787,12 @@ 
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 		$join_form = $output->data;
-		if(!$join_form) return NULL;
+		if (!$join_form) return NULL;
 
 		$column_type = $join_form->column_type;
 		$default_value = $join_form->default_value;
 
-		if(in_array($column_type, array('checkbox','select','radio')))
+		if (in_array($column_type, array('checkbox', 'select', 'radio')))
 		{
 			$join_form->default_value = unserialize($default_value);
 		}
@@ -809,7 +809,7 @@ 
 	 */
 	function getDeniedIDList()
 	{
-		if(!$this->denied_id_list)
+		if (!$this->denied_id_list)
 		{
 			$args->sort_index = "list_order";
 			$args->page = Context::get('page');
@@ -825,14 +825,14 @@ 
 	function getDeniedIDs()
 	{
 		$output = executeQueryArray('member.getDeniedIDs');
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 		return $output->data;
 	}
 
 	function getDeniedNickNames()
 	{
 		$output = executeQueryArray('member.getDeniedNickNames');
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return array();
 		}
@@ -848,7 +848,7 @@ 
 		$args = new stdClass();
 		$args->user_id = $user_id;
 		$output = executeQuery('member.chkDeniedID', $args);
-		if($output->data->count) return true;
+		if ($output->data->count) return true;
 		return false;
 	}
 
@@ -860,8 +860,8 @@ 
 		$args = new stdClass();
 		$args->nick_name = $nickName;
 		$output = executeQuery('member.chkDeniedNickName', $args);
-		if($output->data->count) return true;
-		if(!$output->toBool())
+		if ($output->data->count) return true;
+		if (!$output->toBool())
 		{
 			return true;
 		}
@@ -872,21 +872,21 @@ 
 	 */
 	function getProfileImage($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['profile_image'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['profile_image'][$member_srl]))
 		{
 			$GLOBALS['__member_info__']['profile_image'][$member_srl] = null;
-			$exts = array('gif','jpg','png');
-			for($i=0;$i<3;$i++)
+			$exts = array('gif', 'jpg', 'png');
+			for ($i = 0; $i < 3; $i++)
 			{
 				$image_name_file = sprintf('files/member_extra_info/profile_image/%s%d.%s', getNumberingPath($member_srl), $member_srl, $exts[$i]);
-				if(file_exists($image_name_file))
+				if (file_exists($image_name_file))
 				{
 					list($width, $height, $type, $attrs) = getimagesize($image_name_file);
 					$info = new stdClass();
 					$info->width = $width;
 					$info->height = $height;
-					$info->src = Context::getRequestUri().$image_name_file;
-					$info->file = './'.$image_name_file;
+					$info->src = Context::getRequestUri() . $image_name_file;
+					$info->file = './' . $image_name_file;
 					$GLOBALS['__member_info__']['profile_image'][$member_srl] = $info;
 					break;
 				}
@@ -901,17 +901,17 @@ 
 	 */
 	function getImageName($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['image_name'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['image_name'][$member_srl]))
 		{
 			$image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($image_name_file))
+			if (file_exists($image_name_file))
 			{
 				list($width, $height, $type, $attrs) = getimagesize($image_name_file);
 				$info = new stdClass;
 				$info->width = $width;
 				$info->height = $height;
-				$info->src = Context::getRequestUri().$image_name_file;
-				$info->file = './'.$image_name_file;
+				$info->src = Context::getRequestUri() . $image_name_file;
+				$info->file = './' . $image_name_file;
 				$GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
 			}
 			else $GLOBALS['__member_info__']['image_name'][$member_srl] = null;
@@ -924,16 +924,16 @@ 
 	 */
 	function getImageMark($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['image_mark'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['image_mark'][$member_srl]))
 		{
 			$image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($image_mark_file))
+			if (file_exists($image_mark_file))
 			{
 				list($width, $height, $type, $attrs) = getimagesize($image_mark_file);
 				$info->width = $width;
 				$info->height = $height;
-				$info->src = Context::getRequestUri().$image_mark_file;
-				$info->file = './'.$image_mark_file;
+				$info->src = Context::getRequestUri() . $image_mark_file;
+				$info->file = './' . $image_mark_file;
 				$GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
 			}
 			else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
@@ -946,27 +946,27 @@ 
 	/**
 	 * @brief Get the image mark of the group
 	 */
-	function getGroupImageMark($member_srl,$site_srl=0)
+	function getGroupImageMark($member_srl, $site_srl = 0)
 	{
-		if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
-			if($config->group_image_mark!='Y')
+			if ($config->group_image_mark != 'Y')
 			{
 				return null;
 			}
-			$member_group = $this->getMemberGroups($member_srl,$site_srl);
+			$member_group = $this->getMemberGroups($member_srl, $site_srl);
 			$groups_info = $this->getGroups($site_srl);
-			if(count($member_group) > 0 && is_array($member_group))
+			if (count($member_group) > 0 && is_array($member_group))
 			{
 				$memberGroups = array_keys($member_group);
 
-				foreach($groups_info as $group_srl=>$group_info)
+				foreach ($groups_info as $group_srl=>$group_info)
 				{
-					if(in_array($group_srl, $memberGroups))
+					if (in_array($group_srl, $memberGroups))
 					{
-						if($group_info->image_mark)
+						if ($group_info->image_mark)
 						{
 							$info = new stdClass();
 							$info->title = $group_info->title;
@@ -990,10 +990,10 @@ 
 	 */
 	function getSignature($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['signature'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['signature'][$member_srl]))
 		{
 			$filename = sprintf('files/member_extra_info/signature/%s%d.signature.php', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($filename))
+			if (file_exists($filename))
 			{
 				$buff = FileHandler::readFile($filename);
 				$signature = preg_replace('/<\?.*\?>/', '', $buff);
@@ -1011,10 +1011,10 @@ 
 	 * @param int $member_srl Set this to member_srl when comparing a member's password (optional)
 	 * @return bool
 	 */
-	function isValidPassword($hashed_password, $password_text, $member_srl=null)
+	function isValidPassword($hashed_password, $password_text, $member_srl = null)
 	{
 		// False if no password in entered
-		if(!$password_text)
+		if (!$password_text)
 		{
 			return false;
 		}
@@ -1023,31 +1023,31 @@ 
 		$oPassword = new Password();
 		$current_algorithm = $oPassword->checkAlgorithm($hashed_password);
 		$match = $oPassword->checkPassword($password_text, $hashed_password, $current_algorithm);
-		if(!$match)
+		if (!$match)
 		{
 			return false;
 		}
 		
 		// Update the encryption method if necessary
 		$config = $this->getMemberConfig();
-		if($member_srl > 0 && $config->password_hashing_auto_upgrade != 'N')
+		if ($member_srl > 0 && $config->password_hashing_auto_upgrade != 'N')
 		{
 			$need_upgrade = false;
 			
-			if(!$need_upgrade)
+			if (!$need_upgrade)
 			{
 				$required_algorithm = $oPassword->getCurrentlySelectedAlgorithm();
-				if($required_algorithm !== $current_algorithm) $need_upgrade = true;
+				if ($required_algorithm !== $current_algorithm) $need_upgrade = true;
 			}
 			
-			if(!$need_upgrade)
+			if (!$need_upgrade)
 			{
 				$required_work_factor = $oPassword->getWorkFactor();
 				$current_work_factor = $oPassword->checkWorkFactor($hashed_password);
-				if($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
+				if ($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
 			}
 			
-			if($need_upgrade === true)
+			if ($need_upgrade === true)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
@@ -1075,27 +1075,27 @@ 
 	function checkPasswordStrength($password, $strength)
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if ($logged_info->is_admin == 'Y') return true;
 		
-		if($strength == NULL)
+		if ($strength == NULL)
 		{
 			$config = $this->getMemberConfig();
-			$strength = $config->password_strength?$config->password_strength:'normal';
+			$strength = $config->password_strength ? $config->password_strength : 'normal';
 		}
 		
 		$length = strlen($password);
 		
 		switch ($strength) {
 			case 'high':
-				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
+				if ($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
 				/* no break */
 				
 			case 'normal':
-				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
+				if ($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
 				break;
 				
 			case 'low':
-				if($length < 4) return false;
+				if ($length < 4) return false;
 				break; 
 		}
 		
@@ -1106,11 +1106,11 @@ 
 	{
 		$groupSrl = 0;
 		$output = $this->getGroups($site_srl);
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key=>$value)
+			foreach ($output AS $key=>$value)
 			{
-				if($value->is_admin == 'Y')
+				if ($value->is_admin == 'Y')
 				{
 					$groupSrl = $value->group_srl;
 					break;

Braces +201 added lines, -81 removed lines

@@ -45,32 +45,68 @@ 
 		foreach($config->signupForm AS $key=>$value)
 		{
 			$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
-			if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
-			if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
+			if($config->signupForm[$key]->isPublic != 'N') {
+				$config->signupForm[$key]->isPublic = 'Y';
+			}
+			if($value->name == 'find_account_question') {
+				$config->signupForm[$key]->isPublic = 'N';
+			}
 		}
 
 		// Get terms of user
 		$config->agreement = memberModel::_getAgreement();
 
-		if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
-		if(!$config->image_name_max_width) $config->image_name_max_width = 90;
-		if(!$config->image_name_max_height) $config->image_name_max_height = 20;
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = 20;
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = 90;
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = 90;
-		if(!$config->skin) $config->skin = 'default';
-		if(!$config->colorset) $config->colorset = 'white';
-		if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
-		if(!$config->group_image_mark) $config->group_image_mark = "N";
+		if(!$config->webmaster_name) {
+			$config->webmaster_name = 'webmaster';
+		}
+		if(!$config->image_name_max_width) {
+			$config->image_name_max_width = 90;
+		}
+		if(!$config->image_name_max_height) {
+			$config->image_name_max_height = 20;
+		}
+		if(!$config->image_mark_max_width) {
+			$config->image_mark_max_width = 20;
+		}
+		if(!$config->image_mark_max_height) {
+			$config->image_mark_max_height = 20;
+		}
+		if(!$config->profile_image_max_width) {
+			$config->profile_image_max_width = 90;
+		}
+		if(!$config->profile_image_max_height) {
+			$config->profile_image_max_height = 90;
+		}
+		if(!$config->skin) {
+			$config->skin = 'default';
+		}
+		if(!$config->colorset) {
+			$config->colorset = 'white';
+		}
+		if(!$config->editor_skin || $config->editor_skin == 'default') {
+			$config->editor_skin = 'ckeditor';
+		}
+		if(!$config->group_image_mark) {
+			$config->group_image_mark = "N";
+		}
 
-		if(!$config->identifier) $config->identifier = 'user_id';
+		if(!$config->identifier) {
+			$config->identifier = 'user_id';
+		}
 
-		if(!$config->max_error_count) $config->max_error_count = 10;
-		if(!$config->max_error_count_time) $config->max_error_count_time = 300;
+		if(!$config->max_error_count) {
+			$config->max_error_count = 10;
+		}
+		if(!$config->max_error_count_time) {
+			$config->max_error_count_time = 300;
+		}
 
-		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
-		if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
+		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') {
+			$config->signature_editor_skin = 'ckeditor';
+		}
+		if(!$config->sel_editor_colorset) {
+			$config->sel_editor_colorset = 'moono';
+		}
 
 		$member_config = $config;
 
@@ -116,12 +152,18 @@ 
 		$logged_info = Context::get('logged_info');
 		$act = Context::get('cur_act');
 		// When click user's own nickname
-		if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
+		if($member_srl == $logged_info->member_srl) {
+			$member_info = $logged_info;
+		}
 		// When click other's nickname
-		else $member_info = $this->getMemberInfoByMemberSrl($member_srl);
+		else {
+			$member_info = $this->getMemberInfoByMemberSrl($member_srl);
+		}
 
 		$member_srl = $member_info->member_srl;
-		if(!$member_srl) return;
+		if(!$member_srl) {
+			return;
+		}
 		// List variables
 		$user_id = $member_info->user_id;
 		$user_name = $member_info->user_name;
@@ -156,11 +198,13 @@ 
 			}
 		}
 		// View homepage info
-		if($member_info->homepage)
-			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
+		if($member_info->homepage) {
+					$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
+		}
 		// View blog info
-		if($member_info->blog)
-			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
+		if($member_info->blog) {
+					$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
+		}
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
 		// Display a menu for editting member info to a top administrator
@@ -195,8 +239,7 @@ 
 			if(Mobile::isFromMobilePhone())
 			{
 				return true;
-			}
-			else
+			} else
 			{
 				if(ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
 				{
@@ -225,10 +268,12 @@ 
 				$logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
 				// Add is_site_admin bool variable into logged_info if site_administrator is
 				$oModuleModel = getModel('module');
-				if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
-				else $logged_info->is_site_admin = false;
-			}
-			else
+				if($oModuleModel->isSiteAdmin($logged_info)) {
+					$logged_info->is_site_admin = true;
+				} else {
+					$logged_info->is_site_admin = false;
+				}
+			} else
 			{
 				// Register a default group if the site doesn't have a member group
 				if(count($logged_info->group_list) === 0)
@@ -254,13 +299,19 @@ 
 	 */
 	function getMemberInfoByUserID($user_id, $columnList = array())
 	{
-		if(!$user_id) return;
+		if(!$user_id) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
 		$output = executeQuery('member.getMemberInfo', $args);
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$output->data) {
+			return;
+		}
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 
@@ -272,7 +323,9 @@ 
 	 */
 	function getMemberInfoByEmailAddress($email_address)
 	{
-		if(!$email_address) return;
+		if(!$email_address) {
+			return;
+		}
 
 		$args = new stdClass();
 		
@@ -281,15 +334,18 @@ 
 		{
 			$args->email_address = strtolower($email_address);
 			$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);
-		}
-		else
+		} else
 		{
 			$args->email_address = $email_address;
 			$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
 		}
 		
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$output->data) {
+			return;
+		}
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 		return $member_info;
@@ -300,7 +356,9 @@ 
 	 */
 	function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array())
 	{
-		if(!$member_srl) return;
+		if(!$member_srl) {
+			return;
+		}
 
 		//columnList size zero... get full member info
 		if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
@@ -323,13 +381,17 @@ 
 				$output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
 				if(!$output->data) 
 				{
-					if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
+					if($oCacheHandler->isSupport()) {
+						$oCacheHandler->put($cache_key, new stdClass);
+					}
 					return;
 				}
 				$this->arrangeMemberInfo($output->data, $site_srl);
 
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				}
 			}
 		}
 
@@ -363,8 +425,12 @@ 
 			{
 				foreach($extra_vars as $key => $val)
 				{
-					if(!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
-					if(!$info->{$key}) $info->{$key} = $val;
+					if(!is_array($val) && strpos($val, '|@|') !== FALSE) {
+						$val = explode('|@|', $val);
+					}
+					if(!$info->{$key}) {
+						$info->{$key} = $val;
+					}
 				}
 			}
 
@@ -387,8 +453,7 @@ 
 					if(is_array($val))
 					{
 						$oSecurity->encodeHTML($key . '.');
-					}
-					else
+					} else
 					{
 						$oSecurity->encodeHTML($key);
 					}
@@ -451,7 +516,9 @@ 
 	 */
 	function getLoggedMemberSrl()
 	{
-		if(!$this->isLogged()) return;
+		if(!$this->isLogged()) {
+			return;
+		}
 		return $_SESSION['member_srl'];
 	}
 
@@ -460,7 +527,9 @@ 
 	 */
 	function getLoggedUserID()
 	{
-		if(!$this->isLogged()) return;
+		if(!$this->isLogged()) {
+			return;
+		}
 		$logged_info = Context::get('logged_info');
 		return $logged_info->user_id;
 	}
@@ -492,9 +561,13 @@ 
 				$output = executeQueryArray('member.getMemberGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $group_list);
+				}
+			}
+			if(!$group_list) {
+				return array();
 			}
-			if(!$group_list) return array();
 
 			foreach($group_list as $group)
 			{
@@ -514,7 +587,9 @@ 
 		$args->site_srl = $site_srl;
 		$args->sort_index = 'list_order';
 		$output = executeQueryArray('member.getMembersGroups', $args);
-		if(!$output->data) return array();
+		if(!$output->data) {
+			return array();
+		}
 
 		$result = array();
 		foreach($output->data as $key=>$val)
@@ -606,7 +681,9 @@ 
 				$output = executeQueryArray('member.getGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $group_list);
+				}
 			}
 
 			if(!$group_list)
@@ -654,9 +731,13 @@ 
 			$output = executeQuery('member.getJoinFormList', $args);
 			// NULL if output data deosn't exist
 			$join_form_list = $output->data;
-			if(!$join_form_list) return NULL;
+			if(!$join_form_list) {
+				return NULL;
+			}
 			// Need to unserialize because serialized array is inserted into DB in case of default_value
-			if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
+			if(!is_array($join_form_list)) {
+				$join_form_list = array($join_form_list);
+			}
 			$join_form_count = count($join_form_list);
 			for($i=0;$i<$join_form_count;$i++)
 			{
@@ -673,9 +754,10 @@ 
 				if(in_array($column_type, array('checkbox','select','radio')))
 				{
 					$join_form_list[$i]->default_value = unserialize($default_value);
-					if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
-				}
-				else
+					if(!$join_form_list[$i]->default_value[0]) {
+						$join_form_list[$i]->default_value = '';
+					}
+				} else
 				{
 					$join_form_list[$i]->default_value = '';
 				}
@@ -689,13 +771,18 @@ 
 		{
 			foreach($this->join_form_list as $key => $val)
 			{
-				if($val->is_active != 'Y') continue;
+				if($val->is_active != 'Y') {
+					continue;
+				}
 				unset($obj);
 				$obj->type = $val->column_type;
 				$obj->name = $val->column_name;
 				$obj->lang = $val->column_title;
-				if($logged_info->is_admin != 'Y') $obj->required = $val->required=='Y'?true:false;
-				else $obj->required = false;
+				if($logged_info->is_admin != 'Y') {
+					$obj->required = $val->required=='Y'?true:false;
+				} else {
+					$obj->required = false;
+				}
 				$filter_output[] = $obj;
 
 				unset($open_obj);
@@ -746,7 +833,9 @@ 
 	function getCombineJoinForm($member_info)
 	{
 		$extend_form_list = $this->getJoinFormlist();
-		if(!$extend_form_list) return;
+		if(!$extend_form_list) {
+			return;
+		}
 		// Member info is open only to an administrator and him/herself when is_private is true.
 		$logged_info = Context::get('logged_info');
 
@@ -759,7 +848,9 @@ 
 			switch($item->column_type)
 			{
 				case 'checkbox' :
-					if($value && !is_array($value)) $value = array($value);
+					if($value && !is_array($value)) {
+						$value = array($value);
+					}
 					break;
 				case 'text' :
 				case 'homepage' :
@@ -773,8 +864,11 @@ 
 
 			$extend_form_list[$srl]->value = $value;
 
-			if($member_info->{'open_'.$column_name}=='Y') $extend_form_list[$srl]->is_opened = true;
-			else $extend_form_list[$srl]->is_opened = false;
+			if($member_info->{'open_'.$column_name}=='Y') {
+				$extend_form_list[$srl]->is_opened = true;
+			} else {
+				$extend_form_list[$srl]->is_opened = false;
+			}
 		}
 		return $extend_form_list;
 	}
@@ -787,7 +881,9 @@ 
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 		$join_form = $output->data;
-		if(!$join_form) return NULL;
+		if(!$join_form) {
+			return NULL;
+		}
 
 		$column_type = $join_form->column_type;
 		$default_value = $join_form->default_value;
@@ -795,8 +891,7 @@ 
 		if(in_array($column_type, array('checkbox','select','radio')))
 		{
 			$join_form->default_value = unserialize($default_value);
-		}
-		else
+		} else
 		{
 			$join_form->default_value = '';
 		}
@@ -825,7 +920,9 @@ 
 	function getDeniedIDs()
 	{
 		$output = executeQueryArray('member.getDeniedIDs');
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 		return $output->data;
 	}
 
@@ -848,7 +945,9 @@ 
 		$args = new stdClass();
 		$args->user_id = $user_id;
 		$output = executeQuery('member.chkDeniedID', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		return false;
 	}
 
@@ -860,7 +959,9 @@ 
 		$args = new stdClass();
 		$args->nick_name = $nickName;
 		$output = executeQuery('member.chkDeniedNickName', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		if(!$output->toBool())
 		{
 			return true;
@@ -913,8 +1014,9 @@ 
 				$info->src = Context::getRequestUri().$image_name_file;
 				$info->file = './'.$image_name_file;
 				$GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
+			} else {
+				$GLOBALS['__member_info__']['image_name'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['image_name'][$member_srl] = null;
 		}
 		return $GLOBALS['__member_info__']['image_name'][$member_srl];
 	}
@@ -935,8 +1037,9 @@ 
 				$info->src = Context::getRequestUri().$image_mark_file;
 				$info->file = './'.$image_mark_file;
 				$GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
+			} else {
+				$GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
 		}
 
 		return $GLOBALS['__member_info__']['image_mark'][$member_srl];
@@ -978,9 +1081,13 @@ 
 					}
 				}
 			}
-			if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
+			if (!$info) {
+				$GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
+			}
+		}
+		if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') {
+			return null;
 		}
-		if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') return null;
 
 		return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
 	}
@@ -998,8 +1105,9 @@ 
 				$buff = FileHandler::readFile($filename);
 				$signature = preg_replace('/<\?.*\?>/', '', $buff);
 				$GLOBALS['__member_info__']['signature'][$member_srl] = $signature;
+			} else {
+				$GLOBALS['__member_info__']['signature'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['signature'][$member_srl] = null;
 		}
 		return $GLOBALS['__member_info__']['signature'][$member_srl];
 	}
@@ -1037,14 +1145,18 @@ 
 			if(!$need_upgrade)
 			{
 				$required_algorithm = $oPassword->getCurrentlySelectedAlgorithm();
-				if($required_algorithm !== $current_algorithm) $need_upgrade = true;
+				if($required_algorithm !== $current_algorithm) {
+					$need_upgrade = true;
+				}
 			}
 			
 			if(!$need_upgrade)
 			{
 				$required_work_factor = $oPassword->getWorkFactor();
 				$current_work_factor = $oPassword->checkWorkFactor($hashed_password);
-				if($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
+				if($current_work_factor !== false && $required_work_factor > $current_work_factor) {
+					$need_upgrade = true;
+				}
 			}
 			
 			if($need_upgrade === true)
@@ -1075,7 +1187,9 @@ 
 	function checkPasswordStrength($password, $strength)
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if($logged_info->is_admin == 'Y') {
+			return true;
+		}
 		
 		if($strength == NULL)
 		{
@@ -1087,15 +1201,21 @@ 
 		
 		switch ($strength) {
 			case 'high':
-				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
+				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) {
+					return false;
+				}
 				/* no break */
 				
 			case 'normal':
-				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
+				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) {
+					return false;
+				}
 				break;
 				
 			case 'low':
-				if($length < 4) return false;
+				if($length < 4) {
+					return false;
+				}
 				break; 
 		}
 		

modules/menu/menu.admin.controller.php

Doc Comments +23 added lines, -3 removed lines

@@ -245,7 +245,7 @@ 
 
 	/**
 	 * Delete menu process method
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function procMenuAdminDelete()
 	{
@@ -304,6 +304,7 @@ 
 	/**
 	 * Delete menu
 	 * Delete menu_item and xml cache files
+	 * @param string $menu_srl
 	 * @return Object
 	 */
 	function deleteMenu($menu_srl)
@@ -380,6 +381,7 @@ 
 
 	/**
 	 * Add an item to the menu, simple version
+	 * @param stdClass $request
 	 * @return void
 	 */
 	public function procMenuAdminInsertItem($request = NULL)
@@ -519,6 +521,9 @@ 
 		$this->setMessage('success_registed', 'info');
 	}
 
+	/**
+	 * @param boolean $isProc
+	 */
 	private function _insertMenu(&$request, $isProc)
 	{
 		$oDB = DB::getInstance();
@@ -584,6 +589,7 @@ 
 	 * insert module by men create value
 	 * @request value of client request
 	 * @args value for menu create
+	 * @param stdClass $args
 	 * @return bool result of create module
 	 */
 	private function _insertModule(&$request, &$args)
@@ -641,7 +647,7 @@ 
 
 	/**
 	 * Update an item to the menu, simple version
-	 * @return void
+	 * @return Object|null
 	 */
 	public function procMenuAdminUpdateItem()
 	{
@@ -842,6 +848,7 @@ 
 	/**
 	 * Delete menu item ( Only include BO )
 	 * @args menu_srl, menu_item_srl, is_force
+	 * @param stdClass $args
 	 * @return void|Object
 	 */
 	public function deleteItem($args)
@@ -990,6 +997,9 @@ 
 		return new Object(0, 'success');
 	}
 
+	/**
+	 * @param DB $oDB
+	 */
 	private function _recursiveDeleteMenuItem(&$oDB, &$menuInfo, $node)
 	{
 		$output = $this->_deleteMenuItem($oDB, $menuInfo, $node);
@@ -1009,7 +1019,7 @@ 
 
 	/**
 	 * Move menu items
-	 * @return void
+	 * @return Object|null
 	 */
 	function procMenuAdminMoveItem()
 	{
@@ -1174,6 +1184,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $parentSrl
+	 */
 	private function _copyMenu($menuSrl, $parentSrl, &$originMenu)
 	{
 		$oMenuAdminModel = getAdminModel('menu');
@@ -2182,6 +2195,7 @@ 
 	/**
 	 * When copy a menu, button copied also.
 	 * @param $args menuItemInfo with button values
+	 * @param string $insertedMenuItemSrl
 	 */
 	private function _copyButton($insertedMenuItemSrl, $insertedMenuSrl, &$menuItemInfo)
 	{
@@ -2222,6 +2236,9 @@ 
 		return $copied_info;
 	}
 
+	/**
+	 * @param string $mode
+	 */
 	private function _changeMenuItemSrlInButtonPath($buttonPath, $menuSrl, $menuItemSrl, $mode)
 	{
 		$path = sprintf('./files/attach/menu_button/%d/', $menuSrl);
@@ -2231,6 +2248,9 @@ 
 		return sprintf('%s%d.%s.%s.%s', $path, $menuItemSrl,$date,'menu_'.$mode.'_btn', $ext);
 	}
 
+	/**
+	 * @param integer $menuSrl
+	 */
 	public function makeHomemenuCacheFile($menuSrl)
 	{
 		$cacheBuff .= sprintf('<?php if(!defined("__XE__")) exit();');

Spacing +339 added lines, -339 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	function init()
 	{
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 	}
 
 	function __construct() {
@@ -68,8 +68,8 @@ 
 		// List variables
 		$site_module_info = Context::get('site_module_info');
 
-		$output = $this->addMenu(Context::get('title'), (int)$site_module_info->site_srl);
-		if(!$output->toBool()) return $output;
+		$output = $this->addMenu(Context::get('title'), (int) $site_module_info->site_srl);
+		if (!$output->toBool()) return $output;
 
 		$this->add('menu_srl', $output->get('menuSrl'));
 		$this->setMessage('success_registed');
@@ -95,7 +95,7 @@ 
 		$args->listorder = $args->menu_srl * -1;
 
 		$output = executeQuery('menu.insertMenu', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -109,13 +109,13 @@ 
 		$unlinked_modules = false;
 		$args = new stdClass;
 		$args->site_srl = 0;
-		$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl',$args);
-		if($output->toBool() && $output->data && count($output->data) > 0)
+		$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl', $args);
+		if ($output->toBool() && $output->data && count($output->data) > 0)
 		{
 			$unlinked_modules = $output->data;
 		}
 
-		if($unlinked_modules)
+		if ($unlinked_modules)
 		{
 			$unlinked_menu_srl = $this->getUnlinkedMenu();
 			$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
@@ -129,21 +129,21 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('menu');
 
-		if($moduleConfig->unlinked_menu_srl)
+		if ($moduleConfig->unlinked_menu_srl)
 		{
 			$menuArgs = new stdClass;
 			$menuArgs->menu_srl = $moduleConfig->unlinked_menu_srl;
 			$menuOutput = executeQuery('menu.getMenu', $menuArgs);
-			if(!$menuOutput->data)
+			if (!$menuOutput->data)
 			{
 				unset($moduleConfig->unlinked_menu_srl);
 			}
 		}
 
-		if(!$moduleConfig->unlinked_menu_srl)
+		if (!$moduleConfig->unlinked_menu_srl)
 		{
 			$output = $this->addMenu('unlinked', 0);
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$moduleConfig->unlinked_menu_srl = $output->get('menuSrl');
 				$oModuleController = getController('module');
@@ -168,12 +168,12 @@ 
 	 */
 	function updateLinkModule($moduleInfos, $menuSrl)
 	{
-		if(!$moduleInfos || !is_array($moduleInfos) || count($moduleInfos) == 0 || $menuSrl == 0)
+		if (!$moduleInfos || !is_array($moduleInfos) || count($moduleInfos) == 0 || $menuSrl == 0)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		foreach($moduleInfos as $moduleInfo)
+		foreach ($moduleInfos as $moduleInfo)
 		{
 			// search menu.
 			$args = new stdClass;
@@ -183,7 +183,7 @@ 
 
 			$output = executeQuery('menu.getMenuItemByUrl', $args);
 
-			if($output->toBool() && $output->data)
+			if ($output->toBool() && $output->data)
 			{
 				$moduleInfo->menu_srl = $output->data->menu_srl;
 			}
@@ -194,10 +194,10 @@ 
 				$item_args->url = $moduleInfo->mid;
 				$item_args->name = $moduleInfo->mid;
 				$item_args->menu_item_srl = getNextSequence();
-				$item_args->listorder = -1*$item_args->menu_item_srl;
+				$item_args->listorder = -1 * $item_args->menu_item_srl;
 
 				$output = executeQuery('menu.insertMenuItem', $item_args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -210,7 +210,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -235,7 +235,7 @@ 
 		$args->menu_srl = Context::get('menu_srl');
 
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_registed');
 
@@ -255,14 +255,14 @@ 
 		$menuInfo = $oMenuAdminModel->getMenu($menu_srl);
 
 		$oAdmin = getClass('admin');
-		if($menuInfo->title == $oAdmin->getAdminMenuName())
+		if ($menuInfo->title == $oAdmin->getAdminMenuName())
 			return new Object(-1, 'msg_adminmenu_cannot_delete');
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 		}
@@ -273,25 +273,25 @@ 
 
 		$isStartmenuInclude = false;
 
-		if(is_array($menu->list))
+		if (is_array($menu->list))
 		{
-			foreach($menu->list AS $key=>$value)
+			foreach ($menu->list AS $key=>$value)
 			{
 				$originMenu = $value;
 				$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
 
-				if($isStartmenuInclude)
+				if ($isStartmenuInclude)
 					break;
 			}
 		}
 
-		if($isStartmenuInclude)
+		if ($isStartmenuInclude)
 		{
 			return new Object(-1, 'msg_cannot_delete_homemenu');
 		}
 
 		$output = $this->deleteMenu($menu_srl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return new Object(-1, $output->message);
 		}
@@ -319,7 +319,7 @@ 
 
 		// Delete modules
 		$output = executeQueryArray('menu.getMenuItems', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -327,15 +327,15 @@ 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
 
-		foreach($output->data as $itemInfo)
+		foreach ($output->data as $itemInfo)
 		{
-			if($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0)
+			if ($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl);
-				if($moduleInfo->module_srl)
+				if ($moduleInfo->module_srl)
 				{
 					$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl);
-					if(!$output->toBool())
+					if (!$output->toBool())
 					{
 						$oDB->rollback();
 						return $output;
@@ -346,27 +346,27 @@ 
 
 		// Delete menu items
 		$output = executeQuery("menu.deleteMenuItems", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Delete the menu
 		$output = executeQuery("menu.deleteMenu", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		// Delete cache files
-		$cache_list = FileHandler::readDir("./files/cache/menu","",false,true);
-		if(count($cache_list))
+		$cache_list = FileHandler::readDir("./files/cache/menu", "", false, true);
+		if (count($cache_list))
 		{
-			foreach($cache_list as $cache_file)
+			foreach ($cache_list as $cache_file)
 			{
-				$pos = strpos($cache_file, $menu_srl.'.');
-				if($pos>0)FileHandler::removeFile($cache_file);
+				$pos = strpos($cache_file, $menu_srl . '.');
+				if ($pos > 0)FileHandler::removeFile($cache_file);
 			}
 		}
 		// Delete images of menu buttons
@@ -375,7 +375,7 @@ 
 
 		$oDB->commit();
 
-		return new Object(0,'success_deleted');
+		return new Object(0, 'success_deleted');
 	}
 
 	/**
@@ -385,24 +385,24 @@ 
 	public function procMenuAdminInsertItem($request = NULL)
 	{
 		$isProc = false;
-		if(!$request)
+		if (!$request)
 		{
 			$isProc = true;
 			$request = Context::getRequestVars();
 		}
 
-		if(!$request->parent_srl || !$request->menu_name)
+		if (!$request->parent_srl || !$request->menu_name)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$this->_setMenuSrl($request->parent_srl, $request->menu_srl);
-		if(!$request->menu_srl)
+		if (!$request->menu_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if($request->is_shortcut == 'Y')
+		if ($request->is_shortcut == 'Y')
 		{
 			$result = $this->_insertShortcut($request);
 		}
@@ -411,7 +411,7 @@ 
 			$result = $this->_insertMenu($request, $isProc);
 		}
 
-		if($result->error < 0)
+		if ($result->error < 0)
 		{
 			return new Object($result->error, $result->message);
 		}
@@ -419,7 +419,7 @@ 
 		// recreate menu cache file
 		$this->makeXmlFile($request->menu_srl);
 
-		if(!$isProc)
+		if (!$isProc)
 		{
 			return $this->get('menu_item_srl');
 		}
@@ -431,7 +431,7 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 		$itemInfo = $oMenuAdminModel->getMenuItemInfo($parent_srl);
 		// parent_srl is parent menu item's srl
-		if($itemInfo->menu_srl)
+		if ($itemInfo->menu_srl)
 		{
 			$menu_srl = $itemInfo->menu_srl;
 		}
@@ -439,7 +439,7 @@ 
 		else
 		{
 			$output = $oMenuAdminModel->getMenu($parent_srl);
-			if($output->menu_srl == $parent_srl)
+			if ($output->menu_srl == $parent_srl)
 			{
 				$menu_srl = $output->menu_srl;
 				$parent_srl = 0;
@@ -453,7 +453,7 @@ 
 		$oDB->begin();
 
 		// type is url
-		if(strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
+		if (strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
 		{
 			// set menu variable
 			$args = new stdClass();
@@ -465,27 +465,27 @@ 
 			$args->is_shortcut = $request->is_shortcut;
 			$args->url = $request->shortcut_target;
 
-			if(!$args->open_window) $args->open_window = 'N';
-			if(!$args->expand) $args->expand = 'N';
-			if(!$args->is_shortcut) $args->is_shortcut = 'Y';
+			if (!$args->open_window) $args->open_window = 'N';
+			if (!$args->expand) $args->expand = 'N';
+			if (!$args->is_shortcut) $args->is_shortcut = 'Y';
 
-			if($request->menu_name_key) $args->name = $request->menu_name_key;
+			if ($request->menu_name_key) $args->name = $request->menu_name_key;
 			else $args->name = $request->menu_name;
 		}
 		// type is module short cut
-		else if(is_numeric($request->shortcut_target))
+		else if (is_numeric($request->shortcut_target))
 		{
 			// Get original information
 			$oMenuAdminModel = getAdminModel('menu');
 			$itemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
-			if(!$itemInfo->menu_item_srl)
+			if (!$itemInfo->menu_item_srl)
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 			unset($itemInfo->normal_btn, $itemInfo->hover_btn, $itemInfo->active_btn);
 
 			$args = $itemInfo;
-			if(count($args->group_srls) == 0)
+			if (count($args->group_srls) == 0)
 			{
 				unset($args->group_srls);
 			}
@@ -505,13 +505,13 @@ 
 			$args->url = '#';
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
 		$args->menu_item_srl = getNextSequence();
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oDB->commit();
 
@@ -533,46 +533,46 @@ 
 		$args->expand = $request->menu_expand;
 		$args->is_shortcut = $request->is_shortcut;
 
-		if(!$args->open_window) $args->open_window = 'N';
-		if(!$args->expand) $args->expand = 'N';
-		if(!$args->is_shortcut) $args->is_shortcut = 'N';
+		if (!$args->open_window) $args->open_window = 'N';
+		if (!$args->expand) $args->expand = 'N';
+		if (!$args->is_shortcut) $args->is_shortcut = 'N';
 
-		if($request->menu_name_key) $args->name = $request->menu_name_key;
+		if ($request->menu_name_key) $args->name = $request->menu_name_key;
 		else $args->name = $request->menu_name;
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
-		if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
+		if ($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		// when menu copy, module already copied
-		if($isProc)
+		if ($isProc)
 		{
 			$result = $this->_insertModule($request, $args);
-			if(!$result->toBool())
+			if (!$result->toBool())
 			{
 				return new Object(-1, $result->message);
 			}
 		}
 
 		// if setting button variables, set argument button variables for db insert. but not upload in this method
-		if($request->normal_btn) $args->normal_btn = $request->normal_btn;
-		if($request->hover_btn) $args->hover_btn = $request->hover_btn;
-		if($request->active_btn) $args->active_btn = $request->active_btn;
+		if ($request->normal_btn) $args->normal_btn = $request->normal_btn;
+		if ($request->hover_btn) $args->hover_btn = $request->hover_btn;
+		if ($request->active_btn) $args->active_btn = $request->active_btn;
 
-		if(!$request->module_id)
+		if (!$request->module_id)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$args->url = $request->module_id;
 		$args->menu_item_srl = getNextSequence();
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oDB->commit();
 
@@ -604,7 +604,7 @@ 
 
 		//module create
 		$site_module_info = Context::get('site_module_info');
-		$cmArgs->site_srl = (int)$site_module_info->site_srl;
+		$cmArgs->site_srl = (int) $site_module_info->site_srl;
 		$cmArgs->browser_title = $args->name;
 		$cmArgs->menu_srl = $request->menu_srl;
 		$cmArgs->layout_srl = -1;
@@ -612,23 +612,23 @@ 
 		$cmArgs->is_skin_fix = 'N';
 		$cmArgs->is_mskin_fix = 'N';
 
-		if(Mobile::isMobileEnabled() === true)
+		if (Mobile::isMobileEnabled() === true)
 		{
 			$cmArgs->use_mobile = 'Y';
 		}
 
 		// if mid is empty, auto create mid
-		if(!$request->module_id)
+		if (!$request->module_id)
 		{
 			$randomMid = $this->_makeRandomMid();
-			$request->module_id = $cmArgs->module.'_'.$randomMid;
+			$request->module_id = $cmArgs->module . '_' . $randomMid;
 		}
 		$cmArgs->mid = $request->module_id;
 
 		// check already created module instance
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getModuleInfoByMid($request->module_id);
-		if($output->module_srl)
+		if ($output->module_srl)
 		{
 			return new Object(-1, 'msg_module_name_exists');
 		}
@@ -647,14 +647,14 @@ 
 	{
 		$request = Context::getRequestVars();
 
-		if(!$request->menu_item_srl || !$request->menu_name)
+		if (!$request->menu_item_srl || !$request->menu_name)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		// variables set
-		if($request->menu_open_window != "Y") $request->menu_open_window = "N";
-		if($request->menu_expand != "Y") $request->menu_expand = "N";
+		if ($request->menu_open_window != "Y") $request->menu_open_window = "N";
+		if ($request->menu_expand != "Y") $request->menu_expand = "N";
 
 		// Get original information
 		$oMenuAdminModel = getAdminModel('menu');
@@ -662,19 +662,19 @@ 
 		$args = $itemInfo;
 
 		// if menu type is module, check exists module and update
-		if($itemInfo->is_shortcut == 'Y')
+		if ($itemInfo->is_shortcut == 'Y')
 		{
 			// type is url
-			if(strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
+			if (strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
 			{
 				$args->url = $request->shortcut_target;
 			}
 			// type is module short cut
-			else if(is_numeric($request->shortcut_target))
+			else if (is_numeric($request->shortcut_target))
 			{
 				// Get new original information
 				$newItemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
-				if(!$newItemInfo->menu_item_srl)
+				if (!$newItemInfo->menu_item_srl)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
@@ -691,10 +691,10 @@ 
 		{
 			// check already created module instance
 			$oModuleModel = getModel('module');
-			if($request->module_id != $itemInfo->url)
+			if ($request->module_id != $itemInfo->url)
 			{
 				$output = $oModuleModel->getModuleInfoByMid($request->module_id);
-				if($output->module_srl)
+				if ($output->module_srl)
 				{
 					return new Object(-1, 'msg_module_name_exists');
 				}
@@ -702,13 +702,13 @@ 
 
 			// if not exist module, return error
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url);
-			if(!$moduleInfo)
+			if (!$moduleInfo)
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			$moduleInfo->mid = $request->module_id;
-			if($request->browser_title)
+			if ($request->browser_title)
 			{
 				$moduleInfo->browser_title = $request->browser_title;
 			}
@@ -717,7 +717,7 @@ 
 			$args->url = $request->module_id;
 		}
 
-		if($request->menu_name_key)
+		if ($request->menu_name_key)
 		{
 			$args->name = $request->menu_name_key;
 		}
@@ -726,7 +726,7 @@ 
 			$args->name = $request->menu_name;
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
 		unset($args->group_srls);
@@ -754,38 +754,38 @@ 
 
 		$btnOutput = $this->_uploadButton($args);
 
-		if($btnOutput['normal_btn'])
+		if ($btnOutput['normal_btn'])
 		{
 			$this->add('normal_btn', $btnOutput['normal_btn']);
 			$item_info->normal_btn = $btnOutput['normal_btn'];
 		}
-		if($btnOutput['hover_btn'])
+		if ($btnOutput['hover_btn'])
 		{
 			$this->add('hover_btn', $btnOutput['hover_btn']);
 			$item_info->hover_btn = $btnOutput['hover_btn'];
 		}
-		if($btnOutput['active_btn'])
+		if ($btnOutput['active_btn'])
 		{
 			$this->add('active_btn', $btnOutput['active_btn']);
 			$item_info->active_btn = $btnOutput['active_btn'];
 		}
 
 		// group_srls check
-		if(count($item_info->group_srls) == 0)
+		if (count($item_info->group_srls) == 0)
 		{
 			unset($item_info->group_srls);
 		}
 
 		// Button delete check
-		if(!$btnOutput['normal_btn'] && $args->isNormalDelete == 'Y')
+		if (!$btnOutput['normal_btn'] && $args->isNormalDelete == 'Y')
 		{
 			$item_info->normal_btn = '';
 		}
-		if(!$btnOutput['hover_btn'] && $args->isHoverDelete == 'Y')
+		if (!$btnOutput['hover_btn'] && $args->isHoverDelete == 'Y')
 		{
 			$item_info->hover_btn = '';
 		}
-		if(!$btnOutput['active_btn'] && $args->isActiveDelete == 'Y')
+		if (!$btnOutput['active_btn'] && $args->isActiveDelete == 'Y')
 		{
 			$item_info->active_btn = '';
 		}
@@ -825,7 +825,7 @@ 
 		$args->is_force = Context::get('is_force');
 
 		$returnObj = $this->deleteItem($args);
-		if(is_object($returnObj))
+		if (is_object($returnObj))
 		{
 			$this->setError($returnObj->error);
 			$this->setMessage($returnObj->message);
@@ -854,11 +854,11 @@ 
 		$args->menu_srl = $itemInfo->menu_srl;
 
 		// Display an error that the category cannot be deleted if it has a child node	603
-		if($args->is_force != 'Y')
+		if ($args->is_force != 'Y')
 		{
 			$output = executeQuery('menu.getChildMenuCount', $args);
-			if(!$output->toBool()) return $output;
-			if($output->data->count > 0)
+			if (!$output->toBool()) return $output;
+			if ($output->data->count > 0)
 			{
 				return new Object(-1001, 'msg_cannot_delete_for_child');
 			}
@@ -870,22 +870,22 @@ 
 
 		// check admin menu delete
 		$oAdmin = getClass('admin');
-		if($menu_title == $oAdmin->getAdminMenuName() && $itemInfo->parent_srl == 0)
+		if ($menu_title == $oAdmin->getAdminMenuName() && $itemInfo->parent_srl == 0)
 		{
 			return $this->stop('msg_cannot_delete_for_admin_topmenu');
 		}
 
-		if($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
+		if ($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $args->menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $args->menu_item_srl, $originMenu);
 			}
@@ -895,7 +895,7 @@ 
 		$siteInfo = $oModuleModel->getSiteInfo($menuInfo->site_srl);
 		$isStartmenuInclude = false;
 		$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
-		if($isStartmenuInclude)
+		if ($isStartmenuInclude)
 		{
 			return new Object(-1, 'msg_cannot_delete_homemenu');
 		}
@@ -919,14 +919,14 @@ 
 
 	private function _checkHomeMenuInOriginMenu($originMenu, $startMid, &$isStartmenuInclude)
 	{
-		if($originMenu['is_shortcut'] != 'Y' && $originMenu['url'] == $startMid)
+		if ($originMenu['is_shortcut'] != 'Y' && $originMenu['url'] == $startMid)
 		{
 			$isStartmenuInclude = true;
 		}
 
-		if(!$isStartmenuInclude && is_array($originMenu['list']))
+		if (!$isStartmenuInclude && is_array($originMenu['list']))
 		{
-			foreach($originMenu['list'] AS $key=>$value)
+			foreach ($originMenu['list'] AS $key=>$value)
 			{
 				$this->_checkHomeMenuInOriginMenu($value, $startMid, $isStartmenuInclude);
 			}
@@ -940,7 +940,7 @@ 
 		$args->menu_srl = $menuSrl;
 		$args->menu_item_srl = $node['node_srl'];
 		$output = executeQuery("menu.deleteMenuItem", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -949,12 +949,12 @@ 
 		// Update the xml file and get its location
 		$xml_file = $this->makeXmlFile($args->menu_srl);
 		// Delete all of image buttons
-		if($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
-		if($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
-		if($node['active_btn']) FileHandler::removeFile($node['active_btn']);
+		if ($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
+		if ($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
+		if ($node['active_btn']) FileHandler::removeFile($node['active_btn']);
 
 		// Delete module
-		if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
+		if ($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
 		{
 			$oModuleController = getController('module');
 			$oModuleModel = getModel('module');
@@ -964,12 +964,12 @@ 
 			$args->site_srl = $menuInfo->site_srl;
 			$args->is_shortcut = 'Y';
 			$output = executeQuery('menu.getMenuItemByUrl', $args);
-			if($output->data->menu_item_srl)
+			if ($output->data->menu_item_srl)
 			{
 				$output->data->url = '';
 				$referenceItem = $output->data;
 				$output = $this->_updateMenuItem($referenceItem);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -977,10 +977,10 @@ 
 			}
 
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($node['url'], $menuInfo->site_srl);
-			if($moduleInfo->module_srl)
+			if ($moduleInfo->module_srl)
 			{
 				$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -993,14 +993,14 @@ 
 	private function _recursiveDeleteMenuItem(&$oDB, &$menuInfo, $node)
 	{
 		$output = $this->_deleteMenuItem($oDB, $menuInfo, $node);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return new Object(-1, $output->message);
 		}
 
-		if(is_array($node['list']))
+		if (is_array($node['list']))
 		{
-			foreach($node['list'] AS $key=>$value)
+			foreach ($node['list'] AS $key=>$value)
 			{
 				$this->_recursiveDeleteMenuItem($oDB, $menuInfo, $value);
 			}
@@ -1013,18 +1013,18 @@ 
 	 */
 	function procMenuAdminMoveItem()
 	{
-		$mode = Context::get('mode');	//move
-		$parent_srl = Context::get('parent_srl');	// Parent menu item serial number
-		$source_srl = Context::get('source_srl');	// Same hierarchy's menu item serial number
-		$target_srl = Context::get('target_srl');	// Self menu item serial number
+		$mode = Context::get('mode'); //move
+		$parent_srl = Context::get('parent_srl'); // Parent menu item serial number
+		$source_srl = Context::get('source_srl'); // Same hierarchy's menu item serial number
+		$target_srl = Context::get('target_srl'); // Self menu item serial number
 
-		if(!$mode || !$parent_srl || !$target_srl) return new Object(-1,'msg_invalid_request');
+		if (!$mode || !$parent_srl || !$target_srl) return new Object(-1, 'msg_invalid_request');
 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		// get original menu item info for cache file recreate
 		$originalItemInfo = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if(!$originalItemInfo->menu_item_srl)
+		if (!$originalItemInfo->menu_item_srl)
 		{
 			return new Object(-1, 'msg_empty_menu_item');
 		}
@@ -1033,11 +1033,11 @@ 
 		$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $originalItemInfo->menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $originalItemInfo->menu_item_srl, $originMenu);
 			}
@@ -1046,7 +1046,7 @@ 
 		// get target menu info for move
 		$targetMenuItemInfo = $oMenuAdminModel->getMenuItemInfo($parent_srl);
 		// if move in same sitemap
-		if($targetMenuItemInfo->menu_item_srl)
+		if ($targetMenuItemInfo->menu_item_srl)
 		{
 			$menu_srl = $targetMenuItemInfo->menu_srl;
 		}
@@ -1058,20 +1058,20 @@ 
 			$parent_srl = 0;
 		}
 
-		if(!$this->homeModuleMid)
+		if (!$this->homeModuleMid)
 		{
 			$oModuleModel = getModel('module');
 			$oMenuAdminController = getAdminController('menu');
 			$columnList = array('modules.mid',);
 			$output = $oModuleModel->getSiteInfo(0, $columnList);
-			if($output->mid)
+			if ($output->mid)
 			{
 				$this->homeModuleMid = $output->mid;
 			}
 		}
 
 		$this->moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $originMenu['is_shortcut'], $originMenu['url']);
-		if(count($originMenu['list']) > 0)
+		if (count($originMenu['list']) > 0)
 		{
 			$this->_recursiveUpdateMenuItem($originMenu['list'], $menu_srl);
 		}
@@ -1085,9 +1085,9 @@ 
 
 	private function _recursiveUpdateMenuItem($node, $menu_srl)
 	{
-		if(is_array($node))
+		if (is_array($node))
 		{
-			foreach($node AS $key=>$node)
+			foreach ($node AS $key=>$node)
 			{
 				$args = new stdClass();
 				$args->menu_srl = $menu_srl;
@@ -1095,11 +1095,11 @@ 
 				$output = $this->_updateMenuItem($args);
 
 				//module's menu_srl move also
-				if($node['is_shortcut'] == 'N' && !empty($node['url']))
+				if ($node['is_shortcut'] == 'N' && !empty($node['url']))
 				{
 					$oModuleModel = getModel('module');
 					$moduleInfo = $oModuleModel->getModuleInfoByMid($node['url']);
-					if($menu_srl != $moduleInfo->menu_srl)
+					if ($menu_srl != $moduleInfo->menu_srl)
 					{
 						$moduleInfo->menu_srl = $menu_srl;
 						$oModuleController = getController('module');
@@ -1107,7 +1107,7 @@ 
 					}
 				}
 
-				if(count($node['list']) > 0)
+				if (count($node['list']) > 0)
 				{
 					$this->_recursiveUpdateMenuItem($node['list'], $menu_srl);
 				}
@@ -1132,18 +1132,18 @@ 
 		$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menuSrl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $menuItemSrl, $originMenu);
 			}
 		}
 
 		// copy the menu item with recursively
-		if(is_array($originMenu))
+		if (is_array($originMenu))
 		{
 			$this->_copyMenu($menuSrl, $parentSrl, $originMenu);
 		}
@@ -1159,15 +1159,15 @@ 
 	 */
 	private function _searchMenu(&$menuList, $menuItemSrl, &$originMenu)
 	{
-		if(array_key_exists($menuItemSrl, $menuList))
+		if (array_key_exists($menuItemSrl, $menuList))
 		{
 			$originMenu = $menuList[$menuItemSrl];
 			return;
 		}
 
-		foreach($menuList AS $key=>$value)
+		foreach ($menuList AS $key=>$value)
 		{
-			if(count($value['list']) > 0)
+			if (count($value['list']) > 0)
 			{
 				$this->_searchMenu($value['list'], $menuItemSrl, $originMenu);
 			}
@@ -1182,7 +1182,7 @@ 
 		// default argument setting
 		$args = new stdClass();
 		$args->menu_srl = $menuSrl;
-		if($parentSrl == 0) $args->parent_srl = $menuSrl;
+		if ($parentSrl == 0) $args->parent_srl = $menuSrl;
 		else $args->parent_srl = $parentSrl;
 		$args->menu_name_key = $originMenu['text'];
 		$args->menu_name = $originMenu['text'];
@@ -1195,14 +1195,14 @@ 
 
 		$isModuleCopySuccess = false;
 		// if menu have a reference of module instance
-		if($menuItemInfo->is_shortcut == 'N' && strncasecmp('http', $originMenu['url'], 4) !== 0 )
+		if ($menuItemInfo->is_shortcut == 'N' && strncasecmp('http', $originMenu['url'], 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($originMenu['url']);
 
 			$args->module_type = $moduleInfo->module;
 			$randomMid = $this->_makeRandomMid();
-			$args->module_id = $moduleInfo->module.'_'.$randomMid;
+			$args->module_id = $moduleInfo->module . '_' . $randomMid;
 			$args->layout_srl = $moduleInfo->layout_srl;
 
 			$oModuleAdminController = getAdminController('module');
@@ -1215,22 +1215,22 @@ 
 
 			$args->module_srl = $copiedModuleSrl;
 
-			if($copiedModuleSrl)
+			if ($copiedModuleSrl)
 			{
 				$isModuleCopySuccess = true;
 			}
 		}
 		// if menu type is shortcut
-		else if($menuItemInfo->is_shortcut == 'Y')
+		else if ($menuItemInfo->is_shortcut == 'Y')
 		{
 			$args->shortcut_target = $originMenu['url'];
 			$isModuleCopySuccess = true;
 		}
 
-		if($isModuleCopySuccess)
+		if ($isModuleCopySuccess)
 		{
 			// if have a group permission
-			if($menuItemInfo->group_srls)
+			if ($menuItemInfo->group_srls)
 			{
 				$args->group_srls = $menuItemInfo->group_srls;
 			}
@@ -1244,12 +1244,12 @@ 
 
 			// if have a button, copy a button image also
 			$insertedMenuItemSrl = $this->get('menu_item_srl');
-			if($menuItemInfo->normal_btn || $menuItemInfo->hover_btn || $menuItemInfo->active_btn)
+			if ($menuItemInfo->normal_btn || $menuItemInfo->hover_btn || $menuItemInfo->active_btn)
 			{
 				// copy & upate
 				$update_item_info = $oMenuAdminModel->getMenuItemInfo($insertedMenuItemSrl);
-				$copied_info = $this->_copyButton($insertedMenuItemSrl,$update_item_info->menu_srl, $menuItemInfo);
-				if(count($update_item_info->group_srls) == 0)
+				$copied_info = $this->_copyButton($insertedMenuItemSrl, $update_item_info->menu_srl, $menuItemInfo);
+				if (count($update_item_info->group_srls) == 0)
 				{
 					unset($update_item_info->group_srls);
 				}
@@ -1263,7 +1263,7 @@ 
 
 		// if have a child menu, copy child menu also
 		$childMenu = array_shift($originMenu['list']);
-		if(count($childMenu) > 0)
+		if (count($childMenu) > 0)
 		{
 			$this->_copyMenu($menuSrl, $insertedMenuItemSrl, $childMenu);
 		}
@@ -1273,16 +1273,16 @@ 
 	{
 		$time = $_SERVER['REQUEST_TIME'];
 		$randomString = "";
-		for($i=0;$i<4;$i++)
+		for ($i = 0; $i < 4; $i++)
 		{
 			$case = rand(0, 1);
-			if($case) $doc = rand(65, 90);
+			if ($case) $doc = rand(65, 90);
 			else $doc = rand(97, 122);
 
 			$randomString .= chr($doc);
 		}
 
-		return $randomString.substr($time, -2);
+		return $randomString . substr($time, -2);
 	}
 
 	/**
@@ -1300,32 +1300,32 @@ 
 		// menu name update
 		$args->menu_srl = $this->menuSrl;
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->map = array();
-		if(is_array($parentKeyList))
+		if (is_array($parentKeyList))
 		{
-			foreach($parentKeyList as $no=>$srl)
+			foreach ($parentKeyList as $no=>$srl)
 			{
-				if($srl === 0) continue;
-				if(!is_array($this->map[$srl]))$this->map[$srl] = array();
+				if ($srl === 0) continue;
+				if (!is_array($this->map[$srl]))$this->map[$srl] = array();
 				$this->map[$srl][] = $no;
 			}
 		}
 
 		$result = array();
-		if(is_array($this->itemKeyList))
+		if (is_array($this->itemKeyList))
 		{
-			foreach($this->itemKeyList as $srl)
+			foreach ($this->itemKeyList as $srl)
 			{
-				if(!$this->checked[$srl])
+				if (!$this->checked[$srl])
 				{
 					$target = new stdClass();
 					$this->checked[$srl] = 1;
 					$target->node = $srl;
-					$target->child= array();
+					$target->child = array();
 
-					while(count($this->map[$srl]))
+					while (count($this->map[$srl]))
 					{
 						$this->_setParent($srl, array_shift($this->map[$srl]), $target);
 					}
@@ -1334,13 +1334,13 @@ 
 			}
 		}
 
-		if(is_array($result))
+		if (is_array($result))
 		{
 			$i = 0;
-			foreach($result AS $key=>$node)
+			foreach ($result AS $key=>$node)
 			{
-				$this->moveMenuItem($this->menuSrl, 0, $i, $node->node, 'move');	//move parent node
-				$this->_recursiveMoveMenuItem($node);	//move child node
+				$this->moveMenuItem($this->menuSrl, 0, $i, $node->node, 'move'); //move parent node
+				$this->_recursiveMoveMenuItem($node); //move child node
 				$i = $node->node;
 			}
 		}
@@ -1369,7 +1369,7 @@ 
 		$child_node->child = array();
 		$target->child[] = $child_node;
 
-		while(count($this->map[$child_srl]))
+		while (count($this->map[$child_srl]))
 		{
 			$this->_setParent($child_srl, array_shift($this->map[$child_srl]), $child_node);
 		}
@@ -1384,7 +1384,7 @@ 
 	function _recursiveMoveMenuItem($result)
 	{
 		$i = 0;
-		while(count($result->child))
+		while (count($result->child))
 		{
 			unset($node);
 			$node = array_shift($result->child);
@@ -1404,48 +1404,48 @@ 
 	 * @param string $mode 'move' or 'insert'
 	 * @return void
 	 */
-	function moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $isShortcut='Y', $url=NULL)
+	function moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $isShortcut = 'Y', $url = NULL)
 	{
 		// Get the original menus
 		$oMenuAdminModel = getAdminModel('menu');
 
 		$target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if($target_item->menu_item_srl != $target_srl) return new Object(-1,'msg_invalid_request');
+		if ($target_item->menu_item_srl != $target_srl) return new Object(-1, 'msg_invalid_request');
 		// Move the menu location(change the order menu appears)
-		if($mode == 'move')
+		if ($mode == 'move')
 		{
 			$args = new stdClass();
 			$args->parent_srl = $parent_srl;
 			$args->menu_srl = $menu_srl;
 
-			if($source_srl)
+			if ($source_srl)
 			{
 				$source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
-				if($source_item->menu_item_srl != $source_srl) return new Object(-1,'msg_invalid_request');
-				$args->listorder = $source_item->listorder-1;
+				if ($source_item->menu_item_srl != $source_srl) return new Object(-1, 'msg_invalid_request');
+				$args->listorder = $source_item->listorder - 1;
 			}
 			else
 			{
 				$output = executeQuery('menu.getMaxListorder', $args);
-				if(!$output->toBool()) return $output;
-				$args->listorder = (int)$output->data->listorder;
-				if(!$args->listorder) $args->listorder= 0;
+				if (!$output->toBool()) return $output;
+				$args->listorder = (int) $output->data->listorder;
+				if (!$args->listorder) $args->listorder = 0;
 			}
 			$args->parent_srl = $parent_srl;
 			$output = executeQuery('menu.updateMenuItemListorder', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->parent_srl = $parent_srl;
 			$args->menu_item_srl = $target_srl;
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			//module's menu_srl move also
-			if($isShortcut == 'N' && !empty($url))
+			if ($isShortcut == 'N' && !empty($url))
 			{
 				$oModuleModel = getModel('module');
 				$moduleInfo = $oModuleModel->getModuleInfoByMid($url);
-				if($menu_srl != $moduleInfo->menu_srl)
+				if ($menu_srl != $moduleInfo->menu_srl)
 				{
 					$moduleInfo->menu_srl = $menu_srl;
 					$oModuleController = getController('module');
@@ -1453,13 +1453,13 @@ 
 				}
 
 				// change home menu cache file
-				if($url == $this->homeModuleMid)
+				if ($url == $this->homeModuleMid)
 				{
-					if(file_exists($this->homeMenuCacheFile))
+					if (file_exists($this->homeMenuCacheFile))
 					{
 						include($this->homeMenuCacheFile);
 					}
-					if(!$homeMenuSrl || $homeMenuSrl != $menu_srl)
+					if (!$homeMenuSrl || $homeMenuSrl != $menu_srl)
 					{
 						$this->makeHomemenuCacheFile($menu_srl);
 					}
@@ -1467,13 +1467,13 @@ 
 			}
 			// Add a child
 		}
-		elseif($mode == 'insert')
+		elseif ($mode == 'insert')
 		{
 			$args->menu_item_srl = $target_srl;
 			$args->parent_srl = $parent_srl;
-			$args->listorder = -1*getNextSequence();
+			$args->listorder = -1 * getNextSequence();
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$xml_file = $this->makeXmlFile($menu_srl);
@@ -1498,8 +1498,8 @@ 
 		// Re-generate the xml file
 		$xml_file = $this->makeXmlFile($menu_srl);
 		// Set return value
-		$this->add('menu_title',$menu_title);
-		$this->add('xml_file',$xml_file);
+		$this->add('menu_title', $menu_title);
+		$this->add('xml_file', $xml_file);
 	}
 
 	/**
@@ -1513,12 +1513,12 @@ 
 		$target = Context::get('target');
 		$target_file = Context::get($target);
 		// Error occurs when the target is neither a uploaded file nor a valid file
-		if(!$menu_srl || !$menu_item_srl)
+		if (!$menu_srl || !$menu_item_srl)
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 
 		}
-		else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
+		else if (!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i', $target_file['name']) || !checkUploadedFile($target_file['tmp_name']))
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 		}
@@ -1526,19 +1526,19 @@ 
 		// Move the file to a specific director if the uploaded file meets requirement
 		else
 		{
-			$tmp_arr = explode('.',$target_file['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $target_file['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$path = sprintf('./files/attach/menu_button/%d/', $menu_srl);
 			$filename = sprintf('%s%d.%s.%s', $path, $menu_item_srl, $target, $ext);
 
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if (!is_dir($path)) FileHandler::makeDir($path);
 
 			move_uploaded_file($target_file['tmp_name'], $filename);
 			Context::set('filename', $filename);
 		}
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('menu_file_uploaded');
 	}
 
@@ -1565,14 +1565,14 @@ 
 	{
 		$oModuleModel = getModel('module');
 		$installed_module_list = $oModuleModel->getModulesXmlInfo();
-		if(is_array($installed_module_list))
+		if (is_array($installed_module_list))
 		{
 			$currentLang = Context::getLangType();
 			$menuList = array();
-			foreach($installed_module_list AS $key=>$value)
+			foreach ($installed_module_list AS $key=>$value)
 			{
 				$info = $oModuleModel->getModuleActionXml($value->module);
-				if($info->menu) $menuList[$value->module] = $info->menu;
+				if ($info->menu) $menuList[$value->module] = $info->menu;
 				unset($info->menu);
 			}
 		}
@@ -1604,8 +1604,8 @@ 
 		$info = $oModuleModel->getModuleActionXml($moduleName);
 
 		$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
+		if (empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
+		if (empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
 		$dbInfo = Context::getDBInfo();
 
 		$args = new stdClass();
@@ -1614,9 +1614,9 @@ 
 		$args->menu_srl = $requestArgs->menu_srl;
 		$args->name = sprintf('{$lang->menu_gnb_sub[\'%s\']}', $menuName);
 		//if now page is https...
-		if(strpos($url, 'https') !== false)
+		if (strpos($url, 'https') !== false)
 		{
-			$args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url);
+			$args->url = str_replace('https' . substr($dbInfo->default_url, 4), '', $url);
 		}
 		else
 		{
@@ -1628,23 +1628,23 @@ 
 		$args->hover_btn = '';
 		$args->active_btn = '';
 		$args->group_srls = implode(',', array_keys($groupSrlList));
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 
 		// Check if already exists
 		$oMenuModel = getAdminModel('menu');
 		$item_info = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 		// Update if exists
-		if($item_info->menu_item_srl == $args->menu_item_srl)
+		if ($item_info->menu_item_srl == $args->menu_item_srl)
 		{
 			$output = $this->_updateMenuItem($args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Insert if not exist
 		else
 		{
-			$args->listorder = -1*$args->menu_item_srl;
+			$args->listorder = -1 * $args->menu_item_srl;
 			$output = executeQuery('menu.insertMenuItem', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Get information of the menu
 		$menu_info = $oMenuModel->getMenu($args->menu_srl);
@@ -1672,23 +1672,23 @@ 
 
 		// Menu Exposure update
 		// if exposure target is only login user...
-		if(!$exposure)
+		if (!$exposure)
 		{
 			$args->group_srls = '';
 		}
 		else
 		{
 			$exposure = explode(',', $exposure);
-			if(in_array($exposure, array('-1','-3')))
+			if (in_array($exposure, array('-1', '-3')))
 			{
 				$args->group_srls = $exposure;
 			}
 
-			if($exposure) $args->group_srls = implode(',', $exposure);
+			if ($exposure) $args->group_srls = implode(',', $exposure);
 		}
 
 		$output = $this->_updateMenuItem($args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1704,7 +1704,7 @@ 
 		$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
 
 		$grantList = $xml_info->grant;
-		if(!$grantList) $grantList = new stdClass;
+		if (!$grantList) $grantList = new stdClass;
 
 		$grantList->access = new stdClass();
 		$grantList->access->default = 'guest';
@@ -1712,9 +1712,9 @@ 
 		$grantList->manager->default = 'manager';
 
 		$grant = new stdClass;
-		foreach($grantList AS $grantName=>$grantInfo)
+		foreach ($grantList AS $grantName=>$grantInfo)
 		{
-			if(!$htPerm[$grantName])
+			if (!$htPerm[$grantName])
 			{
 				continue;
 			}
@@ -1722,7 +1722,7 @@ 
 			$htPerm[$grantName] = explode(',', $htPerm[$grantName]);
 
 			// users in a particular group
-			if(is_array($htPerm[$grantName]))
+			if (is_array($htPerm[$grantName]))
 			{
 				$grant->{$grantName} = $htPerm[$grantName];
 				continue;
@@ -1736,7 +1736,7 @@ 
 			$grant->{$group_srls} = array();
 		}
 
-		if(count($grant))
+		if (count($grant))
 		{
 			$oModuleController = getController('module');
 			$oModuleController->insertModuleGrants($moduleInfo->module_srl, $grant);
@@ -1754,15 +1754,15 @@ 
 	function makeXmlFile($menu_srl)
 	{
 		// Return if there is no information when creating the xml file
-		if(!$menu_srl) return;
+		if (!$menu_srl) return;
 		// Get menu informaton
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->toBool() || !$output->data) return $output;
-		$site_srl = (int)$output->data->site_srl;
+		if (!$output->toBool() || !$output->data) return $output;
+		$site_srl = (int) $output->data->site_srl;
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$oModuleModel = getModel('module');
 			$columnList = array('sites.domain');
@@ -1773,13 +1773,13 @@ 
 		$args->menu_srl = $menu_srl;
 		$args->sort_index = 'listorder';
 		$output = executeQuery('menu.getMenuItems', $args);
-		if(!$output->toBool()) return;
+		if (!$output->toBool()) return;
 		// Specify the name of the cache file
 		$xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.xml.php", $menu_srl);
 		$php_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menu_srl);
 		// If no data found, generate an XML file without node data
 		$list = $output->data;
-		if(!$list)
+		if (!$list)
 		{
 			$xml_buff = "<root />";
 			FileHandler::writeFile($xml_file, $xml_buff);
@@ -1787,10 +1787,10 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if (!is_array($list)) $list = array($list);
 		// Create a tree for loop
 		$list_count = count($list);
-		for($i=0;$i<$list_count;$i++)
+		for ($i = 0; $i < $list_count; $i++)
 		{
 			$node = $list[$i];
 			$menu_item_srl = $node->menu_item_srl;
@@ -1800,43 +1800,43 @@ 
 		}
 		// A common header to set permissions of the cache file and groups
 		$header_script =
-			'$lang_type = Context::getLangType(); '.
-			'$is_logged = Context::get(\'is_logged\'); '.
-			'$logged_info = Context::get(\'logged_info\'); '.
-			'$site_srl = '.$site_srl.';'.
-			'$site_admin = false;'.
-			'if($site_srl) { '.
-			'$oModuleModel = getModel(\'module\');'.
-			'$site_module_info = $oModuleModel->getSiteInfo($site_srl); '.
-			'if($site_module_info) Context::set(\'site_module_info\',$site_module_info);'.
-			'else $site_module_info = Context::get(\'site_module_info\');'.
-			'$grant = $oModuleModel->getGrant($site_module_info, $logged_info); '.
-			'if($grant->manager ==1) $site_admin = true;'.
-			'}'.
-			'if($is_logged) {'.
-			'if($logged_info->is_admin=="Y") $is_admin = true; '.
-			'else $is_admin = false; '.
-			'$group_srls = array_keys($logged_info->group_list); '.
-			'} else { '.
-			'$is_admin = false; '.
-			'$group_srls = array(); '.
+			'$lang_type = Context::getLangType(); ' .
+			'$is_logged = Context::get(\'is_logged\'); ' .
+			'$logged_info = Context::get(\'logged_info\'); ' .
+			'$site_srl = ' . $site_srl . ';' .
+			'$site_admin = false;' .
+			'if($site_srl) { ' .
+			'$oModuleModel = getModel(\'module\');' .
+			'$site_module_info = $oModuleModel->getSiteInfo($site_srl); ' .
+			'if($site_module_info) Context::set(\'site_module_info\',$site_module_info);' .
+			'else $site_module_info = Context::get(\'site_module_info\');' .
+			'$grant = $oModuleModel->getGrant($site_module_info, $logged_info); ' .
+			'if($grant->manager ==1) $site_admin = true;' .
+			'}' .
+			'if($is_logged) {' .
+			'if($logged_info->is_admin=="Y") $is_admin = true; ' .
+			'else $is_admin = false; ' .
+			'$group_srls = array_keys($logged_info->group_list); ' .
+			'} else { ' .
+			'$is_admin = false; ' .
+			'$group_srls = array(); ' .
 			'}';
 		// Create the xml cache file (a separate session is needed for xml cache)
 		$xml_buff = sprintf(
-			'<?php '.
-			'define(\'__XE__\', true); '.
-			'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '.
-			'$oContext = Context::getInstance(); '.
-			'$oContext->init(); '.
-			'header("Content-Type: text/xml; charset=UTF-8"); '.
-			'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '.
-			'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '.
-			'header("Cache-Control: no-store, no-cache, must-revalidate"); '.
-			'header("Cache-Control: post-check=0, pre-check=0", false); '.
-			'header("Pragma: no-cache"); '.
-			'%s '.
-			'$oContext->close(); '.
-			'?>'.
+			'<?php ' .
+			'define(\'__XE__\', true); ' .
+			'require_once(\'' . FileHandler::getRealPath('./config/config.inc.php') . '\'); ' .
+			'$oContext = Context::getInstance(); ' .
+			'$oContext->init(); ' .
+			'header("Content-Type: text/xml; charset=UTF-8"); ' .
+			'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); ' .
+			'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); ' .
+			'header("Cache-Control: no-store, no-cache, must-revalidate"); ' .
+			'header("Cache-Control: post-check=0, pre-check=0", false); ' .
+			'header("Pragma: no-cache"); ' .
+			'%s ' .
+			'$oContext->close(); ' .
+			'?>' .
 			'<root>%s</root>',
 			$header_script,
 			$this->getXmlTree($tree[0], $tree, $site_srl, $domain)
@@ -1844,14 +1844,14 @@ 
 		// Create php cache file
 		$php_output = $this->getPhpCacheCode($tree[0], $tree, $site_srl, $domain);
 		$php_buff = sprintf(
-			'<?php '.
-			'if(!defined("__XE__")) exit(); '.
+			'<?php ' .
+			'if(!defined("__XE__")) exit(); ' .
 			'$menu = new stdClass();' .
-			'%s; '.
-			'%s; '.
-			'$menu->list = array(%s); '.
-			'if(!$is_admin) { recurciveExposureCheck($menu->list); }'.
-			'Context::set("included_menu", $menu); '.
+			'%s; ' .
+			'%s; ' .
+			'$menu->list = array(%s); ' .
+			'if(!$is_admin) { recurciveExposureCheck($menu->list); }' .
+			'Context::set("included_menu", $menu); ' .
 			'?>',
 			$header_script,
 			$php_output['name'],
@@ -1875,26 +1875,26 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, $domain)
 	{
-		if(!$source_node) return;
+		if (!$source_node) return;
 
 		$oMenuAdminModel = getAdminModel('menu');
 
-		foreach($source_node as $menu_item_srl => $node)
+		foreach ($source_node as $menu_item_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			if ($menu_item_srl && $tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
-			foreach($names as $key => $val)
+			foreach ($names as $key => $val)
 			{
-				$name_arr_str .= sprintf('"%s"=>\'%s\',',$key, str_replace(array('\\', '\''), array('\\\\', '\\\''), $val));
+				$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\', '\''), array('\\\\', '\\\''), $val));
 			}
 			$name_str = sprintf('$_names = array(%s); print $_names[$lang_type];', $name_arr_str);
 
-			$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
-			$desc = str_replace(array('&','"',"'"),array('&amp;','&quot;','\\\''),$node->desc);
-			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
+			$url = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->url);
+			$desc = str_replace(array('&', '"', "'"), array('&amp;', '&quot;', '\\\''), $node->desc);
+			if (preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
 			}
@@ -1904,21 +1904,21 @@ 
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			if ($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $normal_btn);
 			else $normal_btn = '';
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			if ($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $hover_btn);
 			else $hover_btn = '';
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			if ($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $active_btn);
 			else $active_btn = '';
 
 			$group_srls = $node->group_srls;
 
-			if($normal_btn)
+			if ($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
+				if ($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
+				if ($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
 				$link = sprintf('&lt;img src=&quot;%s&quot; onmouseout=&quot;this.src=\'%s\'&quot; alt=&quot;<?php print htmlspecialchars($_names[$lang_type], ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>&quot; %s %s /&gt;', $normal_btn, $normal_btn, $hover_str, $active_str);
 			}
 			else
@@ -1926,7 +1926,7 @@ 
 				$link = '<?php print $_names[$lang_type]; ?>';
 			}
 			// If the value of node->group_srls exists
-			if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
+			if ($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))', $group_srls, $group_srls == -1 ? 1 : 0);
 			else $group_check_code = "true";
 			$attribute = sprintf(
 				'node_srl="%s" parent_srl="%s" menu_name_key=\'%s\' text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?%s:"")?>" is_shortcut="%s" desc="%s" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
@@ -1950,8 +1950,8 @@ 
 				$link
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if ($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			else $buff .= sprintf('<node %s />', $attribute);
 		}
 		return $buff;
 	}
@@ -1970,74 +1970,74 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
 	{
 		$output = array("buff"=>"", "url_list"=>array());
-		if(!$source_node) return $output;
+		if (!$source_node) return $output;
 
 		$oMenuAdminModel = getAdminModel('menu');
 
-		foreach($source_node as $menu_item_srl => $node)
+		foreach ($source_node as $menu_item_srl => $node)
 		{
 			// Get data from child nodes if exist.
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			if ($menu_item_srl && $tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
 			else $child_output = array("buff"=>"", "url_list"=>array());
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
 			unset($name_arr_str);
-			foreach($names as $key => $val)
+			foreach ($names as $key => $val)
 			{
-				$name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace(array('\\','"'),array('\\\\','&quot;'),$val));
+				$name_arr_str .= sprintf('"%s"=>"%s",', $key, str_replace(array('\\', '"'), array('\\\\', '&quot;'), $val));
 			}
 			$name_str = sprintf('$_menu_names[%d] = array(%s); %s', $node->menu_item_srl, $name_arr_str, $child_output['name']);
 			// If url value is not empty in the current node, put the value into an array url_list
-			if($node->url) $child_output['url_list'][] = $node->url;
+			if ($node->url) $child_output['url_list'][] = $node->url;
 			$output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
 			// If node->group_srls value exists
-			if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls == -1?1:0);
+			if ($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))', $node->group_srls, $node->group_srls == -1 ? 1 : 0);
 			else $group_check_code = "true";
 			// List variables
-			$href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
-			$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
-			$desc = str_replace(array('&','"',"'"),array('&amp;','&quot;','\\\''),$node->desc);
-			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
+			$href = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->href);
+			$url = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->url);
+			$desc = str_replace(array('&', '"', "'"), array('&amp;', '&quot;', '\\\''), $node->desc);
+			if (preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
 			}
 			else $href = sprintf('"%s"', $url);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
-			$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
-			$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->hover_btn);
-			$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->active_btn);
+			$normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->normal_btn);
+			$hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->hover_btn);
+			$active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->active_btn);
 
-			foreach($child_output['url_list'] as $key =>$val)
+			foreach ($child_output['url_list'] as $key =>$val)
 			{
 				$child_output['url_list'][$key] = addslashes($val);
 			}
 
-			$selected = '"'.implode('","',$child_output['url_list']).'"';
+			$selected = '"' . implode('","', $child_output['url_list']) . '"';
 			$child_buff = $child_output['buff'];
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			if ($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $normal_btn);
 			else $normal_btn = '';
 
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			if ($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $hover_btn);
 			else $hover_btn = '';
 
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			if ($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $active_btn);
 			else $active_btn = '';
 
 
 			$group_srls = $node->group_srls;
 
-			if($normal_btn)
+			if ($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
+				if ($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
+				if ($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
 				$link = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s %s />"', $normal_btn, $normal_btn, $node->menu_item_srl, $hover_str, $active_str);
-				if($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
+				if ($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
 				else $link_active = $link;
 			}
 			else
@@ -2075,7 +2075,7 @@ 
 			);
 
 			// Generate buff data
-			$output['buff'] .=  sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute);
+			$output['buff'] .= sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute);
 			$output['name'] .= $name_str;
 		}
 		return $output;
@@ -2089,19 +2089,19 @@ 
 	 */
 	function updateMenuLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if (!count($menu_srl_list)) return;
 		// Delete the value of menu_srls
-		$args->menu_srls = implode(',',$menu_srl_list);
+		$args->menu_srls = implode(',', $menu_srl_list);
 		$output = executeQuery('menu.deleteMenuLayout', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$args->layout_srl = $layout_srl;
 		// Mapping menu_srls, layout_srl
-		for($i=0;$i<count($menu_srl_list);$i++)
+		for ($i = 0; $i < count($menu_srl_list); $i++)
 		{
 			$args->menu_srl = $menu_srl_list[$i];
 			$output = executeQuery('menu.insertMenuLayout', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 	}
 
@@ -2114,47 +2114,47 @@ 
 	{
 		// path setting
 		$path = sprintf('./files/attach/menu_button/%d/', $args->menu_srl);
-		if($args->menu_normal_btn || $args->menu_hover_btn || $args->menu_active_btn && !is_dir($path))
+		if ($args->menu_normal_btn || $args->menu_hover_btn || $args->menu_active_btn && !is_dir($path))
 		{
 			FileHandler::makeDir($path);
 		}
 
-		if($args->isNormalDelete == 'Y' || $args->isHoverDelete == 'Y' || $args->isActiveDelete == 'Y')
+		if ($args->isNormalDelete == 'Y' || $args->isHoverDelete == 'Y' || $args->isActiveDelete == 'Y')
 		{
 			$oMenuModel = getAdminModel('menu');
 			$itemInfo = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 
-			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
-			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
-			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
+			if ($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
+			if ($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
+			if ($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
 		}
 
 		$returnArray = array();
 		$date = date('YmdHis');
 		// normal button
-		if($args->menu_normal_btn)
+		if ($args->menu_normal_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_normal_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_normal_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_normal_btn', $ext);
 
-			if(checkUploadedFile($args->menu_normal_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_normal_btn['tmp_name']))
 			{
-				move_uploaded_file ( $args->menu_normal_btn ['tmp_name'], $filename );
+				move_uploaded_file($args->menu_normal_btn ['tmp_name'], $filename);
 				$returnArray ['normal_btn'] = $filename;
 			}
 		}
 
 		// hover button
-		if($args->menu_hover_btn)
+		if ($args->menu_hover_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_hover_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_hover_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_hover_btn', $ext);
 
-			if(checkUploadedFile($args->menu_hover_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_hover_btn['tmp_name']))
 			{
 				move_uploaded_file($args->menu_hover_btn['tmp_name'], $filename);
 				$returnArray['hover_btn'] = $filename;
@@ -2162,14 +2162,14 @@ 
 		}
 
 		// active button
-		if($args->menu_active_btn)
+		if ($args->menu_active_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_active_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_active_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_active_btn', $ext);
 
-			if(checkUploadedFile($args->menu_active_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_active_btn['tmp_name']))
 			{
 				move_uploaded_file($args->menu_active_btn['tmp_name'], $filename);
 				$returnArray['active_btn'] = $filename;
@@ -2191,7 +2191,7 @@ 
 			"active_btn"=>"",
 		);
 		//normal_btn
-		if($menuItemInfo->normal_btn)
+		if ($menuItemInfo->normal_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->normal_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->normal_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'normal');
@@ -2201,7 +2201,7 @@ 
 		}
 
 		//hover_btn
-		if($menuItemInfo->hover_btn)
+		if ($menuItemInfo->hover_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->hover_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->hover_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'hover');
@@ -2211,7 +2211,7 @@ 
 		}
 
 		//active_btn
-		if($menuItemInfo->active_btn)
+		if ($menuItemInfo->active_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->active_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->active_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'active');
@@ -2226,9 +2226,9 @@ 
 	{
 		$path = sprintf('./files/attach/menu_button/%d/', $menuSrl);
 		$tmp_arr = explode('.', $buttonPath);
-		$ext = $tmp_arr[count($tmp_arr)-1];
+		$ext = $tmp_arr[count($tmp_arr) - 1];
 		$date = date("YmdHis");
-		return sprintf('%s%d.%s.%s.%s', $path, $menuItemSrl,$date,'menu_'.$mode.'_btn', $ext);
+		return sprintf('%s%d.%s.%s.%s', $path, $menuItemSrl, $date, 'menu_' . $mode . '_btn', $ext);
 	}
 
 	public function makeHomemenuCacheFile($menuSrl)

Braces +296 added lines, -128 removed lines

@@ -69,7 +69,9 @@ 
 		$site_module_info = Context::get('site_module_info');
 
 		$output = $this->addMenu(Context::get('title'), (int)$site_module_info->site_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('menu_srl', $output->get('menuSrl'));
 		$this->setMessage('success_registed');
@@ -148,8 +150,7 @@ 
 				$moduleConfig->unlinked_menu_srl = $output->get('menuSrl');
 				$oModuleController = getController('module');
 				$oModuleController->updateModuleConfig('menu', $moduleConfig);
-			}
-			else
+			} else
 			{
 				return false;
 			}
@@ -186,8 +187,7 @@ 
 			if($output->toBool() && $output->data)
 			{
 				$moduleInfo->menu_srl = $output->data->menu_srl;
-			}
-			else
+			} else
 			{
 				// create menu item.
 				$item_args->menu_srl = $menuSrl;
@@ -235,7 +235,9 @@ 
 		$args->menu_srl = Context::get('menu_srl');
 
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_registed');
 
@@ -255,8 +257,9 @@ 
 		$menuInfo = $oMenuAdminModel->getMenu($menu_srl);
 
 		$oAdmin = getClass('admin');
-		if($menuInfo->title == $oAdmin->getAdminMenuName())
-			return new Object(-1, 'msg_adminmenu_cannot_delete');
+		if($menuInfo->title == $oAdmin->getAdminMenuName()) {
+					return new Object(-1, 'msg_adminmenu_cannot_delete');
+		}
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl);
@@ -280,8 +283,9 @@ 
 				$originMenu = $value;
 				$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
 
-				if($isStartmenuInclude)
-					break;
+				if($isStartmenuInclude) {
+									break;
+				}
 			}
 		}
 
@@ -366,7 +370,9 @@ 
 			foreach($cache_list as $cache_file)
 			{
 				$pos = strpos($cache_file, $menu_srl.'.');
-				if($pos>0)FileHandler::removeFile($cache_file);
+				if($pos>0) {
+					FileHandler::removeFile($cache_file);
+				}
 			}
 		}
 		// Delete images of menu buttons
@@ -405,8 +411,7 @@ 
 		if($request->is_shortcut == 'Y')
 		{
 			$result = $this->_insertShortcut($request);
-		}
-		else
+		} else
 		{
 			$result = $this->_insertMenu($request, $isProc);
 		}
@@ -465,12 +470,21 @@ 
 			$args->is_shortcut = $request->is_shortcut;
 			$args->url = $request->shortcut_target;
 
-			if(!$args->open_window) $args->open_window = 'N';
-			if(!$args->expand) $args->expand = 'N';
-			if(!$args->is_shortcut) $args->is_shortcut = 'Y';
+			if(!$args->open_window) {
+				$args->open_window = 'N';
+			}
+			if(!$args->expand) {
+				$args->expand = 'N';
+			}
+			if(!$args->is_shortcut) {
+				$args->is_shortcut = 'Y';
+			}
 
-			if($request->menu_name_key) $args->name = $request->menu_name_key;
-			else $args->name = $request->menu_name;
+			if($request->menu_name_key) {
+				$args->name = $request->menu_name_key;
+			} else {
+				$args->name = $request->menu_name;
+			}
 		}
 		// type is module short cut
 		else if(is_numeric($request->shortcut_target))
@@ -505,13 +519,18 @@ 
 			$args->url = '#';
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
-		else $args->desc = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		$args->menu_item_srl = getNextSequence();
 		$args->listorder = -1*$args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oDB->commit();
 
@@ -533,15 +552,27 @@ 
 		$args->expand = $request->menu_expand;
 		$args->is_shortcut = $request->is_shortcut;
 
-		if(!$args->open_window) $args->open_window = 'N';
-		if(!$args->expand) $args->expand = 'N';
-		if(!$args->is_shortcut) $args->is_shortcut = 'N';
+		if(!$args->open_window) {
+			$args->open_window = 'N';
+		}
+		if(!$args->expand) {
+			$args->expand = 'N';
+		}
+		if(!$args->is_shortcut) {
+			$args->is_shortcut = 'N';
+		}
 
-		if($request->menu_name_key) $args->name = $request->menu_name_key;
-		else $args->name = $request->menu_name;
+		if($request->menu_name_key) {
+			$args->name = $request->menu_name_key;
+		} else {
+			$args->name = $request->menu_name;
+		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
-		else $args->desc = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
 		{
@@ -559,9 +590,15 @@ 
 		}
 
 		// if setting button variables, set argument button variables for db insert. but not upload in this method
-		if($request->normal_btn) $args->normal_btn = $request->normal_btn;
-		if($request->hover_btn) $args->hover_btn = $request->hover_btn;
-		if($request->active_btn) $args->active_btn = $request->active_btn;
+		if($request->normal_btn) {
+			$args->normal_btn = $request->normal_btn;
+		}
+		if($request->hover_btn) {
+			$args->hover_btn = $request->hover_btn;
+		}
+		if($request->active_btn) {
+			$args->active_btn = $request->active_btn;
+		}
 
 		if(!$request->module_id)
 		{
@@ -572,7 +609,9 @@ 
 		$args->menu_item_srl = getNextSequence();
 		$args->listorder = -1*$args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oDB->commit();
 
@@ -653,8 +692,12 @@ 
 		}
 
 		// variables set
-		if($request->menu_open_window != "Y") $request->menu_open_window = "N";
-		if($request->menu_expand != "Y") $request->menu_expand = "N";
+		if($request->menu_open_window != "Y") {
+			$request->menu_open_window = "N";
+		}
+		if($request->menu_expand != "Y") {
+			$request->menu_expand = "N";
+		}
 
 		// Get original information
 		$oMenuAdminModel = getAdminModel('menu');
@@ -681,13 +724,11 @@ 
 
 				$args->url = $newItemInfo->url;
 				$args->is_shortcut = 'Y';
-			}
-			else
+			} else
 			{
 				$args->url = '#';
 			}
-		}
-		else
+		} else
 		{
 			// check already created module instance
 			$oModuleModel = getModel('module');
@@ -720,14 +761,16 @@ 
 		if($request->menu_name_key)
 		{
 			$args->name = $request->menu_name_key;
-		}
-		else
+		} else
 		{
 			$args->name = $request->menu_name;
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
-		else $args->desc = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		unset($args->group_srls);
 		$args->open_window = $request->menu_open_window;
@@ -829,8 +872,7 @@ 
 		{
 			$this->setError($returnObj->error);
 			$this->setMessage($returnObj->message);
-		}
-		else
+		} else
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -857,7 +899,9 @@ 
 		if($args->is_force != 'Y')
 		{
 			$output = executeQuery('menu.getChildMenuCount', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			if($output->data->count > 0)
 			{
 				return new Object(-1001, 'msg_cannot_delete_for_child');
@@ -875,7 +919,9 @@ 
 			return $this->stop('msg_cannot_delete_for_admin_topmenu');
 		}
 
-		if($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
+		if($itemInfo->parent_srl) {
+			$parent_srl = $itemInfo->parent_srl;
+		}
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $args->menu_srl);
@@ -949,9 +995,15 @@ 
 		// Update the xml file and get its location
 		$xml_file = $this->makeXmlFile($args->menu_srl);
 		// Delete all of image buttons
-		if($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
-		if($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
-		if($node['active_btn']) FileHandler::removeFile($node['active_btn']);
+		if($node['normal_btn']) {
+			FileHandler::removeFile($node['normal_btn']);
+		}
+		if($node['hover_btn']) {
+			FileHandler::removeFile($node['hover_btn']);
+		}
+		if($node['active_btn']) {
+			FileHandler::removeFile($node['active_btn']);
+		}
 
 		// Delete module
 		if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
@@ -1018,7 +1070,9 @@ 
 		$source_srl = Context::get('source_srl');	// Same hierarchy's menu item serial number
 		$target_srl = Context::get('target_srl');	// Self menu item serial number
 
-		if(!$mode || !$parent_srl || !$target_srl) return new Object(-1,'msg_invalid_request');
+		if(!$mode || !$parent_srl || !$target_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
@@ -1182,8 +1236,11 @@ 
 		// default argument setting
 		$args = new stdClass();
 		$args->menu_srl = $menuSrl;
-		if($parentSrl == 0) $args->parent_srl = $menuSrl;
-		else $args->parent_srl = $parentSrl;
+		if($parentSrl == 0) {
+			$args->parent_srl = $menuSrl;
+		} else {
+			$args->parent_srl = $parentSrl;
+		}
 		$args->menu_name_key = $originMenu['text'];
 		$args->menu_name = $originMenu['text'];
 		$args->menu_open_window = $originMenu['open_window'];
@@ -1276,8 +1333,11 @@ 
 		for($i=0;$i<4;$i++)
 		{
 			$case = rand(0, 1);
-			if($case) $doc = rand(65, 90);
-			else $doc = rand(97, 122);
+			if($case) {
+				$doc = rand(65, 90);
+			} else {
+				$doc = rand(97, 122);
+			}
 
 			$randomString .= chr($doc);
 		}
@@ -1300,15 +1360,21 @@ 
 		// menu name update
 		$args->menu_srl = $this->menuSrl;
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->map = array();
 		if(is_array($parentKeyList))
 		{
 			foreach($parentKeyList as $no=>$srl)
 			{
-				if($srl === 0) continue;
-				if(!is_array($this->map[$srl]))$this->map[$srl] = array();
+				if($srl === 0) {
+					continue;
+				}
+				if(!is_array($this->map[$srl])) {
+					$this->map[$srl] = array();
+				}
 				$this->map[$srl][] = $no;
 			}
 		}
@@ -1410,7 +1476,9 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		$target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if($target_item->menu_item_srl != $target_srl) return new Object(-1,'msg_invalid_request');
+		if($target_item->menu_item_srl != $target_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Move the menu location(change the order menu appears)
 		if($mode == 'move')
 		{
@@ -1421,24 +1489,33 @@ 
 			if($source_srl)
 			{
 				$source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
-				if($source_item->menu_item_srl != $source_srl) return new Object(-1,'msg_invalid_request');
+				if($source_item->menu_item_srl != $source_srl) {
+					return new Object(-1,'msg_invalid_request');
+				}
 				$args->listorder = $source_item->listorder-1;
-			}
-			else
+			} else
 			{
 				$output = executeQuery('menu.getMaxListorder', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 				$args->listorder = (int)$output->data->listorder;
-				if(!$args->listorder) $args->listorder= 0;
+				if(!$args->listorder) {
+					$args->listorder= 0;
+				}
 			}
 			$args->parent_srl = $parent_srl;
 			$output = executeQuery('menu.updateMenuItemListorder', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->parent_srl = $parent_srl;
 			$args->menu_item_srl = $target_srl;
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			//module's menu_srl move also
 			if($isShortcut == 'N' && !empty($url))
@@ -1466,14 +1543,15 @@ 
 				}
 			}
 			// Add a child
-		}
-		elseif($mode == 'insert')
+		} elseif($mode == 'insert')
 		{
 			$args->menu_item_srl = $target_srl;
 			$args->parent_srl = $parent_srl;
 			$args->listorder = -1*getNextSequence();
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$xml_file = $this->makeXmlFile($menu_srl);
@@ -1517,8 +1595,7 @@ 
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 
-		}
-		else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
+		} else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 		}
@@ -1532,7 +1609,9 @@ 
 			$path = sprintf('./files/attach/menu_button/%d/', $menu_srl);
 			$filename = sprintf('%s%d.%s.%s', $path, $menu_item_srl, $target, $ext);
 
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if(!is_dir($path)) {
+				FileHandler::makeDir($path);
+			}
 
 			move_uploaded_file($target_file['tmp_name'], $filename);
 			Context::set('filename', $filename);
@@ -1572,7 +1651,9 @@ 
 			foreach($installed_module_list AS $key=>$value)
 			{
 				$info = $oModuleModel->getModuleActionXml($value->module);
-				if($info->menu) $menuList[$value->module] = $info->menu;
+				if($info->menu) {
+					$menuList[$value->module] = $info->menu;
+				}
 				unset($info->menu);
 			}
 		}
@@ -1604,8 +1685,12 @@ 
 		$info = $oModuleModel->getModuleActionXml($moduleName);
 
 		$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
+		if(empty($url)) {
+			$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
+		}
+		if(empty($url)) {
+			$url = getNotEncodedFullUrl('', 'module', 'admin');
+		}
 		$dbInfo = Context::getDBInfo();
 
 		$args = new stdClass();
@@ -1617,8 +1702,7 @@ 
 		if(strpos($url, 'https') !== false)
 		{
 			$args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url);
-		}
-		else
+		} else
 		{
 			$args->url = str_replace($dbInfo->default_url, '', $url);
 		}
@@ -1637,14 +1721,18 @@ 
 		if($item_info->menu_item_srl == $args->menu_item_srl)
 		{
 			$output = $this->_updateMenuItem($args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Insert if not exist
 		else
 		{
 			$args->listorder = -1*$args->menu_item_srl;
 			$output = executeQuery('menu.insertMenuItem', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Get information of the menu
 		$menu_info = $oMenuModel->getMenu($args->menu_srl);
@@ -1675,8 +1763,7 @@ 
 		if(!$exposure)
 		{
 			$args->group_srls = '';
-		}
-		else
+		} else
 		{
 			$exposure = explode(',', $exposure);
 			if(in_array($exposure, array('-1','-3')))
@@ -1684,7 +1771,9 @@ 
 				$args->group_srls = $exposure;
 			}
 
-			if($exposure) $args->group_srls = implode(',', $exposure);
+			if($exposure) {
+				$args->group_srls = implode(',', $exposure);
+			}
 		}
 
 		$output = $this->_updateMenuItem($args);
@@ -1704,7 +1793,9 @@ 
 		$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
 
 		$grantList = $xml_info->grant;
-		if(!$grantList) $grantList = new stdClass;
+		if(!$grantList) {
+			$grantList = new stdClass;
+		}
 
 		$grantList->access = new stdClass();
 		$grantList->access->default = 'guest';
@@ -1754,12 +1845,16 @@ 
 	function makeXmlFile($menu_srl)
 	{
 		// Return if there is no information when creating the xml file
-		if(!$menu_srl) return;
+		if(!$menu_srl) {
+			return;
+		}
 		// Get menu informaton
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->toBool() || !$output->data) return $output;
+		if(!$output->toBool() || !$output->data) {
+			return $output;
+		}
 		$site_srl = (int)$output->data->site_srl;
 
 		if($site_srl)
@@ -1773,7 +1868,9 @@ 
 		$args->menu_srl = $menu_srl;
 		$args->sort_index = 'listorder';
 		$output = executeQuery('menu.getMenuItems', $args);
-		if(!$output->toBool()) return;
+		if(!$output->toBool()) {
+			return;
+		}
 		// Specify the name of the cache file
 		$xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.xml.php", $menu_srl);
 		$php_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menu_srl);
@@ -1787,7 +1884,9 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 		// Create a tree for loop
 		$list_count = count($list);
 		for($i=0;$i<$list_count;$i++)
@@ -1875,7 +1974,9 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, $domain)
 	{
-		if(!$source_node) return;
+		if(!$source_node) {
+			return;
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
@@ -1883,7 +1984,9 @@ 
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			if($menu_item_srl&&$tree[$menu_item_srl]) {
+				$child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			}
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
 			foreach($names as $key => $val)
@@ -1897,37 +2000,57 @@ 
 			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
+			} else {
+				$href = sprintf('"%s"', $url);
 			}
-			else $href = sprintf('"%s"', $url);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
-			else $normal_btn = '';
+			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) {
+				$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			} else {
+				$normal_btn = '';
+			}
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
-			else $hover_btn = '';
+			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) {
+				$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			} else {
+				$hover_btn = '';
+			}
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
-			else $active_btn = '';
+			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) {
+				$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			} else {
+				$active_btn = '';
+			}
 
 			$group_srls = $node->group_srls;
 
 			if($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
+				if($hover_btn) {
+					$hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn);
+				} else {
+					$hover_str = '';
+				}
+				if($active_btn) {
+					$active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn);
+				} else {
+					$active_str = '';
+				}
 				$link = sprintf('&lt;img src=&quot;%s&quot; onmouseout=&quot;this.src=\'%s\'&quot; alt=&quot;<?php print htmlspecialchars($_names[$lang_type], ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>&quot; %s %s /&gt;', $normal_btn, $normal_btn, $hover_str, $active_str);
-			}
-			else
+			} else
 			{
 				$link = '<?php print $_names[$lang_type]; ?>';
 			}
 			// If the value of node->group_srls exists
-			if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
-			else $group_check_code = "true";
+			if($group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
+			} else {
+				$group_check_code = "true";
+			}
 			$attribute = sprintf(
 				'node_srl="%s" parent_srl="%s" menu_name_key=\'%s\' text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?%s:"")?>" is_shortcut="%s" desc="%s" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
 				$menu_item_srl,
@@ -1950,8 +2073,11 @@ 
 				$link
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if($child_buff) {
+				$buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			} else {
+				$buff .=  sprintf('<node %s />', $attribute);
+			}
 		}
 		return $buff;
 	}
@@ -1970,15 +2096,20 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
 	{
 		$output = array("buff"=>"", "url_list"=>array());
-		if(!$source_node) return $output;
+		if(!$source_node) {
+			return $output;
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		foreach($source_node as $menu_item_srl => $node)
 		{
 			// Get data from child nodes if exist.
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
-			else $child_output = array("buff"=>"", "url_list"=>array());
+			if($menu_item_srl&&$tree[$menu_item_srl]) {
+				$child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			} else {
+				$child_output = array("buff"=>"", "url_list"=>array());
+			}
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
 			unset($name_arr_str);
@@ -1988,11 +2119,16 @@ 
 			}
 			$name_str = sprintf('$_menu_names[%d] = array(%s); %s', $node->menu_item_srl, $name_arr_str, $child_output['name']);
 			// If url value is not empty in the current node, put the value into an array url_list
-			if($node->url) $child_output['url_list'][] = $node->url;
+			if($node->url) {
+				$child_output['url_list'][] = $node->url;
+			}
 			$output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
 			// If node->group_srls value exists
-			if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls == -1?1:0);
-			else $group_check_code = "true";
+			if($node->group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls == -1?1:0);
+			} else {
+				$group_check_code = "true";
+			}
 			// List variables
 			$href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
 			$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
@@ -2000,8 +2136,9 @@ 
 			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
+			} else {
+				$href = sprintf('"%s"', $url);
 			}
-			else $href = sprintf('"%s"', $url);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
 			$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
@@ -2018,29 +2155,48 @@ 
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
-			else $normal_btn = '';
+			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) {
+				$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			} else {
+				$normal_btn = '';
+			}
 
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
-			else $hover_btn = '';
+			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) {
+				$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			} else {
+				$hover_btn = '';
+			}
 
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
-			else $active_btn = '';
+			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) {
+				$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			} else {
+				$active_btn = '';
+			}
 
 
 			$group_srls = $node->group_srls;
 
 			if($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
+				if($hover_btn) {
+					$hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn);
+				} else {
+					$hover_str = '';
+				}
+				if($active_btn) {
+					$active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn);
+				} else {
+					$active_str = '';
+				}
 				$link = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s %s />"', $normal_btn, $normal_btn, $node->menu_item_srl, $hover_str, $active_str);
-				if($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
-				else $link_active = $link;
-			}
-			else
+				if($active_btn) {
+					$link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
+				} else {
+					$link_active = $link;
+				}
+			} else
 			{
 				$link_active = $link = sprintf('$_menu_names[%d][$lang_type]', $node->menu_item_srl);
 			}
@@ -2089,11 +2245,15 @@ 
 	 */
 	function updateMenuLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if(!count($menu_srl_list)) {
+			return;
+		}
 		// Delete the value of menu_srls
 		$args->menu_srls = implode(',',$menu_srl_list);
 		$output = executeQuery('menu.deleteMenuLayout', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$args->layout_srl = $layout_srl;
 		// Mapping menu_srls, layout_srl
@@ -2101,7 +2261,9 @@ 
 		{
 			$args->menu_srl = $menu_srl_list[$i];
 			$output = executeQuery('menu.insertMenuLayout', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 	}
 
@@ -2124,9 +2286,15 @@ 
 			$oMenuModel = getAdminModel('menu');
 			$itemInfo = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 
-			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
-			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
-			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
+			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) {
+				FileHandler::removeFile($itemInfo->normal_btn);
+			}
+			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) {
+				FileHandler::removeFile($itemInfo->hover_btn);
+			}
+			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) {
+				FileHandler::removeFile($itemInfo->active_btn);
+			}
 		}
 
 		$returnArray = array();

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * menuAdminController class
- * admin controller class of the menu module
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /modules/menu
- * @version 0.1
- */
+	 * menuAdminController class
+	 * admin controller class of the menu module
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 * @package /modules/menu
+	 * @version 0.1
+	 */
 class menuAdminController extends menu
 {
 	/**

modules/menu/menu.mobile.php

Doc Comments +1 added lines

@@ -18,6 +18,7 @@
 
 	/**
 	 * Menu depth arrange
+	 * @param integer $depth
 	 * @return void
 	 */
 	function straightenMenu($menu_item, $depth)

Spacing +12 added lines, -12 removed lines

@@ -22,17 +22,17 @@ 
 	 */
 	function straightenMenu($menu_item, $depth)
 	{
-		if(!$menu_item['link']) return;
+		if (!$menu_item['link']) return;
 		$obj = new stdClass;
 		$obj->href = $menu_item['href'];
 		$obj->depth = $depth;
 		$obj->text = $menu_item['text'];
 		$obj->open_window = $menu_item['open_window'];
 		$this->result[] = $obj;
-		if(!$menu_item['list']) return;
-		foreach($menu_item['list'] as $item)
+		if (!$menu_item['list']) return;
+		foreach ($menu_item['list'] as $item)
 		{
-			$this->straightenMenu($item, $depth+1);
+			$this->straightenMenu($item, $depth + 1);
 		}
 	}
 
@@ -43,25 +43,25 @@ 
 	function dispMenuMenu()
 	{
 		$menu_srl = Context::get('menu_srl');
-		$oAdminModel =& getAdminModel('menu');
+		$oAdminModel = & getAdminModel('menu');
 		$menu_info = $oAdminModel->getMenu($menu_srl);
 
-		if(!$menu_srl)
+		if (!$menu_srl)
 		{
 			$oMenuAdminController = getAdminController('menu');
 			$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
 
-			if(file_exists($homeMenuCacheFile))
+			if (file_exists($homeMenuCacheFile))
 			{
 				@include($homeMenuCacheFile);
 			}
-			$menu_info->php_file = './files/cache/menu/'.$homeMenuSrl.'.php';
+			$menu_info->php_file = './files/cache/menu/' . $homeMenuSrl . '.php';
 		}
 
-		if(file_exists($menu_info->php_file)) @include($menu_info->php_file);
-		if(is_array($menu->list))
+		if (file_exists($menu_info->php_file)) @include($menu_info->php_file);
+		if (is_array($menu->list))
 		{
-			foreach($menu->list as $menu_item)
+			foreach ($menu->list as $menu_item)
 			{
 				$this->straightenMenu($menu_item, 0);
 			}
@@ -69,7 +69,7 @@ 
 
 		Context::set('menu', $this->result);	
 
-		$this->setTemplatePath(sprintf("%stpl/",$this->module_path));
+		$this->setTemplatePath(sprintf("%stpl/", $this->module_path));
 		$this->setTemplateFile('menu.html');
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -22,14 +22,18 @@ 
 	 */
 	function straightenMenu($menu_item, $depth)
 	{
-		if(!$menu_item['link']) return;
+		if(!$menu_item['link']) {
+			return;
+		}
 		$obj = new stdClass;
 		$obj->href = $menu_item['href'];
 		$obj->depth = $depth;
 		$obj->text = $menu_item['text'];
 		$obj->open_window = $menu_item['open_window'];
 		$this->result[] = $obj;
-		if(!$menu_item['list']) return;
+		if(!$menu_item['list']) {
+			return;
+		}
 		foreach($menu_item['list'] as $item)
 		{
 			$this->straightenMenu($item, $depth+1);
@@ -58,7 +62,9 @@ 
 			$menu_info->php_file = './files/cache/menu/'.$homeMenuSrl.'.php';
 		}
 
-		if(file_exists($menu_info->php_file)) @include($menu_info->php_file);
+		if(file_exists($menu_info->php_file)) {
+			@include($menu_info->php_file);
+		}
 		if(is_array($menu->list))
 		{
 			foreach($menu->list as $menu_item)

modules/module/module.admin.controller.php

Doc Comments +6 added lines

@@ -260,6 +260,9 @@ 
 		return $module_srl;
 	}
 
+	/**
+	 * @param boolean $isProc
+	 */
 	private function _returnByProc($isProc, $msg='msg_invalid_request')
 	{
 		if(!$isProc)
@@ -938,6 +941,9 @@ 
 
 	}
 
+	/**
+	 * @param string $skinVars
+	 */
 	public function setDesignInfo($moduleSrl = 0, $mid = '', $skinType = 'P', $layoutSrl = 0, $isSkinFix = 'Y', $skinName = '', $skinVars = NULL)
 	{
 		if(!$moduleSrl && !$mid)

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  moduleAdminController
- * @author NAVER (developers@xpressengine.com)
- * @brief admin controller class of the module module
- */
+	 * @class  moduleAdminController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief admin controller class of the module module
+	 */
 class moduleAdminController extends module
 {
 	/**

Spacing +161 added lines, -161 removed lines

@@ -22,7 +22,7 @@ 
 		$args = new stdClass();
 		$args->title = Context::get('title');
 		$output = executeQuery('module.insertModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage("success_registed");
 
@@ -36,7 +36,7 @@ 
 	function procModuleAdminUpdateCategory()
 	{
 		$output = $this->doUpdateModuleCategory();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_updated');
 
@@ -50,7 +50,7 @@ 
 	function procModuleAdminDeleteCategory()
 	{
 		$output = $this->doDeleteModuleCategory();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_deleted');
 
@@ -85,7 +85,7 @@ 
 	function procModuleAdminCopyModule($args = NULL)
 	{
 		$isProc = false;
-		if(!$args)
+		if (!$args)
 		{
 			$isProc = true;
 			// Get information of the target module to copy
@@ -97,24 +97,24 @@ 
 			$module_srl = $args->module_srl;
 		}
 
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return $this->_returnByProc($isProc);
 		}
 
 		// Get module name to create and browser title
 		$clones = array();
-		for($i=1;$i<=10;$i++)
+		for ($i = 1; $i <= 10; $i++)
 		{
-			$mid = trim($args->{"mid_".$i});
-			if(!$mid) continue;
-			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
-			$browser_title = $args->{"browser_title_".$i};
-			if(!$mid) continue;
-			if($mid && !$browser_title) $browser_title = $mid;
+			$mid = trim($args->{"mid_" . $i});
+			if (!$mid) continue;
+			if (!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
+			$browser_title = $args->{"browser_title_" . $i};
+			if (!$mid) continue;
+			if ($mid && !$browser_title) $browser_title = $mid;
 			$clones[$mid] = $browser_title;
 		}
-		if(count($clones) < 1)
+		if (count($clones) < 1)
 		{
 			return $this->_returnByProc($isProc);
 		}
@@ -129,9 +129,9 @@ 
 		$module_args->module_srl = $module_srl;
 		$output = executeQueryArray('module.getModuleGrants', $module_args);
 		$grant = array();
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val) $grant[$val->name][] = $val->group_srl;
+			foreach ($output->data as $val) $grant[$val->name][] = $val->group_srl;
 		}
 
 		// get Extra Vars
@@ -139,9 +139,9 @@ 
 		$extra_args->module_srl = $module_srl;
 		$extra_output = executeQueryArray('module.getModuleExtraVars', $extra_args);
 		$extra_vars = new stdClass();
-		if($extra_output->toBool() && is_array($extra_output->data))
+		if ($extra_output->toBool() && is_array($extra_output->data))
 		{
-			foreach($extra_output->data as $info)
+			foreach ($extra_output->data as $info)
 			{
 				$extra_vars->{$info->name} = $info->value;
 			}
@@ -150,17 +150,17 @@ 
 		$tmpModuleSkinVars = $oModuleModel->getModuleSkinVars($module_srl);
 		$tmpModuleMobileSkinVars = $oModuleModel->getModuleMobileSkinVars($module_srl);
 
-		if($tmpModuleSkinVars)
+		if ($tmpModuleSkinVars)
 		{
-			foreach($tmpModuleSkinVars as $key=>$value)
+			foreach ($tmpModuleSkinVars as $key=>$value)
 			{
 				$moduleSkinVars->{$key} = $value->value;
 			}
 		}
 
-		if($tmpModuleMobileSkinVars)
+		if ($tmpModuleMobileSkinVars)
 		{
-			foreach($tmpModuleMobileSkinVars as $key=>$value)
+			foreach ($tmpModuleMobileSkinVars as $key=>$value)
 			{
 				$moduleMobileSkinVars->{$key} = $value->value;
 			}
@@ -174,7 +174,7 @@ 
 		$triggerObj->moduleSrlList = array();
 
 		$errorLog = array();
-		foreach($clones as $mid => $browser_title)
+		foreach ($clones as $mid => $browser_title)
 		{
 			$clone_args = new stdClass;
 			$clone_args = clone $module_info;
@@ -188,29 +188,29 @@ 
 			// Create a module
 			$output = $oModuleController->insertModule($clone_args);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
-				$errorLog[] = $mid . ' : '. $output->message;
+				$errorLog[] = $mid . ' : ' . $output->message;
 				continue;
 			}
 			$module_srl = $output->get('module_srl');
 
-			if($module_info->module == 'page' && $extra_vars->page_type == 'ARTICLE')
+			if ($module_info->module == 'page' && $extra_vars->page_type == 'ARTICLE')
 			{
 				// copy document
 				$oDocumentAdminController = getAdminController('document');
 				$copyOutput = $oDocumentAdminController->copyDocumentModule(array($extra_vars->document_srl), $module_srl, $module_info->category_srl);
 				$document_srls = $copyOutput->get('copied_srls');
-				if($document_srls && count($document_srls) > 0)
+				if ($document_srls && count($document_srls) > 0)
 				{
 					$extra_vars->document_srl = array_pop($document_srls);
 				}
 
-				if($extra_vars->mdocument_srl)
+				if ($extra_vars->mdocument_srl)
 				{
 					$copyOutput = $oDocumentAdminController->copyDocumentModule(array($extra_vars->mdocument_srl), $module_srl, $module_info->category_srl);
 					$copiedSrls = $copyOutput->get('copied_srls');
-					if($copiedSrls && count($copiedSrls) > 0)
+					if ($copiedSrls && count($copiedSrls) > 0)
 					{
 						$extra_vars->mdocument_srl = array_pop($copiedSrls);
 					}
@@ -218,11 +218,11 @@ 
 			}
 
 			// Grant module permissions
-			if(count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
-			if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			if (count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
+			if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
 
-			if($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
-			if($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			if ($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
+			if ($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
 
 			$triggerObj->moduleSrlList[] = $module_srl;
 		}
@@ -231,7 +231,7 @@ 
 
 		$oDB->commit();
 
-		if(count($errorLog) > 0)
+		if (count($errorLog) > 0)
 		{
 			$message = implode('\n', $errorLog);
 			$this->setMessage($message);
@@ -242,9 +242,9 @@ 
 			$this->setMessage('success_registed');
 		}
 
-		if($isProc)
+		if ($isProc)
 		{
-			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+			if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
 				global $lang;
 				htmlHeader();
@@ -260,9 +260,9 @@ 
 		return $module_srl;
 	}
 
-	private function _returnByProc($isProc, $msg='msg_invalid_request')
+	private function _returnByProc($isProc, $msg = 'msg_invalid_request')
 	{
-		if(!$isProc)
+		if (!$isProc)
 			return;
 		else
 		{
@@ -282,17 +282,17 @@ 
 		// Get information of the module
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$module_info) return new Object(-1,'msg_invalid_request');
+		if (!$module_info) return new Object(-1, 'msg_invalid_request');
 		// Register Admin ID
 		$oModuleController->deleteAdminId($module_srl);
 		$admin_member = Context::get('admin_member');
-		if($admin_member)
+		if ($admin_member)
 		{
-			$admin_members = explode(',',$admin_member);
-			foreach($admin_members as $admin_id)
+			$admin_members = explode(',', $admin_member);
+			foreach ($admin_members as $admin_id)
 			{
 				$admin_id = trim($admin_id);
-				if(!$admin_id) continue;
+				if (!$admin_id) continue;
 				$oModuleController->insertAdminId($module_srl, $admin_id);
 			}
 		}
@@ -307,13 +307,13 @@ 
 		$grant_list->manager->default = 'manager';
 
 		$grant = new stdClass();
-		foreach($grant_list as $grant_name => $grant_info)
+		foreach ($grant_list as $grant_name => $grant_info)
 		{
 			// Get the default value
-			$default = Context::get($grant_name.'_default');
+			$default = Context::get($grant_name . '_default');
 			// -1 = Log-in user only, -2 = site members only, -3 = manager only, 0 = all users
 			$grant->{$grant_name} = array();
-			if(strlen($default))
+			if (strlen($default))
 			{
 				$grant->{$grant_name}[] = $default;
 				continue;
@@ -322,10 +322,10 @@ 
 			else
 			{
 				$group_srls = Context::get($grant_name);
-				if($group_srls)
+				if ($group_srls)
 				{
-					if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-					elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+					if (strpos($group_srls, '|@|') !== false) $group_srls = explode('|@|', $group_srls);
+					elseif (strpos($group_srls, ',') !== false) $group_srls = explode(',', $group_srls);
 					else $group_srls = array($group_srls);
 					$grant->{$grant_name} = $group_srls;
 				}
@@ -338,18 +338,18 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQuery('module.deleteModuleGrants', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Permissions stored in the DB
-		foreach($grant as $grant_name => $group_srls)
+		foreach ($grant as $grant_name => $group_srls)
 		{
-			foreach($group_srls as $val)
+			foreach ($group_srls as $val)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->name = $grant_name;
 				$args->group_srl = $val;
 				$output = executeQuery('module.insertModuleGrant', $args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 		}
 		$this->setMessage('success_registed');
@@ -368,11 +368,11 @@ 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'skin', 'mskin', 'is_skin_fix', 'is_mskin_fix');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if($module_info->module_srl)
+		if ($module_info->module_srl)
 		{
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
-				if($module_info->is_mskin_fix == 'Y')
+				if ($module_info->is_mskin_fix == 'Y')
 				{
 					$skin = $module_info->mskin;
 				}
@@ -383,7 +383,7 @@ 
 			}
 			else
 			{
-				if($module_info->is_skin_fix == 'Y')
+				if ($module_info->is_skin_fix == 'Y')
 				{
 					$skin = $module_info->skin;
 				}
@@ -394,9 +394,9 @@ 
 			}
 
 			// Get skin information (to check extra_vars)
-			$module_path = _XE_PATH_ . 'modules/'.$module_info->module;
+			$module_path = _XE_PATH_ . 'modules/' . $module_info->module;
 
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 				$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
@@ -417,35 +417,35 @@ 
 			unset($obj->module);
 			unset($obj->_mode);
 			// Separately handle if a type of extra_vars is an image in the original skin_info
-			if($skin_info->extra_vars)
+			if ($skin_info->extra_vars)
 			{
-				foreach($skin_info->extra_vars as $vars)
+				foreach ($skin_info->extra_vars as $vars)
 				{
-					if($vars->type!='image') continue;
+					if ($vars->type != 'image') continue;
 
 					$image_obj = $obj->{$vars->name};
 					// Get a variable to delete
-					$del_var = $obj->{"del_".$vars->name};
-					unset($obj->{"del_".$vars->name});
-					if($del_var == 'Y')
+					$del_var = $obj->{"del_" . $vars->name};
+					unset($obj->{"del_" . $vars->name});
+					if ($del_var == 'Y')
 					{
 						FileHandler::removeFile($skin_vars[$vars->name]->value);
 						continue;
 					}
 					// Use the previous data if not uploaded
-					if(!$image_obj['tmp_name'])
+					if (!$image_obj['tmp_name'])
 					{
 						$obj->{$vars->name} = $skin_vars[$vars->name]->value;
 						continue;
 					}
 					// Ignore if the file is not successfully uploaded
-					if(!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
+					if (!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
 					{
 						unset($obj->{$vars->name});
 						continue;
 					}
 					// Ignore if the file is not an image
-					if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
+					if (!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
 					{
 						unset($obj->{$vars->name});
 						continue;
@@ -453,11 +453,11 @@ 
 					// Upload the file to a path
 					$path = sprintf("./files/attach/images/%s/", $module_srl);
 					// Create a directory
-					if(!FileHandler::makeDir($path)) return false;
+					if (!FileHandler::makeDir($path)) return false;
 
-					$filename = $path.$image_obj['name'];
+					$filename = $path . $image_obj['name'];
 					// Move the file
-					if(!move_uploaded_file($image_obj['tmp_name'], $filename))
+					if (!move_uploaded_file($image_obj['tmp_name'], $filename))
 					{
 						unset($obj->{$vars->name});
 						continue;
@@ -481,7 +481,7 @@ 
 			*/
 			$oModuleController = getController('module');
 
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
 				$output = $oModuleController->insertModuleMobileSkinVars($module_srl, $obj);
 			}
@@ -489,7 +489,7 @@ 
 			{
 				$output = $oModuleController->insertModuleSkinVars($module_srl, $obj);
 			}
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -506,29 +506,29 @@ 
 	{
 		$vars = Context::getRequestVars();
 
-		if(!$vars->module_srls) return new Object(-1,'msg_invalid_request');
+		if (!$vars->module_srls) return new Object(-1, 'msg_invalid_request');
 
-		$module_srls = explode(',',$vars->module_srls);
-		if(count($module_srls) < 1) return new Object(-1,'msg_invalid_request');
+		$module_srls = explode(',', $vars->module_srls);
+		if (count($module_srls) < 1) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$oModuleController= getController('module');
+		$oModuleController = getController('module');
 		$columnList = array('module_srl', 'module', 'menu_srl', 'site_srl', 'mid', 'browser_title', 'is_default', 'content', 'mcontent', 'open_rss', 'regdate');
-		$updateList = array('module_category_srl','layout_srl','skin','mlayout_srl','mskin','description','header_text','footer_text', 'use_mobile');
-		foreach($updateList as $key=>$val)
+		$updateList = array('module_category_srl', 'layout_srl', 'skin', 'mlayout_srl', 'mskin', 'description', 'header_text', 'footer_text', 'use_mobile');
+		foreach ($updateList as $key=>$val)
 		{
-			if(!strlen($vars->{$val}))
+			if (!strlen($vars->{$val}))
 			{
 				unset($updateList[$key]);
 				$columnList[] = $val;
 			}
 		}
 
-		foreach($module_srls as $module_srl)
+		foreach ($module_srls as $module_srl)
 		{
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 
-			foreach($updateList as $val)
+			foreach ($updateList as $val)
 			{
 				$module_info->{$val} = $vars->{$val};
 			}
@@ -536,9 +536,9 @@ 
 		}
 
 		$this->setMessage('success_registed');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('success_return_url'))
+			if (Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
 			}
@@ -561,10 +561,10 @@ 
 	function procModuleAdminModuleGrantSetup()
 	{
 		$module_srls = Context::get('module_srls');
-		if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		if (!$module_srls) return new Object(-1, 'msg_invalid_request');
 
-		$modules = explode(',',$module_srls);
-		if(count($modules) < 1) return new Object(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (count($modules) < 1) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -581,13 +581,13 @@ 
 
 		$grant = new stdClass;
 
-		foreach($grant_list as $grant_name => $grant_info)
+		foreach ($grant_list as $grant_name => $grant_info)
 		{
 			// Get the default value
-			$default = Context::get($grant_name.'_default');
+			$default = Context::get($grant_name . '_default');
 			// -1 = Sign only, 0 = all users
 			$grant->{$grant_name} = array();
-			if(strlen($default))
+			if (strlen($default))
 			{
 				$grant->{$grant_name}[] = $default;
 				continue;
@@ -596,12 +596,12 @@ 
 			else
 			{
 				$group_srls = Context::get($grant_name);
-				if($group_srls)
+				if ($group_srls)
 				{
-					if(!is_array($group_srls))
+					if (!is_array($group_srls))
 					{
-						if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-						elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+						if (strpos($group_srls, '|@|') !== false) $group_srls = explode('|@|', $group_srls);
+						elseif (strpos($group_srls, ',') !== false) $group_srls = explode(',', $group_srls);
 						else $group_srls = array($group_srls);
 					}
 					$grant->{$grant_name} = $group_srls;
@@ -612,30 +612,30 @@ 
 		}
 
 		// Stored in the DB
-		foreach($modules as $module_srl)
+		foreach ($modules as $module_srl)
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.deleteModuleGrants', $args);
-			if(!$output->toBool()) continue;
+			if (!$output->toBool()) continue;
 			// Permissions stored in the DB
-			foreach($grant as $grant_name => $group_srls)
+			foreach ($grant as $grant_name => $group_srls)
 			{
-				foreach($group_srls as $val)
+				foreach ($group_srls as $val)
 				{
 					$args = new stdClass();
 					$args->module_srl = $module_srl;
 					$args->name = $grant_name;
 					$args->group_srl = $val;
 					$output = executeQuery('module.insertModuleGrant', $args);
-					if(!$output->toBool()) return $output;
+					if (!$output->toBool()) return $output;
 				}
 			}
 		}
 		$this->setMessage('success_registed');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('success_return_url'))
+			if (Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
 			}
@@ -662,38 +662,38 @@ 
 		$target = Context::get('target');
 		$module = Context::get('module');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
-		$args->name = str_replace(' ','_',Context::get('lang_code'));
-		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
+		$args->site_srl = (int) $site_module_info->site_srl;
+		$args->name = str_replace(' ', '_', Context::get('lang_code'));
+		$args->lang_name = str_replace(' ', '_', Context::get('lang_name'));
+		if (!empty($args->lang_name)) $args->name = $args->lang_name;
 
 		// if args->name is empty, random generate for user define language
-		if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		if (empty($args->name)) $args->name = 'userLang' . date('YmdHis') . '' . sprintf('%03d', mt_rand(0, 100));
 
-		if(!$args->name) return new Object(-1,'msg_invalid_request');
+		if (!$args->name) return new Object(-1, 'msg_invalid_request');
 		// Check whether a language code exists
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// If exists, clear the old values for updating
-		if($output->data) $output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if ($output->data) $output = executeQuery('module.deleteLang', $args);
+		if (!$output->toBool()) return $output;
 		// Enter
 		$lang_supported = Context::get('lang_supported');
-		foreach($lang_supported as $key => $val)
+		foreach ($lang_supported as $key => $val)
 		{
 			$args->lang_code = $key;
 			$args->value = trim(Context::get($key));
 
 			// if request method is json, strip slashes
-			if(Context::getRequestMethod() == 'JSON' && version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+			if (Context::getRequestMethod() == 'JSON' && version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 			{
 				$args->value = stripslashes($args->value);
 			}
 
-			if($args->value)
+			if ($args->value)
 			{
 				$output = executeQuery('module.insertLang', $args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
@@ -713,14 +713,14 @@ 
 		// Get language code
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
-		$args->name = str_replace(' ','_',Context::get('name'));
-		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
-		if(!$args->name) return new Object(-1,'msg_invalid_request');
+		$args->site_srl = (int) $site_module_info->site_srl;
+		$args->name = str_replace(' ', '_', Context::get('name'));
+		$args->lang_name = str_replace(' ', '_', Context::get('lang_name'));
+		if (!empty($args->lang_name)) $args->name = $args->lang_name;
+		if (!$args->name) return new Object(-1, 'msg_invalid_request');
 
 		$output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		$this->makeCacheDefinedLangCode($args->site_srl);
 
 		$this->setMessage("success_deleted", 'info');
@@ -731,7 +731,7 @@ 
 
 	function procModuleAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -744,12 +744,12 @@ 
 		$args = new stdClass;
 		$logged_info = Context::get('logged_info');
 		$site_module_info = Context::get('site_module_info');
-		if($site_keyword) $args->site_keyword = $site_keyword;
+		if ($site_keyword) $args->site_keyword = $site_keyword;
 
-		if(!$site_srl)
+		if (!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
-			else $args->site_srl = (int)$site_module_info->site_srl;
+			if ($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
+			else $args->site_srl = (int) $site_module_info->site_srl;
 		}
 		else $args->site_srl = $site_srl;
 
@@ -759,12 +759,12 @@ 
 		// Get a list of modules at the site
 		$output = executeQueryArray('module.getSiteModules', $args);
 		$mid_list = array();
-		if(count($output->data) > 0)
+		if (count($output->data) > 0)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
 				$module = trim($val->module);
-				if(!$module) continue;
+				if (!$module) continue;
 
 				// replace user defined lang.
 				$oModuleController->replaceDefinedLangCode($val->browser_title);
@@ -775,7 +775,7 @@ 
 				$obj->browser_title = $val->browser_title;
 				$obj->mid = $val->mid;
 				$obj->module_category_srl = $val->module_category_srl;
-				if($val->module_category_srl > 0)
+				if ($val->module_category_srl > 0)
 				{
 					$moduleCategorySrl[] = $val->module_category_srl;
 				}
@@ -787,23 +787,23 @@ 
 		$moduleCategorySrl = array_unique($moduleCategorySrl);
 		$output = $oModuleModel->getModuleCategories($moduleCategorySrl);
 		$categoryNameList = array();
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output as $value)
+			foreach ($output as $value)
 			{
 				$categoryNameList[$value->module_category_srl] = $value->title;
 			}
 		}
 
 		$selected_module = Context::get('selected_module');
-		if(count($mid_list) > 0)
+		if (count($mid_list) > 0)
 		{
-			foreach($mid_list as $module => $val)
+			foreach ($mid_list as $module => $val)
 			{
-				if(!$selected_module) $selected_module = $module;
+				if (!$selected_module) $selected_module = $module;
 				$xml_info = $oModuleModel->getModuleInfoXml($module);
 
-				if(!$xml_info)
+				if (!$xml_info)
 				{
 					unset($mid_list[$module]);
 					continue;
@@ -812,14 +812,14 @@ 
 				$mid_list[$module]->title = $xml_info->title;
 
 				// change module category srl to title
-				if(is_array($val->list))
+				if (is_array($val->list))
 				{
-					foreach($val->list as $key=>$value)
+					foreach ($val->list as $key=>$value)
 					{
-						if($value->module_category_srl > 0)
+						if ($value->module_category_srl > 0)
 						{
 							$categorySrl = $mid_list[$module]->list[$key]->module_category_srl;
-							if(isset($categoryNameList[$categorySrl]))
+							if (isset($categoryNameList[$categorySrl]))
 							{
 								$mid_list[$module]->list[$key]->module_category_srl = $categoryNameList[$categorySrl];
 							}
@@ -847,23 +847,23 @@ 
 		$args = new stdClass();
 
 		// Get the language file of the current site
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$args->site_srl = (int)$site_module_info->site_srl;
+			$args->site_srl = (int) $site_module_info->site_srl;
 		}
 		else
 		{
 			$args->site_srl = $site_srl;
 		}
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool() || !$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 		// Set the cache directory
-		$cache_path = _XE_PATH_.'files/cache/lang_defined/';
+		$cache_path = _XE_PATH_ . 'files/cache/lang_defined/';
 		FileHandler::makeDir($cache_path);
 
 		$langMap = array();
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
 			$langMap[$val->lang_code][$val->name] = $val->value;
 		}
@@ -872,27 +872,27 @@ 
 		$dbInfo = Context::getDBInfo();
 		$defaultLang = $dbInfo->lang_type;
 
-		if(!is_array($langMap[$defaultLang]))
+		if (!is_array($langMap[$defaultLang]))
 		{
 			$langMap[$defaultLang] = array();
 		}
 
-		foreach($lang_supported as $langCode => $langName)
+		foreach ($lang_supported as $langCode => $langName)
 		{
-			if(!is_array($langMap[$langCode]))
+			if (!is_array($langMap[$langCode]))
 			{
 				$langMap[$langCode] = array();
 			}
 
 			$langMap[$langCode] += $langMap[$defaultLang];
-			foreach($lang_supported as $targetLangCode => $targetLangName)
+			foreach ($lang_supported as $targetLangCode => $targetLangName)
 			{
-				if($langCode == $targetLangCode || $langCode == $defaultLang)
+				if ($langCode == $targetLangCode || $langCode == $defaultLang)
 				{
 					continue;
 				}
 
-				if(!is_array($langMap[$targetLangCode]))
+				if (!is_array($langMap[$targetLangCode]))
 				{
 					$langMap[$targetLangCode] = array();
 				}
@@ -901,7 +901,7 @@ 
 			}
 
 			$buff = array("<?php if(!defined('__XE__')) exit();");
-			foreach($langMap[$langCode] as $code => $value)
+			foreach ($langMap[$langCode] as $code => $value)
 			{
 				$buff[] = sprintf('$lang[\'%s\'] = \'%s\';', $code, addcslashes($value, "'"));
 			}
@@ -924,7 +924,7 @@ 
 
 		$isSkinFix = Context::get('is_skin_fix');
 
-		if($isSkinFix)
+		if ($isSkinFix)
 		{
 			$isSkinFix = ($isSkinFix == 'N') ? 'N' : 'Y';
 		}
@@ -940,14 +940,14 @@ 
 
 	public function setDesignInfo($moduleSrl = 0, $mid = '', $skinType = 'P', $layoutSrl = 0, $isSkinFix = 'Y', $skinName = '', $skinVars = NULL)
 	{
-		if(!$moduleSrl && !$mid)
+		if (!$moduleSrl && !$mid)
 		{
 			return $this->stop(-1, 'msg_invalid_request');
 		}
 
 		$oModuleModel = getModel('module');
 
-		if($mid)
+		if ($mid)
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid);
 		}
@@ -956,7 +956,7 @@ 
 			$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		}
 
-		if(!$moduleInfo)
+		if (!$moduleInfo)
 		{
 			return $this->stop(-1, 'msg_module_not_exists');
 		}
@@ -965,26 +965,26 @@ 
 		$layoutTargetValue = ($skinType == 'M') ? 'mlayout_srl' : 'layout_srl';
 		$skinFixTargetValue = ($skinType == 'M') ? 'is_mskin_fix' : 'is_skin_fix';
 
-		if(strlen($layoutSrl))
+		if (strlen($layoutSrl))
 		{
 			$moduleInfo->{$layoutTargetValue} = $layoutSrl;
 		}
 
-		if(strlen($isSkinFix))
+		if (strlen($isSkinFix))
 		{
 			$moduleInfo->{$skinFixTargetValue} = $isSkinFix;
 		}
 
-		if($isSkinFix == 'Y')
+		if ($isSkinFix == 'Y')
 		{
 			$moduleInfo->{$skinTargetValue} = $skinName;
 			$skinVars = json_decode($skinVars);
 
-			if(is_array($skinVars))
+			if (is_array($skinVars))
 			{
-				foreach($skinVars as $key => $val)
+				foreach ($skinVars as $key => $val)
 				{
-					if(empty($val))
+					if (empty($val))
 					{
 						continue;
 					}
@@ -1005,7 +1005,7 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$useMobile = Context::get('use_mobile');
 
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			return $this->stop(-1, 'msg_invalid_request');
 		}

Braces +155 added lines, -79 removed lines

@@ -22,7 +22,9 @@ 
 		$args = new stdClass();
 		$args->title = Context::get('title');
 		$output = executeQuery('module.insertModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage("success_registed");
 
@@ -36,7 +38,9 @@ 
 	function procModuleAdminUpdateCategory()
 	{
 		$output = $this->doUpdateModuleCategory();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_updated');
 
@@ -50,7 +54,9 @@ 
 	function procModuleAdminDeleteCategory()
 	{
 		$output = $this->doDeleteModuleCategory();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_deleted');
 
@@ -91,8 +97,7 @@ 
 			// Get information of the target module to copy
 			$module_srl = Context::get('module_srl');
 			$args = Context::getRequestVars();
-		}
-		else
+		} else
 		{
 			$module_srl = $args->module_srl;
 		}
@@ -107,11 +112,19 @@ 
 		for($i=1;$i<=10;$i++)
 		{
 			$mid = trim($args->{"mid_".$i});
-			if(!$mid) continue;
-			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
+			if(!$mid) {
+				continue;
+			}
+			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) {
+				return new Object(-1, 'msg_limit_mid');
+			}
 			$browser_title = $args->{"browser_title_".$i};
-			if(!$mid) continue;
-			if($mid && !$browser_title) $browser_title = $mid;
+			if(!$mid) {
+				continue;
+			}
+			if($mid && !$browser_title) {
+				$browser_title = $mid;
+			}
 			$clones[$mid] = $browser_title;
 		}
 		if(count($clones) < 1)
@@ -131,7 +144,9 @@ 
 		$grant = array();
 		if($output->data)
 		{
-			foreach($output->data as $val) $grant[$val->name][] = $val->group_srl;
+			foreach($output->data as $val) {
+				$grant[$val->name][] = $val->group_srl;
+			}
 		}
 
 		// get Extra Vars
@@ -218,11 +233,19 @@ 
 			}
 
 			// Grant module permissions
-			if(count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
-			if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			if(count($grant) > 0) {
+				$oModuleController->insertModuleGrants($module_srl, $grant);
+			}
+			if($extra_vars) {
+				$oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			}
 
-			if($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
-			if($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			if($moduleSkinVars) {
+				$oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
+			}
+			if($moduleMobileSkinVars) {
+				$oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			}
 
 			$triggerObj->moduleSrlList[] = $module_srl;
 		}
@@ -235,8 +258,7 @@ 
 		{
 			$message = implode('\n', $errorLog);
 			$this->setMessage($message);
-		}
-		else
+		} else
 		{
 			$message = $lang->success_registed;
 			$this->setMessage('success_registed');
@@ -262,9 +284,9 @@ 
 
 	private function _returnByProc($isProc, $msg='msg_invalid_request')
 	{
-		if(!$isProc)
-			return;
-		else
+		if(!$isProc) {
+					return;
+		} else
 		{
 			return new Object(-1, $msg);
 		}
@@ -282,7 +304,9 @@ 
 		// Get information of the module
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$module_info) return new Object(-1,'msg_invalid_request');
+		if(!$module_info) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Register Admin ID
 		$oModuleController->deleteAdminId($module_srl);
 		$admin_member = Context::get('admin_member');
@@ -292,7 +316,9 @@ 
 			foreach($admin_members as $admin_id)
 			{
 				$admin_id = trim($admin_id);
-				if(!$admin_id) continue;
+				if(!$admin_id) {
+					continue;
+				}
 				$oModuleController->insertAdminId($module_srl, $admin_id);
 			}
 		}
@@ -318,15 +344,18 @@ 
 				$grant->{$grant_name}[] = $default;
 				continue;
 				// users in a particular group
-			}
-			else
+			} else
 			{
 				$group_srls = Context::get($grant_name);
 				if($group_srls)
 				{
-					if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-					elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
-					else $group_srls = array($group_srls);
+					if(strpos($group_srls,'|@|')!==false) {
+						$group_srls = explode('|@|',$group_srls);
+					} elseif(strpos($group_srls,',')!==false) {
+						$group_srls = explode(',',$group_srls);
+					} else {
+						$group_srls = array($group_srls);
+					}
 					$grant->{$grant_name} = $group_srls;
 				}
 				continue;
@@ -338,7 +367,9 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQuery('module.deleteModuleGrants', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Permissions stored in the DB
 		foreach($grant as $grant_name => $group_srls)
 		{
@@ -349,7 +380,9 @@ 
 				$args->name = $grant_name;
 				$args->group_srl = $val;
 				$output = executeQuery('module.insertModuleGrant', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 		$this->setMessage('success_registed');
@@ -375,19 +408,16 @@ 
 				if($module_info->is_mskin_fix == 'Y')
 				{
 					$skin = $module_info->mskin;
-				}
-				else
+				} else
 				{
 					$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M');
 				}
-			}
-			else
+			} else
 			{
 				if($module_info->is_skin_fix == 'Y')
 				{
 					$skin = $module_info->skin;
-				}
-				else
+				} else
 				{
 					$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P');
 				}
@@ -400,8 +430,7 @@ 
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 				$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
-			}
-			else
+			} else
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 				$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
@@ -421,7 +450,9 @@ 
 			{
 				foreach($skin_info->extra_vars as $vars)
 				{
-					if($vars->type!='image') continue;
+					if($vars->type!='image') {
+						continue;
+					}
 
 					$image_obj = $obj->{$vars->name};
 					// Get a variable to delete
@@ -453,7 +484,9 @@ 
 					// Upload the file to a path
 					$path = sprintf("./files/attach/images/%s/", $module_srl);
 					// Create a directory
-					if(!FileHandler::makeDir($path)) return false;
+					if(!FileHandler::makeDir($path)) {
+						return false;
+					}
 
 					$filename = $path.$image_obj['name'];
 					// Move the file
@@ -484,8 +517,7 @@ 
 			if($mode === 'M')
 			{
 				$output = $oModuleController->insertModuleMobileSkinVars($module_srl, $obj);
-			}
-			else
+			} else
 			{
 				$output = $oModuleController->insertModuleSkinVars($module_srl, $obj);
 			}
@@ -506,10 +538,14 @@ 
 	{
 		$vars = Context::getRequestVars();
 
-		if(!$vars->module_srls) return new Object(-1,'msg_invalid_request');
+		if(!$vars->module_srls) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$module_srls = explode(',',$vars->module_srls);
-		if(count($module_srls) < 1) return new Object(-1,'msg_invalid_request');
+		if(count($module_srls) < 1) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$oModuleController= getController('module');
@@ -541,8 +577,7 @@ 
 			if(Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
-			}
-			else
+			} else
 			{
 				global $lang;
 				htmlHeader();
@@ -561,10 +596,14 @@ 
 	function procModuleAdminModuleGrantSetup()
 	{
 		$module_srls = Context::get('module_srls');
-		if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		if(!$module_srls) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$modules = explode(',',$module_srls);
-		if(count($modules) < 1) return new Object(-1,'msg_invalid_request');
+		if(count($modules) < 1) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -592,17 +631,20 @@ 
 				$grant->{$grant_name}[] = $default;
 				continue;
 				// Users in a particular group
-			}
-			else
+			} else
 			{
 				$group_srls = Context::get($grant_name);
 				if($group_srls)
 				{
 					if(!is_array($group_srls))
 					{
-						if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-						elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
-						else $group_srls = array($group_srls);
+						if(strpos($group_srls,'|@|')!==false) {
+							$group_srls = explode('|@|',$group_srls);
+						} elseif(strpos($group_srls,',')!==false) {
+							$group_srls = explode(',',$group_srls);
+						} else {
+							$group_srls = array($group_srls);
+						}
 					}
 					$grant->{$grant_name} = $group_srls;
 				}
@@ -617,7 +659,9 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.deleteModuleGrants', $args);
-			if(!$output->toBool()) continue;
+			if(!$output->toBool()) {
+				continue;
+			}
 			// Permissions stored in the DB
 			foreach($grant as $grant_name => $group_srls)
 			{
@@ -628,7 +672,9 @@ 
 					$args->name = $grant_name;
 					$args->group_srl = $val;
 					$output = executeQuery('module.insertModuleGrant', $args);
-					if(!$output->toBool()) return $output;
+					if(!$output->toBool()) {
+						return $output;
+					}
 				}
 			}
 		}
@@ -638,8 +684,7 @@ 
 			if(Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
-			}
-			else
+			} else
 			{
 				global $lang;
 				htmlHeader();
@@ -665,18 +710,30 @@ 
 		$args->site_srl = (int)$site_module_info->site_srl;
 		$args->name = str_replace(' ','_',Context::get('lang_code'));
 		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
+		if(!empty($args->lang_name)) {
+			$args->name = $args->lang_name;
+		}
 
 		// if args->name is empty, random generate for user define language
-		if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		if(empty($args->name)) {
+			$args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		}
 
-		if(!$args->name) return new Object(-1,'msg_invalid_request');
+		if(!$args->name) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Check whether a language code exists
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// If exists, clear the old values for updating
-		if($output->data) $output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if($output->data) {
+			$output = executeQuery('module.deleteLang', $args);
+		}
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Enter
 		$lang_supported = Context::get('lang_supported');
 		foreach($lang_supported as $key => $val)
@@ -693,7 +750,9 @@ 
 			if($args->value)
 			{
 				$output = executeQuery('module.insertLang', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
@@ -716,11 +775,17 @@ 
 		$args->site_srl = (int)$site_module_info->site_srl;
 		$args->name = str_replace(' ','_',Context::get('name'));
 		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
-		if(!$args->name) return new Object(-1,'msg_invalid_request');
+		if(!empty($args->lang_name)) {
+			$args->name = $args->lang_name;
+		}
+		if(!$args->name) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
 
 		$this->setMessage("success_deleted", 'info');
@@ -731,7 +796,9 @@ 
 
 	function procModuleAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -744,14 +811,20 @@ 
 		$args = new stdClass;
 		$logged_info = Context::get('logged_info');
 		$site_module_info = Context::get('site_module_info');
-		if($site_keyword) $args->site_keyword = $site_keyword;
+		if($site_keyword) {
+			$args->site_keyword = $site_keyword;
+		}
 
 		if(!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
-			else $args->site_srl = (int)$site_module_info->site_srl;
+			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) {
+				$args->site_srl = 0;
+			} else {
+				$args->site_srl = (int)$site_module_info->site_srl;
+			}
+		} else {
+			$args->site_srl = $site_srl;
 		}
-		else $args->site_srl = $site_srl;
 
 		$args->sort_index1 = 'sites.domain';
 
@@ -764,7 +837,9 @@ 
 			foreach($output->data as $val)
 			{
 				$module = trim($val->module);
-				if(!$module) continue;
+				if(!$module) {
+					continue;
+				}
 
 				// replace user defined lang.
 				$oModuleController->replaceDefinedLangCode($val->browser_title);
@@ -800,7 +875,9 @@ 
 		{
 			foreach($mid_list as $module => $val)
 			{
-				if(!$selected_module) $selected_module = $module;
+				if(!$selected_module) {
+					$selected_module = $module;
+				}
 				$xml_info = $oModuleModel->getModuleInfoXml($module);
 
 				if(!$xml_info)
@@ -823,8 +900,7 @@ 
 							{
 								$mid_list[$module]->list[$key]->module_category_srl = $categoryNameList[$categorySrl];
 							}
-						}
-						else
+						} else
 						{
 							$mid_list[$module]->list[$key]->module_category_srl = Context::getLang('none_category');
 						}
@@ -851,13 +927,14 @@ 
 		{
 			$site_module_info = Context::get('site_module_info');
 			$args->site_srl = (int)$site_module_info->site_srl;
-		}
-		else
+		} else
 		{
 			$args->site_srl = $site_srl;
 		}
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool() || !$output->data) return;
+		if(!$output->toBool() || !$output->data) {
+			return;
+		}
 		// Set the cache directory
 		$cache_path = _XE_PATH_.'files/cache/lang_defined/';
 		FileHandler::makeDir($cache_path);
@@ -950,8 +1027,7 @@ 
 		if($mid)
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid);
-		}
-		else
+		} else
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		}

modules/module/module.admin.model.php

Doc Comments +6 added lines, -1 removed lines

@@ -56,6 +56,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $modulePath
+	 */
 	function getSelectedManageHTML($grantList, $tabChoice = array(), $modulePath = NULL)
 	{
 		if($modulePath)
@@ -306,7 +309,7 @@ 
 	 * Skin setting page for the module
 	 *
 	 * @param $module_srl sequence of module
-	 * @param $mode P or M
+	 * @param string $mode P or M
 	 * @return string The HTML code
 	 */
 	function _getModuleSkinHTML($module_srl, $mode)
@@ -395,6 +398,7 @@ 
 	/**
 	 * @brief Get values for a particular language code
 	 * Return its corresponding value if lang_code is specified. Otherwise return $name.
+	 * @param string $name
 	 */
 	function getLangCode($site_srl, $name, $isFullLanguage = FALSE)
 	{
@@ -513,6 +517,7 @@ 
 
 	/**
 	 * @brief Return current lang list
+	 * @param stdClass $args
 	 */
 	function getLangListByLangcode($args)
 	{

Indentation +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  moduleAdminModel
- * @author NAVER (developers@xpressengine.com)
- * @version 0.1
- * @brief AdminModel class of the "module" module
- */
+	 * @class  moduleAdminModel
+	 * @author NAVER (developers@xpressengine.com)
+	 * @version 0.1
+	 * @brief AdminModel class of the "module" module
+	 */
 class moduleAdminModel extends module
 {
 	/**

Spacing +85 added lines, -85 removed lines

@@ -26,16 +26,16 @@ 
 		$args = new stdClass;
 		$args->module_srls = Context::get('module_srls');
 		$output = executeQueryArray('module.getModulesInfo', $args);
-		if(!$output->toBool() || !$output->data) return new Object();
+		if (!$output->toBool() || !$output->data) return new Object();
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$info_xml = $oModuleModel->getModuleInfoXml($val->module);
 			$oModuleController->replaceDefinedLangCode($val->browser_title);
-			$list[$val->module_srl] = array('module_srl'=>$val->module_srl,'mid'=>$val->mid,'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
+			$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++)
+		$modules = explode(',', $args->module_srls);
+		for ($i = 0; $i < count($modules); $i++)
 		{
 			$module_list[$modules[$i]] = $list[$modules[$i]];
 		}
@@ -49,7 +49,7 @@ 
 		$args->list_count = 20;
 		$args->page_count = 10;
 		$output = executeQueryArray('module.getModuleMidList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		ModuleModel::syncModuleToSite($output->data);
 
@@ -58,12 +58,12 @@ 
 
 	function getSelectedManageHTML($grantList, $tabChoice = array(), $modulePath = NULL)
 	{
-		if($modulePath)
+		if ($modulePath)
 		{
 			// get the skins path
 			$oModuleModel = getModel('module');
 			$skin_list = $oModuleModel->getSkins($modulePath);
-			Context::set('skin_list',$skin_list);
+			Context::set('skin_list', $skin_list);
 
 			$mskin_list = $oModuleModel->getSkins($modulePath, "m.skins");
 			Context::set('mskin_list', $mskin_list);
@@ -74,7 +74,7 @@ 
 		$layout_list = $oLayoutModel->getLayoutList();
 		Context::set('layout_list', $layout_list);
 
-		$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+		$mobile_layout_list = $oLayoutModel->getLayoutList(0, "M");
 		Context::set('mlayout_list', $mobile_layout_list);
 
 		$security = new Security();
@@ -83,21 +83,21 @@ 
 		$security->encodeHTML('skin_list..title');
 		$security->encodeHTML('mskin_list..title');
 
-		$grant_list =new stdClass();
+		$grant_list = new stdClass();
 		// Grant virtual permission for access and manager
-		if(!$grantList)
+		if (!$grantList)
 		{
-			$grantList =new stdClass();
+			$grantList = new stdClass();
 		}
 		$grantList->access = new stdClass();
 		$grantList->access->title = Context::getLang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($grantList))
+		if (count($grantList))
 		{
-			foreach($grantList as $key => $val)
+			foreach ($grantList as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -119,7 +119,7 @@ 
 		$output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
 		Context::set('setup_content', $content);
 
-		if(count($tabChoice) == 0)
+		if (count($tabChoice) == 0)
 		{
 			$tabChoice = array('tab1'=>1, 'tab2'=>1, 'tab3'=>1);
 		}
@@ -127,7 +127,7 @@ 
 
 		// Get information of module_grants
 		$oTemplate = &TemplateHandler::getInstance();
-		return $oTemplate->compile($this->module_path.'tpl', 'include.manage_selected.html');
+		return $oTemplate->compile($this->module_path . 'tpl', 'include.manage_selected.html');
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 */
 	function getModuleGrantHTML($module_srl, $source_grant_list)
 	{
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return;
 		}
@@ -154,12 +154,12 @@ 
 		$grant_list->access = new stdClass();
 		$grant_list->access->title = Context::getLang('grant_access');
 		$grant_list->access->default = 'guest';
-		if(count($source_grant_list))
+		if (count($source_grant_list))
 		{
-			foreach($source_grant_list as $key => $val)
+			foreach ($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -172,14 +172,14 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQueryArray('module.getModuleGrants', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
-				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
+				if ($val->group_srl == 0) $default_grant[$val->name] = 'all';
+				else if ($val->group_srl == -1) $default_grant[$val->name] = 'member';
+				else if ($val->group_srl == -2) $default_grant[$val->name] = 'site';
+				else if ($val->group_srl == -3) $default_grant[$val->name] = 'manager';
 				else
 				{
 					$selected_group[$val->name][] = $val->group_srl;
@@ -206,19 +206,19 @@ 
 
 		// Get information of module_grants
 		$oTemplate = &TemplateHandler::getInstance();
-		return $oTemplate->compile($this->module_path.'tpl', 'module_grants');
+		return $oTemplate->compile($this->module_path . 'tpl', 'module_grants');
 	}
 
 	public function getModuleAdminGrant()
 	{
 		$targetModule = Context::get('target_module');
 		$moduleSrl = Context::get('module_srl');
-		if(!$targetModule || !$moduleSrl)
+		if (!$targetModule || !$moduleSrl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if($targetModule == '_SHORTCUT')
+		if ($targetModule == '_SHORTCUT')
 		{
 			return new Object(0);
 		}
@@ -231,12 +231,12 @@ 
 		$grantList->access = new stdClass();
 		$grantList->access->title = Context::getLang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($xmlInfo->grant))
+		if (count($xmlInfo->grant))
 		{
-			foreach($xmlInfo->grant as $key => $val)
+			foreach ($xmlInfo->grant as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grantList->{$key} = $val;
 			}
 		}
@@ -249,14 +249,14 @@ 
 		$args = new stdClass();
 		$args->module_srl = $moduleSrl;
 		$output = executeQueryArray('module.getModuleGrants', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
-				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
-				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
-				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
+				if ($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
+				else if ($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
+				else if ($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
+				else if ($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
 				else
 				{
 					$selectedGroup->{$val->name}[] = $val->group_srl;
@@ -265,15 +265,15 @@ 
 			}
 		}
 
-		if(is_object($grantList))
+		if (is_object($grantList))
 		{
-			foreach($grantList AS $key=>$value)
+			foreach ($grantList AS $key=>$value)
 			{
-				if(isset($defaultGrant->{$key}))
+				if (isset($defaultGrant->{$key}))
 				{
 					$grantList->{$key}->grant = $defaultGrant->{$key};
 				}
-				if(isset($selectedGroup->{$key}))
+				if (isset($selectedGroup->{$key}))
 				{
 					$grantList->{$key}->group_srls = $selectedGroup->{$key};
 				}
@@ -315,11 +315,11 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info) return;
+		if (!$module_info) return;
 
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
-			if($module_info->is_skin_fix == 'N')
+			if ($module_info->is_skin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl);
 			}
@@ -330,7 +330,7 @@ 
 		}
 		else
 		{
-			if($module_info->is_mskin_fix == 'N')
+			if ($module_info->is_mskin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl);
 			}
@@ -340,10 +340,10 @@ 
 			}
 		}
 
-		$module_path = './modules/'.$module_info->module;
+		$module_path = './modules/' . $module_info->module;
 
 		// Get XML information of the skin and skin sinformation set in DB
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 			$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
@@ -354,25 +354,25 @@ 
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
 		}
 
-		if(count($skin_info->extra_vars)) 
+		if (count($skin_info->extra_vars)) 
 		{
-			foreach($skin_info->extra_vars as $key => $val) 
+			foreach ($skin_info->extra_vars as $key => $val) 
 			{
 				$group = $val->group;
 				$name = $val->name;
 				$type = $val->type;
-				if($skin_vars[$name]) 
+				if ($skin_vars[$name]) 
 				{
 					$value = $skin_vars[$name]->value;
 				}
 				else $value = '';
-				if($type=="checkbox")
+				if ($type == "checkbox")
 				{
-					$value = $value?unserialize($value):array();
+					$value = $value ? unserialize($value) : array();
 				}
 
 				$value = empty($value) ? $val->default : $value;
-				$skin_info->extra_vars[$key]->value= $value;
+				$skin_info->extra_vars[$key]->value = $value;
 			}
 		}
 
@@ -389,7 +389,7 @@ 
 		$security->encodeHTML('skin_info...');
 
 		$oTemplate = &TemplateHandler::getInstance();
-		return $oTemplate->compile($this->module_path.'tpl', 'skin_config');
+		return $oTemplate->compile($this->module_path . 'tpl', 'skin_config');
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	function getLangCode($site_srl, $name, $isFullLanguage = FALSE)
 	{
-		if($isFullLanguage)
+		if ($isFullLanguage)
 		{
 			$lang_supported = Context::loadLangSupported();
 		}
@@ -407,15 +407,15 @@ 
 			$lang_supported = Context::get('lang_supported');
 		}
 
-		if(substr($name,0,12)=='$user_lang->')
+		if (substr($name, 0, 12) == '$user_lang->')
 		{
 			$args = new stdClass();
-			$args->site_srl = (int)$site_srl;
-			$args->name = substr($name,12);
+			$args->site_srl = (int) $site_srl;
+			$args->name = substr($name, 12);
 			$output = executeQueryArray('module.getLang', $args);
-			if($output->data)
+			if ($output->data)
 			{
-				foreach($output->data as $key => $val)
+				foreach ($output->data as $key => $val)
 				{
 					$selected_lang[$val->lang_code] = $val->value;
 				}
@@ -424,24 +424,24 @@ 
 		else
 		{
 			$tmp = unserialize($name);
-			if($tmp)
+			if ($tmp)
 			{
 				$selected_lang = array();
 				$rand_name = $tmp[Context::getLangType()];
-				if(!$rand_name) $rand_name = array_shift($tmp);
-				if(is_array($lang_supported))
+				if (!$rand_name) $rand_name = array_shift($tmp);
+				if (is_array($lang_supported))
 				{
-					foreach($lang_supported as $key => $val)
-						$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					foreach ($lang_supported as $key => $val)
+						$selected_lang[$key] = $tmp[$key] ? $tmp[$key] : $rand_name;
 				}
 			}
 		}
 
 		$output = array();
-		if(is_array($lang_supported))
+		if (is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
-				$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			foreach ($lang_supported as $key => $val)
+				$output[$key] = $selected_lang[$key] ? $selected_lang[$key] : $name;
 		}
 		return $output;
 	}
@@ -452,10 +452,10 @@ 
 	function getModuleAdminLangCode()
 	{
 		$name = Context::get('name');
-		if(!$name) return new Object(-1,'msg_invalid_request');
+		if (!$name) return new Object(-1, 'msg_invalid_request');
 		$site_module_info = Context::get('site_module_info');
 		$this->add('name', $name);
-		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
+		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->' . $name);
 		$this->add('langs', $output);
 	}
 
@@ -465,7 +465,7 @@ 
 	function getModuleAdminLangListByName()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 
 		$columnList = array('lang_code', 'name', 'value');
 
@@ -473,7 +473,7 @@ 
 
 		$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
 		$output = executeQueryArray('module.getLangListByName', $args, $columnList);
-		if($output->toBool()) $langList = $output->data;
+		if ($output->toBool()) $langList = $output->data;
 
 		$this->add('lang_list', $langList);
 		$this->add('lang_name', $args->langName);
@@ -485,23 +485,23 @@ 
 	function getModuleAdminLangListByValue()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 
 		$langList = array();
 
 		// search value
 		$output = executeQueryArray('module.getLangNameByValue', $args);
-		if($output->toBool() && is_array($output->data))
+		if ($output->toBool() && is_array($output->data))
 		{
 			unset($args->value);
 
-			foreach($output->data as $data)
+			foreach ($output->data as $data)
 			{
 				$args->langName = $data->name;
 				$columnList = array('lang_code', 'name', 'value');
 				$outputByName = executeQueryArray('module.getLangListByName', $args, $columnList);
 
-				if($outputByName->toBool())
+				if ($outputByName->toBool())
 				{
 					$langList = array_merge($langList, $outputByName->data);
 				}
@@ -517,7 +517,7 @@ 
 	function getLangListByLangcode($args)
 	{
 		$output = executeQueryArray('module.getLangListByLangcode', $args);
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 
 		return $output;
 	}
@@ -540,7 +540,7 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 		$args->langCode = Context::get('lang_code');
 		$args->page = Context::get('page');
 		$args->sort_index = 'name';
@@ -550,7 +550,7 @@ 
 		$args->list_count = Context::get('list_count');
 		$args->page_count = 5;
 
-		if(!$args->langCode)
+		if (!$args->langCode)
 		{
 			$args->langCode = Context::get('lang_type');
 		}
@@ -589,7 +589,7 @@ 
 	 */
 	function getModuleAdminModuleInfo()
 	{
-		if(Context::get('search_module_srl'))
+		if (Context::get('search_module_srl'))
 		{
 			$module_srl = Context::get('search_module_srl');
 		}

Braces +78 added lines, -44 removed lines

@@ -26,7 +26,9 @@ 
 		$args = new stdClass;
 		$args->module_srls = Context::get('module_srls');
 		$output = executeQueryArray('module.getModulesInfo', $args);
-		if(!$output->toBool() || !$output->data) return new Object();
+		if(!$output->toBool() || !$output->data) {
+			return new Object();
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -49,7 +51,9 @@ 
 		$args->list_count = 20;
 		$args->page_count = 10;
 		$output = executeQueryArray('module.getModuleMidList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		ModuleModel::syncModuleToSite($output->data);
 
@@ -96,8 +100,12 @@ 
 		{
 			foreach($grantList as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -158,8 +166,12 @@ 
 		{
 			foreach($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -176,11 +188,15 @@ 
 		{
 			foreach($output->data as $val)
 			{
-				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
-				else
+				if($val->group_srl == 0) {
+					$default_grant[$val->name] = 'all';
+				} else if($val->group_srl == -1) {
+					$default_grant[$val->name] = 'member';
+				} else if($val->group_srl == -2) {
+					$default_grant[$val->name] = 'site';
+				} else if($val->group_srl == -3) {
+					$default_grant[$val->name] = 'manager';
+				} else
 				{
 					$selected_group[$val->name][] = $val->group_srl;
 					$default_grant[$val->name] = 'group';
@@ -235,8 +251,12 @@ 
 		{
 			foreach($xmlInfo->grant as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grantList->{$key} = $val;
 			}
 		}
@@ -253,11 +273,15 @@ 
 		{
 			foreach($output->data as $val)
 			{
-				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
-				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
-				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
-				else
+				if($val->group_srl == 0) {
+					$defaultGrant->{$val->name} = 'all';
+				} else if($val->group_srl == -1) {
+					$defaultGrant->{$val->name} = 'member';
+				} else if($val->group_srl == -2) {
+					$defaultGrant->{$val->name} = 'site';
+				} else if($val->group_srl == -3) {
+					$defaultGrant->{$val->name} = 'manager';
+				} else
 				{
 					$selectedGroup->{$val->name}[] = $val->group_srl;
 					$defaultGrant->{$val->name} = 'group';
@@ -315,26 +339,25 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info) return;
+		if(!$module_info) {
+			return;
+		}
 
 		if($mode === 'P')
 		{
 			if($module_info->is_skin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$skin = $module_info->skin;
 			}
-		}
-		else
+		} else
 		{
 			if($module_info->is_mskin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$skin = $module_info->mskin;
 			}
@@ -347,8 +370,7 @@ 
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 			$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
-		}
-		else
+		} else
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
@@ -364,8 +386,9 @@ 
 				if($skin_vars[$name]) 
 				{
 					$value = $skin_vars[$name]->value;
+				} else {
+					$value = '';
 				}
-				else $value = '';
 				if($type=="checkbox")
 				{
 					$value = $value?unserialize($value):array();
@@ -401,8 +424,7 @@ 
 		if($isFullLanguage)
 		{
 			$lang_supported = Context::loadLangSupported();
-		}
-		else
+		} else
 		{
 			$lang_supported = Context::get('lang_supported');
 		}
@@ -420,19 +442,21 @@ 
 					$selected_lang[$val->lang_code] = $val->value;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$tmp = unserialize($name);
 			if($tmp)
 			{
 				$selected_lang = array();
 				$rand_name = $tmp[Context::getLangType()];
-				if(!$rand_name) $rand_name = array_shift($tmp);
+				if(!$rand_name) {
+					$rand_name = array_shift($tmp);
+				}
 				if(is_array($lang_supported))
 				{
-					foreach($lang_supported as $key => $val)
-						$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					foreach($lang_supported as $key => $val) {
+											$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					}
 				}
 			}
 		}
@@ -440,8 +464,9 @@ 
 		$output = array();
 		if(is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
-				$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			foreach($lang_supported as $key => $val) {
+							$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			}
 		}
 		return $output;
 	}
@@ -452,7 +477,9 @@ 
 	function getModuleAdminLangCode()
 	{
 		$name = Context::get('name');
-		if(!$name) return new Object(-1,'msg_invalid_request');
+		if(!$name) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		$site_module_info = Context::get('site_module_info');
 		$this->add('name', $name);
 		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
@@ -465,7 +492,9 @@ 
 	function getModuleAdminLangListByName()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 
 		$columnList = array('lang_code', 'name', 'value');
 
@@ -473,7 +502,9 @@ 
 
 		$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
 		$output = executeQueryArray('module.getLangListByName', $args, $columnList);
-		if($output->toBool()) $langList = $output->data;
+		if($output->toBool()) {
+			$langList = $output->data;
+		}
 
 		$this->add('lang_list', $langList);
 		$this->add('lang_name', $args->langName);
@@ -485,7 +516,9 @@ 
 	function getModuleAdminLangListByValue()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 
 		$langList = array();
 
@@ -517,7 +550,9 @@ 
 	function getLangListByLangcode($args)
 	{
 		$output = executeQueryArray('module.getLangListByLangcode', $args);
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 
 		return $output;
 	}
@@ -592,8 +627,7 @@ 
 		if(Context::get('search_module_srl'))
 		{
 			$module_srl = Context::get('search_module_srl');
-		}
-		else
+		} else
 		{
 			$module_srl = Context::get('module_srl');
 		}

modules/module/module.controller.php

Doc Comments +7 added lines

@@ -933,6 +933,7 @@ 
 
 	/**
 	 * @brief Insert skin vars to a module
+	 * @param string $mode
 	 */
 	function _insertModuleSkinVars($module_srl, $obj, $mode)
 	{
@@ -1006,6 +1007,7 @@ 
 
 	/**
 	 * @brief Remove skin vars of a module
+	 * @param string $mode
 	 */
 	function _deleteModuleSkinVars($module_srl, $mode)
 	{
@@ -1242,6 +1244,7 @@ 
 
 	/**
 	 * @brief Update a file into the file box
+	 * @param stdClass $vars
 	 */
 	function updateModuleFileBox($vars)
 	{
@@ -1283,6 +1286,7 @@ 
 
 	/**
 	 * @brief Add a file into the file box
+	 * @param stdClass $vars
 	 */
 	function insertModuleFileBox($vars)
 	{
@@ -1336,6 +1340,9 @@ 
 		if(!$output->toBool()) return $output;
 	}
 
+	/**
+	 * @param stdClass $vars
+	 */
 	function deleteModuleFileBox($vars)
 	{
 		// delete real file

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  moduleController
- * @author NAVER (developers@xpressengine.com)
- * @brief controller class of the module module
- */
+	 * @class  moduleController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief controller class of the module module
+	 */
 class moduleController extends module
 {
 	/**

Spacing +164 added lines, -164 removed lines

@@ -29,7 +29,7 @@ 
 		$output = executeQuery('module.insertActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -51,7 +51,7 @@ 
 		$output = executeQuery('module.deleteActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -75,12 +75,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.insertTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -104,12 +104,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.deleteTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -129,12 +129,12 @@ 
 		$args->module = $module;
 
 		$output = executeQuery('module.deleteModuleTriggers', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -148,11 +148,11 @@ 
 	 * @brief Add module extend
 	 *
 	 */
-	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function insertModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if ($kind != 'admin') $kind = '';
+		if (!in_array($type, array('model', 'controller', 'view', 'api', 'mobile'))) return false;
+		if (in_array($parent_module, array('module', 'addon', 'widget', 'layout'))) return false;
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +164,7 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if ($output->data->count > 0) return false;
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -174,7 +174,7 @@ 
 	 * @brief Delete module extend
 	 *
 	 */
-	function deleteModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function deleteModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -199,9 +199,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if (!$origin_config) $origin_config = new stdClass;
 
-		foreach($config as $key => $val)
+		foreach ($config as $key => $val)
 		{
 			$origin_config->{$key} = $val;
 		}
@@ -215,19 +215,19 @@ 
 	 */
 	function insertModuleConfig($module, $config, $site_srl = 0)
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->module = $module;
 		$args->config = serialize($config);
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -246,13 +246,13 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -265,10 +265,10 @@ 
 	 */
 	function insertSite($domain, $index_module_srl)
 	{
-		if(isSiteID($domain))
+		if (isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
+			if ($oModuleModel->isIDExists($domain, 0)) return new Object(-1, 'msg_already_registed_vid');
 		}
 		else
 		{
@@ -284,10 +284,10 @@ 
 		$columnList = array('modules.site_srl');
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-		if($output) return new Object(-1,'msg_already_registed_vid');
+		if ($output) return new Object(-1, 'msg_already_registed_vid');
 
 		$output = executeQuery('module.insertSite', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output->add('site_srl', $args->site_srl);
 		return $output;
@@ -302,32 +302,32 @@ 
 		$columnList = array('sites.site_srl', 'sites.domain');
 		$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
 
-		if(!$args->domain && $site_info->site_srl == $args->site_srl)
+		if (!$args->domain && $site_info->site_srl == $args->site_srl)
 		{
 			$args->domain = $site_info->domain;
 		}
 
-		if($site_info->domain != $args->domain)
+		if ($site_info->domain != $args->domain)
 		{
 			$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-			if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
+			if ($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1, 'msg_already_registed_domain');
+			if (isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1, 'msg_already_registed_vid');
 
-			if($args->domain && !isSiteID($args->domain))
+			if ($args->domain && !isSiteID($args->domain))
 			{
 				$args->domain = (strlen($args->domain) >= 1 && substr_compare($args->domain, '/', -1) === 0) ? substr($args->domain, 0, -1) : $args->domain;
 			}
 		}
 		$output = executeQuery('module.updateSite', $args);
 		//clear cache for default mid
-		if($args->site_srl == 0) $vid='';
-		else $vid=$args->domain;
+		if ($args->site_srl == 0) $vid = '';
+		else $vid = $args->domain;
 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
 		$mid = $module_info->mid;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -345,7 +345,7 @@ 
 		unset($args->act);
 		unset($args->page);
 		// Test mid value
-		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
+		if (!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
 		// Test variables (separate basic vars and other vars in modules)
 		$extra_vars = clone($args);
 		unset($extra_vars->module_srl);
@@ -379,7 +379,7 @@ 
 	 */
 	function insertModule($args)
 	{
-		if(isset($args->isMenuCreate))
+		if (isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
 		}
@@ -389,11 +389,11 @@ 
 		}
 
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check whether the module name already exists
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 		$oModuleModel = getModel('module');
-		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
+		if ($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -404,16 +404,16 @@ 
 		$skin_vars = new stdClass();
 		$skin_vars->colorset = $skin_info->colorset[0]->name;
 		// Arrange variables and then execute a query
-		if(!$args->module_srl) $args->module_srl = getNextSequence();
+		if (!$args->module_srl) $args->module_srl = getNextSequence();
 
 		// default value
-		if($args->skin == '/USE_DEFAULT/')
+		if ($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_skin_fix))
+			if (isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -423,13 +423,13 @@ 
 			}
 		}
 
-		if($args->mskin == '/USE_DEFAULT/')
+		if ($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_mskin_fix))
+			if (isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -443,14 +443,14 @@ 
 
 		$args->browser_title = strip_tags($args->browser_title);
 
-		if($isMenuCreate == TRUE)
+		if ($isMenuCreate == TRUE)
 		{
 			$menuArgs = new stdClass;
 			$menuArgs->menu_srl = $args->menu_srl;
 			$menuOutput = executeQuery('menu.getMenu', $menuArgs);
 
 			// if menu is not created, create menu also. and does not supported that in virtual site.
-			if(!$menuOutput->data && !$args->site_srl)
+			if (!$menuOutput->data && !$args->site_srl)
 			{
 				$oMenuAdminModel = getAdminModel('menu');
 
@@ -468,7 +468,7 @@ 
 				$menuArgs->listorder = $args->menu_item_srl * -1;
 
 				$menuItemOutput = executeQuery('menu.insertMenuItem', $menuArgs);
-				if(!$menuItemOutput->toBool())
+				if (!$menuItemOutput->toBool())
 				{
 					$oDB->rollback();
 					return $menuItemOutput;
@@ -481,7 +481,7 @@ 
 		// Insert a module
 		$args->menu_srl = $menuArgs->menu_srl;
 		$output = executeQuery('module.insertModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -493,12 +493,12 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
 
-		$output->add('module_srl',$args->module_srl);
+		$output->add('module_srl', $args->module_srl);
 		return $output;
 	}
 
@@ -508,7 +508,7 @@ 
 	function updateModule($args)
 	{
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -517,29 +517,29 @@ 
 		$columnList = array('module_srl', 'site_srl', 'browser_title', 'mid');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
 
-		if(!$args->site_srl || !$args->browser_title)
+		if (!$args->site_srl || !$args->browser_title)
 		{
-			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
-			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			if (!$args->site_srl) $args->site_srl = (int) $module_info->site_srl;
+			if (!$args->browser_title) $args->browser_title = $module_info->browser_title;
 		}
 
 		$args->browser_title = strip_tags($args->browser_title);
 
 		$output = executeQuery('module.isExistsModuleName', $args);
-		if(!$output->toBool() || $output->data->count)
+		if (!$output->toBool() || $output->data->count)
 		{
 			$oDB->rollback();
 			return new Object(-1, 'msg_module_name_exists');
 		}
 
 		// default value
-		if($args->skin == '/USE_DEFAULT/')
+		if ($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_skin_fix))
+			if (isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -549,13 +549,13 @@ 
 			}
 		}
 
-		if($args->mskin == '/USE_DEFAULT/')
+		if ($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_mskin_fix))
+			if (isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -565,7 +565,7 @@ 
 			}
 		}
 		$output = executeQuery('module.updateModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -575,15 +575,15 @@ 
 		$menuArgs->url = $module_info->mid;
 		$menuArgs->site_srl = $module_info->site_srl;
 		$menuOutput = executeQueryArray('menu.getMenuItemByUrl', $menuArgs);
-		if($menuOutput->data && count($menuOutput->data))
+		if ($menuOutput->data && count($menuOutput->data))
 		{
 			$oMenuAdminController = getAdminController('menu');
-			foreach($menuOutput->data as $itemInfo)
+			foreach ($menuOutput->data as $itemInfo)
 			{
 				$itemInfo->url = $args->mid;
 
 				$updateMenuItemOutput = $oMenuAdminController->updateMenuItem($itemInfo);
-				if(!$updateMenuItemOutput->toBool())
+				if (!$updateMenuItemOutput->toBool())
 				{
 					$oDB->rollback();
 					return $updateMenuItemOutput;
@@ -592,7 +592,7 @@ 
 		}
 
 		// if mid changed, change mid of success_return_url to new mid
-		if($module_info->mid != $args->mid && Context::get('success_return_url'))
+		if ($module_info->mid != $args->mid && Context::get('success_return_url'))
 		{
 			changeValueInUrl('mid', $args->mid, $module_info->mid);
 		}
@@ -602,11 +602,11 @@ 
 
 		$oDB->commit();
 
-		$output->add('module_srl',$args->module_srl);
+		$output->add('module_srl', $args->module_srl);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -624,11 +624,11 @@ 
 		$args->site_srl = $site_srl;
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('module.updateModuleSite', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -643,7 +643,7 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -653,7 +653,7 @@ 
 		$args = new stdClass();
 		$args->url = $output->mid;
 		$args->is_shortcut = 'N';
-		if(!$site_srl) $args->site_srl = $site_module_info->site_srl;
+		if (!$site_srl) $args->site_srl = $site_module_info->site_srl;
 		else $args->site_srl = $site_srl;
 
 		unset($output);
@@ -662,9 +662,9 @@ 
 		$menuOutput = $oMenuAdminModel->getMenuList($args);
 
 		// get menu_srl by site_srl
-		if(is_array($menuOutput->data))
+		if (is_array($menuOutput->data))
 		{
-			foreach($menuOutput->data AS $key=>$value)
+			foreach ($menuOutput->data AS $key=>$value)
 			{
 				$args->menu_srl = $value->menu_srl;
 				break;
@@ -673,7 +673,7 @@ 
 
 		$output = executeQuery('menu.getMenuItemByUrl', $args);
 		// menu delete
-		if($output->data)
+		if ($output->data)
 		{
 			unset($args);
 			$args = new stdClass;
@@ -684,7 +684,7 @@ 
 			$oMenuAdminController = getAdminController('menu');
 			$output = $oMenuAdminController->deleteItem($args);
 
-			if($output->isSuccess)
+			if ($output->isSuccess)
 			{
 				return new Object(0, 'success_deleted');
 			}
@@ -706,19 +706,19 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 
 		// check start module
 		$oModuleModel = getModel('module');
 		$columnList = array('sites.index_module_srl');
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
-		if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
+		if ($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
 
 		// Call a trigger (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->module_srl = $module_srl;
 		$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -728,7 +728,7 @@ 
 		$args->module_srl = $module_srl;
 		// Delete module information from the DB
 		$output = executeQuery('module.deleteModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -742,10 +742,10 @@ 
 		// Remove the module manager
 		$this->deleteAdminId($module_srl);
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('module.deleteModule', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -757,7 +757,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -779,10 +779,10 @@ 
 	function clearDefaultModule()
 	{
 		$output = executeQuery('module.clearDefaultModule');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -798,7 +798,7 @@ 
 		$output = executeQuery('module.updateModuleMenu', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -811,15 +811,15 @@ 
 	 */
 	function updateModuleLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if (!count($menu_srl_list)) return;
 
 		$args = new stdClass;
 		$args->layout_srl = $layout_srl;
-		$args->menu_srls = implode(',',$menu_srl_list);
+		$args->menu_srls = implode(',', $menu_srl_list);
 		$output = executeQuery('module.updateModuleLayout', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -838,37 +838,37 @@ 
 
 		$output = executeQuery('module.deleteSiteAdmin', $args);
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Get user id of an administrator
-		if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
-		foreach($arr_admins as $key => $user_id)
+		if (!is_array($arr_admins) || !count($arr_admins)) return new Object();
+		foreach ($arr_admins as $key => $user_id)
 		{
-			if(!trim($user_id)) continue;
+			if (!trim($user_id)) continue;
 			$admins[] = trim($user_id);
 		}
-		if(!count($admins)) return new Object();
+		if (!count($admins)) return new Object();
 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
-		if($member_config->identifier == 'email_address')
+		if ($member_config->identifier == 'email_address')
 		{
-			$args->email_address = '\''.implode('\',\'',$admins).'\'';
+			$args->email_address = '\'' . implode('\',\'', $admins) . '\'';
 		}
 		else
 		{
-			$args->user_ids = '\''.implode('\',\'',$admins).'\'';
+			$args->user_ids = '\'' . implode('\',\'', $admins) . '\'';
 		}
 		$output = executeQueryArray('module.getAdminSrls', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			unset($args);
 			$args = new stdClass;
 			$args->site_srl = $site_srl;
 			$args->member_srl = $val->member_srl;
 			$output = executeQueryArray('module.insertSiteAdmin', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		return new Object();
 	}
@@ -881,12 +881,12 @@ 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 
-		if($member_config->identifier == 'email_address')
+		if ($member_config->identifier == 'email_address')
 			$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
 		else
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
 
-		if(!$member_info->member_srl) return;
+		if (!$member_info->member_srl) return;
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->member_srl = $member_info->member_srl;
@@ -901,11 +901,11 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 
-		if($admin_id)
+		if ($admin_id)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-			if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+			if ($member_info->member_srl) $args->member_srl = $member_info->member_srl;
 		}
 		return executeQuery('module.deleteAdminId', $args);
 	}
@@ -942,18 +942,18 @@ 
 		$oDB->begin();
 
 		$output = $this->_deleteModuleSkinVars($module_srl, $mode);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new Object();
+		if (!$obj || !count($obj)) return new Object();
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
 			// #17927989 For an old board which used the old blog module
 			// it often saved menu item(stdClass) on the skin info column
@@ -964,9 +964,9 @@ 
 
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if (!$args->name || !$args->value) continue;
 
-			if($mode === 'P')
+			if ($mode === 'P')
 			{
 				$output = executeQuery('module.insertModuleSkinVars', $args);
 			}
@@ -974,7 +974,7 @@ 
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 				$oDB->rollback();
@@ -1013,21 +1013,21 @@ 
 		$args->module_srl = $module_srl;
 		$mode = $mode === 'P' ? 'P' : 'M';
 
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
-			$object_key = 'module_skin_vars:'.$module_srl;
+			$object_key = 'module_skin_vars:' . $module_srl;
 			$query = 'module.deleteModuleSkinVars';
 		}
 		else
 		{
-			$object_key = 'module_mobile_skin_vars:'.$module_srl;
+			$object_key = 'module_mobile_skin_vars:' . $module_srl;
 			$query = 'module.deleteModuleMobileSkinVars';
 		}
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->delete($cache_key);
 		}
@@ -1042,24 +1042,24 @@ 
 	{
 		$this->deleteModuleExtraVars($module_srl);
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return;
+		if (!$obj || !count($obj)) return;
 
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
-			if(is_object($val) || is_array($val)) continue;
+			if (is_object($val) || is_array($val)) continue;
 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if (!$args->name || !$args->value) continue;
 			$output = executeQuery('module.insertModuleExtraVars', $args);
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_extra_vars:'.$module_srl;
+			$object_key = 'module_extra_vars:' . $module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
@@ -1076,9 +1076,9 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_extra_vars:'.$module_srl;
+			$object_key = 'module_extra_vars:' . $module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
@@ -1092,19 +1092,19 @@ 
 	function insertModuleGrants($module_srl, $obj)
 	{
 		$this->deleteModuleGrants($module_srl);
-		if(!$obj || !count($obj)) return;
+		if (!$obj || !count($obj)) return;
 
-		foreach($obj as $name => $val)
+		foreach ($obj as $name => $val)
 		{
-			if(!$val || !count($val)) continue;
+			if (!$val || !count($val)) continue;
 
-			foreach($val as $group_srl)
+			foreach ($val as $group_srl)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->name = $name;
 				$args->group_srl = trim($group_srl);
-				if(!$args->name || !$args->group_srl) continue;
+				if (!$args->name || !$args->group_srl) continue;
 				executeQuery('module.insertModuleGrant', $args);
 			}
 		}
@@ -1125,9 +1125,9 @@ 
 	 */
 	function replaceDefinedLangCode(&$output, $isReplaceLangCode = true)
 	{
-		if($isReplaceLangCode)
+		if ($isReplaceLangCode)
 		{
-			$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
+			$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this, '_replaceLangCode'), $output);
 		}
 	}
 
@@ -1135,27 +1135,27 @@ 
 	{
 		static $lang = null;
 
-		if(is_null($lang))
+		if (is_null($lang))
 		{
 			$site_module_info = Context::get('site_module_info');
-			if(!$site_module_info)
+			if (!$site_module_info)
 			{
 				$oModuleModel = getModel('module');
 				$site_module_info = $oModuleModel->getDefaultMid();
 				Context::set('site_module_info', $site_module_info);
 			}
 			$cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
-			if(!file_exists($cache_file))
+			if (!file_exists($cache_file))
 			{
 				$oModuleAdminController = getAdminController('module');
 				$oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
 			}
 
-			if(file_exists($cache_file))
+			if (file_exists($cache_file))
 			{
 				$moduleAdminControllerMtime = filemtime(_XE_PATH_ . 'modules/module/module.admin.controller.php');
 				$cacheFileMtime = filemtime($cache_file);
-				if($cacheFileMtime < $moduleAdminControllerMtime)
+				if ($cacheFileMtime < $moduleAdminControllerMtime)
 				{
 					$oModuleAdminController = getAdminController('module');
 					$oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
@@ -1164,9 +1164,9 @@ 
 				require_once($cache_file);
 			}
 		}
-		if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+		if (!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
 
-		return str_replace('$user_lang->','',$matches[0]);
+		return str_replace('$user_lang->', '', $matches[0]);
 	}
 
 
@@ -1179,17 +1179,17 @@ 
 		if ($ajax) Context::setRequestMethod('JSON');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
 
-		$vars = Context::gets('addfile','filter');
+		$vars = Context::gets('addfile', 'filter');
 		$attributeNames = Context::get('attribute_name');
 		$attributeValues = Context::get('attribute_value');
-		if(is_array($attributeNames) && is_array($attributeValues) && count($attributeNames) == count($attributeValues))
+		if (is_array($attributeNames) && is_array($attributeValues) && count($attributeNames) == count($attributeValues))
 		{
 			$attributes = array();
-			foreach($attributeNames as $no => $name)
+			foreach ($attributeNames as $no => $name)
 			{
-				if(empty($name))
+				if (empty($name))
 				{
 					continue;
 				}
@@ -1201,16 +1201,16 @@ 
 		$vars->comment = $attributes;
 		$module_filebox_srl = Context::get('module_filebox_srl');
 
-		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+		$ext = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+		if ($vars->filter) $filter = explode(',', $vars->filter);
+		else $filter = array('jpg', 'jpeg', 'gif', 'png');
+		if (!in_array($ext, $filter)) return new Object(-1, 'msg_error_occured');
 
 		$vars->member_srl = $logged_info->member_srl;
 
 		// update
-		if($module_filebox_srl > 0)
+		if ($module_filebox_srl > 0)
 		{
 			$vars->module_filebox_srl = $module_filebox_srl;
 			$output = $this->updateModuleFileBox($vars);
@@ -1218,14 +1218,14 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
+			if (!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
+			if (!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
+			if ($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
 			$output = $this->insertModuleFileBox($vars);
 		}
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 
 		if (!$ajax)
 		{
@@ -1235,7 +1235,7 @@ 
 		}
 		else
 		{
-			if($output) $this->add('save_filename', $output->get('save_filename'));
+			if ($output) $this->add('save_filename', $output->get('save_filename'));
 			else $this->add('save_filename', '');
 		}
 	}
@@ -1247,7 +1247,7 @@ 
 	{
 		$args = new stdClass;
 		// have file
-		if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
+		if ($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
 		{
 			$oModuleModel = getModel('module');
 			$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
@@ -1256,18 +1256,18 @@ 
 			$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 			FileHandler::makeDir($path);
 
-			$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext);
+			$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $ext);
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if (!checkUploadedFile($tmp)) return false;
 
-			if(!@move_uploaded_file($tmp, $save_filename))
+			if (!@move_uploaded_file($tmp, $save_filename))
 			{
 				return false;
 			}
 
-			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 			$args->filename = $save_filename;
 			$args->filesize = $vars->addfile['size'];
 		}
@@ -1293,14 +1293,14 @@ 
 		$oModuleModel = getModel('module');
 		$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 		FileHandler::makeDir($path);
-		$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
+		$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $vars->ext);
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if (!checkUploadedFile($tmp)) return false;
 
 		// upload
-		if(!@move_uploaded_file($tmp, $save_filename))
+		if (!@move_uploaded_file($tmp, $save_filename))
 		{
 			return false;
 		}
@@ -1311,7 +1311,7 @@ 
 		$args->member_srl = $vars->member_srl;
 		$args->comment = $vars->comment;
 		$args->filename = $save_filename;
-		$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+		$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 		$args->filesize = $vars->addfile['size'];
 
 		$output = executeQuery('module.insertModuleFileBox', $args);
@@ -1326,14 +1326,14 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
 		$vars = new stdClass();
 		$vars->module_filebox_srl = $module_filebox_srl;
 		$output = $this->deleteModuleFileBox($vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 	}
 
 	function deleteModuleFileBox($vars)
@@ -1356,11 +1356,11 @@ 
 		$this->unlockTimeoutPassed();
 		$args = new stdClass;
 		$args->lock_name = $lock_name;
-		if(!$timeout) $timeout = 60;
+		if (!$timeout) $timeout = 60;
 		$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
-		if($member_srl) $args->member_srl = $member_srl;
+		if ($member_srl) $args->member_srl = $member_srl;
 		$output = executeQuery('module.insertLock', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output->add('lock_name', $lock_name);
 			$output->add('deadline', $args->deadline);
@@ -1389,7 +1389,7 @@ 
 		$output = executeQuery('module.updateModuleInSites', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}

Braces +217 added lines, -101 removed lines

@@ -150,9 +150,15 @@ 
 	 */
 	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if($kind != 'admin') {
+			$kind = '';
+		}
+		if(!in_array($type,array('model','controller','view','api','mobile'))) {
+			return false;
+		}
+		if(in_array($parent_module, array('module','addon','widget','layout'))) {
+			return false;
+		}
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +170,9 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if($output->data->count>0) {
+			return false;
+		}
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -199,7 +207,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if(!$origin_config) {
+			$origin_config = new stdClass;
+		}
 
 		foreach($config as $key => $val)
 		{
@@ -221,7 +231,9 @@ 
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
@@ -246,7 +258,9 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
@@ -268,9 +282,10 @@ 
 		if(isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
-		}
-		else
+			if($oModuleModel->isIDExists($domain, 0)) {
+				return new Object(-1,'msg_already_registed_vid');
+			}
+		} else
 		{
 			$domain = strtolower($domain);
 		}
@@ -284,10 +299,14 @@ 
 		$columnList = array('modules.site_srl');
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-		if($output) return new Object(-1,'msg_already_registed_vid');
+		if($output) {
+			return new Object(-1,'msg_already_registed_vid');
+		}
 
 		$output = executeQuery('module.insertSite', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output->add('site_srl', $args->site_srl);
 		return $output;
@@ -310,8 +329,12 @@ 
 		if($site_info->domain != $args->domain)
 		{
 			$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-			if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
+			if($info->site_srl && $info->site_srl != $args->site_srl) {
+				return new Object(-1,'msg_already_registed_domain');
+			}
+			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) {
+				return new Object(-1,'msg_already_registed_vid');
+			}
 
 			if($args->domain && !isSiteID($args->domain))
 			{
@@ -320,8 +343,11 @@ 
 		}
 		$output = executeQuery('module.updateSite', $args);
 		//clear cache for default mid
-		if($args->site_srl == 0) $vid='';
-		else $vid=$args->domain;
+		if($args->site_srl == 0) {
+			$vid='';
+		} else {
+			$vid=$args->domain;
+		}
 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
 		$mid = $module_info->mid;
@@ -345,7 +371,9 @@ 
 		unset($args->act);
 		unset($args->page);
 		// Test mid value
-		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
+		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) {
+			return new Object(-1, 'msg_limit_mid');
+		}
 		// Test variables (separate basic vars and other vars in modules)
 		$extra_vars = clone($args);
 		unset($extra_vars->module_srl);
@@ -382,18 +410,23 @@ 
 		if(isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
-		}
-		else
+		} else
 		{
 			$isMenuCreate = TRUE;
 		}
 
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check whether the module name already exists
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 		$oModuleModel = getModel('module');
-		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
+		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) {
+			return new Object(-1, 'msg_module_name_exists');
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -404,20 +437,20 @@ 
 		$skin_vars = new stdClass();
 		$skin_vars->colorset = $skin_info->colorset[0]->name;
 		// Arrange variables and then execute a query
-		if(!$args->module_srl) $args->module_srl = getNextSequence();
+		if(!$args->module_srl) {
+			$args->module_srl = getNextSequence();
+		}
 
 		// default value
 		if($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_skin_fix = 'Y';
 			}
@@ -426,14 +459,12 @@ 
 		if($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_mskin_fix = 'Y';
 			}
@@ -508,7 +539,9 @@ 
 	function updateModule($args)
 	{
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -519,8 +552,12 @@ 
 
 		if(!$args->site_srl || !$args->browser_title)
 		{
-			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
-			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			if(!$args->site_srl) {
+				$args->site_srl = (int)$module_info->site_srl;
+			}
+			if(!$args->browser_title) {
+				$args->browser_title = $module_info->browser_title;
+			}
 		}
 
 		$args->browser_title = strip_tags($args->browser_title);
@@ -536,14 +573,12 @@ 
 		if($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_skin_fix = 'Y';
 			}
@@ -552,14 +587,12 @@ 
 		if($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_mskin_fix = 'Y';
 			}
@@ -624,7 +657,9 @@ 
 		$args->site_srl = $site_srl;
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('module.updateModuleSite', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
@@ -643,7 +678,9 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -653,8 +690,11 @@ 
 		$args = new stdClass();
 		$args->url = $output->mid;
 		$args->is_shortcut = 'N';
-		if(!$site_srl) $args->site_srl = $site_module_info->site_srl;
-		else $args->site_srl = $site_srl;
+		if(!$site_srl) {
+			$args->site_srl = $site_module_info->site_srl;
+		} else {
+			$args->site_srl = $site_srl;
+		}
 
 		unset($output);
 
@@ -687,8 +727,7 @@ 
 			if($output->isSuccess)
 			{
 				return new Object(0, 'success_deleted');
-			}
-			else
+			} else
 			{
 				return new Object($output->error, $output->message);
 			}
@@ -706,19 +745,25 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		// check start module
 		$oModuleModel = getModel('module');
 		$columnList = array('sites.index_module_srl');
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
-		if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
+		if($module_srl == $start_module->index_module_srl) {
+			return new Object(-1, 'msg_cannot_delete_startmodule');
+		}
 
 		// Call a trigger (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->module_srl = $module_srl;
 		$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -779,7 +824,9 @@ 
 	function clearDefaultModule()
 	{
 		$output = executeQuery('module.clearDefaultModule');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		if($oCacheHandler->isSupport())
@@ -811,7 +858,9 @@ 
 	 */
 	function updateModuleLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if(!count($menu_srl_list)) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->layout_srl = $layout_srl;
@@ -838,28 +887,37 @@ 
 
 		$output = executeQuery('module.deleteSiteAdmin', $args);
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Get user id of an administrator
-		if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
+		if(!is_array($arr_admins) || !count($arr_admins)) {
+			return new Object();
+		}
 		foreach($arr_admins as $key => $user_id)
 		{
-			if(!trim($user_id)) continue;
+			if(!trim($user_id)) {
+				continue;
+			}
 			$admins[] = trim($user_id);
 		}
-		if(!count($admins)) return new Object();
+		if(!count($admins)) {
+			return new Object();
+		}
 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 		if($member_config->identifier == 'email_address')
 		{
 			$args->email_address = '\''.implode('\',\'',$admins).'\'';
-		}
-		else
+		} else
 		{
 			$args->user_ids = '\''.implode('\',\'',$admins).'\'';
 		}
 		$output = executeQueryArray('module.getAdminSrls', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if(!$output->toBool()||!$output->data) {
+			return $output;
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -868,7 +926,9 @@ 
 			$args->site_srl = $site_srl;
 			$args->member_srl = $val->member_srl;
 			$output = executeQueryArray('module.insertSiteAdmin', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		return new Object();
 	}
@@ -881,12 +941,15 @@ 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 
-		if($member_config->identifier == 'email_address')
-			$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
-		else
-			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+		if($member_config->identifier == 'email_address') {
+					$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
+		} else {
+					$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+		}
 
-		if(!$member_info->member_srl) return;
+		if(!$member_info->member_srl) {
+			return;
+		}
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->member_srl = $member_info->member_srl;
@@ -905,7 +968,9 @@ 
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-			if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+			if($member_info->member_srl) {
+				$args->member_srl = $member_info->member_srl;
+			}
 		}
 		return executeQuery('module.deleteAdminId', $args);
 	}
@@ -949,7 +1014,9 @@ 
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new Object();
+		if(!$obj || !count($obj)) {
+			return new Object();
+		}
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
@@ -959,18 +1026,23 @@ 
 			// it often saved menu item(stdClass) on the skin info column
 			// When updating the module on XE core 1.2.0 later versions, it occurs an error
 			// fixed the error
-			if (is_object($val)) continue;
-			if (is_array($val)) $val = serialize($val);
+			if (is_object($val)) {
+				continue;
+			}
+			if (is_array($val)) {
+				$val = serialize($val);
+			}
 
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if(!$args->name || !$args->value) {
+				continue;
+			}
 
 			if($mode === 'P')
 			{
 				$output = executeQuery('module.insertModuleSkinVars', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
@@ -1017,8 +1089,7 @@ 
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleSkinVars';
-		}
-		else
+		} else
 		{
 			$object_key = 'module_mobile_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleMobileSkinVars';
@@ -1042,17 +1113,23 @@ 
 	{
 		$this->deleteModuleExtraVars($module_srl);
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return;
+		if(!$obj || !count($obj)) {
+			return;
+		}
 
 		foreach($obj as $key => $val)
 		{
-			if(is_object($val) || is_array($val)) continue;
+			if(is_object($val) || is_array($val)) {
+				continue;
+			}
 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if(!$args->name || !$args->value) {
+				continue;
+			}
 			$output = executeQuery('module.insertModuleExtraVars', $args);
 		}
 
@@ -1092,11 +1169,15 @@ 
 	function insertModuleGrants($module_srl, $obj)
 	{
 		$this->deleteModuleGrants($module_srl);
-		if(!$obj || !count($obj)) return;
+		if(!$obj || !count($obj)) {
+			return;
+		}
 
 		foreach($obj as $name => $val)
 		{
-			if(!$val || !count($val)) continue;
+			if(!$val || !count($val)) {
+				continue;
+			}
 
 			foreach($val as $group_srl)
 			{
@@ -1104,7 +1185,9 @@ 
 				$args->module_srl = $module_srl;
 				$args->name = $name;
 				$args->group_srl = trim($group_srl);
-				if(!$args->name || !$args->group_srl) continue;
+				if(!$args->name || !$args->group_srl) {
+					continue;
+				}
 				executeQuery('module.insertModuleGrant', $args);
 			}
 		}
@@ -1164,7 +1247,9 @@ 
 				require_once($cache_file);
 			}
 		}
-		if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+		if(!Context::get($matches[1]) && $lang[$matches[1]]) {
+			return $lang[$matches[1]];
+		}
 
 		return str_replace('$user_lang->','',$matches[0]);
 	}
@@ -1176,10 +1261,14 @@ 
 	function procModuleFileBoxAdd()
 	{
 		$ajax = Context::get('ajax');
-		if ($ajax) Context::setRequestMethod('JSON');
+		if ($ajax) {
+			Context::setRequestMethod('JSON');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$vars = Context::gets('addfile','filter');
 		$attributeNames = Context::get('attribute_name');
@@ -1203,9 +1292,14 @@ 
 
 		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+		if($vars->filter) {
+			$filter = explode(',',$vars->filter);
+		} else {
+			$filter = array('jpg','jpeg','gif','png');
+		}
+		if(!in_array($ext,$filter)) {
+			return new Object(-1, 'msg_error_occured');
+		}
 
 		$vars->member_srl = $logged_info->member_srl;
 
@@ -1218,10 +1312,16 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
+			if(!Context::isUploaded()) {
+				return new Object(-1, 'msg_error_occured');
+			}
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
+			if(!is_uploaded_file($addfile['tmp_name'])) {
+				return new Object(-1, 'msg_error_occured');
+			}
+			if($vars->addfile['error'] != 0) {
+				return new Object(-1, 'msg_error_occured');
+			}
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1232,11 +1332,13 @@ 
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox');
 			$this->setRedirectUrl($returnUrl);
 			return;
-		}
-		else
+		} else
 		{
-			if($output) $this->add('save_filename', $output->get('save_filename'));
-			else $this->add('save_filename', '');
+			if($output) {
+				$this->add('save_filename', $output->get('save_filename'));
+			} else {
+				$this->add('save_filename', '');
+			}
 		}
 	}
 
@@ -1260,7 +1362,9 @@ 
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if(!checkUploadedFile($tmp)) {
+				return false;
+			}
 
 			if(!@move_uploaded_file($tmp, $save_filename))
 			{
@@ -1297,7 +1401,9 @@ 
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if(!checkUploadedFile($tmp)) {
+			return false;
+		}
 
 		// upload
 		if(!@move_uploaded_file($tmp, $save_filename))
@@ -1326,14 +1432,20 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$module_filebox_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		$vars = new stdClass();
 		$vars->module_filebox_srl = $module_filebox_srl;
 		$output = $this->deleteModuleFileBox($vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 	}
 
 	function deleteModuleFileBox($vars)
@@ -1356,9 +1468,13 @@ 
 		$this->unlockTimeoutPassed();
 		$args = new stdClass;
 		$args->lock_name = $lock_name;
-		if(!$timeout) $timeout = 60;
+		if(!$timeout) {
+			$timeout = 60;
+		}
 		$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
-		if($member_srl) $args->member_srl = $member_srl;
+		if($member_srl) {
+			$args->member_srl = $member_srl;
+		}
 		$output = executeQuery('module.insertLock', $args);
 		if($output->toBool())
 		{

modules/module/module.model.php

Doc Comments +3 added lines

@@ -1035,6 +1035,7 @@ 
 	/**
 	 * @brief Get a list of skins for the module
 	 * Return file analysis of skin and skin.xml
+	 * @param string $path
 	 */
 	function getSkins($path, $dir = 'skins')
 	{
@@ -1359,6 +1360,8 @@ 
 	/**
 	 * @brief Return module configurations
 	 * Global configuration is used to manage board, member and others
+	 * @param string $module
+	 * @return string
 	 */
 	function getModuleConfig($module, $site_srl = 0)
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  moduleModel
- * @author NAVER (developers@xpressengine.com)
- * @brief Model class of module module
- */
+	 * @class  moduleModel
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief Model class of module module
+	 */
 class moduleModel extends module
 {
 	/**

Spacing +367 added lines, -367 removed lines

@@ -19,26 +19,26 @@ 
 	 */
 	function isIDExists($id, $site_srl = 0)
 	{
-		if(!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i',$id)) return true;
+		if (!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i', $id)) return true;
 		// directory and rss/atom/api reserved checking, etc.
 		$dirs = FileHandler::readDir(_XE_PATH_);
 		$dirs[] = 'rss';
 		$dirs[] = 'atom';
 		$dirs[] = 'api';
-		if(in_array($id, $dirs)) return true;
+		if (in_array($id, $dirs)) return true;
 		// mid test
 		$args = new stdClass();
 		$args->mid = $id;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('module.isExistsModuleName', $args);
-		if($output->data->count) return true;
+		if ($output->data->count) return true;
 		// vid test (check mid != vid if site_srl=0, which means it is not a virtual site)
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_args = new stdClass();
 			$site_args->domain = $id;
 			$output = executeQuery('module.isExistsSiteDomain', $site_args);
-			if($output->data->count) return true;
+			if ($output->data->count) return true;
 		}
 
 		return false;
@@ -82,10 +82,10 @@ 
 	function getDefaultMid()
 	{
 		$default_url = Context::getDefaultUrl();
-		if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+		if ($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
 
 		$request_url = Context::getRequestUri();
-		if($request_url && substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1);
+		if ($request_url && substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1);
 
 		$default_url_parse = parse_url($default_url);
 		$request_url_parse = parse_url($request_url);
@@ -95,20 +95,20 @@ 
 		// Set up
 		$domain = '';
 		$site_info = NULL;
-		if($default_url && $default_url_parse['host'] != $request_url_parse['host'])
+		if ($default_url && $default_url_parse['host'] != $request_url_parse['host'])
 		{
 			$url_info = parse_url($request_url);
 			$hostname = $url_info['host'];
 			$path = $url_info['path'];
-			if(strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) $path = substr($path, 0, -1);
+			if (strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) $path = substr($path, 0, -1);
 
-			$domain = sprintf('%s%s%s', $hostname, $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$path);
+			$domain = sprintf('%s%s%s', $hostname, $url_info['port'] && $url_info['port'] != 80 ? ':' . $url_info['port'] : '', $path);
 		}
 
-		if($domain === '')
+		if ($domain === '')
 		{
-			if(!$vid) $vid = $mid;
-			if($vid)
+			if (!$vid) $vid = $mid;
+			if ($vid)
 			{
 				$domain = $vid;
 			}
@@ -116,89 +116,89 @@ 
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		// If domain is set, look for subsite
-		if($domain !== '')
+		if ($domain !== '')
 		{
 			$site_info = false;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$object_key = 'site_info:' . md5($domain);
 				$domain_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$site_info = $oCacheHandler->get($domain_cache_key);
 			}
 
-			if($site_info === false)
+			if ($site_info === false)
 			{
 				$args = new stdClass();
 				$args->domain = $domain;
 				$output = executeQuery('module.getSiteInfoByDomain', $args);
 				$site_info = $output->data;
 
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($domain_cache_key, $site_info);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($domain_cache_key, $site_info);
 			}
 
-			if($site_info && $vid)
+			if ($site_info && $vid)
 			{
 				Context::set('vid', $site_info->domain, true);
-				if(strtolower($mid)==strtolower($site_info->domain)) Context::set('mid', $site_info->mid,true);
+				if (strtolower($mid) == strtolower($site_info->domain)) Context::set('mid', $site_info->mid, true);
 			}
-			if(!$site_info || !$site_info->domain) { $domain = ''; unset($site_info); }
+			if (!$site_info || !$site_info->domain) { $domain = ''; unset($site_info); }
 		}
 
 		// If no virtual website was found, get default website
-		if($domain === '')
+		if ($domain === '')
 		{
 			$site_info = false;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$object_key = 'default_site';
 				$default_site_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$site_info = $oCacheHandler->get($default_site_cache_key);
 			}
 
-			if($site_info === false)
+			if ($site_info === false)
 			{
 				$args = new stdClass();
 				$args->site_srl = 0;
 				$output = executeQuery('module.getSiteInfo', $args);
 				// Update the related informaion if there is no default site info
-				if(!$output->data)
+				if (!$output->data)
 				{
 					// Create a table if sites table doesn't exist
 					$oDB = &DB::getInstance();
-					if(!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
-					if(!$oDB->isTableExists('sites')) return;
+					if (!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_ . 'modules/module/schemas/sites.xml');
+					if (!$oDB->isTableExists('sites')) return;
 
 					// Get mid, language
 					$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
 					$db_info = Context::getDBInfo();
 					$domain = Context::getDefaultUrl();
 					$url_info = parse_url($domain);
-					$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+					$domain = $url_info['host'] . ((!empty($url_info['port']) && $url_info['port'] != 80) ? ':' . $url_info['port'] : '') . $url_info['path'];
 
 					$site_args = new stdClass;
 					$site_args->site_srl = 0;
-					$site_args->index_module_srl  = $mid_output->data->module_srl;
+					$site_args->index_module_srl = $mid_output->data->module_srl;
 					$site_args->domain = $domain;
 					$site_args->default_language = $db_info->lang_type;
 
-					if($output->data && !$output->data->index_module_srl)
+					if ($output->data && !$output->data->index_module_srl)
 					{
 						$output = executeQuery('module.updateSite', $site_args);
 					}
 					else
 					{
 						$output = executeQuery('module.insertSite', $site_args);
-						if(!$output->toBool()) return $output;
+						if (!$output->toBool()) return $output;
 					}
 					$output = executeQuery('module.getSiteInfo', $args);
 				}
 				$site_info = $output->data;
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($default_site_cache_key, $site_info);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($default_site_cache_key, $site_info);
 			}
 		}
 
-		if(!$site_info->module_srl) return $site_info;
-		if(is_array($site_info) && $site_info->data[0]) $site_info = $site_info[0];
+		if (!$site_info->module_srl) return $site_info;
+		if (is_array($site_info) && $site_info->data[0]) $site_info = $site_info[0];
 		return $this->addModuleExtraVars($site_info);
 	}
 
@@ -207,25 +207,25 @@ 
 	 */
 	function getModuleInfoByMid($mid, $site_srl = 0, $columnList = array())
 	{
-		if(!$mid || ($mid && !preg_match("/^[a-z][a-z0-9_]+$/i", $mid)))
+		if (!$mid || ($mid && !preg_match("/^[a-z][a-z0-9_]+$/i", $mid)))
 		{
 			return;
 		}
 
 		$args = new stdClass();
 		$args->mid = $mid;
-		$args->site_srl = (int)$site_srl;
+		$args->site_srl = (int) $site_srl;
 
 		$module_srl = false;
 		$module_info = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_srl:'.$mid.'_'.$site_srl;
+			$object_key = 'module_srl:' . $mid . '_' . $site_srl;
 			$module_srl_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$module_srl = $oCacheHandler->get($module_srl_cache_key);
-			if($module_srl)
+			if ($module_srl)
 			{
 				$object_key = 'mid_info:' . $module_srl;
 				$module_info_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -233,11 +233,11 @@ 
 			}
 		}
 
-		if($module_info === false)
+		if ($module_info === false)
 		{
 			$output = executeQuery('module.getMidInfo', $args);
 			$module_info = $output->data;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($module_srl_cache_key, $module_info->module_srl);
 
@@ -248,7 +248,7 @@ 
 		}
 
 		$this->applyDefaultSkin($module_info);
-		if(!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
+		if (!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
 		return $this->addModuleExtraVars($module_info);
 	}
 
@@ -264,7 +264,7 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$menuItemSrl = (!$menuItemSrl) ? $menu_item_srl : $menuItemSrl;
 
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			$this->stop(-1, 'msg_invalid_request');
 			return;
@@ -273,7 +273,7 @@ 
 		$args = new stdClass();
 		$args->menu_item_srl = $menuItemSrl;
 		$output = executeQuery('module.getModuleInfoByMenuItemSrl', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -297,12 +297,12 @@ 
 		$layoutInfoMobile = $layoutSrlMobile ? $oLayoutModel->getLayoutRawData($layoutSrlMobile, array('title')) : NULL;
 		$skinInfoPc = $this->loadSkinInfo(Modulehandler::getModulePath($moduleInfo->module), $skinNamePc);
 		$skinInfoMobile = $this->loadSkinInfo(Modulehandler::getModulePath($moduleInfo->module), $skinNameMobile, 'm.skins');
-		if(!$skinInfoPc)
+		if (!$skinInfoPc)
 		{
 			$skinInfoPc = new stdClass();
 			$skinInfoPc->title = $skinNamePc;
 		}
-		if(!$skinInfoMobile)
+		if (!$skinInfoMobile)
 		{
 			$skinInfoMobile = new stdClass();
 			$skinInfoMobile->title = $skinNameMobile;
@@ -321,19 +321,19 @@ 
 		$mid_info = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_srl:'.$mid.'_'.$site_srl;
+			$object_key = 'module_srl:' . $mid . '_' . $site_srl;
 			$module_srl_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$module_srl = $oCacheHandler->get($module_srl_cache_key);
-			if($module_srl)
+			if ($module_srl)
 			{
 				$object_key = 'mid_info:' . $module_srl;
 				$module_info_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$mid_info = $oCacheHandler->get($module_info_cache_key);
 			}
 
-			if($mid_info === false)
+			if ($mid_info === false)
 			{
 				$oCacheHandler->put($module_srl_cache_key, $output->data->module_srl);
 
@@ -350,7 +350,7 @@ 
 
 		$moduleInfo = $this->addModuleExtraVars($moduleInfo);
 
-		if($moduleInfo->module == 'page' && $moduleInfo->page_type != 'ARTICLE')
+		if ($moduleInfo->module == 'page' && $moduleInfo->page_type != 'ARTICLE')
 		{
 			unset($moduleInfo->skin);
 			unset($moduleInfo->mskin);
@@ -369,32 +369,32 @@ 
 		$mid_info = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'mid_info:' . $module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$mid_info = $oCacheHandler->get($cache_key);
 		}
 
-		if($mid_info === false)
+		if ($mid_info === false)
 		{
 			// Get data
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.getMidInfo', $args);
-			if(!$output->toBool()) return;
+			if (!$output->toBool()) return;
 
 			$mid_info = $output->data;
 			$this->applyDefaultSkin($mid_info);
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $mid_info);
+			if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $mid_info);
 		}
 
-		if($mid_info && count($columnList))
+		if ($mid_info && count($columnList))
 		{
 			$module_info = new stdClass();
-			foreach($mid_info as $key => $item)
+			foreach ($mid_info as $key => $item)
 			{
-				if(in_array($key, $columnList))
+				if (in_array($key, $columnList))
 				{
 					$module_info->$key = $item;
 				}
@@ -403,7 +403,7 @@ 
 		else $module_info = $mid_info;
 
 		$oModuleController = getController('module');
-		if(isset($module_info->browser_title)) $oModuleController->replaceDefinedLangCode($module_info->browser_title);
+		if (isset($module_info->browser_title)) $oModuleController->replaceDefinedLangCode($module_info->browser_title);
 
 		$this->applyDefaultSkin($module_info);
 		return $this->addModuleExtraVars($module_info);
@@ -416,12 +416,12 @@ 
 	 */
 	private function applyDefaultSkin(&$moduleInfo)
 	{
-		if($moduleInfo->is_skin_fix == 'N')
+		if ($moduleInfo->is_skin_fix == 'N')
 		{
 			$moduleInfo->skin = '/USE_DEFAULT/';
 		}
 
-		if($moduleInfo->is_mskin_fix == 'N')
+		if ($moduleInfo->is_mskin_fix == 'N')
 		{
 			$moduleInfo->mskin = '/USE_DEFAULT/';
 		}
@@ -439,7 +439,7 @@ 
 		$count = count($output->data);
 
 		$modules = array();
-		for($i=0;$i<$count;$i++)
+		for ($i = 0; $i < $count; $i++)
 		{
 			$modules[] = $output->data[$i];
 		}
@@ -451,11 +451,11 @@ 
 	 */
 	function getModulesInfo($module_srls, $columnList = array())
 	{
-		if(is_array($module_srls)) $module_srls = implode(',',$module_srls);
+		if (is_array($module_srls)) $module_srls = implode(',', $module_srls);
 		$args = new stdClass();
 		$args->module_srls = $module_srls;
 		$output = executeQueryArray('module.getModulesInfo', $args, $columnList);
-		if(!$output->toBool()) return;
+		if (!$output->toBool()) return;
 		return $this->addModuleExtraVars($output->data);
 	}
 
@@ -465,31 +465,31 @@ 
 	function addModuleExtraVars($module_info)
 	{
 		// Process although one or more module informaion is requested
-		if(!is_array($module_info)) $target_module_info = array($module_info);
+		if (!is_array($module_info)) $target_module_info = array($module_info);
 		else $target_module_info = $module_info;
 		// Get module_srl
 		$module_srls = array();
-		foreach($target_module_info as $key => $val)
+		foreach ($target_module_info as $key => $val)
 		{
 			$module_srl = $val->module_srl;
-			if(!$module_srl) continue;
+			if (!$module_srl) continue;
 			$module_srls[] = $val->module_srl;
 		}
 		// Extract extra information of the module and skin
 		$extra_vars = $this->getModuleExtraVars($module_srls);
-		if(!count($module_srls) || !count($extra_vars)) return $module_info;
+		if (!count($module_srls) || !count($extra_vars)) return $module_info;
 
-		foreach($target_module_info as $key => $val)
+		foreach ($target_module_info as $key => $val)
 		{
-			if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
-			foreach($extra_vars[$val->module_srl] as $k => $v)
+			if (!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
+			foreach ($extra_vars[$val->module_srl] as $k => $v)
 			{
-				if($target_module_info[$key]->{$k}) continue;
+				if ($target_module_info[$key]->{$k}) continue;
 				$target_module_info[$key]->{$k} = $v;
 			}
 		}
 
-		if(is_array($module_info)) return $target_module_info;
+		if (is_array($module_info)) return $target_module_info;
 		return $target_module_info[0];
 	}
 
@@ -500,9 +500,9 @@ 
 	{
 		$list = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			if(count($args) === 1 && isset($args->site_srl))
+			if (count($args) === 1 && isset($args->site_srl))
 			{
 				$object_key = 'module:mid_list_' . $args->site_srl;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -510,27 +510,27 @@ 
 			}
 		}
 
-		if($list === false)
+		if ($list === false)
 		{
-			if($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
+			if ($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
 			{
 				$columnList = array();
 			}
 
 			$output = executeQuery('module.getMidList', $args, $columnList);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$list = $output->data;
 
-			if($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
+			if ($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
 			{
 				$oCacheHandler->put($cache_key, $list);
 			}
 		}
-		if(!$list) return;
+		if (!$list) return;
 
-		if(!is_array($list)) $list = array($list);
+		if (!is_array($list)) $list = array($list);
 
-		foreach($list as $val)
+		foreach ($list as $val)
 		{
 			$mid_list[$val->mid] = $val;
 		}
@@ -544,10 +544,10 @@ 
 	function getModuleSrlList($args = null, $columnList = array())
 	{
 		$output = executeQueryArray('module.getMidList', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$list = $output->data;
-		if(!$list) return;
+		if (!$list) return;
 
 		return $list;
 	}
@@ -557,22 +557,22 @@ 
 	 */
 	function getModuleSrlByMid($mid)
 	{
-		if($mid && !is_array($mid)) $mid = explode(',',$mid);
-		if(is_array($mid)) $mid = "'".implode("','",$mid)."'";
+		if ($mid && !is_array($mid)) $mid = explode(',', $mid);
+		if (is_array($mid)) $mid = "'" . implode("','", $mid) . "'";
 
 		$site_module_info = Context::get('site_module_info');
 
 		$args = new stdClass;
 		$args->mid = $mid;
-		if($site_module_info) $args->site_srl = $site_module_info->site_srl;
+		if ($site_module_info) $args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('module.getModuleSrlByMid', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$list = $output->data;
-		if(!$list) return;
-		if(!is_array($list)) $list = array($list);
+		if (!$list) return;
+		if (!is_array($list)) $list = array($list);
 
-		foreach($list as $key => $val)
+		foreach ($list as $key => $val)
 		{
 			$module_srl_list[] = $val->module_srl;
 		}
@@ -588,33 +588,33 @@ 
 		$action_forward = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$action_forward = $oCacheHandler->get($cache_key);
 		}
 
 		// retrieve and caching all registered action_forward
-		if($action_forward === false)
+		if ($action_forward === false)
 		{
 			$args = new stdClass();
-			$output = executeQueryArray('module.getActionForward',$args);
-			if(!$output->toBool()) return new stdClass;
-			if(!$output->data) $output->data = array();
+			$output = executeQueryArray('module.getActionForward', $args);
+			if (!$output->toBool()) return new stdClass;
+			if (!$output->data) $output->data = array();
 
 			$action_forward = array();
-			foreach($output->data as $item)
+			foreach ($output->data as $item)
 			{
 				$action_forward[$item->act] = $item;
 			}
 
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $action_forward);
 			}
 		}
 
-		if($action_forward[$act])
+		if ($action_forward[$act])
 		{
 			return $action_forward[$act];
 		}
@@ -629,25 +629,25 @@ 
 	 */
 	function getTriggers($trigger_name, $called_position)
 	{
-		if(is_null($GLOBALS['__triggers__']))
+		if (is_null($GLOBALS['__triggers__']))
 		{
 			$triggers = FALSE;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$triggers = $oCacheHandler->get($cache_key);
 			}
-			if($triggers === FALSE)
+			if ($triggers === FALSE)
 			{
 				$output = executeQueryArray('module.getTriggers');
 				$triggers = $output->data;
-				if($output->toBool() && $oCacheHandler->isSupport())
+				if ($output->toBool() && $oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $triggers);
 				}
 			}
-			foreach($triggers as $item)
+			foreach ($triggers as $item)
 			{
 				$GLOBALS['__triggers__'][$item->trigger_name][$item->called_position][] = $item;
 			}
@@ -663,11 +663,11 @@ 
 	{
 		$triggers = $this->getTriggers($trigger_name, $called_position);
 
-		if($triggers && is_array($triggers))
+		if ($triggers && is_array($triggers))
 		{
-			foreach($triggers as $item)
+			foreach ($triggers as $item)
 			{
-				if($item->module == $module && $item->type == $type && $item->called_method == $called_method)
+				if ($item->module == $module && $item->type == $type && $item->called_method == $called_method)
 				{
 					return $item;
 				}
@@ -680,12 +680,12 @@ 
 	/**
 	 * @brief Get module extend
 	 */
-	function getModuleExtend($parent_module, $type, $kind='')
+	function getModuleExtend($parent_module, $type, $kind = '')
 	{
-		$key = $parent_module.'.'.$kind.'.'.$type;
+		$key = $parent_module . '.' . $kind . '.' . $type;
 
 		$module_extend_info = $this->loadModuleExtends();
-		if(array_key_exists($key, $module_extend_info))
+		if (array_key_exists($key, $module_extend_info))
 		{
 			return $module_extend_info[$key];
 		}
@@ -701,29 +701,29 @@ 
 		$cache_file = './files/config/module_extend.php';
 		$cache_file = FileHandler::getRealPath($cache_file);
 
-		if(!isset($GLOBALS['__MODULE_EXTEND__']))
+		if (!isset($GLOBALS['__MODULE_EXTEND__']))
 		{
 			// check pre install
-			if(file_exists(FileHandler::getRealPath('./files')) && !file_exists($cache_file))
+			if (file_exists(FileHandler::getRealPath('./files')) && !file_exists($cache_file))
 			{
 				$arr = array();
 				$output = executeQueryArray('module.getModuleExtend');
-				if($output->data)
+				if ($output->data)
 				{
-					foreach($output->data as $v)
+					foreach ($output->data as $v)
 					{
 						$arr[] = sprintf("'%s.%s.%s' => '%s'", $v->parent_module, $v->kind, $v->type, $v->extend_module);
 					}
 				}
 
 				$str = '<?PHP return array(%s); ?>';
-				$str = sprintf($str, join(',',$arr));
+				$str = sprintf($str, join(',', $arr));
 
 				FileHandler::writeFile($cache_file, $str);
 			}
 
 
-			if(file_exists($cache_file))
+			if (file_exists($cache_file))
 			{
 				$GLOBALS['__MODULE_EXTEND__'] = include($cache_file);
 			}
@@ -743,20 +743,20 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$module_path = ModuleHandler::getModulePath($module);
-		if(!$module_path) return;
+		if (!$module_path) return;
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%s/conf/info.xml", $module_path);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->module;
 
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		// Module Information
 		$module_info = new stdClass();
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// module format 0.2
 			$module_info->title = $xml_obj->title->body;
@@ -764,16 +764,16 @@ 
 			$module_info->version = $xml_obj->version->body;
 			$module_info->homepage = $xml_obj->link->body;
 			$module_info->category = $xml_obj->category->body;
-			if(!$module_info->category) $module_info->category = 'service';
+			if (!$module_info->category) $module_info->category = 'service';
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->license = $xml_obj->license->body;
 			$module_info->license_link = $xml_obj->license->attrs->link;
 
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
-			foreach($author_list as $author)
+			foreach ($author_list as $author)
 			{
 				$author_obj = new stdClass();
 				$author_obj->name = $author->name->body;
@@ -789,7 +789,7 @@ 
 			$module_info->description = $xml_obj->author->description->body;
 			$module_info->version = $xml_obj->attrs->version;
 			$module_info->category = $xml_obj->attrs->category;
-			if(!$module_info->category) $module_info->category = 'service';
+			if (!$module_info->category) $module_info->category = 'service';
 			sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$author_obj = new stdClass();
@@ -818,17 +818,17 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$class_path = ModuleHandler::getModulePath($module);
-		if(!$class_path) return;
+		if (!$class_path) return;
 
 		// Check if module.xml exists in the path. Return if not exist
 		$xml_file = sprintf("%sconf/module.xml", $class_path);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 
 		// Check if cached file exists
 		$cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
 
 		// Update if no cache file exists or it is older than xml file
-		if(!file_exists($cache_file) || filemtime($cache_file) < filemtime($xml_file) || $re_cache)
+		if (!file_exists($cache_file) || filemtime($cache_file) < filemtime($xml_file) || $re_cache)
 		{
 			$info = new stdClass();
 			$buff = array(); // /< Set buff variable to use in the cache file
@@ -841,7 +841,7 @@ 
 
 			$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
 
-			if(!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
+			if (!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
 
 			$grants = $xml_obj->module->grants->grant; // /< Permission information
 			$permissions = $xml_obj->module->permissions->permission; // /<  Acting permission
@@ -851,17 +851,17 @@ 
 			$default_index = $admin_index = '';
 
 			// Arrange permission information
-			if($grants)
+			if ($grants)
 			{
-				if(is_array($grants)) $grant_list = $grants;
+				if (is_array($grants)) $grant_list = $grants;
 				else $grant_list[] = $grants;
 
 				$info->grant = new stdClass();
 				$buff[] = '$info->grant = new stdClass;';
-				foreach($grant_list as $grant)
+				foreach ($grant_list as $grant)
 				{
 					$name = $grant->attrs->name;
-					$default = $grant->attrs->default?$grant->attrs->default:'guest';
+					$default = $grant->attrs->default ? $grant->attrs->default : 'guest';
 					$title = $grant->title->body;
 
 					$info->grant->{$name} = new stdClass();
@@ -874,15 +874,15 @@ 
 				}
 			}
 			// Permissions to grant
-			if($permissions)
+			if ($permissions)
 			{
-				if(is_array($permissions)) $permission_list = $permissions;
+				if (is_array($permissions)) $permission_list = $permissions;
 				else $permission_list[] = $permissions;
 
 				$buff[] = '$info->permission = new stdClass;';
 
 				$info->permission = new stdClass();
-				foreach($permission_list as $permission)
+				foreach ($permission_list as $permission)
 				{
 					$action = $permission->attrs->action;
 					$target = $permission->attrs->target;
@@ -893,14 +893,14 @@ 
 				}
 			}
 			// for admin menus
-			if($menus)
+			if ($menus)
 			{
-				if(is_array($menus)) $menu_list = $menus;
+				if (is_array($menus)) $menu_list = $menus;
 				else $menu_list[] = $menus;
 
 				$buff[] = '$info->menu = new stdClass;';
 				$info->menu = new stdClass();
-				foreach($menu_list as $menu)
+				foreach ($menu_list as $menu)
 				{
 					$menu_name = $menu->attrs->name;
 					$menu_title = is_array($menu->title) ? $menu->title[0]->body : $menu->title->body;
@@ -918,22 +918,22 @@ 
 			}
 
 			// actions
-			if($actions)
+			if ($actions)
 			{
-				if(is_array($actions)) $action_list = $actions;
+				if (is_array($actions)) $action_list = $actions;
 				else $action_list[] = $actions;
 
 				$buff[] = '$info->action = new stdClass;';
 				$info->action = new stdClass();
-				foreach($action_list as $action)
+				foreach ($action_list as $action)
 				{
 					$name = $action->attrs->name;
 
 					$type = $action->attrs->type;
-					$grant = $action->attrs->grant?$action->attrs->grant:'guest';
-					$standalone = $action->attrs->standalone=='false'?'false':'true';
-					$ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
-					$method = $action->attrs->method?$action->attrs->method:'';
+					$grant = $action->attrs->grant ? $action->attrs->grant : 'guest';
+					$standalone = $action->attrs->standalone == 'false' ? 'false' : 'true';
+					$ruleset = $action->attrs->ruleset ? $action->attrs->ruleset : '';
+					$method = $action->attrs->method ? $action->attrs->method : '';
 
 					$index = $action->attrs->index;
 					$admin_index = $action->attrs->admin_index;
@@ -947,14 +947,14 @@ 
 					$info->action->{$name}->standalone = $standalone;
 					$info->action->{$name}->ruleset = $ruleset;
 					$info->action->{$name}->method = $method;
-					if($action->attrs->menu_name)
+					if ($action->attrs->menu_name)
 					{
-						if($menu_index == 'true')
+						if ($menu_index == 'true')
 						{
 							$info->menu->{$action->attrs->menu_name}->index = $name;
 							$buff[] = sprintf('$info->menu->%s->index=\'%s\';', $action->attrs->menu_name, $name);
 						}
-						if(is_array($info->menu->{$action->attrs->menu_name}->acts))
+						if (is_array($info->menu->{$action->attrs->menu_name}->acts))
 						{
 							$info->menu->{$action->attrs->menu_name}->acts[] = $name;
 							$currentKey = array_search($name, $info->menu->{$action->attrs->menu_name}->acts);
@@ -971,22 +971,22 @@ 
 					$buff[] = sprintf('$info->action->%s->ruleset=\'%s\';', $name, $ruleset);
 					$buff[] = sprintf('$info->action->%s->method=\'%s\';', $name, $method);
 
-					if($index=='true')
+					if ($index == 'true')
 					{
 						$default_index_act = $name;
 						$info->default_index_act = $name;
 					}
-					if($admin_index=='true')
+					if ($admin_index == 'true')
 					{
 						$admin_index_act = $name;
 						$info->admin_index_act = $name;
 					}
-					if($setup_index=='true')
+					if ($setup_index == 'true')
 					{
 						$setup_index_act = $name;
 						$info->setup_index_act = $name;
 					}
-					if($simple_setup_index=='true')
+					if ($simple_setup_index == 'true')
 					{
 						$simple_setup_index_act = $name;
 						$info->simple_setup_index_act = $name;
@@ -1007,7 +1007,7 @@ 
 			return $info;
 		}
 
-		if(file_exists($cache_file)) return include($cache_file);
+		if (file_exists($cache_file)) return include($cache_file);
 	}
 
 	/**
@@ -1018,7 +1018,7 @@ 
 	{
 		$module = Context::get('module_type');
 
-		if($module == 'ARTICLE')
+		if ($module == 'ARTICLE')
 		{
 			$module = 'page';
 		}
@@ -1038,26 +1038,26 @@ 
 	 */
 	function getSkins($path, $dir = 'skins')
 	{
-		if(substr($path, -1) == '/')
+		if (substr($path, -1) == '/')
 		{
 			$path = substr($path, 0, -1);
 		}
 
 		$skin_path = sprintf("%s/%s/", $path, $dir);
 		$list = FileHandler::readDir($skin_path);
-		if(!count($list)) return;
+		if (!count($list)) return;
 
 		natcasesort($list);
 
-		foreach($list as $skin_name)
+		foreach ($list as $skin_name)
 		{
-			if(!is_dir($skin_path . $skin_name))
+			if (!is_dir($skin_path . $skin_name))
 			{
 				continue;
 			}
 			unset($skin_info);
 			$skin_info = $this->loadSkinInfo($path, $skin_name, $dir);
-			if(!$skin_info)
+			if (!$skin_info)
 			{
 				$skin_info = new stdClass();
 				$skin_info->title = $skin_name;
@@ -1070,15 +1070,15 @@ 
 		$tmpPath = trim($tmpPath);
 		$module = array_pop(explode(' ', $tmpPath));
 
-		if($dir == 'skins')
+		if ($dir == 'skins')
 		{
 			$oAdminModel = getAdminModel('admin');
 			$themesInfo = $oAdminModel->getThemeList();
 
-			foreach($themesInfo as $themeName => $info)
+			foreach ($themesInfo as $themeName => $info)
 			{
 				$skinInfos = $info->skin_infos;
-				if(isset($skinInfos[$module]) && $skinInfos[$module]->is_theme)
+				if (isset($skinInfos[$module]) && $skinInfos[$module]->is_theme)
 				{
 					$themeSkinInfo = $GLOBALS['__ThemeModuleSkin__'][$module]['skins'][$skinInfos[$module]->name];
 					$skin_list[$skinInfos[$module]->name] = $themeSkinInfo;
@@ -1090,13 +1090,13 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 		$installedMenuTypes = $oMenuAdminModel->getModuleListInSitemap($siteInfo->site_srl);
 		$moduleName = $module;
-		if($moduleName === 'page')
+		if ($moduleName === 'page')
 		{
 			$moduleName = 'ARTICLE';
 		}
-		if(array_key_exists($moduleName, $installedMenuTypes))
+		if (array_key_exists($moduleName, $installedMenuTypes))
 		{
-			if($dir == 'skins')
+			if ($dir == 'skins')
 			{
 				$type = 'P';
 			}
@@ -1106,7 +1106,7 @@ 
 			}
 			$defaultSkinName = $this->getModuleDefaultSkin($module, $type, $site_info->site_srl);
 
-			if(isset($defaultSkinName))
+			if (isset($defaultSkinName))
 			{
 				$defaultSkinInfo = $this->loadSkinInfo($path, $defaultSkinName, $dir);
 
@@ -1128,20 +1128,20 @@ 
 	function loadSkinInfo($path, $skin, $dir = 'skins')
 	{
 		// Read xml file having skin information
-		if(substr($path,-1)!='/') $path .= '/';
+		if (substr($path, -1) != '/') $path .= '/';
 		$skin_xml_file = sprintf("%s%s/%s/skin.xml", $path, $dir, $skin);
-		if(!file_exists($skin_xml_file)) return;
+		if (!file_exists($skin_xml_file)) return;
 		// Create XmlParser object
 		$oXmlParser = new XmlParser();
 		$_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
 		// Return if no skin information is
-		if(!$_xml_obj->skin) return;
+		if (!$_xml_obj->skin) return;
 		$xml_obj = $_xml_obj->skin;
 		// Skin Name
 		$skin_info = new stdClass();
 		$skin_info->title = $xml_obj->title->body;
 		// Author information
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// skin format v0.2
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -1152,10 +1152,10 @@ 
 			$skin_info->license_link = $xml_obj->license->attrs->link;
 			$skin_info->description = $xml_obj->description->body;
 
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
-			foreach($author_list as $author)
+			foreach ($author_list as $author)
 			{
 				$author_obj = new stdClass();
 				$author_obj->name = $author->name->body;
@@ -1164,25 +1164,25 @@ 
 				$skin_info->author[] = $author_obj;
 			}
 			// List extra vars
-			if($xml_obj->extra_vars)
+			if ($xml_obj->extra_vars)
 			{
 				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-				if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+				if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+				if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
-				foreach($extra_var_groups as $group)
+				foreach ($extra_var_groups as $group)
 				{
 					$extra_vars = $group->var;
-					if(!$extra_vars)
+					if (!$extra_vars)
 					{
 						continue;
 					}
-					if(!is_array($group->var)) $extra_vars = array($group->var);
+					if (!is_array($group->var)) $extra_vars = array($group->var);
 
-					foreach($extra_vars as $key => $val)
+					foreach ($extra_vars as $key => $val)
 					{
 						$obj = new stdClass();
-						if(!$val->attrs->type) { $val->attrs->type = 'text'; }
+						if (!$val->attrs->type) { $val->attrs->type = 'text'; }
 
 						$obj->group = $group->title->body;
 						$obj->name = $val->attrs->name;
@@ -1191,14 +1191,14 @@ 
 						$obj->description = $val->description->body;
 						$obj->value = $extra_vals->{$obj->name};
 						$obj->default = $val->attrs->default;
-						if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
-						if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
+						if (strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
+						if ($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
 						// Get an option list from 'select'type
-						if(is_array($val->options))
+						if (is_array($val->options))
 						{
 							$option_count = count($val->options);
 
-							for($i = 0; $i < $option_count; $i++)
+							for ($i = 0; $i < $option_count; $i++)
 							{
 								$obj->options[$i] = new stdClass();
 								$obj->options[$i]->title = $val->options[$i]->title->body;
@@ -1235,18 +1235,18 @@ 
 			$skin_info->author[0]->homepage = $xml_obj->maker->attrs->link;
 			// Variables used in the skin
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+			if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
-			foreach($extra_var_groups as $group)
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
 
-				if($extra_vars)
+				if ($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
-					foreach($extra_vars as $var)
+					foreach ($extra_vars as $var)
 					{
 						unset($obj);
 						unset($options);
@@ -1257,11 +1257,11 @@ 
 						$title = $var->title->body;
 						$description = $var->description->body;
 						// Get an option list from 'select'type.
-						if(is_array($var->default))
+						if (is_array($var->default))
 						{
 							$option_count = count($var->default);
 
-							for($i = 0; $i < $option_count; $i++)
+							for ($i = 0; $i < $option_count; $i++)
 							{
 								$options[$i]->title = $var->default[$i]->body;
 								$options[$i]->value = $var->default[$i]->body;
@@ -1295,19 +1295,19 @@ 
 
 		// colorset
 		$colorset = $xml_obj->colorset->color;
-		if($colorset)
+		if ($colorset)
 		{
-			if(!is_array($colorset)) $colorset = array($colorset);
+			if (!is_array($colorset)) $colorset = array($colorset);
 
-			foreach($colorset as $color)
+			foreach ($colorset as $color)
 			{
 				$name = $color->attrs->name;
 				$title = $color->title->body;
 				$screenshot = $color->attrs->src;
-				if($screenshot)
+				if ($screenshot)
 				{
 					$screenshot = sprintf("%s%s/%s/%s", $path, $dir, $skin, $screenshot);
-					if(!file_exists($screenshot)) $screenshot = "";
+					if (!file_exists($screenshot)) $screenshot = "";
 				}
 				else $screenshot = "";
 
@@ -1319,19 +1319,19 @@ 
 			}
 		}
 		// Menu type (settings for layout)
-		if($xml_obj->menus->menu)
+		if ($xml_obj->menus->menu)
 		{
 			$menus = $xml_obj->menus->menu;
-			if(!is_array($menus)) $menus = array($menus);
+			if (!is_array($menus)) $menus = array($menus);
 
 			$menu_count = count($menus);
 			$skin_info->menu_count = $menu_count;
-			for($i=0;$i<$menu_count;$i++)
+			for ($i = 0; $i < $menu_count; $i++)
 			{
 				unset($obj);
 
 				$obj->name = $menus[$i]->attrs->name;
-				if($menus[$i]->attrs->default == "true") $obj->default = true;
+				if ($menus[$i]->attrs->default == "true") $obj->default = true;
 				$obj->title = $menus[$i]->title->body;
 				$obj->maxdepth = $menus[$i]->maxdepth->body;
 
@@ -1340,7 +1340,7 @@ 
 		}
 
 		$thumbnail = sprintf("%s%s/%s/thumbnail.png", $path, $dir, $skin);
-		$skin_info->thumbnail = (file_exists($thumbnail))?$thumbnail:null;
+		$skin_info->thumbnail = (file_exists($thumbnail)) ? $thumbnail : null;
 		return $skin_info;
 	}
 
@@ -1351,7 +1351,7 @@ 
 	{
 		$args = new stdClass;
 		$args->site_srl = $site_srl;
-		if(!is_null($module)) $args->module = $module;
+		if (!is_null($module)) $args->module = $module;
 		$output = executeQuery('module.getModuleCount', $args);
 		return $output->data->count;
 	}
@@ -1365,26 +1365,26 @@ 
 		$config = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_config:' . $module . '_' . $site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$config = $oCacheHandler->get($cache_key);
 		}
 
-		if($config === false)
+		if ($config === false)
 		{
-			if(!$GLOBALS['__ModuleConfig__'][$site_srl][$module])
+			if (!$GLOBALS['__ModuleConfig__'][$site_srl][$module])
 			{
 				$args = new stdClass();
 				$args->module = $module;
 				$args->site_srl = $site_srl;
 				$output = executeQuery('module.getModuleConfig', $args);
-				if($output->data->config) $config = unserialize($output->data->config);
+				if ($output->data->config) $config = unserialize($output->data->config);
 				else $config = null;
 
 				//insert in cache
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $config);
 				}
@@ -1405,26 +1405,26 @@ 
 		$config = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_part_config:'.$module.'_'.$module_srl;
+			$object_key = 'module_part_config:' . $module . '_' . $module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$config = $oCacheHandler->get($cache_key);
 		}
 
-		if($config === false)
+		if ($config === false)
 		{
-			if(!isset($GLOBALS['__ModulePartConfig__'][$module][$module_srl]))
+			if (!isset($GLOBALS['__ModulePartConfig__'][$module][$module_srl]))
 			{
 				$args = new stdClass();
 				$args->module = $module;
 				$args->module_srl = $module_srl;
 				$output = executeQuery('module.getModulePartConfig', $args);
-				if($output->data->config) $config = unserialize($output->data->config);
+				if ($output->data->config) $config = unserialize($output->data->config);
 				else $config = null;
 
 				//insert in cache
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $config);
 				}
@@ -1443,11 +1443,11 @@ 
 	{
 		$args = new stdClass();
 		$args->module = $module;
-		if($site_srl) $args->site_srl = $site_srl;
+		if ($site_srl) $args->site_srl = $site_srl;
 		$output = executeQueryArray('module.getModulePartConfigs', $args);
-		if(!$output->toBool() || !$output->data) return array();
+		if (!$output->toBool() || !$output->data) return array();
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$result[$val->module_srl] = unserialize($val->config);
 		}
@@ -1463,12 +1463,12 @@ 
 		$args->moduleCategorySrl = $moduleCategorySrl;
 		// Get data from the DB
 		$output = executeQuery('module.getModuleCategories', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		$list = $output->data;
-		if(!$list) return;
-		if(!is_array($list)) $list = array($list);
+		if (!$list) return;
+		if (!is_array($list)) $list = array($list);
 
-		foreach($list as $val)
+		foreach ($list as $val)
 		{
 			$category_list[$val->module_category_srl] = $val;
 		}
@@ -1484,7 +1484,7 @@ 
 		$args = new stdClass;
 		$args->module_category_srl = $module_category_srl;
 		$output = executeQuery('module.getModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		return $output->data;
 	}
 
@@ -1496,10 +1496,10 @@ 
 		// Get a list of downloaded and installed modules
 		$searched_list = FileHandler::readDir('./modules');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 		sort($searched_list);
 
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// Module name
 			$module_name = $searched_list[$i];
@@ -1509,7 +1509,7 @@ 
 			$info = $this->getModuleInfoXml($module_name);
 			unset($obj);
 
-			if(!isset($info)) continue;
+			if (!isset($info)) continue;
 			$info->module = $module_name;
 			$info->created_table_count = $created_table_count;
 			$info->table_count = $table_count;
@@ -1526,19 +1526,19 @@ 
 		$info = null;
 
 		$moduledir = ModuleHandler::getModulePath($module_name);
-		if(file_exists(FileHandler::getRealPath($moduledir."schemas")))
+		if (file_exists(FileHandler::getRealPath($moduledir . "schemas")))
 		{
-			$tmp_files = FileHandler::readDir($moduledir."schemas", '/(\.xml)$/');
+			$tmp_files = FileHandler::readDir($moduledir . "schemas", '/(\.xml)$/');
 			$table_count = count($tmp_files);
 			// Check if the table is created
 			$created_table_count = 0;
-			for($j=0;$j<count($tmp_files);$j++)
+			for ($j = 0; $j < count($tmp_files); $j++)
 			{
-				list($table_name) = explode(".",$tmp_files[$j]);
-				if($oDB->isTableExists($table_name)) $created_table_count ++;
+				list($table_name) = explode(".", $tmp_files[$j]);
+				if ($oDB->isTableExists($table_name)) $created_table_count++;
 			}
 			// Check if DB is installed
-			if($table_count > $created_table_count) return true;
+			if ($table_count > $created_table_count) return true;
 			else return false;
 		}
 		return false;
@@ -1548,7 +1548,7 @@ 
 	{
 		// Check if it is upgraded to module.class.php on each module
 		$oDummy = getModule($module_name, 'class');
-		if($oDummy && method_exists($oDummy, "checkUpdate"))
+		if ($oDummy && method_exists($oDummy, "checkUpdate"))
 		{
 			return $oDummy->checkUpdate();
 		}
@@ -1567,31 +1567,31 @@ 
 		sort($searched_list);
 
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// module name
 			$module_name = $searched_list[$i];
 
 			$path = ModuleHandler::getModulePath($module_name);
-			if(!is_dir(FileHandler::getRealPath($path))) continue;
+			if (!is_dir(FileHandler::getRealPath($path))) continue;
 
 			// Get the number of xml files to create a table in schemas
-			$tmp_files = FileHandler::readDir($path.'schemas', '/(\.xml)$/');
+			$tmp_files = FileHandler::readDir($path . 'schemas', '/(\.xml)$/');
 			$table_count = count($tmp_files);
 			// Check if the table is created
 			$created_table_count = 0;
-			for($j=0;$j<$table_count;$j++)
+			for ($j = 0; $j < $table_count; $j++)
 			{
-				list($table_name) = explode('.',$tmp_files[$j]);
-				if($oDB->isTableExists($table_name)) $created_table_count ++;
+				list($table_name) = explode('.', $tmp_files[$j]);
+				if ($oDB->isTableExists($table_name)) $created_table_count++;
 			}
 			// Get information of the module
 			$info = NULL;
 			$info = $this->getModuleInfoXml($module_name);
 
-			if(!$info) continue;
+			if (!$info) continue;
 
 			$info->module = $module_name;
 			$info->category = $info->category;
@@ -1600,12 +1600,12 @@ 
 			$info->path = $path;
 			$info->admin_index_act = $info->admin_index_act;
 			// Check if DB is installed
-			if($table_count > $created_table_count) $info->need_install = true;
+			if ($table_count > $created_table_count) $info->need_install = true;
 			else $info->need_install = false;
 			// Check if it is upgraded to module.class.php on each module
 			$oDummy = null;
 			$oDummy = getModule($module_name, 'class');
-			if($oDummy && method_exists($oDummy, "checkUpdate"))
+			if ($oDummy && method_exists($oDummy, "checkUpdate"))
 			{
 				$info->need_update = $oDummy->checkUpdate();
 			}
@@ -1626,15 +1626,15 @@ 
 	 */
 	function syncModuleToSite(&$data)
 	{
-		if(!$data) return;
+		if (!$data) return;
 
-		if(is_array($data))
+		if (is_array($data))
 		{
-			foreach($data as $key => $val)
+			foreach ($data as $key => $val)
 			{
 				$module_srls[] = $val->module_srl;
 			}
-			if(!count($module_srls)) return;
+			if (!count($module_srls)) return;
 		}
 		else
 		{
@@ -1642,17 +1642,17 @@ 
 		}
 
 		$args = new stdClass();
-		$args->module_srls = implode(',',$module_srls);
+		$args->module_srls = implode(',', $module_srls);
 		$output = executeQueryArray('module.getModuleSites', $args);
-		if(!$output->data) return array();
-		foreach($output->data as $key => $val)
+		if (!$output->data) return array();
+		foreach ($output->data as $key => $val)
 		{
 			$modules[$val->module_srl] = $val;
 		}
 
-		if(is_array($data))
+		if (is_array($data))
 		{
-			foreach($data as $key => $val)
+			foreach ($data as $key => $val)
 			{
 				$data[$key]->domain = $modules[$val->module_srl]->domain;
 			}
@@ -1668,14 +1668,14 @@ 
 	 */
 	function isSiteAdmin($member_info, $site_srl = null)
 	{
-		if(!$member_info->member_srl) return false;
-		if($member_info->is_admin == 'Y') return true;
+		if (!$member_info->member_srl) return false;
+		if ($member_info->is_admin == 'Y') return true;
 
 		$args = new stdClass();
-		if(!isset($site_srl))
+		if (!isset($site_srl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			if(!$site_module_info) return;
+			if (!$site_module_info) return;
 			$args->site_srl = $site_module_info->site_srl;
 		}
 		else
@@ -1685,7 +1685,7 @@ 
 
 		$args->member_srl = $member_info->member_srl;
 		$output = executeQuery('module.isSiteAdmin', $args);
-		if($output->data->member_srl == $args->member_srl) return true;
+		if ($output->data->member_srl == $args->member_srl) return true;
 		return false;
 	}
 
@@ -1708,7 +1708,7 @@ 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
 		$output = executeQueryArray('module.getAdminID', $obj);
-		if(!$output->toBool() || !$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 
 		return $output->data;
 	}
@@ -1721,20 +1721,20 @@ 
 	{
 		$extra_vars = array();
 		$get_module_srls = array();
-		if(!is_array($list_module_srl)) $list_module_srl = array($list_module_srl);
+		if (!is_array($list_module_srl)) $list_module_srl = array($list_module_srl);
 
 		$vars = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			foreach($list_module_srl as $module_srl)
+			foreach ($list_module_srl as $module_srl)
 			{
-				$object_key = 'module_extra_vars:'.$module_srl;
+				$object_key = 'module_extra_vars:' . $module_srl;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$vars = $oCacheHandler->get($cache_key);
 
-				if($vars)
+				if ($vars)
 				{
 					$extra_vars[$module_srl] = $vars;
 				}
@@ -1749,37 +1749,37 @@ 
 			$get_module_srls = $list_module_srl;
 		}
 
-		if(count($get_module_srls) > 0)
+		if (count($get_module_srls) > 0)
 		{
 			$args = new stdClass();
 			$args->module_srl = implode(',', $get_module_srls);
 			$output = executeQueryArray('module.getModuleExtraVars', $args);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return;
 			}
 
-			if(!$output->data)
+			if (!$output->data)
 			{
-				foreach($get_module_srls as $module_srl)
+				foreach ($get_module_srls as $module_srl)
 				{
 					$extra_vars[$module_srl] = new stdClass;
 				}
 			}
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if(in_array($val->name, array('mid','module')) || $val->value == 'Array') continue;
+				if (in_array($val->name, array('mid', 'module')) || $val->value == 'Array') continue;
 
-				if(!isset($extra_vars[$val->module_srl]))
+				if (!isset($extra_vars[$val->module_srl]))
 				{
 					$extra_vars[$val->module_srl] = new stdClass();
 				}
 				$extra_vars[$val->module_srl]->{$val->name} = $val->value;
 
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
-					$object_key = 'module_extra_vars:'.$val->module_srl;
+					$object_key = 'module_extra_vars:' . $val->module_srl;
 					$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 					$oCacheHandler->put($cache_key, $extra_vars[$val->module_srl]);
 				}
@@ -1796,27 +1796,27 @@ 
 	{
 		$skin_vars = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_skin_vars:'.$module_srl;
+			$object_key = 'module_skin_vars:' . $module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$skin_vars = $oCacheHandler->get($cache_key);
 		}
 
-		if($skin_vars === false)
+		if ($skin_vars === false)
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
-			$output = executeQueryArray('module.getModuleSkinVars',$args);
-			if(!$output->toBool()) return;
+			$output = executeQueryArray('module.getModuleSkinVars', $args);
+			if (!$output->toBool()) return;
 
 			$skin_vars = array();
-			foreach($output->data as $vars)
+			foreach ($output->data as $vars)
 			{
 				$skin_vars[$vars->name] = $vars;
 			}
 
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
 		}
 
 		return $skin_vars;
@@ -1828,32 +1828,32 @@ 
 	function getModuleDefaultSkin($module_name, $skin_type = 'P', $site_srl = 0, $updateCache = true)
 	{
 		$target = ($skin_type == 'M') ? 'mskin' : 'skin';
-		if(!$site_srl) $site_srl = 0;
+		if (!$site_srl) $site_srl = 0;
 
-		$designInfoFile = sprintf(_XE_PATH_.'files/site_design/design_%s.php', $site_srl);
-		if(is_readable($designInfoFile))
+		$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $site_srl);
+		if (is_readable($designInfoFile))
 		{
 			include($designInfoFile);
 
 			$skinName = $designInfo->module->{$module_name}->{$target};
 		}
-		if(!$skinName)
+		if (!$skinName)
 		{
 			$dir = ($skin_type == 'M') ? 'm.skins/' : 'skins/';
-			$moduleSkinPath = ModuleHandler::getModulePath($module_name).$dir;
+			$moduleSkinPath = ModuleHandler::getModulePath($module_name) . $dir;
 
-			if(is_dir($moduleSkinPath.'default'))
+			if (is_dir($moduleSkinPath . 'default'))
 			{
 				$skinName = 'default';
 			}
-			else if(is_dir($moduleSkinPath.'xe_default'))
+			else if (is_dir($moduleSkinPath . 'xe_default'))
 			{
 				$skinName = 'xe_default';
 			}
 			else
 			{
 				$skins = FileHandler::readDir($moduleSkinPath);
-				if(count($skins) > 0)
+				if (count($skins) > 0)
 				{
 					$skinName = $skins[0];
 				}
@@ -1863,9 +1863,9 @@ 
 				}
 			}
 
-			if($updateCache && $skinName)
+			if ($updateCache && $skinName)
 			{
-				if(!isset($designInfo->module->{$module_name})) $designInfo->module->{$module_name} = new stdClass();
+				if (!isset($designInfo->module->{$module_name})) $designInfo->module->{$module_name} = new stdClass();
 				$designInfo->module->{$module_name}->{$target} = $skinName;
 
 				$oAdminController = getAdminController('admin');
@@ -1881,10 +1881,10 @@ 
 	 */
 	function syncSkinInfoToModuleInfo(&$module_info)
 	{
-		if(!$module_info->module_srl) return;
+		if (!$module_info->module_srl) return;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$skin_vars = $this->getModuleMobileSkinVars($module_info->module_srl);
 		}
@@ -1893,11 +1893,11 @@ 
 			$skin_vars = $this->getModuleSkinVars($module_info->module_srl);
 		}
 
-		if(!$skin_vars) return;
+		if (!$skin_vars) return;
 
-		foreach($skin_vars as $name => $val)
+		foreach ($skin_vars as $name => $val)
 		{
-			if(isset($module_info->{$name})) continue;
+			if (isset($module_info->{$name})) continue;
 			$module_info->{$name} = $val->value;
 		}
 	}
@@ -1911,27 +1911,27 @@ 
 	{
 		$skin_vars = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_mobile_skin_vars:'.$module_srl;
+			$object_key = 'module_mobile_skin_vars:' . $module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$skin_vars = $oCacheHandler->get($cache_key);
 		}
 
-		if($skin_vars === false)
+		if ($skin_vars === false)
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
-			$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
-			if(!$output->toBool() || !$output->data) return;
+			$output = executeQueryArray('module.getModuleMobileSkinVars', $args);
+			if (!$output->toBool() || !$output->data) return;
 
 			$skin_vars = array();
-			foreach($output->data as $vars)
+			foreach ($output->data as $vars)
 			{
 				$skin_vars[$vars->name] = $vars;
 			}
 
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
 		}
 
 		return $skin_vars;
@@ -1943,32 +1943,32 @@ 
 	 */
 	function syncMobileSkinInfoToModuleInfo(&$module_info)
 	{
-		if(!$module_info->module_srl) return;
+		if (!$module_info->module_srl) return;
 		$skin_vars = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_mobile_skin_vars:'.$module_info->module_srl;
+			$object_key = 'module_mobile_skin_vars:' . $module_info->module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$skin_vars = $oCacheHandler->get($cache_key);
 		}
-		if($skin_vars === false)
+		if ($skin_vars === false)
 		{
 			$args = new stdClass;
 			$args->module_srl = $module_info->module_srl;
-			$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
-			if(!$output->toBool()) return;
+			$output = executeQueryArray('module.getModuleMobileSkinVars', $args);
+			if (!$output->toBool()) return;
 			$skin_vars = $output->data;
 
 			//insert in cache
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
 		}
-		if(!$skin_vars) return;
+		if (!$skin_vars) return;
 
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
-			if(isset($module_info->{$val->name})) continue;
+			if (isset($module_info->{$val->name})) continue;
 			$module_info->{$val->name} = $val->value;
 		}
 	}
@@ -1980,7 +1980,7 @@ 
 	{
 		$grant = new stdClass();
 
-		if(!$xml_info)
+		if (!$xml_info)
 		{
 			$module = $module_info->module;
 			$xml_info = $this->getModuleActionXml($module);
@@ -1988,9 +1988,9 @@ 
 		// Set variables to grant group permission
 		$module_srl = $module_info->module_srl;
 		$grant_info = $xml_info->grant;
-		if($member_info->member_srl)
+		if ($member_info->member_srl)
 		{
-			if(is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
+			if (is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
 			else $group_list = array();
 		}
 		else
@@ -1998,10 +1998,10 @@ 
 			$group_list = array();
 		}
 		// If module_srl doesn't exist(if unable to set permissions)
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$grant->access = true;
-			if($this->isSiteAdmin($member_info, $module_info->site_srl))
+			if ($this->isSiteAdmin($member_info, $module_info->site_srl))
 			{
 				$grant->access = $grant->manager = $grant->is_site_admin = true;
 			}
@@ -2012,23 +2012,23 @@ 
 		{
 			// If module_srl exists
 			// Get a type of granted permission
-			$grant->access = $grant->manager = $grant->is_site_admin = ($member_info->is_admin=='Y'||$this->isSiteAdmin($member_info, $module_info->site_srl))?true:false;
+			$grant->access = $grant->manager = $grant->is_site_admin = ($member_info->is_admin == 'Y' || $this->isSiteAdmin($member_info, $module_info->site_srl)) ? true : false;
 			$grant->is_admin = ($member_info->is_admin == 'Y') ? true : false;
 			// If a just logged-in member is, check if the member is a module administrator
-			if(!$grant->manager && $member_info->member_srl)
+			if (!$grant->manager && $member_info->member_srl)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->member_srl = $member_info->member_srl;
-				$output = executeQuery('module.getModuleAdmin',$args);
-				if($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = true;
+				$output = executeQuery('module.getModuleAdmin', $args);
+				if ($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = true;
 			}
 			// If not an administrator, get information from the DB and grant manager privilege.
-			if(!$grant->manager)
+			if (!$grant->manager)
 			{
 				$args = new stdClass();
 				// If planet, get permission settings from the planet home
-				if($module_info->module == 'planet')
+				if ($module_info->module == 'planet')
 				{
 					$output = executeQueryArray('module.getPlanetGrants', $args);
 				}
@@ -2041,37 +2041,37 @@ 
 
 				$grant_exists = $granted = array();
 
-				if($output->data)
+				if ($output->data)
 				{
 					// Arrange names and groups who has privileges
-					foreach($output->data as $val)
+					foreach ($output->data as $val)
 					{
 						$grant_exists[$val->name] = true;
-						if($granted[$val->name]) continue;
+						if ($granted[$val->name]) continue;
 						// Log-in member only
-						if($val->group_srl == -1)
+						if ($val->group_srl == -1)
 						{
 							$granted[$val->name] = true;
-							if($member_info->member_srl) $grant->{$val->name} = true;
+							if ($member_info->member_srl) $grant->{$val->name} = true;
 							// Site-joined member only
 						}
-						elseif($val->group_srl == -2)
+						elseif ($val->group_srl == -2)
 						{
 							$granted[$val->name] = true;
 							// Do not grant any permission for non-logged member
-							if(!$member_info->member_srl) $grant->{$val->name} = false;
+							if (!$member_info->member_srl) $grant->{$val->name} = false;
 							// Log-in member
 							else
 							{
 								$site_module_info = Context::get('site_module_info');
 								// Permission granted if no information of the currently connected site exists
-								if(!$site_module_info->site_srl) $grant->{$val->name} = true;
+								if (!$site_module_info->site_srl) $grant->{$val->name} = true;
 								// Permission is not granted if information of the currently connected site exists
-								elseif(count($group_list)) $grant->{$val->name} = true;
+								elseif (count($group_list)) $grant->{$val->name} = true;
 							}
 							// All of non-logged members
 						}
-						elseif($val->group_srl == 0)
+						elseif ($val->group_srl == 0)
 						{
 							$granted[$val->name] = true;
 							$grant->{$val->name} = true;
@@ -2079,7 +2079,7 @@ 
 						}
 						else
 						{
-							if($group_list && count($group_list) && in_array($val->group_srl, $group_list))
+							if ($group_list && count($group_list) && in_array($val->group_srl, $group_list))
 							{
 								$grant->{$val->name} = true;
 								$granted[$val->name] = true;
@@ -2088,29 +2088,29 @@ 
 					}
 				}
 				// Separate processing for the virtual group access
-				if(!$grant_exists['access']) $grant->access = true;
-				if(count($grant_info))
+				if (!$grant_exists['access']) $grant->access = true;
+				if (count($grant_info))
 				{
-					foreach($grant_info as  $grant_name => $grant_item)
+					foreach ($grant_info as  $grant_name => $grant_item)
 					{
-						if($grant_exists[$grant_name]) continue;
-						switch($grant_item->default)
+						if ($grant_exists[$grant_name]) continue;
+						switch ($grant_item->default)
 						{
 							case 'guest' :
 								$grant->{$grant_name} = true;
 								break;
 							case 'member' :
-								if($member_info->member_srl) $grant->{$grant_name} = true;
+								if ($member_info->member_srl) $grant->{$grant_name} = true;
 								else $grant->{$grant_name} = false;
 								break;
 							case 'site' :
 								$site_module_info = Context::get('site_module_info');
-								if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
+								if ($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
 								else $grant->{$grant_name} = false;
 								break;
 							case 'manager' :
 							case 'root' :
-								if($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
+								if ($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
 								else $grant->{$grant_name} = false;
 								break;
 						}
@@ -2118,12 +2118,12 @@ 
 				}
 			}
 			// Set true to grant all privileges if an administrator is
-			if($grant->manager)
+			if ($grant->manager)
 			{
 				$grant->access = true;
-				if(count($grant_info))
+				if (count($grant_info))
 				{
-					foreach($grant_info as $key => $val)
+					foreach ($grant_info as $key => $val)
 					{
 						$grant->{$key} = true;
 					}
@@ -2155,27 +2155,27 @@ 
 
 	function unserializeAttributes($module_filebox_list)
 	{
-		if(is_array($module_filebox_list->data))
+		if (is_array($module_filebox_list->data))
 		{
-			foreach($module_filebox_list->data as &$item)
+			foreach ($module_filebox_list->data as &$item)
 			{
-				if(empty($item->comment))
+				if (empty($item->comment))
 				{
 					continue;
 				}
 
 				$attributes = explode(';', $item->comment);
-				foreach($attributes as $attribute)
+				foreach ($attributes as $attribute)
 				{
 					$values = explode(':', $attribute);
-					if((count($values) % 2) ==1)
+					if ((count($values) % 2) == 1)
 					{
-						for($i=2;$i<count($values);$i++)
+						for ($i = 2; $i < count($values); $i++)
 						{
-							$values[1].=":".$values[$i];
+							$values[1] .= ":" . $values[$i];
 						}
 					}
-					$atts[$values[0]]=$values[1];
+					$atts[$values[0]] = $values[1];
 				}
 				$item->attributes = $atts;
 				unset($atts);
@@ -2187,16 +2187,16 @@ 
 	function getFileBoxListHtml()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
 		$link = parse_url($_SERVER["HTTP_REFERER"]);
-		$link_params = explode('&',$link['query']);
+		$link_params = explode('&', $link['query']);
 		foreach ($link_params as $param)
 		{
-			$param = explode("=",$param);
-			if($param[0] == 'selected_widget') $selected_widget = $param[1];
+			$param = explode("=", $param);
+			if ($param[0] == 'selected_widget') $selected_widget = $param[1];
 		}
 		$oWidgetModel = getModel('widget');
-		if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
+		if ($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
 		Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple);
 
 		$oModuleModel = getModel('module');
@@ -2219,17 +2219,17 @@ 
 
 	function getModuleFileBoxPath($module_filebox_srl)
 	{
-		return sprintf("./files/attach/filebox/%s",getNumberingPath($module_filebox_srl,3));
+		return sprintf("./files/attach/filebox/%s", getNumberingPath($module_filebox_srl, 3));
 	}
 
 	/**
 	 * @brief Return ruleset cache file path
 	 * @param module, act
 	 */
-	function getValidatorFilePath($module, $ruleset, $mid=null)
+	function getValidatorFilePath($module, $ruleset, $mid = null)
 	{
 		// load dynamic ruleset xml file
-		if(strpos($ruleset, '@') !== false)
+		if (strpos($ruleset, '@') !== false)
 		{
 			$rulsetFile = str_replace('@', '', $ruleset);
 			$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
@@ -2237,22 +2237,22 @@ 
 		}
 		else if (strpos($ruleset, '#') !== false)
 		{
-			$rulsetFile = str_replace('#', '', $ruleset).'.'.$mid;
+			$rulsetFile = str_replace('#', '', $ruleset) . '.' . $mid;
 			$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
-			if(is_readable($xml_file))
+			if (is_readable($xml_file))
 				return FileHandler::getRealPath($xml_file);
-			else{
+			else {
 				$ruleset = str_replace('#', '', $ruleset);
 			}
 
 		}
 		// Get a path of the requested module. Return if not exists.
 		$class_path = ModuleHandler::getModulePath($module);
-		if(!$class_path) return;
+		if (!$class_path) return;
 
 		// Check if module.xml exists in the path. Return if not exist
 		$xml_file = sprintf("%sruleset/%s.xml", $class_path, $ruleset);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 
 		return $xml_file;
 	}
@@ -2264,7 +2264,7 @@ 
 		$requestVars = Context::getRequestVars();
 
 		$args = new stdClass;
-		$args->site_srl = (int)$requestVars->site_srl;
+		$args->site_srl = (int) $requestVars->site_srl;
 		$args->page = 1; // /< Page
 		$args->list_count = 100; // /< the number of posts to display on a single page
 		$args->page_count = 5; // /< the number of pages that appear in the page navigation
@@ -2276,12 +2276,12 @@ 
 
 		$list = array();
 
-		if($output->toBool())
+		if ($output->toBool())
 		{
-			foreach((array)$output->data as $code_info)
+			foreach ((array) $output->data as $code_info)
 			{
 				unset($codeInfo);
-				$codeInfo = array('name'=>'$user_lang->'.$code_info->name, 'value'=>$code_info->value);
+				$codeInfo = array('name'=>'$user_lang->' . $code_info->name, 'value'=>$code_info->value);
 				$list[] = $codeInfo;
 			}
 		}

Braces +457 added lines, -203 removed lines

@@ -19,26 +19,34 @@ 
 	 */
 	function isIDExists($id, $site_srl = 0)
 	{
-		if(!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i',$id)) return true;
+		if(!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i',$id)) {
+			return true;
+		}
 		// directory and rss/atom/api reserved checking, etc.
 		$dirs = FileHandler::readDir(_XE_PATH_);
 		$dirs[] = 'rss';
 		$dirs[] = 'atom';
 		$dirs[] = 'api';
-		if(in_array($id, $dirs)) return true;
+		if(in_array($id, $dirs)) {
+			return true;
+		}
 		// mid test
 		$args = new stdClass();
 		$args->mid = $id;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('module.isExistsModuleName', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		// vid test (check mid != vid if site_srl=0, which means it is not a virtual site)
 		if(!$site_srl)
 		{
 			$site_args = new stdClass();
 			$site_args->domain = $id;
 			$output = executeQuery('module.isExistsSiteDomain', $site_args);
-			if($output->data->count) return true;
+			if($output->data->count) {
+				return true;
+			}
 		}
 
 		return false;
@@ -82,10 +90,14 @@ 
 	function getDefaultMid()
 	{
 		$default_url = Context::getDefaultUrl();
-		if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+		if($default_url && substr_compare($default_url, '/', -1) === 0) {
+			$default_url = substr($default_url, 0, -1);
+		}
 
 		$request_url = Context::getRequestUri();
-		if($request_url && substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1);
+		if($request_url && substr_compare($request_url, '/', -1) === 0) {
+			$request_url = substr($request_url, 0, -1);
+		}
 
 		$default_url_parse = parse_url($default_url);
 		$request_url_parse = parse_url($request_url);
@@ -100,14 +112,18 @@ 
 			$url_info = parse_url($request_url);
 			$hostname = $url_info['host'];
 			$path = $url_info['path'];
-			if(strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) $path = substr($path, 0, -1);
+			if(strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) {
+				$path = substr($path, 0, -1);
+			}
 
 			$domain = sprintf('%s%s%s', $hostname, $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$path);
 		}
 
 		if($domain === '')
 		{
-			if(!$vid) $vid = $mid;
+			if(!$vid) {
+				$vid = $mid;
+			}
 			if($vid)
 			{
 				$domain = $vid;
@@ -133,13 +149,17 @@ 
 				$output = executeQuery('module.getSiteInfoByDomain', $args);
 				$site_info = $output->data;
 
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($domain_cache_key, $site_info);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($domain_cache_key, $site_info);
+				}
 			}
 
 			if($site_info && $vid)
 			{
 				Context::set('vid', $site_info->domain, true);
-				if(strtolower($mid)==strtolower($site_info->domain)) Context::set('mid', $site_info->mid,true);
+				if(strtolower($mid)==strtolower($site_info->domain)) {
+					Context::set('mid', $site_info->mid,true);
+				}
 			}
 			if(!$site_info || !$site_info->domain) { $domain = ''; unset($site_info); }
 		}
@@ -165,8 +185,12 @@ 
 				{
 					// Create a table if sites table doesn't exist
 					$oDB = &DB::getInstance();
-					if(!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
-					if(!$oDB->isTableExists('sites')) return;
+					if(!$oDB->isTableExists('sites')) {
+						$oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
+					}
+					if(!$oDB->isTableExists('sites')) {
+						return;
+					}
 
 					// Get mid, language
 					$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
@@ -184,21 +208,28 @@ 
 					if($output->data && !$output->data->index_module_srl)
 					{
 						$output = executeQuery('module.updateSite', $site_args);
-					}
-					else
+					} else
 					{
 						$output = executeQuery('module.insertSite', $site_args);
-						if(!$output->toBool()) return $output;
+						if(!$output->toBool()) {
+							return $output;
+						}
 					}
 					$output = executeQuery('module.getSiteInfo', $args);
 				}
 				$site_info = $output->data;
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($default_site_cache_key, $site_info);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($default_site_cache_key, $site_info);
+				}
 			}
 		}
 
-		if(!$site_info->module_srl) return $site_info;
-		if(is_array($site_info) && $site_info->data[0]) $site_info = $site_info[0];
+		if(!$site_info->module_srl) {
+			return $site_info;
+		}
+		if(is_array($site_info) && $site_info->data[0]) {
+			$site_info = $site_info[0];
+		}
 		return $this->addModuleExtraVars($site_info);
 	}
 
@@ -248,7 +279,9 @@ 
 		}
 
 		$this->applyDefaultSkin($module_info);
-		if(!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
+		if(!$module_info->module_srl && $module_info->data[0]) {
+			$module_info = $module_info->data[0];
+		}
 		return $this->addModuleExtraVars($module_info);
 	}
 
@@ -340,8 +373,7 @@ 
 				$object_key = 'mid_info:' . $output->data->module_srl;
 				$module_info_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$oCacheHandler->put($module_info_cache_key, $moduleInfo);
-			}
-			else
+			} else
 			{
 				$mid_info->designSettings = $moduleInfo->designSettings;
 				$moduleInfo = $mid_info;
@@ -382,11 +414,15 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.getMidInfo', $args);
-			if(!$output->toBool()) return;
+			if(!$output->toBool()) {
+				return;
+			}
 
 			$mid_info = $output->data;
 			$this->applyDefaultSkin($mid_info);
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $mid_info);
+			if($oCacheHandler->isSupport()) {
+				$oCacheHandler->put($cache_key, $mid_info);
+			}
 		}
 
 		if($mid_info && count($columnList))
@@ -399,11 +435,14 @@ 
 					$module_info->$key = $item;
 				}
 			}
+		} else {
+			$module_info = $mid_info;
 		}
-		else $module_info = $mid_info;
 
 		$oModuleController = getController('module');
-		if(isset($module_info->browser_title)) $oModuleController->replaceDefinedLangCode($module_info->browser_title);
+		if(isset($module_info->browser_title)) {
+			$oModuleController->replaceDefinedLangCode($module_info->browser_title);
+		}
 
 		$this->applyDefaultSkin($module_info);
 		return $this->addModuleExtraVars($module_info);
@@ -451,11 +490,15 @@ 
 	 */
 	function getModulesInfo($module_srls, $columnList = array())
 	{
-		if(is_array($module_srls)) $module_srls = implode(',',$module_srls);
+		if(is_array($module_srls)) {
+			$module_srls = implode(',',$module_srls);
+		}
 		$args = new stdClass();
 		$args->module_srls = $module_srls;
 		$output = executeQueryArray('module.getModulesInfo', $args, $columnList);
-		if(!$output->toBool()) return;
+		if(!$output->toBool()) {
+			return;
+		}
 		return $this->addModuleExtraVars($output->data);
 	}
 
@@ -465,31 +508,44 @@ 
 	function addModuleExtraVars($module_info)
 	{
 		// Process although one or more module informaion is requested
-		if(!is_array($module_info)) $target_module_info = array($module_info);
-		else $target_module_info = $module_info;
+		if(!is_array($module_info)) {
+			$target_module_info = array($module_info);
+		} else {
+			$target_module_info = $module_info;
+		}
 		// Get module_srl
 		$module_srls = array();
 		foreach($target_module_info as $key => $val)
 		{
 			$module_srl = $val->module_srl;
-			if(!$module_srl) continue;
+			if(!$module_srl) {
+				continue;
+			}
 			$module_srls[] = $val->module_srl;
 		}
 		// Extract extra information of the module and skin
 		$extra_vars = $this->getModuleExtraVars($module_srls);
-		if(!count($module_srls) || !count($extra_vars)) return $module_info;
+		if(!count($module_srls) || !count($extra_vars)) {
+			return $module_info;
+		}
 
 		foreach($target_module_info as $key => $val)
 		{
-			if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
+			if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) {
+				continue;
+			}
 			foreach($extra_vars[$val->module_srl] as $k => $v)
 			{
-				if($target_module_info[$key]->{$k}) continue;
+				if($target_module_info[$key]->{$k}) {
+					continue;
+				}
 				$target_module_info[$key]->{$k} = $v;
 			}
 		}
 
-		if(is_array($module_info)) return $target_module_info;
+		if(is_array($module_info)) {
+			return $target_module_info;
+		}
 		return $target_module_info[0];
 	}
 
@@ -518,7 +574,9 @@ 
 			}
 
 			$output = executeQuery('module.getMidList', $args, $columnList);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$list = $output->data;
 
 			if($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
@@ -526,9 +584,13 @@ 
 				$oCacheHandler->put($cache_key, $list);
 			}
 		}
-		if(!$list) return;
+		if(!$list) {
+			return;
+		}
 
-		if(!is_array($list)) $list = array($list);
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 
 		foreach($list as $val)
 		{
@@ -544,10 +606,14 @@ 
 	function getModuleSrlList($args = null, $columnList = array())
 	{
 		$output = executeQueryArray('module.getMidList', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$list = $output->data;
-		if(!$list) return;
+		if(!$list) {
+			return;
+		}
 
 		return $list;
 	}
@@ -557,20 +623,32 @@ 
 	 */
 	function getModuleSrlByMid($mid)
 	{
-		if($mid && !is_array($mid)) $mid = explode(',',$mid);
-		if(is_array($mid)) $mid = "'".implode("','",$mid)."'";
+		if($mid && !is_array($mid)) {
+			$mid = explode(',',$mid);
+		}
+		if(is_array($mid)) {
+			$mid = "'".implode("','",$mid)."'";
+		}
 
 		$site_module_info = Context::get('site_module_info');
 
 		$args = new stdClass;
 		$args->mid = $mid;
-		if($site_module_info) $args->site_srl = $site_module_info->site_srl;
+		if($site_module_info) {
+			$args->site_srl = $site_module_info->site_srl;
+		}
 		$output = executeQuery('module.getModuleSrlByMid', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$list = $output->data;
-		if(!$list) return;
-		if(!is_array($list)) $list = array($list);
+		if(!$list) {
+			return;
+		}
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 
 		foreach($list as $key => $val)
 		{
@@ -599,8 +677,12 @@ 
 		{
 			$args = new stdClass();
 			$output = executeQueryArray('module.getActionForward',$args);
-			if(!$output->toBool()) return new stdClass;
-			if(!$output->data) $output->data = array();
+			if(!$output->toBool()) {
+				return new stdClass;
+			}
+			if(!$output->data) {
+				$output->data = array();
+			}
 
 			$action_forward = array();
 			foreach($output->data as $item)
@@ -617,8 +699,7 @@ 
 		if($action_forward[$act])
 		{
 			return $action_forward[$act];
-		}
-		else
+		} else
 		{
 			return new stdClass();
 		}
@@ -726,8 +807,7 @@ 
 			if(file_exists($cache_file))
 			{
 				$GLOBALS['__MODULE_EXTEND__'] = include($cache_file);
-			}
-			else
+			} else
 			{
 				$GLOBALS['__MODULE_EXTEND__'] = array();
 			}
@@ -743,16 +823,22 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$module_path = ModuleHandler::getModulePath($module);
-		if(!$module_path) return;
+		if(!$module_path) {
+			return;
+		}
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%s/conf/info.xml", $module_path);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->module;
 
-		if(!$xml_obj) return;
+		if(!$xml_obj) {
+			return;
+		}
 
 		// Module Information
 		$module_info = new stdClass();
@@ -764,14 +850,19 @@ 
 			$module_info->version = $xml_obj->version->body;
 			$module_info->homepage = $xml_obj->link->body;
 			$module_info->category = $xml_obj->category->body;
-			if(!$module_info->category) $module_info->category = 'service';
+			if(!$module_info->category) {
+				$module_info->category = 'service';
+			}
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->license = $xml_obj->license->body;
 			$module_info->license_link = $xml_obj->license->attrs->link;
 
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
+			if(!is_array($xml_obj->author)) {
+				$author_list[] = $xml_obj->author;
+			} else {
+				$author_list = $xml_obj->author;
+			}
 
 			foreach($author_list as $author)
 			{
@@ -781,15 +872,16 @@ 
 				$author_obj->homepage = $author->attrs->link;
 				$module_info->author[] = $author_obj;
 			}
-		}
-		else
+		} else
 		{
 			// module format 0.1
 			$module_info->title = $xml_obj->title->body;
 			$module_info->description = $xml_obj->author->description->body;
 			$module_info->version = $xml_obj->attrs->version;
 			$module_info->category = $xml_obj->attrs->category;
-			if(!$module_info->category) $module_info->category = 'service';
+			if(!$module_info->category) {
+				$module_info->category = 'service';
+			}
 			sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$author_obj = new stdClass();
@@ -818,11 +910,15 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$class_path = ModuleHandler::getModulePath($module);
-		if(!$class_path) return;
+		if(!$class_path) {
+			return;
+		}
 
 		// Check if module.xml exists in the path. Return if not exist
 		$xml_file = sprintf("%sconf/module.xml", $class_path);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 
 		// Check if cached file exists
 		$cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
@@ -841,7 +937,10 @@ 
 
 			$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
 
-			if(!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
+			if(!count($xml_obj->module)) {
+				return;
+			}
+			// /< Error occurs if module tag doesn't included in the xml
 
 			$grants = $xml_obj->module->grants->grant; // /< Permission information
 			$permissions = $xml_obj->module->permissions->permission; // /<  Acting permission
@@ -853,8 +952,11 @@ 
 			// Arrange permission information
 			if($grants)
 			{
-				if(is_array($grants)) $grant_list = $grants;
-				else $grant_list[] = $grants;
+				if(is_array($grants)) {
+					$grant_list = $grants;
+				} else {
+					$grant_list[] = $grants;
+				}
 
 				$info->grant = new stdClass();
 				$buff[] = '$info->grant = new stdClass;';
@@ -876,8 +978,11 @@ 
 			// Permissions to grant
 			if($permissions)
 			{
-				if(is_array($permissions)) $permission_list = $permissions;
-				else $permission_list[] = $permissions;
+				if(is_array($permissions)) {
+					$permission_list = $permissions;
+				} else {
+					$permission_list[] = $permissions;
+				}
 
 				$buff[] = '$info->permission = new stdClass;';
 
@@ -895,8 +1000,11 @@ 
 			// for admin menus
 			if($menus)
 			{
-				if(is_array($menus)) $menu_list = $menus;
-				else $menu_list[] = $menus;
+				if(is_array($menus)) {
+					$menu_list = $menus;
+				} else {
+					$menu_list[] = $menus;
+				}
 
 				$buff[] = '$info->menu = new stdClass;';
 				$info->menu = new stdClass();
@@ -920,8 +1028,11 @@ 
 			// actions
 			if($actions)
 			{
-				if(is_array($actions)) $action_list = $actions;
-				else $action_list[] = $actions;
+				if(is_array($actions)) {
+					$action_list = $actions;
+				} else {
+					$action_list[] = $actions;
+				}
 
 				$buff[] = '$info->action = new stdClass;';
 				$info->action = new stdClass();
@@ -1007,7 +1118,9 @@ 
 			return $info;
 		}
 
-		if(file_exists($cache_file)) return include($cache_file);
+		if(file_exists($cache_file)) {
+			return include($cache_file);
+		}
 	}
 
 	/**
@@ -1045,7 +1158,9 @@ 
 
 		$skin_path = sprintf("%s/%s/", $path, $dir);
 		$list = FileHandler::readDir($skin_path);
-		if(!count($list)) return;
+		if(!count($list)) {
+			return;
+		}
 
 		natcasesort($list);
 
@@ -1099,8 +1214,7 @@ 
 			if($dir == 'skins')
 			{
 				$type = 'P';
-			}
-			else
+			} else
 			{
 				$type = 'M';
 			}
@@ -1128,14 +1242,20 @@ 
 	function loadSkinInfo($path, $skin, $dir = 'skins')
 	{
 		// Read xml file having skin information
-		if(substr($path,-1)!='/') $path .= '/';
+		if(substr($path,-1)!='/') {
+			$path .= '/';
+		}
 		$skin_xml_file = sprintf("%s%s/%s/skin.xml", $path, $dir, $skin);
-		if(!file_exists($skin_xml_file)) return;
+		if(!file_exists($skin_xml_file)) {
+			return;
+		}
 		// Create XmlParser object
 		$oXmlParser = new XmlParser();
 		$_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
 		// Return if no skin information is
-		if(!$_xml_obj->skin) return;
+		if(!$_xml_obj->skin) {
+			return;
+		}
 		$xml_obj = $_xml_obj->skin;
 		// Skin Name
 		$skin_info = new stdClass();
@@ -1152,8 +1272,11 @@ 
 			$skin_info->license_link = $xml_obj->license->attrs->link;
 			$skin_info->description = $xml_obj->description->body;
 
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
+			if(!is_array($xml_obj->author)) {
+				$author_list[] = $xml_obj->author;
+			} else {
+				$author_list = $xml_obj->author;
+			}
 
 			foreach($author_list as $author)
 			{
@@ -1167,8 +1290,12 @@ 
 			if($xml_obj->extra_vars)
 			{
 				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-				if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+				if(!$extra_var_groups) {
+					$extra_var_groups = $xml_obj->extra_vars;
+				}
+				if(!is_array($extra_var_groups)) {
+					$extra_var_groups = array($extra_var_groups);
+				}
 
 				foreach($extra_var_groups as $group)
 				{
@@ -1177,7 +1304,9 @@ 
 					{
 						continue;
 					}
-					if(!is_array($group->var)) $extra_vars = array($group->var);
+					if(!is_array($group->var)) {
+						$extra_vars = array($group->var);
+					}
 
 					foreach($extra_vars as $key => $val)
 					{
@@ -1204,8 +1333,7 @@ 
 								$obj->options[$i]->title = $val->options[$i]->title->body;
 								$obj->options[$i]->value = $val->options[$i]->attrs->value;
 							}
-						}
-						else
+						} else
 						{
 							$obj->options[0] = new stdClass();
 							$obj->options[0]->title = $val->options->title->body;
@@ -1216,8 +1344,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			// skin format v0.1
 			sscanf($xml_obj->maker->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -1235,8 +1362,12 @@ 
 			$skin_info->author[0]->homepage = $xml_obj->maker->attrs->link;
 			// Variables used in the skin
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if(!$extra_var_groups) {
+				$extra_var_groups = $xml_obj->extra_vars;
+			}
+			if(!is_array($extra_var_groups)) {
+				$extra_var_groups = array($extra_var_groups);
+			}
 
 			foreach($extra_var_groups as $group)
 			{
@@ -1244,7 +1375,9 @@ 
 
 				if($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if(!is_array($extra_vars)) {
+						$extra_vars = array($extra_vars);
+					}
 
 					foreach($extra_vars as $var)
 					{
@@ -1266,8 +1399,7 @@ 
 								$options[$i]->title = $var->default[$i]->body;
 								$options[$i]->value = $var->default[$i]->body;
 							}
-						}
-						else
+						} else
 						{
 							$options[0]->title = $var->default->body;
 							$options[0]->value = $var->default->body;
@@ -1297,7 +1429,9 @@ 
 		$colorset = $xml_obj->colorset->color;
 		if($colorset)
 		{
-			if(!is_array($colorset)) $colorset = array($colorset);
+			if(!is_array($colorset)) {
+				$colorset = array($colorset);
+			}
 
 			foreach($colorset as $color)
 			{
@@ -1307,9 +1441,12 @@ 
 				if($screenshot)
 				{
 					$screenshot = sprintf("%s%s/%s/%s", $path, $dir, $skin, $screenshot);
-					if(!file_exists($screenshot)) $screenshot = "";
+					if(!file_exists($screenshot)) {
+						$screenshot = "";
+					}
+				} else {
+					$screenshot = "";
 				}
-				else $screenshot = "";
 
 				$obj = new stdClass();
 				$obj->name = $name;
@@ -1322,7 +1459,9 @@ 
 		if($xml_obj->menus->menu)
 		{
 			$menus = $xml_obj->menus->menu;
-			if(!is_array($menus)) $menus = array($menus);
+			if(!is_array($menus)) {
+				$menus = array($menus);
+			}
 
 			$menu_count = count($menus);
 			$skin_info->menu_count = $menu_count;
@@ -1331,7 +1470,9 @@ 
 				unset($obj);
 
 				$obj->name = $menus[$i]->attrs->name;
-				if($menus[$i]->attrs->default == "true") $obj->default = true;
+				if($menus[$i]->attrs->default == "true") {
+					$obj->default = true;
+				}
 				$obj->title = $menus[$i]->title->body;
 				$obj->maxdepth = $menus[$i]->maxdepth->body;
 
@@ -1351,7 +1492,9 @@ 
 	{
 		$args = new stdClass;
 		$args->site_srl = $site_srl;
-		if(!is_null($module)) $args->module = $module;
+		if(!is_null($module)) {
+			$args->module = $module;
+		}
 		$output = executeQuery('module.getModuleCount', $args);
 		return $output->data->count;
 	}
@@ -1380,8 +1523,11 @@ 
 				$args->module = $module;
 				$args->site_srl = $site_srl;
 				$output = executeQuery('module.getModuleConfig', $args);
-				if($output->data->config) $config = unserialize($output->data->config);
-				else $config = new stdClass();
+				if($output->data->config) {
+					$config = unserialize($output->data->config);
+				} else {
+					$config = new stdClass();
+				}
 
 				//insert in cache
 				if($oCacheHandler->isSupport())
@@ -1420,8 +1566,11 @@ 
 				$args->module = $module;
 				$args->module_srl = $module_srl;
 				$output = executeQuery('module.getModulePartConfig', $args);
-				if($output->data->config) $config = unserialize($output->data->config);
-				else $config = null;
+				if($output->data->config) {
+					$config = unserialize($output->data->config);
+				} else {
+					$config = null;
+				}
 
 				//insert in cache
 				if($oCacheHandler->isSupport())
@@ -1443,9 +1592,13 @@ 
 	{
 		$args = new stdClass();
 		$args->module = $module;
-		if($site_srl) $args->site_srl = $site_srl;
+		if($site_srl) {
+			$args->site_srl = $site_srl;
+		}
 		$output = executeQueryArray('module.getModulePartConfigs', $args);
-		if(!$output->toBool() || !$output->data) return array();
+		if(!$output->toBool() || !$output->data) {
+			return array();
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -1463,10 +1616,16 @@ 
 		$args->moduleCategorySrl = $moduleCategorySrl;
 		// Get data from the DB
 		$output = executeQuery('module.getModuleCategories', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		$list = $output->data;
-		if(!$list) return;
-		if(!is_array($list)) $list = array($list);
+		if(!$list) {
+			return;
+		}
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 
 		foreach($list as $val)
 		{
@@ -1484,7 +1643,9 @@ 
 		$args = new stdClass;
 		$args->module_category_srl = $module_category_srl;
 		$output = executeQuery('module.getModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		return $output->data;
 	}
 
@@ -1496,7 +1657,9 @@ 
 		// Get a list of downloaded and installed modules
 		$searched_list = FileHandler::readDir('./modules');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 		sort($searched_list);
 
 		for($i=0;$i<$searched_count;$i++)
@@ -1509,7 +1672,9 @@ 
 			$info = $this->getModuleInfoXml($module_name);
 			unset($obj);
 
-			if(!isset($info)) continue;
+			if(!isset($info)) {
+				continue;
+			}
 			$info->module = $module_name;
 			$info->created_table_count = $created_table_count;
 			$info->table_count = $table_count;
@@ -1535,11 +1700,16 @@ 
 			for($j=0;$j<count($tmp_files);$j++)
 			{
 				list($table_name) = explode(".",$tmp_files[$j]);
-				if($oDB->isTableExists($table_name)) $created_table_count ++;
+				if($oDB->isTableExists($table_name)) {
+					$created_table_count ++;
+				}
 			}
 			// Check if DB is installed
-			if($table_count > $created_table_count) return true;
-			else return false;
+			if($table_count > $created_table_count) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -1567,7 +1737,9 @@ 
 		sort($searched_list);
 
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 
 		for($i=0;$i<$searched_count;$i++)
 		{
@@ -1575,7 +1747,9 @@ 
 			$module_name = $searched_list[$i];
 
 			$path = ModuleHandler::getModulePath($module_name);
-			if(!is_dir(FileHandler::getRealPath($path))) continue;
+			if(!is_dir(FileHandler::getRealPath($path))) {
+				continue;
+			}
 
 			// Get the number of xml files to create a table in schemas
 			$tmp_files = FileHandler::readDir($path.'schemas', '/(\.xml)$/');
@@ -1585,13 +1759,17 @@ 
 			for($j=0;$j<$table_count;$j++)
 			{
 				list($table_name) = explode('.',$tmp_files[$j]);
-				if($oDB->isTableExists($table_name)) $created_table_count ++;
+				if($oDB->isTableExists($table_name)) {
+					$created_table_count ++;
+				}
 			}
 			// Get information of the module
 			$info = NULL;
 			$info = $this->getModuleInfoXml($module_name);
 
-			if(!$info) continue;
+			if(!$info) {
+				continue;
+			}
 
 			$info->module = $module_name;
 			$info->category = $info->category;
@@ -1600,16 +1778,18 @@ 
 			$info->path = $path;
 			$info->admin_index_act = $info->admin_index_act;
 			// Check if DB is installed
-			if($table_count > $created_table_count) $info->need_install = true;
-			else $info->need_install = false;
+			if($table_count > $created_table_count) {
+				$info->need_install = true;
+			} else {
+				$info->need_install = false;
+			}
 			// Check if it is upgraded to module.class.php on each module
 			$oDummy = null;
 			$oDummy = getModule($module_name, 'class');
 			if($oDummy && method_exists($oDummy, "checkUpdate"))
 			{
 				$info->need_update = $oDummy->checkUpdate();
-			}
-			else
+			} else
 			{
 				continue;
 			}
@@ -1626,7 +1806,9 @@ 
 	 */
 	function syncModuleToSite(&$data)
 	{
-		if(!$data) return;
+		if(!$data) {
+			return;
+		}
 
 		if(is_array($data))
 		{
@@ -1634,9 +1816,10 @@ 
 			{
 				$module_srls[] = $val->module_srl;
 			}
-			if(!count($module_srls)) return;
-		}
-		else
+			if(!count($module_srls)) {
+				return;
+			}
+		} else
 		{
 			$module_srls[] = $data->module_srl;
 		}
@@ -1644,7 +1827,9 @@ 
 		$args = new stdClass();
 		$args->module_srls = implode(',',$module_srls);
 		$output = executeQueryArray('module.getModuleSites', $args);
-		if(!$output->data) return array();
+		if(!$output->data) {
+			return array();
+		}
 		foreach($output->data as $key => $val)
 		{
 			$modules[$val->module_srl] = $val;
@@ -1656,8 +1841,7 @@ 
 			{
 				$data[$key]->domain = $modules[$val->module_srl]->domain;
 			}
-		}
-		else
+		} else
 		{
 			$data->domain = $modules[$data->module_srl]->domain;
 		}
@@ -1668,24 +1852,31 @@ 
 	 */
 	function isSiteAdmin($member_info, $site_srl = null)
 	{
-		if(!$member_info->member_srl) return false;
-		if($member_info->is_admin == 'Y') return true;
+		if(!$member_info->member_srl) {
+			return false;
+		}
+		if($member_info->is_admin == 'Y') {
+			return true;
+		}
 
 		$args = new stdClass();
 		if(!isset($site_srl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			if(!$site_module_info) return;
+			if(!$site_module_info) {
+				return;
+			}
 			$args->site_srl = $site_module_info->site_srl;
-		}
-		else
+		} else
 		{
 			$args->site_srl = $site_srl;
 		}
 
 		$args->member_srl = $member_info->member_srl;
 		$output = executeQuery('module.isSiteAdmin', $args);
-		if($output->data->member_srl == $args->member_srl) return true;
+		if($output->data->member_srl == $args->member_srl) {
+			return true;
+		}
 		return false;
 	}
 
@@ -1708,7 +1899,9 @@ 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
 		$output = executeQueryArray('module.getAdminID', $obj);
-		if(!$output->toBool() || !$output->data) return;
+		if(!$output->toBool() || !$output->data) {
+			return;
+		}
 
 		return $output->data;
 	}
@@ -1721,7 +1914,9 @@ 
 	{
 		$extra_vars = array();
 		$get_module_srls = array();
-		if(!is_array($list_module_srl)) $list_module_srl = array($list_module_srl);
+		if(!is_array($list_module_srl)) {
+			$list_module_srl = array($list_module_srl);
+		}
 
 		$vars = false;
 		// cache controll
@@ -1737,14 +1932,12 @@ 
 				if($vars)
 				{
 					$extra_vars[$module_srl] = $vars;
-				}
-				else
+				} else
 				{
 					$get_module_srls[] = $module_srl;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$get_module_srls = $list_module_srl;
 		}
@@ -1769,7 +1962,9 @@ 
 			}
 			foreach($output->data as $key => $val)
 			{
-				if(in_array($val->name, array('mid','module')) || $val->value == 'Array') continue;
+				if(in_array($val->name, array('mid','module')) || $val->value == 'Array') {
+					continue;
+				}
 
 				if(!isset($extra_vars[$val->module_srl]))
 				{
@@ -1808,7 +2003,9 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQueryArray('module.getModuleSkinVars',$args);
-			if(!$output->toBool()) return;
+			if(!$output->toBool()) {
+				return;
+			}
 
 			$skin_vars = array();
 			foreach($output->data as $vars)
@@ -1816,7 +2013,9 @@ 
 				$skin_vars[$vars->name] = $vars;
 			}
 
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if($oCacheHandler->isSupport()) {
+				$oCacheHandler->put($cache_key, $skin_vars);
+			}
 		}
 
 		return $skin_vars;
@@ -1828,7 +2027,9 @@ 
 	function getModuleDefaultSkin($module_name, $skin_type = 'P', $site_srl = 0, $updateCache = true)
 	{
 		$target = ($skin_type == 'M') ? 'mskin' : 'skin';
-		if(!$site_srl) $site_srl = 0;
+		if(!$site_srl) {
+			$site_srl = 0;
+		}
 
 		$designInfoFile = sprintf(_XE_PATH_.'files/site_design/design_%s.php', $site_srl);
 		if(is_readable($designInfoFile))
@@ -1845,19 +2046,16 @@ 
 			if(is_dir($moduleSkinPath.'default'))
 			{
 				$skinName = 'default';
-			}
-			else if(is_dir($moduleSkinPath.'xe_default'))
+			} else if(is_dir($moduleSkinPath.'xe_default'))
 			{
 				$skinName = 'xe_default';
-			}
-			else
+			} else
 			{
 				$skins = FileHandler::readDir($moduleSkinPath);
 				if(count($skins) > 0)
 				{
 					$skinName = $skins[0];
-				}
-				else
+				} else
 				{
 					$skinName = NULL;
 				}
@@ -1865,7 +2063,9 @@ 
 
 			if($updateCache && $skinName)
 			{
-				if(!isset($designInfo->module->{$module_name})) $designInfo->module->{$module_name} = new stdClass();
+				if(!isset($designInfo->module->{$module_name})) {
+					$designInfo->module->{$module_name} = new stdClass();
+				}
 				$designInfo->module->{$module_name}->{$target} = $skinName;
 
 				$oAdminController = getAdminController('admin');
@@ -1881,23 +2081,28 @@ 
 	 */
 	function syncSkinInfoToModuleInfo(&$module_info)
 	{
-		if(!$module_info->module_srl) return;
+		if(!$module_info->module_srl) {
+			return;
+		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		if(Mobile::isFromMobilePhone())
 		{
 			$skin_vars = $this->getModuleMobileSkinVars($module_info->module_srl);
-		}
-		else
+		} else
 		{
 			$skin_vars = $this->getModuleSkinVars($module_info->module_srl);
 		}
 
-		if(!$skin_vars) return;
+		if(!$skin_vars) {
+			return;
+		}
 
 		foreach($skin_vars as $name => $val)
 		{
-			if(isset($module_info->{$name})) continue;
+			if(isset($module_info->{$name})) {
+				continue;
+			}
 			$module_info->{$name} = $val->value;
 		}
 	}
@@ -1923,7 +2128,9 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
-			if(!$output->toBool() || !$output->data) return;
+			if(!$output->toBool() || !$output->data) {
+				return;
+			}
 
 			$skin_vars = array();
 			foreach($output->data as $vars)
@@ -1931,7 +2138,9 @@ 
 				$skin_vars[$vars->name] = $vars;
 			}
 
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if($oCacheHandler->isSupport()) {
+				$oCacheHandler->put($cache_key, $skin_vars);
+			}
 		}
 
 		return $skin_vars;
@@ -1943,7 +2152,9 @@ 
 	 */
 	function syncMobileSkinInfoToModuleInfo(&$module_info)
 	{
-		if(!$module_info->module_srl) return;
+		if(!$module_info->module_srl) {
+			return;
+		}
 		$skin_vars = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
@@ -1958,17 +2169,25 @@ 
 			$args = new stdClass;
 			$args->module_srl = $module_info->module_srl;
 			$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
-			if(!$output->toBool()) return;
+			if(!$output->toBool()) {
+				return;
+			}
 			$skin_vars = $output->data;
 
 			//insert in cache
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if($oCacheHandler->isSupport()) {
+				$oCacheHandler->put($cache_key, $skin_vars);
+			}
+		}
+		if(!$skin_vars) {
+			return;
 		}
-		if(!$skin_vars) return;
 
 		foreach($output->data as $val)
 		{
-			if(isset($module_info->{$val->name})) continue;
+			if(isset($module_info->{$val->name})) {
+				continue;
+			}
 			$module_info->{$val->name} = $val->value;
 		}
 	}
@@ -1990,10 +2209,12 @@ 
 		$grant_info = $xml_info->grant;
 		if($member_info->member_srl)
 		{
-			if(is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
-			else $group_list = array();
-		}
-		else
+			if(is_array($member_info->group_list)) {
+				$group_list = array_keys($member_info->group_list);
+			} else {
+				$group_list = array();
+			}
+		} else
 		{
 			$group_list = array();
 		}
@@ -2007,8 +2228,7 @@ 
 			}
 
 			$grant->is_admin = $grant->manager = ($member_info->is_admin == 'Y') ? true : false;
-		}
-		else
+		} else
 		{
 			// If module_srl exists
 			// Get a type of granted permission
@@ -2021,7 +2241,9 @@ 
 				$args->module_srl = $module_srl;
 				$args->member_srl = $member_info->member_srl;
 				$output = executeQuery('module.getModuleAdmin',$args);
-				if($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = true;
+				if($output->data && $output->data->member_srl == $member_info->member_srl) {
+					$grant->manager = true;
+				}
 			}
 			// If not an administrator, get information from the DB and grant manager privilege.
 			if(!$grant->manager)
@@ -2031,8 +2253,7 @@ 
 				if($module_info->module == 'planet')
 				{
 					$output = executeQueryArray('module.getPlanetGrants', $args);
-				}
-				else
+				} else
 				{
 					$args = new stdClass;
 					$args->module_srl = $module_srl;
@@ -2047,37 +2268,44 @@ 
 					foreach($output->data as $val)
 					{
 						$grant_exists[$val->name] = true;
-						if($granted[$val->name]) continue;
+						if($granted[$val->name]) {
+							continue;
+						}
 						// Log-in member only
 						if($val->group_srl == -1)
 						{
 							$granted[$val->name] = true;
-							if($member_info->member_srl) $grant->{$val->name} = true;
+							if($member_info->member_srl) {
+								$grant->{$val->name} = true;
+							}
 							// Site-joined member only
-						}
-						elseif($val->group_srl == -2)
+						} elseif($val->group_srl == -2)
 						{
 							$granted[$val->name] = true;
 							// Do not grant any permission for non-logged member
-							if(!$member_info->member_srl) $grant->{$val->name} = false;
+							if(!$member_info->member_srl) {
+								$grant->{$val->name} = false;
+							}
 							// Log-in member
 							else
 							{
 								$site_module_info = Context::get('site_module_info');
 								// Permission granted if no information of the currently connected site exists
-								if(!$site_module_info->site_srl) $grant->{$val->name} = true;
+								if(!$site_module_info->site_srl) {
+									$grant->{$val->name} = true;
+								}
 								// Permission is not granted if information of the currently connected site exists
-								elseif(count($group_list)) $grant->{$val->name} = true;
+								elseif(count($group_list)) {
+									$grant->{$val->name} = true;
+								}
 							}
 							// All of non-logged members
-						}
-						elseif($val->group_srl == 0)
+						} elseif($val->group_srl == 0)
 						{
 							$granted[$val->name] = true;
 							$grant->{$val->name} = true;
 							// If a target is a group
-						}
-						else
+						} else
 						{
 							if($group_list && count($group_list) && in_array($val->group_srl, $group_list))
 							{
@@ -2088,30 +2316,43 @@ 
 					}
 				}
 				// Separate processing for the virtual group access
-				if(!$grant_exists['access']) $grant->access = true;
+				if(!$grant_exists['access']) {
+					$grant->access = true;
+				}
 				if(count($grant_info))
 				{
 					foreach($grant_info as  $grant_name => $grant_item)
 					{
-						if($grant_exists[$grant_name]) continue;
+						if($grant_exists[$grant_name]) {
+							continue;
+						}
 						switch($grant_item->default)
 						{
 							case 'guest' :
 								$grant->{$grant_name} = true;
 								break;
 							case 'member' :
-								if($member_info->member_srl) $grant->{$grant_name} = true;
-								else $grant->{$grant_name} = false;
+								if($member_info->member_srl) {
+									$grant->{$grant_name} = true;
+								} else {
+									$grant->{$grant_name} = false;
+								}
 								break;
 							case 'site' :
 								$site_module_info = Context::get('site_module_info');
-								if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
-								else $grant->{$grant_name} = false;
+								if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) {
+									$grant->{$grant_name} = true;
+								} else {
+									$grant->{$grant_name} = false;
+								}
 								break;
 							case 'manager' :
 							case 'root' :
-								if($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
-								else $grant->{$grant_name} = false;
+								if($member_info->is_admin == 'Y') {
+									$grant->{$grant_name} = true;
+								} else {
+									$grant->{$grant_name} = false;
+								}
 								break;
 						}
 					}
@@ -2187,16 +2428,22 @@ 
 	function getFileBoxListHtml()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 		$link = parse_url($_SERVER["HTTP_REFERER"]);
 		$link_params = explode('&',$link['query']);
 		foreach ($link_params as $param)
 		{
 			$param = explode("=",$param);
-			if($param[0] == 'selected_widget') $selected_widget = $param[1];
+			if($param[0] == 'selected_widget') {
+				$selected_widget = $param[1];
+			}
 		}
 		$oWidgetModel = getModel('widget');
-		if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
+		if($selected_widget) {
+			$widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
+		}
 		Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple);
 
 		$oModuleModel = getModel('module');
@@ -2204,7 +2451,9 @@ 
 		Context::set('filebox_list', $output->data);
 
 		$page = Context::get('page');
-		if (!$page) $page = 1;
+		if (!$page) {
+			$page = 1;
+		}
 		Context::set('page', $page);
 		Context::set('page_navigation', $output->page_navigation);
 
@@ -2234,25 +2483,28 @@ 
 			$rulsetFile = str_replace('@', '', $ruleset);
 			$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
 			return FileHandler::getRealPath($xml_file);
-		}
-		else if (strpos($ruleset, '#') !== false)
+		} else if (strpos($ruleset, '#') !== false)
 		{
 			$rulsetFile = str_replace('#', '', $ruleset).'.'.$mid;
 			$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
-			if(is_readable($xml_file))
-				return FileHandler::getRealPath($xml_file);
-			else{
+			if(is_readable($xml_file)) {
+							return FileHandler::getRealPath($xml_file);
+			} else{
 				$ruleset = str_replace('#', '', $ruleset);
 			}
 
 		}
 		// Get a path of the requested module. Return if not exists.
 		$class_path = ModuleHandler::getModulePath($module);
-		if(!$class_path) return;
+		if(!$class_path) {
+			return;
+		}
 
 		// Check if module.xml exists in the path. Return if not exist
 		$xml_file = sprintf("%sruleset/%s.xml", $class_path, $ruleset);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 
 		return $xml_file;
 	}
@@ -2302,7 +2554,9 @@ 
 	function getLangByLangcode()
 	{
 		$langCode = Context::get('langCode');
-		if (!$langCode) return;
+		if (!$langCode) {
+			return;
+		}
 
 		$oModuleController = getController('module');
 		$oModuleController->replaceDefinedLangCode($langCode);

modules/page/page.view.php

Doc Comments +4 added lines

@@ -129,6 +129,8 @@ 
 
 	/**
 	 * @brief Save the file and return if a file is requested by http
+	 * @param integer $caching_interval
+	 * @param string $cache_file
 	 */
 	function getHtmlPage($path, $caching_interval, $cache_file)
 	{
@@ -167,6 +169,8 @@ 
 
 	/**
 	 * @brief Create a cache file in order to include if it is an internal file
+	 * @param integer $caching_interval
+	 * @param string $cache_file
 	 */
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  pageView
- * @author NAVER (developers@xpressengine.com)
- * @brief page view class of the module
- */
+	 * @class  pageView
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief page view class of the module
+	 */
 class pageView extends page
 {
 	var $module_srl = 0;

Spacing +33 added lines, -33 removed lines

@@ -20,20 +20,20 @@ 
 	function init()
 	{
 		// Get a template path (page in the administrative template tpl putting together)
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 
-		switch($this->module_info->page_type)
+		switch ($this->module_info->page_type)
 		{
 			case 'WIDGET' :
 				{
 					$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
-					$this->interval = (int)($this->module_info->page_caching_interval);
+					$this->interval = (int) ($this->module_info->page_caching_interval);
 					break;
 				}
 			case 'OUTSIDE' :
 				{
 					$this->cache_file = sprintf("%sfiles/cache/opage/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getSslStatus());
-					$this->interval = (int)($this->module_info->page_caching_interval);
+					$this->interval = (int) ($this->module_info->page_caching_interval);
 					$this->path = $this->module_info->path;
 					break;
 				}
@@ -46,11 +46,11 @@ 
 	function dispPageIndex()
 	{
 		// Variables used in the template Context:: set()
-		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+		if ($this->module_srl) Context::set('module_srl', $this->module_srl);
 
 		$page_type_name = strtolower($this->module_info->page_type);
 		$method = '_get' . ucfirst($page_type_name) . 'Content';
-		if(method_exists($this, $method)) $page_content = $this->{$method}();
+		if (method_exists($this, $method)) $page_content = $this->{$method}();
 		else return new Object(-1, sprintf('%s method is not exists', $method));
 
 		Context::set('module_info', $this->module_info);
@@ -61,12 +61,12 @@ 
 
 	function _getWidgetContent()
 	{
-		if($this->interval>0)
+		if ($this->interval > 0)
 		{
-			if(!file_exists($this->cache_file)) $mtime = 0;
+			if (!file_exists($this->cache_file)) $mtime = 0;
 			else $mtime = filemtime($this->cache_file);
 
-			if($mtime + $this->interval*60 > $_SERVER['REQUEST_TIME'])
+			if ($mtime + $this->interval * 60 > $_SERVER['REQUEST_TIME'])
 			{
 				$page_content = FileHandler::readFile($this->cache_file); 
 				$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
@@ -80,7 +80,7 @@ 
 		}
 		else
 		{
-			if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
+			if (file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
 			$page_content = $this->module_info->content;
 		}
 		return $page_content;
@@ -93,7 +93,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument(0, true);
 
-		if($this->module_info->document_srl)
+		if ($this->module_info->document_srl)
 		{
 			$document_srl = $this->module_info->document_srl;
 			$oDocument->setDocument($document_srl);
@@ -103,11 +103,11 @@ 
 
 		if ($this->module_info->skin)
 		{
-			$templatePath = (sprintf($this->module_path.'skins/%s', $this->module_info->skin));
+			$templatePath = (sprintf($this->module_path . 'skins/%s', $this->module_info->skin));
 		}
 		else
 		{
-			$templatePath = ($this->module_path.'skins/default');
+			$templatePath = ($this->module_path . 'skins/default');
 		}
 
 		$page_content = $oTemplate->compile($templatePath, 'content');
@@ -118,9 +118,9 @@ 
 	function _getOutsideContent()
 	{
 		// check if it is http or internal file
-		if($this->path)
+		if ($this->path)
 		{
-			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			if (preg_match("/^([a-z]+):\/\//i", $this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
 			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
 		}
 
@@ -133,7 +133,7 @@ 
 	function getHtmlPage($path, $caching_interval, $cache_file)
 	{
 		// Verify cache
-		if($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval*60 > $_SERVER['REQUEST_TIME'])
+		if ($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval * 60 > $_SERVER['REQUEST_TIME'])
 		{
 			$content = FileHandler::readFile($cache_file);
 		}
@@ -154,13 +154,13 @@ 
 		$content = $buff->content;
 		// Extract a title
 		$title = $oPageController->getTitle($content);
-		if($title) Context::setBrowserTitle($title);
+		if ($title) Context::setBrowserTitle($title);
 		// Extract header script
 		$head_script = $oPageController->getHeadScript($content);
-		if($head_script) Context::addHtmlHeader($head_script);
+		if ($head_script) Context::addHtmlHeader($head_script);
 		// Extract content from the body
 		$body_script = $oPageController->getBodyScript($content);
-		if(!$body_script) $body_script = $content;
+		if (!$body_script) $body_script = $content;
 
 		return $content;
 	}
@@ -171,19 +171,19 @@ 
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{
 		// Cancel if the file doesn't exist
-		if(!file_exists(FileHandler::getRealPath($target_file))) return;
+		if (!file_exists(FileHandler::getRealPath($target_file))) return;
 
 		// Get a path and filename
-		$tmp_path = explode('/',$cache_file);
-		$filename = $tmp_path[count($tmp_path)-1];
-		$filepath = preg_replace('/'.$filename."$/i","",$cache_file);
+		$tmp_path = explode('/', $cache_file);
+		$filename = $tmp_path[count($tmp_path) - 1];
+		$filepath = preg_replace('/' . $filename . "$/i", "", $cache_file);
 		$cache_file = FileHandler::getRealPath($cache_file);
 
 		$level = ob_get_level();
 		// Verify cache
-		if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file))
+		if ($caching_interval < 1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval * 60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file) < filemtime($target_file))
 		{
-			if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+			if (file_exists($cache_file)) FileHandler::removeFile($cache_file);
 
 			// Read a target file and get content
 			ob_start();
@@ -191,12 +191,12 @@ 
 			$content = ob_get_clean();
 			// Replace relative path to the absolute path 
 			$this->path = str_replace('\\', '/', realpath(dirname($target_file))) . '/';
-			$content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
-			$content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is',array($this,'_replacePath'),$content);
+			$content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is', array($this, '_replacePath'), $content);
+			$content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is', array($this, '_replacePath'), $content);
 
 			FileHandler::writeFile($cache_file, $content);
 			// Include and then Return the result
-			if(!file_exists($cache_file)) return;
+			if (!file_exists($cache_file)) return;
 			// Attempt to compile
 			$oTemplate = &TemplateHandler::getInstance();
 			$script = $oTemplate->compileDirect($filepath, $filename);
@@ -223,20 +223,20 @@ 
 		$val = trim($matches[3]);
 		// Pass if the path is external or starts with /, #, { characters
 		// /=absolute path, #=hash in a page, {=Template syntax
-		if(strpos($val, '.') === FALSE || preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i',$val))
+		if (strpos($val, '.') === FALSE || preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i', $val))
 		{
 				return $matches[0];
 			// In case of  .. , get a path
 		}
-		else if(strncasecmp('..', $val, 2) === 0)
+		else if (strncasecmp('..', $val, 2) === 0)
 		{
 			$p = Context::pathToUrl($this->path);
-			return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
+			return sprintf("%s%s%s%s", $matches[1], $matches[2], $p . $val, $matches[4]);
 		}
 
-		if(strncasecmp('..', $val, 2) === 0) $val = substr($val,2);
+		if (strncasecmp('..', $val, 2) === 0) $val = substr($val, 2);
 		$p = Context::pathToUrl($this->path);
-		$path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
+		$path = sprintf("%s%s%s%s", $matches[1], $matches[2], $p . $val, $matches[4]);
 
 		return $path;
 	}

Braces +47 added lines, -25 removed lines

@@ -46,12 +46,17 @@ 
 	function dispPageIndex()
 	{
 		// Variables used in the template Context:: set()
-		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+		if($this->module_srl) {
+			Context::set('module_srl',$this->module_srl);
+		}
 
 		$page_type_name = strtolower($this->module_info->page_type);
 		$method = '_get' . ucfirst($page_type_name) . 'Content';
-		if(method_exists($this, $method)) $page_content = $this->{$method}();
-		else return new Object(-1, sprintf('%s method is not exists', $method));
+		if(method_exists($this, $method)) {
+			$page_content = $this->{$method}();
+		} else {
+			return new Object(-1, sprintf('%s method is not exists', $method));
+		}
 
 		Context::set('module_info', $this->module_info);
 		Context::set('page_content', $page_content);
@@ -63,24 +68,27 @@ 
 	{
 		if($this->interval>0)
 		{
-			if(!file_exists($this->cache_file)) $mtime = 0;
-			else $mtime = filemtime($this->cache_file);
+			if(!file_exists($this->cache_file)) {
+				$mtime = 0;
+			} else {
+				$mtime = filemtime($this->cache_file);
+			}
 
 			if($mtime + $this->interval*60 > $_SERVER['REQUEST_TIME'])
 			{
 				$page_content = FileHandler::readFile($this->cache_file); 
 				$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
-			}
-			else
+			} else
 			{
 				$oWidgetController = getController('widget');
 				$page_content = $oWidgetController->transWidgetCode($this->module_info->content);
 				FileHandler::writeFile($this->cache_file, $page_content);
 			}
-		}
-		else
+		} else
 		{
-			if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
+			if(file_exists($this->cache_file)) {
+				FileHandler::removeFile($this->cache_file);
+			}
 			$page_content = $this->module_info->content;
 		}
 		return $page_content;
@@ -104,8 +112,7 @@ 
 		if ($this->module_info->skin)
 		{
 			$templatePath = (sprintf($this->module_path.'skins/%s', $this->module_info->skin));
-		}
-		else
+		} else
 		{
 			$templatePath = ($this->module_path.'skins/default');
 		}
@@ -120,8 +127,11 @@ 
 		// check if it is http or internal file
 		if($this->path)
 		{
-			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
-			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+			if(preg_match("/^([a-z]+):\/\//i",$this->path)) {
+				$content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			} else {
+				$content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+			}
 		}
 
 		return $content;
@@ -136,8 +146,7 @@ 
 		if($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval*60 > $_SERVER['REQUEST_TIME'])
 		{
 			$content = FileHandler::readFile($cache_file);
-		}
-		else
+		} else
 		{
 			FileHandler::getRemoteFile($path, $cache_file);
 			$content = FileHandler::readFile($cache_file);
@@ -154,13 +163,19 @@ 
 		$content = $buff->content;
 		// Extract a title
 		$title = $oPageController->getTitle($content);
-		if($title) Context::setBrowserTitle($title);
+		if($title) {
+			Context::setBrowserTitle($title);
+		}
 		// Extract header script
 		$head_script = $oPageController->getHeadScript($content);
-		if($head_script) Context::addHtmlHeader($head_script);
+		if($head_script) {
+			Context::addHtmlHeader($head_script);
+		}
 		// Extract content from the body
 		$body_script = $oPageController->getBodyScript($content);
-		if(!$body_script) $body_script = $content;
+		if(!$body_script) {
+			$body_script = $content;
+		}
 
 		return $content;
 	}
@@ -171,7 +186,9 @@ 
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{
 		// Cancel if the file doesn't exist
-		if(!file_exists(FileHandler::getRealPath($target_file))) return;
+		if(!file_exists(FileHandler::getRealPath($target_file))) {
+			return;
+		}
 
 		// Get a path and filename
 		$tmp_path = explode('/',$cache_file);
@@ -183,7 +200,9 @@ 
 		// Verify cache
 		if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file))
 		{
-			if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+			if(file_exists($cache_file)) {
+				FileHandler::removeFile($cache_file);
+			}
 
 			// Read a target file and get content
 			ob_start();
@@ -196,7 +215,9 @@ 
 
 			FileHandler::writeFile($cache_file, $content);
 			// Include and then Return the result
-			if(!file_exists($cache_file)) return;
+			if(!file_exists($cache_file)) {
+				return;
+			}
 			// Attempt to compile
 			$oTemplate = &TemplateHandler::getInstance();
 			$script = $oTemplate->compileDirect($filepath, $filename);
@@ -227,14 +248,15 @@ 
 		{
 				return $matches[0];
 			// In case of  .. , get a path
-		}
-		else if(strncasecmp('..', $val, 2) === 0)
+		} else if(strncasecmp('..', $val, 2) === 0)
 		{
 			$p = Context::pathToUrl($this->path);
 			return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
 		}
 
-		if(strncasecmp('..', $val, 2) === 0) $val = substr($val,2);
+		if(strncasecmp('..', $val, 2) === 0) {
+			$val = substr($val,2);
+		}
 		$p = Context::pathToUrl($this->path);
 		$path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
 

modules/point/point.controller.php

Doc Comments +1 added lines

@@ -478,6 +478,7 @@
 
 	/**
 	 * @brief Set points
+	 * @param string $mode
 	 */
 	function setPoint($member_srl, $point, $mode = null)
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  pointController
- * @author NAVER (developers@xpressengine.com)
- * @brief Controller class of point modules
- */
+	 * @class  pointController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief Controller class of point modules
+	 */
 class pointController extends point
 {
 	/**

Spacing +102 added lines, -102 removed lines

@@ -31,7 +31,7 @@ 
 		$point = $config->signup_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point, 'signup');
+		$this->setPoint($member_srl, $cur_point, 'signup');
 
 		return new Object();
 	}
@@ -42,9 +42,9 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new Object();
+		if (!$member_srl) return new Object();
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
+		if (substr($obj->last_login, 0, 8) == date("Ymd")) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -55,7 +55,7 @@ 
 		$point = $config->login_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -66,30 +66,30 @@ 
 	function triggerInsertDocument(&$obj)
 	{
 		$oDocumentModel = getModel('document');
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new Object();
+			if (!$module_srl || !$member_srl) return new Object();
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new Object();
+			if ($module_srl == $member_srl) return new Object();
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new Object();
@@ -106,24 +106,24 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 
 		// if status is TEMP or PUBLIC... give not point, only status is empty
-		if($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$oModuleModel = getModel('module');
 
 			// Get the point module information
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $obj->module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,42 +141,42 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
+		if (!$oDocument->isExists()) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
-		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
+		$module_config = $oModuleModel->getModulePartConfig('point', $oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if (strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new Object();
+		if ($comment_point > 0) return new Object();
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if ($output->data[$i]->member_srl < 1) continue;
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new Object();
+		if ($member_srl) unset($member_srls[abs($member_srl)]);
+		if (!count($member_srls)) return new Object();
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
 		$point = $module_config['download_file'];
-		foreach($member_srls as $member_srl => $cnt)
+		foreach ($member_srls as $member_srl => $cnt)
 		{
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 			$cur_point -= $cnt * $comment_point;
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new Object();
@@ -190,10 +190,10 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
 		// The process related to clearing the post object
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new Object();
+		if (!$logged_info->member_srl) return new Object();
 		// Get the points of the member
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -203,16 +203,16 @@ 
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 
 		$point = $module_config['insert_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 		// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-		if($point < 0) return new Object();
+		if ($point < 0) return new Object();
 		$cur_point -= $point;
 		// Add points related to deleting an attachment
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-		if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if ($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
 		// Increase the point
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -224,12 +224,12 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
+		if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == abs($member_srl)) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -239,10 +239,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -259,11 +259,11 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
-		if($oDocument->get('member_srl')==$member_srl) return new Object();
+		if (!$oDocument->isExists()) return new Object();
+		if ($oDocument->get('member_srl') == $member_srl) return new Object();
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -271,12 +271,12 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new Object();
+		if ($point < 0) return new Object();
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -296,11 +296,11 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new Object();
+		if ($obj->isvalid != 'Y') return new Object();
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -310,10 +310,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -326,17 +326,17 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 		// Pass if it is your file
-		if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+		if (abs($obj->member_srl) == abs($member_srl)) return new Object();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 		// If it is set not to allow downloading for non-logged in users, do not permit
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
-			if($config->disable_download == 'Y' && strlen($module_config['download_file']) == 0 && !is_int($module_config['download_file'])) return new Object(-1,'msg_not_permitted_download');
+			if ($config->disable_download == 'Y' && strlen($module_config['download_file']) == 0 && !is_int($module_config['download_file'])) return new Object(-1, 'msg_not_permitted_download');
 			else return new Object();
 		}
 		// Get the points of the member
@@ -344,9 +344,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 		// Get the points
 		$point = $module_config['download_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
 		// If points are less than 0, and if downloading a file is not allowed in this case, give an errors
-		if($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1,'msg_cannot_download');
+		if ($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1, 'msg_cannot_download');
 
 		return new Object();
 	}
@@ -358,12 +358,12 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new Object();
+		if (!$logged_info->member_srl) return new Object();
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 		// Pass if it is your file
-		if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+		if (abs($obj->member_srl) == abs($member_srl)) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -373,10 +373,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 		// Get the points
 		$point = $module_config['download_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -395,22 +395,22 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new Object();
+		if ($target_member_srl == $member_srl) return new Object();
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
 		// Pass if there are no requested points
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new Object();
+			if ($output->data->count) return new Object();
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 		}
 		else
@@ -421,7 +421,7 @@ 
 		$config = $oModuleModel->getModuleConfig('point');
 		// When the requested points are negative, compared it with the current point
 		$_SESSION['banned_document'][$obj->document_srl] = false;
-		if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
+		if ($config->disable_read_document == 'Y' && $point < 0 && abs($point) > $cur_point)
 		{
 			$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
 			$obj->add('content', $message);
@@ -429,14 +429,14 @@ 
 			return new Object(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new Object();
+		if (!$logged_info->member_srl) return new Object();
 		// Pass, if there are no requested points
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -448,7 +448,7 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -457,21 +457,21 @@ 
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
-		if( $obj->point > 0 )
+		if ($obj->point > 0)
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->voted;
 		}
 		else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
 		}
 
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -483,7 +483,7 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if (!$mode || !in_array($mode, $mode_arr)) $mode = 'update';
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -500,7 +500,7 @@ 
 		$args->member_srl = $member_srl;
 		$args->point = $current_point;
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'add' :
 				$args->point += $point;
@@ -513,7 +513,7 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if ($args->point < 0) $args->point = 0;
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -524,7 +524,7 @@ 
 		$trigger_obj->current_level = $current_level;
 		$trigger_obj->set_point = $point;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -535,19 +535,19 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
+		if ($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
 		else executeQuery("point.insertPoint", $args);
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
 
 		// If existing level and a new one are different attempt to set a point group
-		if($level != $current_level)
+		if ($level != $current_level)
 		{
 			// Check if the level, for which the current points are prepared, is calculate and set the correct group
 			$point_group = $config->point_group;
 			// If the point group exists
-			if($point_group && is_array($point_group) && count($point_group) )
+			if ($point_group && is_array($point_group) && count($point_group))
 			{
 				// Get the default group
 				$default_group = $oMemberModel->getDefaultGroup();
@@ -557,29 +557,29 @@ 
 
 				asort($point_group);
 				// Reset group after initialization
-				if($config->group_reset != 'N')
+				if ($config->group_reset != 'N')
 				{
 					// If the new level is in the right group
-					if(in_array($level, $point_group))
+					if (in_array($level, $point_group))
 					{
 						// Delete all groups except the one which the current level belongs to
-						foreach($point_group as $group_srl => $target_level)
+						foreach ($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if ($target_level == $level) $new_group_list[] = $group_srl;
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
 					else
 					{
 						$i = $level;
-						while($i > 0)
+						while ($i > 0)
 						{
-							if(in_array($i, $point_group))
+							if (in_array($i, $point_group))
 							{
-								foreach($point_group as $group_srl => $target_level)
+								foreach ($point_group as $group_srl => $target_level)
 								{
-									if($target_level == $i)
+									if ($target_level == $i)
 									{
 										$new_group_list[] = $group_srl;
 									}
@@ -590,9 +590,9 @@ 
 						}
 					}
 					// Delete the group of a level which is higher than the current level
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if ($target_level > $level) $del_group_list[] = $group_srl;
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -600,16 +600,16 @@ 
 				else
 				{
 					// Check until the current level by rotating setting the configurations of the point groups
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if ($target_level <= $level) $new_group_list[] = $group_srl;
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if (!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
 				// Remove linkage group
-				if($del_group_list && count($del_group_list))
+				if ($del_group_list && count($del_group_list))
 				{
 					$del_group_args = new stdClass;
 					$del_group_args->member_srl = $member_srl;
@@ -617,7 +617,7 @@ 
 					$del_group_output = executeQuery('point.deleteMemberGroup', $del_group_args);
 				}
 				// Grant a new group
-				foreach($new_group_list as $group_srl)
+				foreach ($new_group_list as $group_srl)
 				{
 					$new_group_args = new stdClass;
 					$new_group_args->member_srl = $member_srl;
@@ -632,7 +632,7 @@ 
 		$trigger_obj->del_group_list = $del_group_list;
 		$trigger_obj->new_level = $level;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -648,7 +648,7 @@ 
 		FileHandler::writeFile($cache_filename, $point);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
 			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
@@ -656,7 +656,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
 			$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
@@ -672,9 +672,9 @@ 
 		$pointConfig = $oModuleModel->getModulePartConfig('point', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('point', $moduleSrl, $pointConfig);
 			}

Braces +186 added lines, -66 removed lines

@@ -42,9 +42,13 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new Object();
+		if(!$member_srl) {
+			return new Object();
+		}
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
+		if(substr($obj->last_login,0,8)==date("Ymd")) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -70,9 +74,13 @@ 
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new Object();
+			if(!$module_srl || !$member_srl) {
+				return new Object();
+			}
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new Object();
+			if($module_srl == $member_srl) {
+				return new Object();
+			}
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
@@ -82,12 +90,18 @@ 
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}
@@ -118,12 +132,18 @@ 
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,33 +161,47 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
+		if(!$oDocument->isExists()) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if(strlen($comment_point) == 0 && !is_int($comment_point)) {
+			$comment_point = $config->insert_comment;
+		}
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new Object();
+		if($comment_point>0) {
+			return new Object();
+		}
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
 		for($i=0;$i<$cnt;$i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if($output->data[$i]->member_srl<1) {
+				continue;
+			}
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new Object();
+		if($member_srl) {
+			unset($member_srls[abs($member_srl)]);
+		}
+		if(!count($member_srls)) {
+			return new Object();
+		}
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
@@ -190,10 +224,14 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
 		// The process related to clearing the post object
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new Object();
+		if(!$logged_info->member_srl) {
+			return new Object();
+		}
 		// Get the points of the member
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -203,14 +241,22 @@ 
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 
 		$point = $module_config['insert_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_document;
+		}
 		// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-		if($point < 0) return new Object();
+		if($point < 0) {
+			return new Object();
+		}
 		$cur_point -= $point;
 		// Add points related to deleting an attachment
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-		if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->upload_file;
+		}
+		if($obj->uploaded_count) {
+			$cur_point -= $point * $obj->uploaded_count;
+		}
 		// Increase the point
 		$this->setPoint($member_srl,$cur_point);
 
@@ -224,12 +270,16 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
+		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -239,7 +289,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -259,11 +311,17 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
-		if($oDocument->get('member_srl')==$member_srl) return new Object();
+		if(!$oDocument->isExists()) {
+			return new Object();
+		}
+		if($oDocument->get('member_srl')==$member_srl) {
+			return new Object();
+		}
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -271,9 +329,13 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new Object();
+		if($point < 0) {
+			return new Object();
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -296,11 +358,15 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new Object();
+		if($obj->isvalid != 'Y') {
+			return new Object();
+		}
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -310,7 +376,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->upload_file;
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -326,9 +394,13 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 		// Pass if it is your file
-		if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+		if(abs($obj->member_srl) == abs($member_srl)) {
+			return new Object();
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -336,17 +408,24 @@ 
 		// If it is set not to allow downloading for non-logged in users, do not permit
 		if(!Context::get('is_logged'))
 		{
-			if($config->disable_download == 'Y' && strlen($module_config['download_file']) == 0 && !is_int($module_config['download_file'])) return new Object(-1,'msg_not_permitted_download');
-			else return new Object();
+			if($config->disable_download == 'Y' && strlen($module_config['download_file']) == 0 && !is_int($module_config['download_file'])) {
+				return new Object(-1,'msg_not_permitted_download');
+			} else {
+				return new Object();
+			}
 		}
 		// Get the points of the member
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 		// Get the points
 		$point = $module_config['download_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->download_file;
+		}
 		// If points are less than 0, and if downloading a file is not allowed in this case, give an errors
-		if($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1,'msg_cannot_download');
+		if($cur_point + $point < 0 && $config->disable_download == 'Y') {
+			return new Object(-1,'msg_cannot_download');
+		}
 
 		return new Object();
 	}
@@ -358,12 +437,18 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new Object();
+		if(!$logged_info->member_srl) {
+			return new Object();
+		}
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 		// Pass if it is your file
-		if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+		if(abs($obj->member_srl) == abs($member_srl)) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -373,7 +458,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 		// Get the points
 		$point = $module_config['download_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->download_file;
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -395,25 +482,32 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new Object();
+		if($target_member_srl == $member_srl) {
+			return new Object();
+		}
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->read_document;
+		}
 		// Pass if there are no requested points
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new Object();
+			if($output->data->count) {
+				return new Object();
+			}
 			$cur_point = $oPointModel->getPoint($member_srl, true);
-		}
-		else
+		} else
 		{
 			$cur_point = 0;
 		}
@@ -429,9 +523,13 @@ 
 			return new Object(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new Object();
+		if(!$logged_info->member_srl) {
+			return new Object();
+		}
 		// Pass, if there are no requested points
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
@@ -448,7 +546,9 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -460,15 +560,20 @@ 
 		if( $obj->point > 0 )
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
-		}
-		else
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->voted;
+			}
+		} else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->blamed;
+			}
 		}
 
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -483,7 +588,9 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if(!$mode || !in_array($mode,$mode_arr)) {
+			$mode = 'update';
+		}
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -513,7 +620,9 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if($args->point < 0) {
+			$args->point = 0;
+		}
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -535,8 +644,11 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
-		else executeQuery("point.insertPoint", $args);
+		if($oPointModel->isExistsPoint($member_srl)) {
+			executeQuery("point.updatePoint", $args);
+		} else {
+			executeQuery("point.insertPoint", $args);
+		}
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
@@ -566,7 +678,9 @@ 
 						foreach($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if($target_level == $level) {
+								$new_group_list[] = $group_srl;
+							}
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
@@ -592,7 +706,9 @@ 
 					// Delete the group of a level which is higher than the current level
 					foreach($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if($target_level > $level) {
+							$del_group_list[] = $group_srl;
+						}
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -603,11 +719,15 @@ 
 					foreach($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if($target_level <= $level) {
+							$new_group_list[] = $group_srl;
+						}
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if(!$new_group_list[0]) {
+					$new_group_list[0] = $default_group->group_srl;
+				}
 				// Remove linkage group
 				if($del_group_list && count($del_group_list))
 				{