xpressengine / xe-core

modules/layout/layout.class.php

Spacing +23 added lines, -23 removed lines

@@ -27,27 +27,27 @@ 
 	{
 		$oDB = &DB::getInstance();
 		// 2009. 02. 11 Add site_srl to layout table
-		if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
+		if (!$oDB->isColumnExists('layouts', 'site_srl')) return true;
 		// 2009. 02. 26 Move the previous layout for faceoff
 		$files = FileHandler::readDir('./files/cache/layout');
-		for($i=0,$c=count($files);$i<$c;$i++)
+		for ($i = 0, $c = count($files); $i < $c; $i++)
 		{
 			$filename = $files[$i];
-			if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
+			if (preg_match('/([0-9]+)\.html/i', $filename)) return true;
 		}
 
-		if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
+		if (!$oDB->isColumnExists('layouts', 'layout_type')) return true;
 
 		$args = new stdClass();
 		$args->layout = '.';
 		$output = executeQueryArray('layout.getLayoutDotList', $args);
-		if($output->data && count($output->data) > 0)
+		if ($output->data && count($output->data) > 0)
 		{
-			foreach($output->data as $layout)
+			foreach ($output->data as $layout)
 			{
 				$layout_path = explode('.', $layout->layout);
-				if(count($layout_path) != 2) continue;
-				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
+				if (count($layout_path) != 2) continue;
+				if (is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
 			}
 		}
 
@@ -62,39 +62,39 @@ 
 	{
 		$oDB = &DB::getInstance();
 		// 2009. 02. 11 Add site_srl to menu table
-		if(!$oDB->isColumnExists('layouts', 'site_srl'))
+		if (!$oDB->isColumnExists('layouts', 'site_srl'))
 		{
-			$oDB->addColumn('layouts','site_srl','number',11,0,true);
+			$oDB->addColumn('layouts', 'site_srl', 'number', 11, 0, true);
 		}
 		// 2009. 02. 26 Move the previous layout for faceoff
 		$oLayoutModel = getModel('layout');
 		$files = FileHandler::readDir('./files/cache/layout');
-		for($i=0,$c=count($files);$i<$c;$i++)
+		for ($i = 0, $c = count($files); $i < $c; $i++)
 		{
 			$filename = $files[$i];
-			if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
+			if (!preg_match('/([0-9]+)\.html/i', $filename, $match)) continue;
 			$layout_srl = $match[1];
-			if(!$layout_srl) continue;
+			if (!$layout_srl) continue;
 			$path = $oLayoutModel->getUserLayoutPath($layout_srl);
-			if(!is_dir($path)) FileHandler::makeDir($path);
-			FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
-			@unlink('./files/cache/layout/'.$filename);
+			if (!is_dir($path)) FileHandler::makeDir($path);
+			FileHandler::copyFile('./files/cache/layout/' . $filename, $path . 'layout.html');
+			@unlink('./files/cache/layout/' . $filename);
 		}
 
-		if(!$oDB->isColumnExists('layouts', 'layout_type'))
+		if (!$oDB->isColumnExists('layouts', 'layout_type'))
 		{
-			$oDB->addColumn('layouts','layout_type','char',1,'P',true);
+			$oDB->addColumn('layouts', 'layout_type', 'char', 1, 'P', true);
 		}
 
 		$args->layout = '.';
 		$output = executeQueryArray('layout.getLayoutDotList', $args);
-		if($output->data && count($output->data) > 0)
+		if ($output->data && count($output->data) > 0)
 		{
-			foreach($output->data as $layout)
+			foreach ($output->data as $layout)
 			{
 				$layout_path = explode('.', $layout->layout);
-				if(count($layout_path) != 2) continue;
-				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
+				if (count($layout_path) != 2) continue;
+				if (is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
 				{
 					$args->layout = implode('|@|', $layout_path);
 					$args->layout_srl = $layout->layout_srl;
@@ -112,7 +112,7 @@ 
 	function recompileCache()
 	{
 		$path = './files/cache/layout';
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			FileHandler::makeDir($path);
 			return;

Braces +27 added lines, -9 removed lines

@@ -27,16 +27,22 @@ 
 	{
 		$oDB = &DB::getInstance();
 		// 2009. 02. 11 Add site_srl to layout table
-		if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
+		if(!$oDB->isColumnExists('layouts', 'site_srl')) {
+			return true;
+		}
 		// 2009. 02. 26 Move the previous layout for faceoff
 		$files = FileHandler::readDir('./files/cache/layout');
 		for($i=0,$c=count($files);$i<$c;$i++)
 		{
 			$filename = $files[$i];
-			if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
+			if(preg_match('/([0-9]+)\.html/i',$filename)) {
+				return true;
+			}
 		}
 
-		if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
+		if(!$oDB->isColumnExists('layouts', 'layout_type')) {
+			return true;
+		}
 
 		$args = new stdClass();
 		$args->layout = '.';
@@ -46,8 +52,12 @@ 
 			foreach($output->data as $layout)
 			{
 				$layout_path = explode('.', $layout->layout);
-				if(count($layout_path) != 2) continue;
-				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
+				if(count($layout_path) != 2) {
+					continue;
+				}
+				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) {
+					return true;
+				}
 			}
 		}
 
@@ -72,11 +82,17 @@ 
 		for($i=0,$c=count($files);$i<$c;$i++)
 		{
 			$filename = $files[$i];
-			if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
+			if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) {
+				continue;
+			}
 			$layout_srl = $match[1];
-			if(!$layout_srl) continue;
+			if(!$layout_srl) {
+				continue;
+			}
 			$path = $oLayoutModel->getUserLayoutPath($layout_srl);
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if(!is_dir($path)) {
+				FileHandler::makeDir($path);
+			}
 			FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
 			@unlink('./files/cache/layout/'.$filename);
 		}
@@ -93,7 +109,9 @@ 
 			foreach($output->data as $layout)
 			{
 				$layout_path = explode('.', $layout->layout);
-				if(count($layout_path) != 2) continue;
+				if(count($layout_path) != 2) {
+					continue;
+				}
 				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
 				{
 					$args->layout = implode('|@|', $layout_path);

modules/member/member.admin.model.php

Indentation +4 added lines, -4 removed lines

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

Spacing +44 added lines, -44 removed lines

@@ -42,64 +42,64 @@ 
 	{
 		// Search option
 		$args = new stdClass();
-		$args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
-		$args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
+		$args->is_admin = Context::get('is_admin') == 'Y' ? 'Y' : '';
+		$args->is_denied = Context::get('is_denied') == 'Y' ? 'Y' : '';
 		$args->selected_group_srl = Context::get('selected_group_srl');
 
 		$filter = Context::get('filter_type');
-		switch($filter)
+		switch ($filter)
 		{
-			case 'super_admin' : $args->is_admin = 'Y';break;
-			case 'site_admin' : $args->member_srls = $this->getSiteAdminMemberSrls();break;
-			case 'enable' : $args->is_denied = 'N';break;
-			case 'disable' : $args->is_denied = 'Y';break;
+			case 'super_admin' : $args->is_admin = 'Y'; break;
+			case 'site_admin' : $args->member_srls = $this->getSiteAdminMemberSrls(); break;
+			case 'enable' : $args->is_denied = 'N'; break;
+			case 'disable' : $args->is_denied = 'Y'; break;
 		}
 
 		$search_target = trim(Context::get('search_target'));
 		$search_keyword = trim(Context::get('search_keyword'));
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_nick_name = $search_keyword;
 					$args->html_nick_name = htmlspecialchars($search_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
-					$args->s_regdate = preg_replace("/[^0-9]/","",$search_keyword);
+					$args->s_regdate = preg_replace("/[^0-9]/", "", $search_keyword);
 					break;
 				case 'regdate_more' :
-					$args->s_regdate_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+					$args->s_regdate_more = substr(preg_replace("/[^0-9]/", "", $search_keyword) . '00000000000000', 0, 14);
 					break;
 				case 'regdate_less' :
-					$args->s_regdate_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+					$args->s_regdate_less = substr(preg_replace("/[^0-9]/", "", $search_keyword) . '00000000000000', 0, 14);
 					break;
 				case 'last_login' :
-					$args->s_last_login = preg_replace("/[^0-9]/","",$search_keyword);
+					$args->s_last_login = preg_replace("/[^0-9]/", "", $search_keyword);
 					//$args->s_last_login = $search_keyword;
 					break;
 				case 'last_login_more' :
-					$args->s_last_login_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+					$args->s_last_login_more = substr(preg_replace("/[^0-9]/", "", $search_keyword) . '00000000000000', 0, 14);
 					break;
 				case 'last_login_less' :
-					$args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+					$args->s_last_login_less = substr(preg_replace("/[^0-9]/", "", $search_keyword) . '00000000000000', 0, 14);
 					break;
 				case 'birthday' :
-					$args->s_birthday = preg_replace("/[^0-9]/","",$search_keyword);
+					$args->s_birthday = preg_replace("/[^0-9]/", "", $search_keyword);
 					break;
 				case 'extra_vars' :
 					$args->s_extra_vars = $search_keyword;
@@ -110,25 +110,25 @@ 
 		// Change the query id if selected_group_srl exists (for table join)
 		$sort_order = Context::get('sort_order');
 		$sort_index = Context::get('sort_index');
-		if(!$sort_index)
+		if (!$sort_index)
 		{
 			$sort_index = "list_order";
 		}
 
-		if(!$sort_order)
+		if (!$sort_order)
 		{
 			$sort_order = 'asc';
 		}
 
-		if($sort_order != 'asc')
+		if ($sort_order != 'asc')
 		{
 			$sort_order = 'desc';
 		}
 
-		if($args->selected_group_srl)
+		if ($args->selected_group_srl)
 		{
 			$query_id = 'member.getMemberListWithinGroup';
-			$args->sort_index = "member.".$sort_index;
+			$args->sort_index = "member." . $sort_index;
 		}
 		else
 		{
@@ -174,10 +174,10 @@ 
 	function getSiteAdminMemberSrls()
 	{
 		$output = executeQueryArray('member.getSiteAdminMemberSrls');
-		if(!$output->toBool() || !$output->data) return array();
+		if (!$output->toBool() || !$output->data) return array();
 
 		$member_srls = array();
-		foreach($output->data as $member_info)
+		foreach ($output->data as $member_info)
 		{
 			$member_srls[] = $member_info->member_srl;
 		}
@@ -193,7 +193,7 @@ 
 	function getMemberAdminColorset()
 	{
 		$skin = Context::get('skin');
-		if(!$skin) $tpl = "";
+		if (!$skin) $tpl = "";
 		else
 		{
 			$oModuleModel = getModel('module');
@@ -202,11 +202,11 @@ 
 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
-			if(!$config->colorset) $config->colorset = "white";
+			if (!$config->colorset) $config->colorset = "white";
 			Context::set('config', $config);
 
 			$oTemplate = &TemplateHandler::getInstance();
-			$tpl = $oTemplate->compile($this->module_path.'tpl', 'new_colorset_list');
+			$tpl = $oTemplate->compile($this->module_path . 'tpl', 'new_colorset_list');
 		}
 
 		$this->add('tpl', $tpl);
@@ -223,10 +223,10 @@ 
 	public function getMemberCountByDate($date = '')
 	{
 		$args = new stdClass();
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if ($date) $args->regDate = date('Ymd', strtotime($date));
 
 		$output = executeQuery('member.getMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if (!$output->toBool()) return 0;
 
 		return $output->data->count;
 	}
@@ -240,10 +240,10 @@ 
 	 */
 	function getMemberGroupMemberCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if ($date) $args->regDate = date('Ymd', strtotime($date));
 
 		$output = executeQuery('member.getMemberGroupMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if (!$output->toBool()) return 0;
 
 		return count($output->data);
 	}
@@ -261,11 +261,11 @@ 
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 
-		if($output->toBool() && $output->data)
+		if ($output->toBool() && $output->data)
 		{
 			$formInfo = $output->data;
 			$default_value = $formInfo->default_value;
-			if($default_value)
+			if ($default_value)
 			{
 				$default_value = unserialize($default_value);
 				Context::set('default_value', $default_value);
@@ -275,18 +275,18 @@ 
 
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		foreach($config->signupForm as $item) 
+		foreach ($config->signupForm as $item) 
 		{
 			$list[] = $item->name;
 		}
 
-		$id_list = implode(',',$list);
-		Context::set('id_list',$id_list);
+		$id_list = implode(',', $list);
+		Context::set('id_list', $id_list);
 
 		$oTemplate = &TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile($this->module_path.'tpl', 'insert_join_form');
+		$tpl = $oTemplate->compile($this->module_path . 'tpl', 'insert_join_form');
 
-		$this->add('tpl', str_replace("\n"," ",$tpl));
+		$this->add('tpl', str_replace("\n", " ", $tpl));
 	}
 
 	/**
@@ -298,9 +298,9 @@ 
 	{
 		$db_info = Context::getDBInfo();
 		$admin_ip_list = $db_info->admin_ip_list;
-		if(!$admin_ip_list) return true;
-		if(!is_array($admin_ip_list)) $admin_ip_list = explode(',',$admin_ip_list);
-		if(!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) return true;
+		if (!$admin_ip_list) return true;
+		if (!is_array($admin_ip_list)) $admin_ip_list = explode(',', $admin_ip_list);
+		if (!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) return true;
 		else return false;
 	}
 }

Braces +45 added lines, -18 removed lines

@@ -63,20 +63,28 @@ 
 			switch($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_nick_name = $search_keyword;
 					$args->html_nick_name = htmlspecialchars($search_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
@@ -129,8 +137,7 @@ 
 		{
 			$query_id = 'member.getMemberListWithinGroup';
 			$args->sort_index = "member.".$sort_index;
-		}
-		else
+		} else
 		{
 			$query_id = 'member.getMemberList';
 			$args->sort_index = $sort_index; 
@@ -174,7 +181,9 @@ 
 	function getSiteAdminMemberSrls()
 	{
 		$output = executeQueryArray('member.getSiteAdminMemberSrls');
-		if(!$output->toBool() || !$output->data) return array();
+		if(!$output->toBool() || !$output->data) {
+			return array();
+		}
 
 		$member_srls = array();
 		foreach($output->data as $member_info)
@@ -193,8 +202,9 @@ 
 	function getMemberAdminColorset()
 	{
 		$skin = Context::get('skin');
-		if(!$skin) $tpl = "";
-		else
+		if(!$skin) {
+			$tpl = "";
+		} else
 		{
 			$oModuleModel = getModel('module');
 			$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
@@ -202,7 +212,9 @@ 
 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
-			if(!$config->colorset) $config->colorset = "white";
+			if(!$config->colorset) {
+				$config->colorset = "white";
+			}
 			Context::set('config', $config);
 
 			$oTemplate = &TemplateHandler::getInstance();
@@ -223,10 +235,14 @@ 
 	public function getMemberCountByDate($date = '')
 	{
 		$args = new stdClass();
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if($date) {
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('member.getMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool()) {
+			return 0;
+		}
 
 		return $output->data->count;
 	}
@@ -240,10 +256,14 @@ 
 	 */
 	function getMemberGroupMemberCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if($date) {
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('member.getMemberGroupMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool()) {
+			return 0;
+		}
 
 		return count($output->data);
 	}
@@ -298,10 +318,17 @@ 
 	{
 		$db_info = Context::getDBInfo();
 		$admin_ip_list = $db_info->admin_ip_list;
-		if(!$admin_ip_list) return true;
-		if(!is_array($admin_ip_list)) $admin_ip_list = explode(',',$admin_ip_list);
-		if(!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) return true;
-		else return false;
+		if(!$admin_ip_list) {
+			return true;
+		}
+		if(!is_array($admin_ip_list)) {
+			$admin_ip_list = explode(',',$admin_ip_list);
+		}
+		if(!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 }
 /* End of file member.admin.model.php */

modules/member/member.class.php

Indentation +4 added lines, -4 removed lines

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

Spacing +96 added lines, -96 removed lines

@@ -20,13 +20,13 @@ 
 	 */
 	function member()
 	{
-		if(!Context::isInstalled()) return;
+		if (!Context::isInstalled()) return;
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
 
 		// Set to use SSL upon actions related member join/information/password and so on. 2013.02.15
-		if(!Context::isExistsSSLAction('dispMemberModifyPassword') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispMemberModifyPassword') && Context::getSslStatus() == 'optional')
 		{
 			$ssl_actions = array('dispMemberModifyPassword', 'dispMemberSignUpForm', 'dispMemberModifyInfo', 'dispMemberModifyEmailAddress', 'dispMemberGetTempPassword', 'dispMemberResendAuthMail', 'dispMemberLoginForm', 'dispMemberFindAccount', 'dispMemberLeave', 'procMemberLogin', 'procMemberModifyPassword', 'procMemberInsert', 'procMemberModifyInfo', 'procMemberFindAccount', 'procMemberModifyEmailAddress', 'procMemberResendAuthMail', 'procMemberLeave'/*, 'getMemberMenu'*/, 'procMemberFindAccountByQuestion');
 			Context::addSSLActions($ssl_actions);
@@ -44,12 +44,12 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
+		$oDB->addIndex("member_group", "idx_site_title", array("site_srl", "title"), true);
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
-		if(empty($config))
+		if (empty($config))
 		{
 			$isNotInstall = true;
 			$config = new stdClass;
@@ -58,29 +58,29 @@ 
 		// Set the basic information
 		$config->enable_join = 'Y';
 		$config->enable_openid = 'N';
-		if(!$config->enable_auth_mail) $config->enable_auth_mail = 'N';
-		if(!$config->image_name) $config->image_name = 'Y';
-		if(!$config->image_mark) $config->image_mark = 'Y';
-		if(!$config->profile_image) $config->profile_image = 'Y';
-		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->group_image_mark!='Y') $config->group_image_mark = 'N';
-		if(!$config->password_strength) $config->password_strength = 'normal';
+		if (!$config->enable_auth_mail) $config->enable_auth_mail = 'N';
+		if (!$config->image_name) $config->image_name = 'Y';
+		if (!$config->image_mark) $config->image_mark = 'Y';
+		if (!$config->profile_image) $config->profile_image = 'Y';
+		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->group_image_mark != 'Y') $config->group_image_mark = 'N';
+		if (!$config->password_strength) $config->password_strength = 'normal';
 		
-		if(!$config->password_hashing_algorithm)
+		if (!$config->password_hashing_algorithm)
 		{
 			$oPassword = new Password();
 			$config->password_hashing_algorithm = $oPassword->getBestAlgorithm();
 		}
-		if(!$config->password_hashing_work_factor)
+		if (!$config->password_hashing_work_factor)
 		{
 			$config->password_hashing_work_factor = 8;
 		}
-		if(!$config->password_hashing_auto_upgrade)
+		if (!$config->password_hashing_auto_upgrade)
 		{
 			$config->password_hashing_auto_upgrade = 'Y';
 		}
@@ -91,7 +91,7 @@ 
 		$oMemberController = getController('member');
 		$oMemberAdminController = getAdminController('member');
 
-		if(!$config->signupForm || !is_array($config->signupForm))
+		if (!$config->signupForm || !is_array($config->signupForm))
 		{
 			$identifier = $isNotInstall ? 'email_address' : 'user_id';
 
@@ -106,10 +106,10 @@ 
 			$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
 		}
 		
-		$oModuleController->insertModuleConfig('member',$config);
+		$oModuleController->insertModuleConfig('member', $config);
 
 		$groups = $oMemberModel->getGroups();
-		if(!count($groups))
+		if (!count($groups))
 		{
 			// Set an administrator, regular member(group1), and associate member(group2)
 			$group_args = new stdClass;
@@ -135,10 +135,10 @@ 
 		$admin_args = new stdClass;
 		$admin_args->is_admin = 'Y';
 		$output = executeQuery('member.getMemberList', $admin_args);
-		if(!$output->data)
+		if (!$output->data)
 		{
-			$admin_info = Context::gets('password','nick_name','email_address', 'user_id');
-			if($admin_info->email_address)
+			$admin_info = Context::gets('password', 'nick_name', 'email_address', 'user_id');
+			if ($admin_info->email_address)
 			{
 				$admin_info->user_name = 'admin';
 				// Insert admin information
@@ -150,16 +150,16 @@ 
 		// Register denied ID(default + module name)
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		foreach($module_list as $key => $val)
+		foreach ($module_list as $key => $val)
 		{
-			$oMemberAdminController->insertDeniedID($val->module,'');
+			$oMemberAdminController->insertDeniedID($val->module, '');
 		}
-		$oMemberAdminController->insertDeniedID('www','');
-		$oMemberAdminController->insertDeniedID('root','');
-		$oMemberAdminController->insertDeniedID('administrator','');
-		$oMemberAdminController->insertDeniedID('telnet','');
-		$oMemberAdminController->insertDeniedID('ftp','');
-		$oMemberAdminController->insertDeniedID('http','');
+		$oMemberAdminController->insertDeniedID('www', '');
+		$oMemberAdminController->insertDeniedID('root', '');
+		$oMemberAdminController->insertDeniedID('administrator', '');
+		$oMemberAdminController->insertDeniedID('telnet', '');
+		$oMemberAdminController->insertDeniedID('ftp', '');
+		$oMemberAdminController->insertDeniedID('http', '');
 		// Create cache directory to use in the member module
 		FileHandler::makeDir('./files/member_extra_info/image_name');
 		FileHandler::makeDir('./files/member_extra_info/image_mark');
@@ -183,60 +183,60 @@ 
 		$oDB = &DB::getInstance();
 		$oModuleModel = getModel('module');
 		// check member directory (11/08/2007 added)
-		if(!is_dir("./files/member_extra_info")) return true;
+		if (!is_dir("./files/member_extra_info")) return true;
 		// check member directory (22/10/2007 added)
-		if(!is_dir("./files/member_extra_info/profile_image")) return true;
+		if (!is_dir("./files/member_extra_info/profile_image")) return true;
 		// Add a column(is_register) to "member_auth_mail" table (22/04/2008)
 		$act = $oDB->isColumnExists("member_auth_mail", "is_register");
-		if(!$act) return true;
+		if (!$act) return true;
 		// Add a column(site_srl) to "member_group_member" table (11/15/2008)
-		if(!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
-		if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
-		if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
+		if (!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
+		if (!$oDB->isColumnExists("member_group", "site_srl")) return true;
+		if ($oDB->isIndexExists("member_group", "uni_member_group_title")) return true;
 
 		// Add a column for list_order (05/18/2011)
-		if(!$oDB->isColumnExists("member_group", "list_order")) return true;
+		if (!$oDB->isColumnExists("member_group", "list_order")) return true;
 
 		// image_mark 추가 (2009. 02. 14)
-		if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
+		if (!$oDB->isColumnExists("member_group", "image_mark")) return true;
 		// Add c column for password expiration date
-		if(!$oDB->isColumnExists("member", "change_password_date")) return true;
+		if (!$oDB->isColumnExists("member", "change_password_date")) return true;
 
 		// Add columns of question and answer to verify a password
-		if(!$oDB->isColumnExists("member", "find_account_question")) return true;
-		if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
+		if (!$oDB->isColumnExists("member", "find_account_question")) return true;
+		if (!$oDB->isColumnExists("member", "find_account_answer")) return true;
 
-		if(!$oDB->isColumnExists("member", "list_order")) return true;
-		if(!$oDB->isIndexExists("member","idx_list_order")) return true;
+		if (!$oDB->isColumnExists("member", "list_order")) return true;
+		if (!$oDB->isIndexExists("member", "idx_list_order")) return true;
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// check signup form ordering info
-		if(!$config->signupForm) return true;
+		if (!$config->signupForm) return true;
 
 		// check agreement field exist
-		if($config->agreement) return true;
+		if ($config->agreement) return true;
 
-		if($config->skin)
+		if ($config->skin)
 		{
 			$config_parse = explode('.', $config->skin);
-			if(count($config_parse) > 1)
+			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/member/', $config_parse[0]);
-				if(is_dir($template_path)) return true;
+				if (is_dir($template_path)) return true;
 			}
 		}
 
 		// supprot multilanguage agreement.
-		if(is_readable('./files/member_extra_info/agreement.txt')) return true;
+		if (is_readable('./files/member_extra_info/agreement.txt')) return true;
 
-		if(!is_readable('./files/ruleset/insertMember.xml')) return true;
-		if(!is_readable('./files/ruleset/login.xml')) return true;
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
+		if (!is_readable('./files/ruleset/insertMember.xml')) return true;
+		if (!is_readable('./files/ruleset/login.xml')) return true;
+		if (!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
 
 		// 2013. 11. 22 add menu when popup document menu called
-		if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
-		if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
+		if (!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
 
 		return false;
 	}
@@ -256,66 +256,66 @@ 
 		FileHandler::makeDir('./files/member_extra_info/signature');
 		FileHandler::makeDir('./files/member_extra_info/profile_image');
 		// Add a column
-		if(!$oDB->isColumnExists("member_auth_mail", "is_register"))
+		if (!$oDB->isColumnExists("member_auth_mail", "is_register"))
 		{
 			$oDB->addColumn("member_auth_mail", "is_register", "char", 1, "N", true);
 		}
 		// Add a column(site_srl) to "member_group_member" table (11/15/2008)
-		if(!$oDB->isColumnExists("member_group_member", "site_srl"))
+		if (!$oDB->isColumnExists("member_group_member", "site_srl"))
 		{
 			$oDB->addColumn("member_group_member", "site_srl", "number", 11, 0, true);
 			$oDB->addIndex("member_group_member", "idx_site_srl", "site_srl", false);
 		}
-		if(!$oDB->isColumnExists("member_group", "site_srl"))
+		if (!$oDB->isColumnExists("member_group", "site_srl"))
 		{
 			$oDB->addColumn("member_group", "site_srl", "number", 11, 0, true);
-			$oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
+			$oDB->addIndex("member_group", "idx_site_title", array("site_srl", "title"), true);
 		}
-		if($oDB->isIndexExists("member_group","uni_member_group_title"))
+		if ($oDB->isIndexExists("member_group", "uni_member_group_title"))
 		{
-			$oDB->dropIndex("member_group","uni_member_group_title",true);
+			$oDB->dropIndex("member_group", "uni_member_group_title", true);
 		}
 
 		// Add a column(list_order) to "member_group" table (05/18/2011)
-		if(!$oDB->isColumnExists("member_group", "list_order"))
+		if (!$oDB->isColumnExists("member_group", "list_order"))
 		{
 			$oDB->addColumn("member_group", "list_order", "number", 11, '', true);
-			$oDB->addIndex("member_group","idx_list_order", "list_order",false);
+			$oDB->addIndex("member_group", "idx_list_order", "list_order", false);
 			$output = executeQuery('member.updateAllMemberGroupListOrder');
 		}
 		// Add a column for image_mark (02/14/2009)
-		if(!$oDB->isColumnExists("member_group", "image_mark"))
+		if (!$oDB->isColumnExists("member_group", "image_mark"))
 		{
 			$oDB->addColumn("member_group", "image_mark", "text");
 		}
 		// Add a column for password expiration date
-		if(!$oDB->isColumnExists("member", "change_password_date"))
+		if (!$oDB->isColumnExists("member", "change_password_date"))
 		{
 			$oDB->addColumn("member", "change_password_date", "date");
 			executeQuery('member.updateAllChangePasswordDate');
 		}
 
 		// Add columns of question and answer to verify a password
-		if(!$oDB->isColumnExists("member", "find_account_question"))
+		if (!$oDB->isColumnExists("member", "find_account_question"))
 		{
 			$oDB->addColumn("member", "find_account_question", "number", 11);
 		}
-		if(!$oDB->isColumnExists("member", "find_account_answer"))
+		if (!$oDB->isColumnExists("member", "find_account_answer"))
 		{
 			$oDB->addColumn("member", "find_account_answer", "varchar", 250);
 		}
 
-		if(!$oDB->isColumnExists("member", "list_order"))
+		if (!$oDB->isColumnExists("member", "list_order"))
 		{
 			$oDB->addColumn("member", "list_order", "number", 11);
 			@set_time_limit(0);
 			$args->list_order = 'member_srl';
-			executeQuery('member.updateMemberListOrderAll',$args);
+			executeQuery('member.updateMemberListOrderAll', $args);
 			executeQuery('member.updateMemberListOrderAll');
 		}
-		if(!$oDB->isIndexExists("member","idx_list_order"))
+		if (!$oDB->isIndexExists("member", "idx_list_order"))
 		{
-			$oDB->addIndex("member","idx_list_order", array("list_order"));
+			$oDB->addIndex("member", "idx_list_order", array("list_order"));
 		}
 
 		$oModuleModel = getModel('module');
@@ -323,9 +323,9 @@ 
 		$oModuleController = getController('module');
 
 		// check agreement value exist
-		if($config->agreement)
+		if ($config->agreement)
 		{
-			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+			$agreement_file = _XE_PATH_ . 'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
 			$output = FileHandler::writeFile($agreement_file, $config->agreement);
 
 			$config->agreement = NULL;
@@ -334,7 +334,7 @@ 
 
 		$oMemberAdminController = getAdminController('member');
 		// check signup form ordering info
-		if(!$config->signupForm || !is_array($config->signupForm))
+		if (!$config->signupForm || !is_array($config->signupForm))
 		{
 			$identifier = 'user_id';
 
@@ -344,13 +344,13 @@ 
 			$output = $oModuleController->updateModuleConfig('member', $config);
 		}
 
-		if($config->skin)
+		if ($config->skin)
 		{
 			$config_parse = explode('.', $config->skin);
 			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/member/', $config_parse[0]);
-				if(is_dir($template_path))
+				if (is_dir($template_path))
 				{
 					$config->skin = implode('|@|', $config_parse);
 					$oModuleController = getController('module');
@@ -359,26 +359,26 @@ 
 			}
 		}
 
-		if(is_readable('./files/member_extra_info/agreement.txt'))
+		if (is_readable('./files/member_extra_info/agreement.txt'))
 		{
-			$source_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
-			$target_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+			$source_file = _XE_PATH_ . 'files/member_extra_info/agreement.txt';
+			$target_file = _XE_PATH_ . 'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
 
 			FileHandler::rename($source_file, $target_file);
 		}
 
 		FileHandler::makeDir('./files/ruleset');
-		if(!is_readable('./files/ruleset/insertMember.xml'))
+		if (!is_readable('./files/ruleset/insertMember.xml'))
 			$oMemberAdminController->_createSignupRuleset($config->signupForm);
-		if(!is_readable('./files/ruleset/login.xml'))
+		if (!is_readable('./files/ruleset/login.xml'))
 			$oMemberAdminController->_createLoginRuleset($config->identifier);
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml'))
+		if (!is_readable('./files/ruleset/find_member_account_by_question.xml'))
 			$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
 
 		// 2013. 11. 22 add menu when popup document menu called
-		if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'))
+		if (!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'))
 			$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
-		if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
+		if (!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
 			$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
 
 		return new Object(0, 'success_updated');
@@ -398,7 +398,7 @@ 
 	 */
 	function recordLoginError($error = 0, $message = 'success')
 	{
-		if($error == 0) return new Object($error, $message);
+		if ($error == 0) return new Object($error, $message);
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -406,18 +406,18 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new Object($error, $message);
+		if (!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new Object($error, $message);
 
 		$args = new stdClass();
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 
 		$output = executeQuery('member.getLoginCountByIp', $args);
-		if($output->data && $output->data->count)
+		if ($output->data && $output->data->count)
 		{
 			$last_update = strtotime($output->data->last_update);
-			$term = intval($_SERVER['REQUEST_TIME']-$last_update);
+			$term = intval($_SERVER['REQUEST_TIME'] - $last_update);
 			//update, if IP address access in a short time, update count. If not, make count 1.
-			if($term < $config->max_error_count_time)
+			if ($term < $config->max_error_count_time)
 			{
 				$args->count = $output->data->count + 1;
 			}
@@ -443,7 +443,7 @@ 
 	 */
 	function recordMemberLoginError($error = 0, $message = 'success', $args = NULL)
 	{
-		if($error == 0 || !$args->member_srl) return new Object($error, $message);
+		if ($error == 0 || !$args->member_srl) return new Object($error, $message);
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -451,21 +451,21 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new Object($error, $message);
+		if (!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new Object($error, $message);
 
 		$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
-		if($output->data && $output->data->content)
+		if ($output->data && $output->data->content)
 		{
 			//update
 			$content = unserialize($output->data->content);
-			$content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
+			$content[] = array($_SERVER['REMOTE_ADDR'], Context::getLang($message), $_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);
 		}
 		else
 		{
 			//insert
-			$content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
+			$content[0] = array($_SERVER['REMOTE_ADDR'], Context::getLang($message), $_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.insertLoginCountHistoryByMemberSrl', $args);
 		}

Braces +135 added lines, -55 removed lines

@@ -20,7 +20,9 @@ 
 	 */
 	function member()
 	{
-		if(!Context::isInstalled()) return;
+		if(!Context::isInstalled()) {
+			return;
+		}
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
@@ -58,18 +60,42 @@ 
 		// Set the basic information
 		$config->enable_join = 'Y';
 		$config->enable_openid = 'N';
-		if(!$config->enable_auth_mail) $config->enable_auth_mail = 'N';
-		if(!$config->image_name) $config->image_name = 'Y';
-		if(!$config->image_mark) $config->image_mark = 'Y';
-		if(!$config->profile_image) $config->profile_image = 'Y';
-		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->group_image_mark!='Y') $config->group_image_mark = 'N';
-		if(!$config->password_strength) $config->password_strength = 'normal';
+		if(!$config->enable_auth_mail) {
+			$config->enable_auth_mail = 'N';
+		}
+		if(!$config->image_name) {
+			$config->image_name = 'Y';
+		}
+		if(!$config->image_mark) {
+			$config->image_mark = 'Y';
+		}
+		if(!$config->profile_image) {
+			$config->profile_image = 'Y';
+		}
+		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->group_image_mark!='Y') {
+			$config->group_image_mark = 'N';
+		}
+		if(!$config->password_strength) {
+			$config->password_strength = 'normal';
+		}
 		
 		if(!$config->password_hashing_algorithm)
 		{
@@ -183,39 +209,69 @@ 
 		$oDB = &DB::getInstance();
 		$oModuleModel = getModel('module');
 		// check member directory (11/08/2007 added)
-		if(!is_dir("./files/member_extra_info")) return true;
+		if(!is_dir("./files/member_extra_info")) {
+			return true;
+		}
 		// check member directory (22/10/2007 added)
-		if(!is_dir("./files/member_extra_info/profile_image")) return true;
+		if(!is_dir("./files/member_extra_info/profile_image")) {
+			return true;
+		}
 		// Add a column(is_register) to "member_auth_mail" table (22/04/2008)
 		$act = $oDB->isColumnExists("member_auth_mail", "is_register");
-		if(!$act) return true;
+		if(!$act) {
+			return true;
+		}
 		// Add a column(site_srl) to "member_group_member" table (11/15/2008)
-		if(!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
-		if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
-		if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
+		if(!$oDB->isColumnExists("member_group_member", "site_srl")) {
+			return true;
+		}
+		if(!$oDB->isColumnExists("member_group", "site_srl")) {
+			return true;
+		}
+		if($oDB->isIndexExists("member_group","uni_member_group_title")) {
+			return true;
+		}
 
 		// Add a column for list_order (05/18/2011)
-		if(!$oDB->isColumnExists("member_group", "list_order")) return true;
+		if(!$oDB->isColumnExists("member_group", "list_order")) {
+			return true;
+		}
 
 		// image_mark 추가 (2009. 02. 14)
-		if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
+		if(!$oDB->isColumnExists("member_group", "image_mark")) {
+			return true;
+		}
 		// Add c column for password expiration date
-		if(!$oDB->isColumnExists("member", "change_password_date")) return true;
+		if(!$oDB->isColumnExists("member", "change_password_date")) {
+			return true;
+		}
 
 		// Add columns of question and answer to verify a password
-		if(!$oDB->isColumnExists("member", "find_account_question")) return true;
-		if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
+		if(!$oDB->isColumnExists("member", "find_account_question")) {
+			return true;
+		}
+		if(!$oDB->isColumnExists("member", "find_account_answer")) {
+			return true;
+		}
 
-		if(!$oDB->isColumnExists("member", "list_order")) return true;
-		if(!$oDB->isIndexExists("member","idx_list_order")) return true;
+		if(!$oDB->isColumnExists("member", "list_order")) {
+			return true;
+		}
+		if(!$oDB->isIndexExists("member","idx_list_order")) {
+			return true;
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// check signup form ordering info
-		if(!$config->signupForm) return true;
+		if(!$config->signupForm) {
+			return true;
+		}
 
 		// check agreement field exist
-		if($config->agreement) return true;
+		if($config->agreement) {
+			return true;
+		}
 
 		if($config->skin)
 		{
@@ -223,20 +279,34 @@ 
 			if(count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/member/', $config_parse[0]);
-				if(is_dir($template_path)) return true;
+				if(is_dir($template_path)) {
+					return true;
+				}
 			}
 		}
 
 		// supprot multilanguage agreement.
-		if(is_readable('./files/member_extra_info/agreement.txt')) return true;
+		if(is_readable('./files/member_extra_info/agreement.txt')) {
+			return true;
+		}
 
-		if(!is_readable('./files/ruleset/insertMember.xml')) return true;
-		if(!is_readable('./files/ruleset/login.xml')) return true;
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
+		if(!is_readable('./files/ruleset/insertMember.xml')) {
+			return true;
+		}
+		if(!is_readable('./files/ruleset/login.xml')) {
+			return true;
+		}
+		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) {
+			return true;
+		}
 
 		// 2013. 11. 22 add menu when popup document menu called
-		if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
-		if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
+		if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) {
+			return true;
+		}
+		if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) {
+			return true;
+		}
 
 		return false;
 	}
@@ -368,18 +438,23 @@ 
 		}
 
 		FileHandler::makeDir('./files/ruleset');
-		if(!is_readable('./files/ruleset/insertMember.xml'))
-			$oMemberAdminController->_createSignupRuleset($config->signupForm);
-		if(!is_readable('./files/ruleset/login.xml'))
-			$oMemberAdminController->_createLoginRuleset($config->identifier);
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml'))
-			$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
+		if(!is_readable('./files/ruleset/insertMember.xml')) {
+					$oMemberAdminController->_createSignupRuleset($config->signupForm);
+		}
+		if(!is_readable('./files/ruleset/login.xml')) {
+					$oMemberAdminController->_createLoginRuleset($config->identifier);
+		}
+		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) {
+					$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
+		}
 
 		// 2013. 11. 22 add menu when popup document menu called
-		if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'))
-			$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
-		if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
-			$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
+		if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) {
+					$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
+		}
+		if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) {
+					$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
+		}
 
 		return new Object(0, 'success_updated');
 	}
@@ -398,7 +473,9 @@ 
 	 */
 	function recordLoginError($error = 0, $message = 'success')
 	{
-		if($error == 0) return new Object($error, $message);
+		if($error == 0) {
+			return new Object($error, $message);
+		}
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -406,7 +483,9 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new Object($error, $message);
+		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') {
+			return new Object($error, $message);
+		}
 
 		$args = new stdClass();
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
@@ -420,16 +499,14 @@ 
 			if($term < $config->max_error_count_time)
 			{
 				$args->count = $output->data->count + 1;
-			}
-			else
+			} else
 			{
 				$args->count = 1;
 			}
 			unset($oMemberModel);
 			unset($config);
 			$output = executeQuery('member.updateLoginCountByIp', $args);
-		}
-		else
+		} else
 		{
 			//insert
 			$args->count = 1;
@@ -443,7 +520,9 @@ 
 	 */
 	function recordMemberLoginError($error = 0, $message = 'success', $args = NULL)
 	{
-		if($error == 0 || !$args->member_srl) return new Object($error, $message);
+		if($error == 0 || !$args->member_srl) {
+			return new Object($error, $message);
+		}
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -451,7 +530,9 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new Object($error, $message);
+		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') {
+			return new Object($error, $message);
+		}
 
 		$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
 		if($output->data && $output->data->content)
@@ -461,8 +542,7 @@ 
 			$content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);
-		}
-		else
+		} else
 		{
 			//insert
 			$content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);

modules/member/member.mobile.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
-require_once(_XE_PATH_.'modules/member/member.view.php');
+require_once(_XE_PATH_ . 'modules/member/member.view.php');
 class memberMobile extends memberView
 {
 	/**
@@ -21,7 +21,7 @@ 
 
 		$mskin = $this->member_config->mskin;
 		// Set the template path
-		if(!$mskin)
+		if (!$mskin)
 		{
 			$mskin = 'default';
 			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
@@ -33,17 +33,17 @@ 
 
 		// if member_srl exists, set memberInfo
 		$member_srl = Context::get('member_srl');
-		if($member_srl)
+		if ($member_srl)
 		{
 			$oMemberModel = getModel('member');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-			if(!$this->memberInfo)
+			if (!$this->memberInfo)
 			{
-				Context::set('member_srl','');
+				Context::set('member_srl', '');
 			}
 			else
 			{
-				Context::set('member_info',$this->memberInfo);
+				Context::set('member_info', $this->memberInfo);
 			}
 		}
 
@@ -51,7 +51,7 @@ 
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($this->member_config->mlayout_srl);
-		if($layout_info)
+		if ($layout_info)
 		{
 			$this->module_info->mlayout_srl = $this->member_config->mlayout_srl;
 			$this->setLayoutPath($layout_info->path);
@@ -62,7 +62,7 @@ 
 	{
 		parent::dispMemberModifyInfo();
 
-		if($this->member_info)
+		if ($this->member_info)
 		{
 			Context::set('oMemberInfo', get_object_vars($this->member_info));
 		}

Braces +2 added lines, -4 removed lines

@@ -25,8 +25,7 @@ 
 		{
 			$mskin = 'default';
 			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
-		}
-		else
+		} else
 		{
 			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
 		}
@@ -40,8 +39,7 @@ 
 			if(!$this->memberInfo)
 			{
 				Context::set('member_srl','');
-			}
-			else
+			} else
 			{
 				Context::set('member_info',$this->memberInfo);
 			}

modules/member/member.view.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  memberView
- * @author NAVER (developers@xpressengine.com)
- * @brief View class of member module
- */
+	 * @class  memberView
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief View class of member module
+	 */
 class memberView extends member
 {
 	var $group_list = NULL; // /< Group list information
@@ -635,7 +635,7 @@ 
 	 * Spammer manage popup
 	 * 
 	 * @return void
-	**/
+	 **/
 	function dispMemberSpammer()
 	{
 		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');

Spacing +68 added lines, -68 removed lines

@@ -25,7 +25,7 @@ 
 
 		$skin = $this->member_config->skin;
 		// Set the template path
-		if(!$skin)
+		if (!$skin)
 		{
 			$skin = 'default';
 			$template_path = sprintf('%sskins/%s', $this->module_path, $skin);
@@ -48,7 +48,7 @@ 
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($this->member_config->layout_srl);
-		if($layout_info)
+		if ($layout_info)
 		{
 			$this->module_info->layout_srl = $this->member_config->layout_srl;
 			$this->setLayoutPath($layout_info->path);
@@ -63,14 +63,14 @@ 
 		$oMemberModel = getModel('member');
 		$logged_info = Context::get('logged_info');
 		// Don't display member info to non-logged user
-		if(!$logged_info->member_srl) return $this->stop('msg_not_permitted');
+		if (!$logged_info->member_srl) return $this->stop('msg_not_permitted');
 
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl && Context::get('is_logged'))
+		if (!$member_srl && Context::get('is_logged'))
 		{
 			$member_srl = $logged_info->member_srl;
 		}
-		elseif(!$member_srl)
+		elseif (!$member_srl)
 		{
 			return $this->dispMemberSignUpForm();
 		}
@@ -82,14 +82,14 @@ 
 		unset($member_info->email_id);
 		unset($member_info->email_host);
 
-		if($logged_info->is_admin != 'Y' && ($member_info->member_srl != $logged_info->member_srl))
+		if ($logged_info->is_admin != 'Y' && ($member_info->member_srl != $logged_info->member_srl))
 		{
-			$start = strpos($member_info->email_address, '@')+1;
+			$start = strpos($member_info->email_address, '@') + 1;
 			$replaceStr = str_repeat('*', (strlen($member_info->email_address) - $start));
 			$member_info->email_address = substr_replace($member_info->email_address, $replaceStr, $start);
 		}
 
-		if(!$member_info->member_srl) return $this->dispMemberSignUpForm();
+		if (!$member_info->member_srl) return $this->dispMemberSignUpForm();
 
 		Context::set('memberInfo', get_object_vars($member_info));
 
@@ -107,46 +107,46 @@ 
 	{
 		$logged_info = Context::get('logged_info');
 		$displayDatas = array();
-		foreach($memberConfig->signupForm as $no=>$formInfo)
+		foreach ($memberConfig->signupForm as $no=>$formInfo)
 		{
-			if(!$formInfo->isUse)
+			if (!$formInfo->isUse)
 			{
 				continue;
 			}
 
-			if($formInfo->name == 'password' || $formInfo->name == 'find_account_question')
+			if ($formInfo->name == 'password' || $formInfo->name == 'find_account_question')
 			{
 				continue;
 			}
 
-			if($logged_info->is_admin != 'Y' && $memberInfo->member_srl != $logged_info->member_srl && $formInfo->isPublic != 'Y')
+			if ($logged_info->is_admin != 'Y' && $memberInfo->member_srl != $logged_info->member_srl && $formInfo->isPublic != 'Y')
 			{
 				continue;
 			}
 
 			$item = $formInfo;
 
-			if($formInfo->isDefaultForm)
+			if ($formInfo->isDefaultForm)
 			{
 				$item->title = Context::getLang($formInfo->name);
 				$item->value = $memberInfo->{$formInfo->name};
 
-				if($formInfo->name == 'profile_image' && $memberInfo->profile_image)
+				if ($formInfo->name == 'profile_image' && $memberInfo->profile_image)
 				{
 					$target = $memberInfo->profile_image;
-					$item->value = '<img src="'.$target->src.'" />';
+					$item->value = '<img src="' . $target->src . '" />';
 				}
-				elseif($formInfo->name == 'image_name' && $memberInfo->image_name)
+				elseif ($formInfo->name == 'image_name' && $memberInfo->image_name)
 				{
 					$target = $memberInfo->image_name;
-					$item->value = '<img src="'.$target->src.'" />';
+					$item->value = '<img src="' . $target->src . '" />';
 				}
-				elseif($formInfo->name == 'image_mark' && $memberInfo->image_mark)
+				elseif ($formInfo->name == 'image_mark' && $memberInfo->image_mark)
 				{
 					$target = $memberInfo->image_mark;
-					$item->value = '<img src="'.$target->src.'" />';
+					$item->value = '<img src="' . $target->src . '" />';
 				}
-				elseif($formInfo->name == 'birthday' && $memberInfo->birthday)
+				elseif ($formInfo->name == 'birthday' && $memberInfo->birthday)
 				{
 					$item->value = zdate($item->value, 'Y-m-d');
 				}
@@ -155,19 +155,19 @@ 
 			{
 				$item->title = $extendFormInfo[$formInfo->member_join_form_srl]->column_title;
 				$orgValue = $extendFormInfo[$formInfo->member_join_form_srl]->value;
-				if($formInfo->type=='tel' && is_array($orgValue))
+				if ($formInfo->type == 'tel' && is_array($orgValue))
 				{
 					$item->value = implode('-', $orgValue);
 				}
-				elseif($formInfo->type=='kr_zip' && is_array($orgValue))
+				elseif ($formInfo->type == 'kr_zip' && is_array($orgValue))
 				{
 					$item->value = implode(' ', $orgValue);
 				}
-				elseif($formInfo->type=='checkbox' && is_array($orgValue))
+				elseif ($formInfo->type == 'checkbox' && is_array($orgValue))
 				{
-					$item->value = implode(", ",$orgValue);
+					$item->value = implode(", ", $orgValue);
 				}
-				elseif($formInfo->type=='date')
+				elseif ($formInfo->type == 'date')
 				{
 					$item->value = zdate($orgValue, "Y-m-d");
 				}
@@ -198,12 +198,12 @@ 
 
 		$oMemberModel = getModel('member');
 		// Get the member information if logged-in
-		if($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
+		if ($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
 		// call a trigger (before) 
 		$trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $member_config);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Error appears if the member is not allowed to join
-		if($member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
+		if ($member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
 
 		$oMemberAdminView = getAdminView('member');
 		$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
@@ -226,15 +226,15 @@ 
 	{
 		$logged_info = Context::get('logged_info');
 		$oMemberModel = getModel('member');
-		if(!$oMemberModel->isLogged() || empty($logged_info))
+		if (!$oMemberModel->isLogged() || empty($logged_info))
 		{
 			return $this->stop('msg_not_logged');
 		}
 
 		$_SESSION['rechecked_password_step'] = 'INPUT_PASSWORD';
 
-		$templateFile = $this->getTemplatePath().'rechecked_password.html';
-		if(!is_readable($templateFile))
+		$templateFile = $this->getTemplatePath() . 'rechecked_password.html';
+		if (!is_readable($templateFile))
 		{
 			$templatePath = sprintf('%sskins/default', $this->module_path);
 			$this->setTemplatePath($templatePath);
@@ -259,7 +259,7 @@ 
 	 */
 	function dispMemberModifyInfo() 
 	{
-		if($_SESSION['rechecked_password_step'] != 'VALIDATE_PASSWORD' && $_SESSION['rechecked_password_step'] != 'INPUT_DATA')
+		if ($_SESSION['rechecked_password_step'] != 'VALIDATE_PASSWORD' && $_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
 			$this->dispMemberModifyInfoBefore();
 			return;
@@ -271,7 +271,7 @@ 
 
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
@@ -279,13 +279,13 @@ 
 		$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address', 'find_account_answer', 'homepage', 'blog', 'birthday', 'allow_mailing');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		$member_info->signature = $oMemberModel->getSignature($member_srl);
-		Context::set('member_info',$member_info);
+		Context::set('member_info', $member_info);
 
 		// Get a list of extend join form
 		Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
 
 		// Editor of the module set for signing by calling getEditor
-		if($member_info->member_srl)
+		if ($member_info->member_srl)
 		{
 			$oEditorModel = getModel('editor');
 			$option = new stdClass();
@@ -330,15 +330,15 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 
 		$module_srl = Context::get('module_srl');
-		Context::set('module_srl',Context::get('selected_module_srl'));
-		Context::set('search_target','member_srl');
-		Context::set('search_keyword',$member_srl);
+		Context::set('module_srl', Context::get('selected_module_srl'));
+		Context::set('search_target', 'member_srl');
+		Context::set('search_keyword', $member_srl);
 
 		$oDocumentAdminView = getAdminView('document');
 		$oDocumentAdminView->dispDocumentAdminList();
@@ -357,12 +357,12 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();
 		$args->member_srl = $logged_info->member_srl;
-		$args->page = (int)Context::get('page');
+		$args->page = (int) Context::get('page');
 
 		$output = executeQuery('member.getScrapDocumentList', $args);
 		Context::set('total_count', $output->total_count);
@@ -381,12 +381,12 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 		// Get the saved document(module_srl is set to member_srl instead)
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();
 		$args->member_srl = $logged_info->member_srl;
-		$args->page = (int)Context::get('page');
+		$args->page = (int) Context::get('page');
 		$args->statusList = array('TEMP');
 
 		$oDocumentModel = getModel('document');
@@ -405,10 +405,10 @@ 
 	 */
 	function dispMemberLoginForm()
 	{
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
-			Context::set('redirect_url', getNotEncodedUrl('act',''));
-			$this->setTemplatePath($this->module_path.'tpl');
+			Context::set('redirect_url', getNotEncodedUrl('act', ''));
+			$this->setTemplatePath($this->module_path . 'tpl');
 			$this->setTemplateFile('redirect.html');
 			return;
 		}
@@ -420,10 +420,10 @@ 
 
 		$XE_VALIDATOR_MESSAGE = Context::get('XE_VALIDATOR_MESSAGE');
 		$XE_VALIDATOR_ERROR = Context::get('XE_VALIDATOR_ERROR');
-		if($XE_VALIDATOR_ERROR == -11)
+		if ($XE_VALIDATOR_ERROR == -11)
 			Context::set('XE_VALIDATOR_MESSAGE', $XE_VALIDATOR_MESSAGE . $config->limit_day_description);
 
-		if($XE_VALIDATOR_ERROR < -10 && $XE_VALIDATOR_ERROR > -21)
+		if ($XE_VALIDATOR_ERROR < -10 && $XE_VALIDATOR_ERROR > -21)
 			Context::set('referer_url', getUrl('')); 
 		else
 			Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
@@ -439,7 +439,7 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
 		$memberConfig = $this->member_config;
 
@@ -448,9 +448,9 @@ 
 
 		$columnList = array('member_srl', 'user_id');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
-		Context::set('member_info',$member_info);
+		Context::set('member_info', $member_info);
 
-		if($memberConfig->identifier == 'user_id')
+		if ($memberConfig->identifier == 'user_id')
 		{
 			Context::set('identifier', 'user_id');
 			Context::set('formValue', $member_info->user_id);
@@ -471,7 +471,7 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
 		$memberConfig = $this->member_config;
 
@@ -479,9 +479,9 @@ 
 		$member_srl = $logged_info->member_srl;
 
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-		Context::set('member_info',$member_info);
+		Context::set('member_info', $member_info);
 
-		if($memberConfig->identifier == 'user_id')
+		if ($memberConfig->identifier == 'user_id')
 		{
 			Context::set('identifier', 'user_id');
 			Context::set('formValue', $member_info->user_id);
@@ -502,7 +502,7 @@ 
 	{
 		$oMemberController = getController('member');
 		$output = $oMemberController->procMemberLogout();
-		if(!$output->redirect_url)
+		if (!$output->redirect_url)
 			$this->setRedirectUrl(getNotEncodedUrl('act', ''));
 		else
 			$this->setRedirectUrl($output->redirect_url);
@@ -524,7 +524,7 @@ 
 	 */
 	function dispMemberFindAccount()
 	{
-		if(Context::get('is_logged')) return $this->stop('already_logged');
+		if (Context::get('is_logged')) return $this->stop('already_logged');
 
 		$config = $this->member_config;
 
@@ -538,13 +538,13 @@ 
 	 */
 	function dispMemberGetTempPassword()
 	{
-		if(Context::get('is_logged')) return $this->stop('already_logged');
+		if (Context::get('is_logged')) return $this->stop('already_logged');
 
 		$user_id = Context::get('user_id');
-		$temp_password = $_SESSION['xe_temp_password_'.$user_id];
-		unset($_SESSION['xe_temp_password_'.$user_id]);
+		$temp_password = $_SESSION['xe_temp_password_' . $user_id];
+		unset($_SESSION['xe_temp_password_' . $user_id]);
 
-		if(!$user_id||!$temp_password) return new Object(-1,'msg_invaild_request');
+		if (!$user_id || !$temp_password) return new Object(-1, 'msg_invaild_request');
 
 		Context::set('temp_password', $temp_password);
 
@@ -559,12 +559,12 @@ 
 		$authMemberSrl = $_SESSION['auth_member_srl'];
 		unset($_SESSION['auth_member_srl']);
 
-		if(Context::get('is_logged')) 
+		if (Context::get('is_logged')) 
 		{
 			return $this->stop('already_logged');
 		}
 
-		if($authMemberSrl)
+		if ($authMemberSrl)
 		{
 			$oMemberModel = getModel('member');
 			$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($authMemberSrl);
@@ -581,7 +581,7 @@ 
 
 	function dispMemberModifyEmailAddress()
 	{
-		if($_SESSION['rechecked_password_step'] != 'VALIDATE_PASSWORD' && $_SESSION['rechecked_password_step'] != 'INPUT_DATA')
+		if ($_SESSION['rechecked_password_step'] != 'VALIDATE_PASSWORD' && $_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
 			Context::set('success_return_url', getUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyEmailAddress'));
 			$this->dispMemberModifyInfoBefore();
@@ -609,10 +609,10 @@ 
 		$js_code[] = 'if(!validator) return false;';
 
 		$errorLang = array();
-		foreach($extraList as $val) 
+		foreach ($extraList as $val) 
 		{
 			$title = str_ireplace(array('<script', '</script'), array('<scr"+"ipt', '</scr"+"ipt'), addslashes($val->column_title));
-			if($val->column_type == 'kr_zip' || $val->column_type == 'tel')
+			if ($val->column_type == 'kr_zip' || $val->column_type == 'tel')
 			{
 				$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["%s[]","%s"]);', $val->column_name, $title);
 			}
@@ -638,7 +638,7 @@ 
 	**/
 	function dispMemberSpammer()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 
 		$member_srl = Context::get('member_srl');
 		$module_srl = Context::get('module_srl');
@@ -649,7 +649,7 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
 
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if (!$grant->manager) return new Object(-1, 'msg_not_permitted');
 
 		$oMemberModel = getModel('member');
 
@@ -661,7 +661,7 @@ 
 		$this->setLayoutPath('./common/tpl');
 		$this->setLayoutFile('popup_layout');
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('spammer');
 	}
 	

Braces +77 added lines, -58 removed lines

@@ -29,16 +29,14 @@ 
 		{
 			$skin = 'default';
 			$template_path = sprintf('%sskins/%s', $this->module_path, $skin);
-		}
-		else
+		} else
 		{
 			//check theme
 			$config_parse = explode('|@|', $skin);
 			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/member/', $config_parse[0]);
-			}
-			else
+			} else
 			{
 				$template_path = sprintf('%sskins/%s', $this->module_path, $skin);
 			}
@@ -63,14 +61,15 @@ 
 		$oMemberModel = getModel('member');
 		$logged_info = Context::get('logged_info');
 		// Don't display member info to non-logged user
-		if(!$logged_info->member_srl) return $this->stop('msg_not_permitted');
+		if(!$logged_info->member_srl) {
+			return $this->stop('msg_not_permitted');
+		}
 
 		$member_srl = Context::get('member_srl');
 		if(!$member_srl && Context::get('is_logged'))
 		{
 			$member_srl = $logged_info->member_srl;
-		}
-		elseif(!$member_srl)
+		} elseif(!$member_srl)
 		{
 			return $this->dispMemberSignUpForm();
 		}
@@ -89,7 +88,9 @@ 
 			$member_info->email_address = substr_replace($member_info->email_address, $replaceStr, $start);
 		}
 
-		if(!$member_info->member_srl) return $this->dispMemberSignUpForm();
+		if(!$member_info->member_srl) {
+			return $this->dispMemberSignUpForm();
+		}
 
 		Context::set('memberInfo', get_object_vars($member_info));
 
@@ -135,43 +136,35 @@ 
 				{
 					$target = $memberInfo->profile_image;
 					$item->value = '<img src="'.$target->src.'" />';
-				}
-				elseif($formInfo->name == 'image_name' && $memberInfo->image_name)
+				} elseif($formInfo->name == 'image_name' && $memberInfo->image_name)
 				{
 					$target = $memberInfo->image_name;
 					$item->value = '<img src="'.$target->src.'" />';
-				}
-				elseif($formInfo->name == 'image_mark' && $memberInfo->image_mark)
+				} elseif($formInfo->name == 'image_mark' && $memberInfo->image_mark)
 				{
 					$target = $memberInfo->image_mark;
 					$item->value = '<img src="'.$target->src.'" />';
-				}
-				elseif($formInfo->name == 'birthday' && $memberInfo->birthday)
+				} elseif($formInfo->name == 'birthday' && $memberInfo->birthday)
 				{
 					$item->value = zdate($item->value, 'Y-m-d');
 				}
-			}
-			else
+			} else
 			{
 				$item->title = $extendFormInfo[$formInfo->member_join_form_srl]->column_title;
 				$orgValue = $extendFormInfo[$formInfo->member_join_form_srl]->value;
 				if($formInfo->type=='tel' && is_array($orgValue))
 				{
 					$item->value = implode('-', $orgValue);
-				}
-				elseif($formInfo->type=='kr_zip' && is_array($orgValue))
+				} elseif($formInfo->type=='kr_zip' && is_array($orgValue))
 				{
 					$item->value = implode(' ', $orgValue);
-				}
-				elseif($formInfo->type=='checkbox' && is_array($orgValue))
+				} elseif($formInfo->type=='checkbox' && is_array($orgValue))
 				{
 					$item->value = implode(", ",$orgValue);
-				}
-				elseif($formInfo->type=='date')
+				} elseif($formInfo->type=='date')
 				{
 					$item->value = zdate($orgValue, "Y-m-d");
-				}
-				else
+				} else
 				{
 					$item->value = nl2br($orgValue);
 				}
@@ -198,12 +191,18 @@ 
 
 		$oMemberModel = getModel('member');
 		// Get the member information if logged-in
-		if($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
+		if($oMemberModel->isLogged()) {
+			return $this->stop('msg_already_logged');
+		}
 		// call a trigger (before) 
 		$trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $member_config);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// Error appears if the member is not allowed to join
-		if($member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
+		if($member_config->enable_join != 'Y') {
+			return $this->stop('msg_signup_disabled');
+		}
 
 		$oMemberAdminView = getAdminView('member');
 		$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
@@ -244,8 +243,7 @@ 
 		{
 			Context::set('identifierTitle', Context::getLang('email_address'));
 			Context::set('identifierValue', $logged_info->email_address); 
-		}
-		else
+		} else
 		{
 			Context::set('identifierTitle', Context::getLang('user_id'));
 			Context::set('identifierValue', $logged_info->user_id);
@@ -271,7 +269,9 @@ 
 
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if(!$oMemberModel->isLogged()) {
+			return $this->stop('msg_not_logged');
+		}
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
@@ -330,7 +330,9 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if(!$oMemberModel->isLogged()) {
+			return $this->stop('msg_not_logged');
+		}
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
@@ -357,7 +359,9 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if(!$oMemberModel->isLogged()) {
+			return $this->stop('msg_not_logged');
+		}
 
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();
@@ -381,7 +385,9 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if(!$oMemberModel->isLogged()) {
+			return $this->stop('msg_not_logged');
+		}
 		// Get the saved document(module_srl is set to member_srl instead)
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();
@@ -420,13 +426,15 @@ 
 
 		$XE_VALIDATOR_MESSAGE = Context::get('XE_VALIDATOR_MESSAGE');
 		$XE_VALIDATOR_ERROR = Context::get('XE_VALIDATOR_ERROR');
-		if($XE_VALIDATOR_ERROR == -11)
-			Context::set('XE_VALIDATOR_MESSAGE', $XE_VALIDATOR_MESSAGE . $config->limit_day_description);
+		if($XE_VALIDATOR_ERROR == -11) {
+					Context::set('XE_VALIDATOR_MESSAGE', $XE_VALIDATOR_MESSAGE . $config->limit_day_description);
+		}
 
-		if($XE_VALIDATOR_ERROR < -10 && $XE_VALIDATOR_ERROR > -21)
-			Context::set('referer_url', getUrl('')); 
-		else
-			Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		if($XE_VALIDATOR_ERROR < -10 && $XE_VALIDATOR_ERROR > -21) {
+					Context::set('referer_url', getUrl(''));
+		} else {
+					Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		}
 
 		// Set a template file
 		$this->setTemplateFile('login_form');
@@ -439,7 +447,9 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if(!$oMemberModel->isLogged()) {
+			return $this->stop('msg_not_logged');
+		}
 
 		$memberConfig = $this->member_config;
 
@@ -454,8 +464,7 @@ 
 		{
 			Context::set('identifier', 'user_id');
 			Context::set('formValue', $member_info->user_id);
-		}
-		else
+		} else
 		{
 			Context::set('identifier', 'email_address');
 			Context::set('formValue', $member_info->email_address);
@@ -471,7 +480,9 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if(!$oMemberModel->isLogged()) {
+			return $this->stop('msg_not_logged');
+		}
 
 		$memberConfig = $this->member_config;
 
@@ -485,8 +496,7 @@ 
 		{
 			Context::set('identifier', 'user_id');
 			Context::set('formValue', $member_info->user_id);
-		}
-		else
+		} else
 		{
 			Context::set('identifier', 'email_address');
 			Context::set('formValue', $member_info->email_address);
@@ -502,10 +512,11 @@ 
 	{
 		$oMemberController = getController('member');
 		$output = $oMemberController->procMemberLogout();
-		if(!$output->redirect_url)
-			$this->setRedirectUrl(getNotEncodedUrl('act', ''));
-		else
-			$this->setRedirectUrl($output->redirect_url);
+		if(!$output->redirect_url) {
+					$this->setRedirectUrl(getNotEncodedUrl('act', ''));
+		} else {
+					$this->setRedirectUrl($output->redirect_url);
+		}
 
 		return;
 	}
@@ -524,7 +535,9 @@ 
 	 */
 	function dispMemberFindAccount()
 	{
-		if(Context::get('is_logged')) return $this->stop('already_logged');
+		if(Context::get('is_logged')) {
+			return $this->stop('already_logged');
+		}
 
 		$config = $this->member_config;
 
@@ -538,13 +551,17 @@ 
 	 */
 	function dispMemberGetTempPassword()
 	{
-		if(Context::get('is_logged')) return $this->stop('already_logged');
+		if(Context::get('is_logged')) {
+			return $this->stop('already_logged');
+		}
 
 		$user_id = Context::get('user_id');
 		$temp_password = $_SESSION['xe_temp_password_'.$user_id];
 		unset($_SESSION['xe_temp_password_'.$user_id]);
 
-		if(!$user_id||!$temp_password) return new Object(-1,'msg_invaild_request');
+		if(!$user_id||!$temp_password) {
+			return new Object(-1,'msg_invaild_request');
+		}
 
 		Context::set('temp_password', $temp_password);
 
@@ -572,8 +589,7 @@ 
 			$_SESSION['auth_member_info'] = $memberInfo;
 			Context::set('memberInfo', $memberInfo);
 			$this->setTemplateFile('reset_mail');
-		}
-		else
+		} else
 		{
 			$this->setTemplateFile('resend_auth_mail');
 		}
@@ -615,8 +631,7 @@ 
 			if($val->column_type == 'kr_zip' || $val->column_type == 'tel')
 			{
 				$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["%s[]","%s"]);', $val->column_name, $title);
-			}
-			else
+			} else
 			{
 				$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["%s","%s"]);', $val->column_name, $title);
 			}
@@ -638,7 +653,9 @@ 
 	**/
 	function dispMemberSpammer()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$member_srl = Context::get('member_srl');
 		$module_srl = Context::get('module_srl');
@@ -649,7 +666,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
 
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$oMemberModel = getModel('member');
 

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	/**
 	 * RSS Module configurations
 	 *
-	 * @return void
+	 * @return Object|null
 	 */
 	function procRssAdminInsertModuleConfig()
 	{

modules/menu/menu.admin.model.php

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  menuAdminModel
- * @brief admin model class of the menu module
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /modules/menu
- * @version 0.1
- */
+	 * @class  menuAdminModel
+	 * @brief admin model class of the menu module
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 * @package /modules/menu
+	 * @version 0.1
+	 */
 class menuAdminModel extends menu
 {
 	private $menuSrlWithinHome = 0;

Spacing +89 added lines, -89 removed lines

@@ -27,21 +27,21 @@ 
 	 */
 	function getMenuList($obj)
 	{
-		if(!$obj->site_srl)
+		if (!$obj->site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$obj->site_srl = (int)$site_module_info->site_srl;
+			$obj->site_srl = (int) $site_module_info->site_srl;
 		}
 		$args = new stdClass;
 		$args->site_srl = $obj->site_srl;
 		$args->sort_index = $obj->sort_index;
-		$args->page = $obj->page?$obj->page:1;
-		$args->list_count = $obj->list_count?$obj->list_count:20;
-		$args->page_count = $obj->page_count?$obj->page_count:10;
+		$args->page = $obj->page ? $obj->page : 1;
+		$args->list_count = $obj->list_count ? $obj->list_count : 20;
+		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		// document.getDocumentList query execution
 		$output = executeQuery('menu.getMenuList', $args);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 
 		return $output;
 	}
@@ -53,17 +53,17 @@ 
 	 */
 	function getMenus($site_srl = null)
 	{
-		if(!isset($site_srl))
+		if (!isset($site_srl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		// Get information from the DB
 		$args = new stdClass();
-		$args->site_srl = $site_srl ;
+		$args->site_srl = $site_srl;
 		$args->menu_srl = $menu_srl;
 		$output = executeQueryArray('menu.getMenus', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 		$menus = $output->data;
 		return $menus;
 	}
@@ -80,11 +80,11 @@ 
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$menu_info = $output->data;
-		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
-		$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_srl);
+		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php', $menu_srl);
+		$menu_info->php_file = sprintf('./files/cache/menu/%s.php', $menu_srl);
 		return $menu_info;
 	}
 
@@ -97,7 +97,7 @@ 
 	function getMenuByTitle($title, $site_srl = 0)
 	{
 		// Get information from the DB
-		if(!is_array($title))
+		if (!is_array($title))
 		{
 			$title = array($title);
 		}
@@ -105,15 +105,15 @@ 
 		$args->title = $title;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('menu.getMenuByTitle', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
-		if(is_array($output->data)) $menu_info = $output->data[0];
+		if (is_array($output->data)) $menu_info = $output->data[0];
 		else $menu_info = $output->data;
 
-		if($menu_info->menu_srl)
+		if ($menu_info->menu_srl)
 		{
-			$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_info->menu_srl);
-			$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_info->menu_srl);
+			$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php', $menu_info->menu_srl);
+			$menu_info->php_file = sprintf('./files/cache/menu/%s.php', $menu_info->menu_srl);
 		}
 		return $menu_info;
 	}
@@ -130,7 +130,7 @@ 
 		$args = new stdClass();
 		$args->title = $title;
 		$output = executeQueryArray('menu.getMenuByTitle', $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}
@@ -151,16 +151,16 @@ 
 		$args->menu_item_srl = $menu_item_srl;
 		$output = executeQuery('menu.getMenuItem', $args);
 		$node = $output->data;
-		settype($node,'object');
-		if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
+		settype($node, 'object');
+		if ($node->group_srls) $node->group_srls = explode(',', $node->group_srls);
 		else $node->group_srls = array();
 
 		$tmp_name = unserialize($node->name);
-		if($tmp_name && count($tmp_name))
+		if ($tmp_name && count($tmp_name))
 		{
 			$selected_lang = array();
 			$rand_name = $tmp_name[Context::getLangType()];
-			if(!$rand_name) $rand_name = array_shift($tmp_name);
+			if (!$rand_name) $rand_name = array_shift($tmp_name);
 			$node->name = $rand_name;
 		}
 		return $node;
@@ -175,18 +175,18 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$menuItem = $this->getMenuItemInfo($menuItemSrl);
 
-		if(!$menuItem->url)
+		if (!$menuItem->url)
 		{
 			$menuItem->moduleType = null;
 		}
-		else if(strncasecmp('http', $menuItem->url, 4) !== 0)
+		else if (strncasecmp('http', $menuItem->url, 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
-			if(!$moduleInfo) $menuItem->moduleType = 'url';
+			if (!$moduleInfo) $menuItem->moduleType = 'url';
 			else
 			{
-				if($moduleInfo->mid == $menuItem->url)
+				if ($moduleInfo->mid == $menuItem->url)
 				{
 					$menuItem->moduleType = $moduleInfo->module;
 					$menuItem->pageType = $moduleInfo->page_type;
@@ -197,13 +197,13 @@ 
 		else $menuItem->moduleType = 'url';
 
 		// grant setting
-		if(is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
+		if (is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
 		{
-			if($menuItem->group_srls[0] == -1)
+			if ($menuItem->group_srls[0] == -1)
 			{
 				$menuItem->grant = 'member';
 			}
-			else if($menuItem->group_srls[0] == -3)
+			else if ($menuItem->group_srls[0] == -3)
 			{
 				$menuItem->grant = 'manager';
 			}
@@ -217,21 +217,21 @@ 
 		$oMemberModel = getModel('member');
 		$oModuleAdminModel = getAdminModel('module');
 		$output = $oMemberModel->getGroups();
-		if(is_array($output))
+		if (is_array($output))
 		{
 			$groupList = array();
-			foreach($output AS $key=>$value)
+			foreach ($output AS $key=>$value)
 			{
 				$groupList[$value->group_srl] = new stdClass();
 				$groupList[$value->group_srl]->group_srl = $value->group_srl;
-				if(substr($value->title,0,12)=='$user_lang->')
+				if (substr($value->title, 0, 12) == '$user_lang->')
 				{
 					$tmp = $oModuleAdminModel->getLangCode(0, $value->title);
 					$groupList[$value->group_srl]->title = $tmp[Context::getLangType()];
 				}
 				else $groupList[$value->group_srl]->title = $value->title;
 
-				if(in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
+				if (in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
 				else $groupList[$value->group_srl]->isChecked = false;
 			}
 		}
@@ -269,10 +269,10 @@ 
 	 */
 	function getMenuItemNames($source_name, $site_srl = null)
 	{
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		// Get language code
 		$oModuleAdminModel = getAdminModel('module');
@@ -296,7 +296,7 @@ 
 
 		// Add a sub-menu if there is parent_srl but not menu_item_srl
 		$item_info = new stdClass;
-		if(!$menu_item_srl && $parent_srl)
+		if (!$menu_item_srl && $parent_srl)
 		{
 			// Get information of the parent menu
 			$parent_info = $this->getMenuItemInfo($parent_srl);
@@ -309,9 +309,9 @@ 
 		else
 		{
 			// Get information of the menu if menu_item_srl exists
-			if($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
+			if ($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
 			// Get only menu_item_srl if no values found, considering it as adding a new menu
-			if(!$item_info->menu_item_srl)
+			if (!$item_info->menu_item_srl)
 			{
 				$item_info->menu_item_srl = getNextSequence();
 			}
@@ -325,9 +325,9 @@ 
 
 		// Compile the template file into tpl variable and then return it
 		$oTemplate = &TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');
+		$tpl = $oTemplate->compile($this->module_path . 'tpl', 'menu_item_info');
 
-		$this->add('tpl', str_replace("\n"," ",$tpl));
+		$this->add('tpl', str_replace("\n", " ", $tpl));
 	}
 
 	/**
@@ -346,10 +346,10 @@ 
 
 		Context::loadLang('modules/page/lang');
 
-		foreach($_allModules as $module_name)
+		foreach ($_allModules as $module_name)
 		{
 			$module = $oModuleModel->getModuleInfoXml($module_name);
-			if(!isset($module)) continue;
+			if (!isset($module)) continue;
 			$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
 			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
 			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);
@@ -364,7 +364,7 @@ 
 			$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name);
 			$module->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $module->package_srl;
 
-			if($module_name == 'page')
+			if ($module_name == 'page')
 			{
 				$pageTypeName = Context::getLang('page_type_name');
 				$module->title = $pageTypeName['ARTICLE'];
@@ -401,11 +401,11 @@ 
 		$moduleList = array('page');
 
 		$output = $oModuleModel->getModuleListByInstance($site_srl);
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
-				if($value->instanceCount > 1)
+				if ($value->instanceCount > 1)
 				{
 					$moduleList[] = $value->module;
 				}
@@ -414,7 +414,7 @@ 
 
 		// after trigger
 		$output = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$localModuleList = array_unique($moduleList);
 
@@ -423,9 +423,9 @@ 
 		// get have instance
 		$remotePackageList = $oAutoinstallModel->getHaveInstance(array('path'));
 		$remoteModuleList = array();
-		foreach($remotePackageList as $package)
+		foreach ($remotePackageList as $package)
 		{
-			if(strpos($package->path, './modules/') !== 0) continue;
+			if (strpos($package->path, './modules/') !== 0) continue;
 
 			$pathInfo = explode('/', $package->path);
 			$remoteModuleList[] = $pathInfo[2];
@@ -443,13 +443,13 @@ 
 
 		$moduleInfoList = array();
 		Context::loadLang('modules/page/lang');
-		if(is_array($moduleList))
+		if (is_array($moduleList))
 		{
-			foreach($moduleList as $value)
+			foreach ($moduleList as $value)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoXml($value);
 
-				if($value == 'page')
+				if ($value == 'page')
 				{
 					$pageTypeName = Context::getLang('page_type_name');
 					$moduleInfo->title = $pageTypeName['ARTICLE'];
@@ -480,10 +480,10 @@ 
 		$siteSrl = Context::get('site_srl');
 		$menuSrl = Context::get('menu_srl');
 
-		if(!isset($siteSrl))
+		if (!isset($siteSrl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			$siteSrl = (int)$site_module_info->site_srl;
+			$siteSrl = (int) $site_module_info->site_srl;
 		}
 
 		$oModuleModel = getModel('module');
@@ -492,24 +492,24 @@ 
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
 
 		$menuList = array();
-		if($menuSrl)
+		if ($menuSrl)
 		{
 			$isMenuFixed = false;
 			$output = $this->getMenu($menuSrl);
-			$php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$output->menu_srl);
-			if(file_exists($php_file)) include($php_file);
+			$php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php', $output->menu_srl);
+			if (file_exists($php_file)) include($php_file);
 			else $oMenuAdminController->makeXmlFile($menuSrl);
 
-			if(count($menu->list)>0)
+			if (count($menu->list) > 0)
 			{
-				foreach($menu->list AS $key=>$value)
+				foreach ($menu->list AS $key=>$value)
 				{
-					$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl,$siteSrl);
+					$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl, $siteSrl);
 				}
 			}
 
 			// menu recreate
-			if($isMenuFixed)
+			if ($isMenuFixed)
 			{
 				$oMenuAdminController->makeXmlFile($menuSrl);
 			}
@@ -522,18 +522,18 @@ 
 		else
 		{
 			$menuListFromDB = $this->getMenus($siteSrl);
-			if(is_array($menuListFromDB))
+			if (is_array($menuListFromDB))
 			{
 				$oAdmin = getClass('admin');
-				foreach($menuListFromDB AS $key=>$value)
+				foreach ($menuListFromDB AS $key=>$value)
 				{
-					if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
+					if ($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
 					else
 					{
 						unset($menu);
 						unset($menuItems);
-						$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl);
-						if(!file_exists($value->php_file))
+						$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php', $value->menu_srl);
+						if (!file_exists($value->php_file))
 						{
 							$oMenuAdminController->makeXmlFile($value->menu_srl);
 						}
@@ -541,16 +541,16 @@ 
 						include($value->php_file);
 
 						$isMenuFixed = false;
-						if(count($menu->list) > 0)
+						if (count($menu->list) > 0)
 						{
-							foreach($menu->list AS $key2=>$value2)
+							foreach ($menu->list AS $key2=>$value2)
 							{
-								$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl,$siteSrl);
+								$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl, $siteSrl);
 							}
 						}
 
 						// menu recreate
-						if($isMenuFixed)
+						if ($isMenuFixed)
 						{
 							$oMenuAdminController->makeXmlFile($value->menu_srl);
 						}
@@ -561,7 +561,7 @@ 
 						$menuItems->menuItems = $menu;
 
 						// If include home menu, move first
-						if($value->menu_srl == $this->menuSrlWithinHome)
+						if ($value->menu_srl == $this->menuSrlWithinHome)
 						{
 							$menuList[-1] = $menuItems;
 						}
@@ -584,7 +584,7 @@ 
 	public function getMenuAdminDetailSetup()
 	{
 		$menuItemSrl = Context::get('menu_item_srl');
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -592,7 +592,7 @@ 
 		$menuItemInfo = $this->getMenuItemInfo($menuItemSrl);
 
 		// if menu is shortcut
-		if($menuItemInfo->is_shortcut == 'Y')
+		if ($menuItemInfo->is_shortcut == 'Y')
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -604,18 +604,18 @@ 
 		// get xml info
 		$moduleConfInfo = $oModuleModel->getModuleInfoXml($moduleInfo->module);
 
-		if($moduleConfInfo->setup_index_act)
+		if ($moduleConfInfo->setup_index_act)
 		{
 			$setupUrl = getNotEncodedUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl, 'isLayoutDrop', '1');
 		}
 
-		if($moduleConfInfo->simple_setup_index_act)
+		if ($moduleConfInfo->simple_setup_index_act)
 		{
 			$oTargetmoduleAdminModel = getAdminModel($moduleInfo->module);
 			$advancedSetupUrl = getUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl);
 			$simpleSetupHtml = $oTargetmoduleAdminModel->{$moduleConfInfo->simple_setup_index_act}($moduleInfo->module_srl, $advancedSetupUrl);
 
-			if($simpleSetupHtml)
+			if ($simpleSetupHtml)
 			{
 				$this->add('simpleSetupHtml', $simpleSetupHtml);
 			}
@@ -628,18 +628,18 @@ 
 	 * @param array $menu
 	 * @return void
 	 */
-	private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl,$siteSrl = 0)
+	private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl, $siteSrl = 0)
 	{
 		$oModuleModel = getModel('module');
 		// if url is empty and is_shortcut is 'N', change to is_shortcut 'Y'
-		if(!$menu['url'] && $menu['is_shortcut'] == 'N')
+		if (!$menu['url'] && $menu['is_shortcut'] == 'N')
 		{
 			$menu['is_shortcut'] = 'Y';
 
 			$args = new stdClass;
 			$args->menu_item_srl = $menu['node_srl'];
 			$args->is_shortcut = 'Y';
-			if($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
+			if ($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
 			else $args->name = $menu['menu_name'];
 			$output = executeQuery('menu.updateMenuItem', $args);
 
@@ -648,17 +648,17 @@ 
 
 		//if menu type is module menu
 		//if(!empty($menu['url']) && !preg_match('/^http/i', $menu['url']))
-		if($menu['is_shortcut'] != 'Y')
+		if ($menu['is_shortcut'] != 'Y')
 		{
 			unset($midInfo, $moduleInfo);
 			$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], $siteSrl);
 			$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
 
-			if($midInfo)
+			if ($midInfo)
 			{
 				$menu['module_srl'] = $midInfo->module_srl;
 				$menu['module'] = $midInfo->module;
-				if($midInfo->page_type)
+				if ($midInfo->page_type)
 				{
 					$menu['module_type'] = $midInfo->page_type;
 				}
@@ -668,16 +668,16 @@ 
 				}
 			}
 
-			if($moduleInfo->setup_index_act)
+			if ($moduleInfo->setup_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->setup_index_act;
 			}
-			else if($moduleInfo->default_index_act)
+			else if ($moduleInfo->default_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->default_index_act;
 			}
 
-			if($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
+			if ($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
 			{
 				$menu['is_start_module'] = true;
 				$this->menuSrlWithinHome = $menuSrl;
@@ -686,9 +686,9 @@ 
 			$menu['layout_srl'] = $midInfo->layout_srl;
 			$menu['browser_title'] = $midInfo->browser_title;
 		}
-		if(count($menu['list']) > 0)
+		if (count($menu['list']) > 0)
 		{
-			foreach($menu['list'] as $key=>$value)
+			foreach ($menu['list'] as $key=>$value)
 			{
 				$this->_menuInfoSetting($menu['list'][$key], $start_module, $isMenuFixed, $menuSrl, $siteSrl);
 			}

Braces +72 added lines, -45 removed lines

@@ -41,7 +41,9 @@ 
 		// document.getDocumentList query execution
 		$output = executeQuery('menu.getMenuList', $args);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -63,7 +65,9 @@ 
 		$args->site_srl = $site_srl ;
 		$args->menu_srl = $menu_srl;
 		$output = executeQueryArray('menu.getMenus', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 		$menus = $output->data;
 		return $menus;
 	}
@@ -80,7 +84,9 @@ 
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		$menu_info = $output->data;
 		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
@@ -105,10 +111,15 @@ 
 		$args->title = $title;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('menu.getMenuByTitle', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
-		if(is_array($output->data)) $menu_info = $output->data[0];
-		else $menu_info = $output->data;
+		if(is_array($output->data)) {
+			$menu_info = $output->data[0];
+		} else {
+			$menu_info = $output->data;
+		}
 
 		if($menu_info->menu_srl)
 		{
@@ -152,15 +163,20 @@ 
 		$output = executeQuery('menu.getMenuItem', $args);
 		$node = $output->data;
 		settype($node,'object');
-		if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
-		else $node->group_srls = array();
+		if($node->group_srls) {
+			$node->group_srls = explode(',',$node->group_srls);
+		} else {
+			$node->group_srls = array();
+		}
 
 		$tmp_name = unserialize($node->name);
 		if($tmp_name && count($tmp_name))
 		{
 			$selected_lang = array();
 			$rand_name = $tmp_name[Context::getLangType()];
-			if(!$rand_name) $rand_name = array_shift($tmp_name);
+			if(!$rand_name) {
+				$rand_name = array_shift($tmp_name);
+			}
 			$node->name = $rand_name;
 		}
 		return $node;
@@ -178,13 +194,13 @@ 
 		if(!$menuItem->url)
 		{
 			$menuItem->moduleType = null;
-		}
-		else if(strncasecmp('http', $menuItem->url, 4) !== 0)
+		} else if(strncasecmp('http', $menuItem->url, 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
-			if(!$moduleInfo) $menuItem->moduleType = 'url';
-			else
+			if(!$moduleInfo) {
+				$menuItem->moduleType = 'url';
+			} else
 			{
 				if($moduleInfo->mid == $menuItem->url)
 				{
@@ -193,8 +209,9 @@ 
 					$menuItem->layoutSrl = $moduleInfo->layout_srl;
 				}
 			}
+		} else {
+			$menuItem->moduleType = 'url';
 		}
-		else $menuItem->moduleType = 'url';
 
 		// grant setting
 		if(is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
@@ -202,12 +219,10 @@ 
 			if($menuItem->group_srls[0] == -1)
 			{
 				$menuItem->grant = 'member';
-			}
-			else if($menuItem->group_srls[0] == -3)
+			} else if($menuItem->group_srls[0] == -3)
 			{
 				$menuItem->grant = 'manager';
-			}
-			else
+			} else
 			{
 				$menuItem->grant = 'group';
 			}
@@ -228,11 +243,15 @@ 
 				{
 					$tmp = $oModuleAdminModel->getLangCode(0, $value->title);
 					$groupList[$value->group_srl]->title = $tmp[Context::getLangType()];
+				} else {
+					$groupList[$value->group_srl]->title = $value->title;
 				}
-				else $groupList[$value->group_srl]->title = $value->title;
 
-				if(in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
-				else $groupList[$value->group_srl]->isChecked = false;
+				if(in_array($key, $menuItem->group_srls)) {
+					$groupList[$value->group_srl]->isChecked = true;
+				} else {
+					$groupList[$value->group_srl]->isChecked = false;
+				}
 			}
 		}
 		$menuItem->groupList = $groupList;
@@ -305,11 +324,12 @@ 
 			$item_info->parent_srl = $parent_srl;
 			$item_info->parent_menu_name = $parent_info->name;
 			// In case of modifying the existing menu or addting a new menu to the root
-		}
-		else
+		} else
 		{
 			// Get information of the menu if menu_item_srl exists
-			if($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
+			if($menu_item_srl) {
+				$item_info = $this->getMenuItemInfo($menu_item_srl);
+			}
 			// Get only menu_item_srl if no values found, considering it as adding a new menu
 			if(!$item_info->menu_item_srl)
 			{
@@ -349,7 +369,9 @@ 
 		foreach($_allModules as $module_name)
 		{
 			$module = $oModuleModel->getModuleInfoXml($module_name);
-			if(!isset($module)) continue;
+			if(!isset($module)) {
+				continue;
+			}
 			$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
 			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
 			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);
@@ -379,8 +401,7 @@ 
 				$oModuleInfo->title = $pageTypeName['OUTSIDE'];
 				$oModuleInfo->no_skin = 'Y';
 				$allModules['OUTSIDE'] = $oModuleInfo;
-			}
-			else
+			} else
 			{
 				$allModules[$module_name] = $module;
 			}
@@ -414,7 +435,9 @@ 
 
 		// after trigger
 		$output = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$localModuleList = array_unique($moduleList);
 
@@ -425,7 +448,9 @@ 
 		$remoteModuleList = array();
 		foreach($remotePackageList as $package)
 		{
-			if(strpos($package->path, './modules/') !== 0) continue;
+			if(strpos($package->path, './modules/') !== 0) {
+				continue;
+			}
 
 			$pathInfo = explode('/', $package->path);
 			$remoteModuleList[] = $pathInfo[2];
@@ -464,8 +489,7 @@ 
 					$oModuleInfo->title = $pageTypeName['OUTSIDE'];
 					$oModuleInfo->no_skin = 'Y';
 					$moduleInfoList['OUTSIDE'] = $oModuleInfo;
-				}
-				else
+				} else
 				{
 					$moduleInfoList[$value] = $moduleInfo;
 				}
@@ -497,8 +521,11 @@ 
 			$isMenuFixed = false;
 			$output = $this->getMenu($menuSrl);
 			$php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$output->menu_srl);
-			if(file_exists($php_file)) include($php_file);
-			else $oMenuAdminController->makeXmlFile($menuSrl);
+			if(file_exists($php_file)) {
+				include($php_file);
+			} else {
+				$oMenuAdminController->makeXmlFile($menuSrl);
+			}
 
 			if(count($menu->list)>0)
 			{
@@ -518,8 +545,7 @@ 
 			$menuItems->title = $output->title;
 			$menuItems->menuItems = $menu;
 			$menuList[] = $menuItems;
-		}
-		else
+		} else
 		{
 			$menuListFromDB = $this->getMenus($siteSrl);
 			if(is_array($menuListFromDB))
@@ -527,8 +553,9 @@ 
 				$oAdmin = getClass('admin');
 				foreach($menuListFromDB AS $key=>$value)
 				{
-					if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
-					else
+					if($value->title == $oAdmin->getAdminMenuName()) {
+						unset($output[$key]);
+					} else
 					{
 						unset($menu);
 						unset($menuItems);
@@ -564,8 +591,7 @@ 
 						if($value->menu_srl == $this->menuSrlWithinHome)
 						{
 							$menuList[-1] = $menuItems;
-						}
-						else
+						} else
 						{
 							$menuList[] = $menuItems;
 						}
@@ -639,8 +665,11 @@ 
 			$args = new stdClass;
 			$args->menu_item_srl = $menu['node_srl'];
 			$args->is_shortcut = 'Y';
-			if($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
-			else $args->name = $menu['menu_name'];
+			if($menu['menu_name_key']) {
+				$args->name = $menu['menu_name_key'];
+			} else {
+				$args->name = $menu['menu_name'];
+			}
 			$output = executeQuery('menu.updateMenuItem', $args);
 
 			$isMenuFixed = true;
@@ -661,8 +690,7 @@ 
 				if($midInfo->page_type)
 				{
 					$menu['module_type'] = $midInfo->page_type;
-				}
-				else
+				} else
 				{
 					$menu['module_type'] = $midInfo->module;
 				}
@@ -671,8 +699,7 @@ 
 			if($moduleInfo->setup_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->setup_index_act;
-			}
-			else if($moduleInfo->default_index_act)
+			} else if($moduleInfo->default_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->default_index_act;
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	/**
 	 * RSS Module configurations
 	 *
-	 * @return void
+	 * @return Object|null
 	 */
 	function procRssAdminInsertModuleConfig()
 	{

modules/menu/menu.admin.view.php

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * menuAdminView class
- * admin view class of the menu module
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /modules/menu
- * @version 0.1
- */
+	 * menuAdminView class
+	 * admin view class of the menu module
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 * @package /modules/menu
+	 * @version 0.1
+	 */
 class menuAdminView extends menu
 {
 	var $tmpMenu = null;

Spacing +28 added lines, -28 removed lines

@@ -18,7 +18,7 @@ 
 	 */
 	function init()
 	{
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 	}
 
 	
@@ -28,20 +28,20 @@ 
 	 */
 	function dispMenuAdminSiteMap()
 	{
-		Context::loadLang(_XE_PATH_.'modules/document/lang/');
-		Context::loadLang(_XE_PATH_.'modules/layout/lang/');
-		Context::loadLang(_XE_PATH_.'modules/autoinstall/lang/');
+		Context::loadLang(_XE_PATH_ . 'modules/document/lang/');
+		Context::loadLang(_XE_PATH_ . 'modules/layout/lang/');
+		Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang/');
 		$site_srl = Context::get('site_srl');
 		$site_module_info = Context::get('site_module_info');
 
-		if(!$site_srl)
+		if (!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword) $site_srl = 0;
-			else $site_srl = (int)$site_module_info->site_srl;
+			if ($logged_info->is_admin == 'Y' && !$site_keyword) $site_srl = 0;
+			else $site_srl = (int) $site_module_info->site_srl;
 		}
 
 		// process for unlinked modules
-		if($site_srl == 0)
+		if ($site_srl == 0)
 		{
 			$oMenuController = getAdminController('menu');
 			$oMenuController->linkAllModuleInstancesToSitemap();
@@ -51,25 +51,25 @@ 
 
 		$oMenuAdminModel = getAdminModel('menu');
 		$menuListFromDB = $oMenuAdminModel->getMenus();
-		if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
+		if (is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
 
 		$menuList = array();
-		if(is_array($output))
+		if (is_array($output))
 		{
 			$menuItems = array();
-			foreach($output as $key=>$value)
+			foreach ($output as $key=>$value)
 			{
-				if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
+				if ($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
 				else
 				{
 					unset($menu, $menuItems);
 					//$value->xml_file = sprintf('./files/cache/menu/%s.xml.php',$value->menu_srl);
-					$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl);
-					if(file_exists($value->php_file)) include($value->php_file);
+					$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php', $value->menu_srl);
+					if (file_exists($value->php_file)) include($value->php_file);
 
-					if(count($menu->list)>0)
+					if (count($menu->list) > 0)
 					{
-						foreach($menu->list as $key2=>$value2)
+						foreach ($menu->list as $key2=>$value2)
 						{
 							$this->_menuInfoSetting($menu->list[$key2]);
 						}
@@ -97,8 +97,8 @@ 
 		Context::set('layout_list', $layoutList);
 
 		// choice theme file
-		$theme_file = _XE_PATH_.'files/theme/theme_info.php';
-		if(is_readable($theme_file))
+		$theme_file = _XE_PATH_ . 'files/theme/theme_info.php';
+		if (is_readable($theme_file))
 		{
 			include($theme_file);
 			Context::set('current_layout', $theme_info->layout);
@@ -113,10 +113,10 @@ 
 		// get default group list
 		$oMemberModel = getModel('member');
 		$output = $oMemberModel->getGroups();
-		if(is_array($output))
+		if (is_array($output))
 		{
 			$groupList = array();
-			foreach($output as $value)
+			foreach ($output as $value)
 			{
 				$groupList[$value->group_srl] = new stdClass();
 				$groupList[$value->group_srl]->group_srl = $value->group_srl;
@@ -145,13 +145,13 @@ 
 	function _menuInfoSetting(&$menu)
 	{
 		$oModuleModel = getModel('module');
-		if($menu['url'] && strncasecmp('http', $menu['url'], 4) !== 0)
+		if ($menu['url'] && strncasecmp('http', $menu['url'], 4) !== 0)
 		{
 			unset($midInfo);
 			unset($moduleInfo);
 			$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], 0);
 			$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
-			if($moduleInfo->setup_index_act)
+			if ($moduleInfo->setup_index_act)
 			{
 				$menu['module_srl'] = $midInfo->module_srl;
 				$menu['setup_index_act'] = $moduleInfo->setup_index_act;
@@ -159,9 +159,9 @@ 
 			// setting layout srl for layout management
 			$menu['layout_srl'] = $midInfo->layout_srl;
 		}
-		if(count($menu['list']) > 0)
+		if (count($menu['list']) > 0)
 		{
-			foreach($menu['list'] as $key=>$value)
+			foreach ($menu['list'] as $key=>$value)
 			{
 				$this->_menuInfoSetting($menu['list'][$key]);
 			}
@@ -175,17 +175,17 @@ 
 	 */
 	function _arrangeMenuItem($menuItems)
 	{
-		if(is_array($menuItems))
+		if (is_array($menuItems))
 		{
 			$arrangedMenuItemList = array();
-			foreach($menuItems as $value)
+			foreach ($menuItems as $value)
 			{
-				if($value->parent_srl == 0)
+				if ($value->parent_srl == 0)
 				{
 					$arrangedMenuItemList[$value->menu_item_srl] = array('name'=>$value->name, 'subMenu'=>array());
 				}
 
-				if($value->parent_srl > 0 && isset($arrangedMenuItemList[$value->parent_srl]))
+				if ($value->parent_srl > 0 && isset($arrangedMenuItemList[$value->parent_srl]))
 				{
 					$arrangedMenuItemList[$value->parent_srl]['subMenu'][$value->menu_item_srl] = $value;
 				}

Braces +15 added lines, -8 removed lines

@@ -36,8 +36,11 @@ 
 
 		if(!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword) $site_srl = 0;
-			else $site_srl = (int)$site_module_info->site_srl;
+			if($logged_info->is_admin == 'Y' && !$site_keyword) {
+				$site_srl = 0;
+			} else {
+				$site_srl = (int)$site_module_info->site_srl;
+			}
 		}
 
 		// process for unlinked modules
@@ -51,7 +54,9 @@ 
 
 		$oMenuAdminModel = getAdminModel('menu');
 		$menuListFromDB = $oMenuAdminModel->getMenus();
-		if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
+		if(is_array($menuListFromDB)) {
+			$output = array_reverse($menuListFromDB);
+		}
 
 		$menuList = array();
 		if(is_array($output))
@@ -59,13 +64,16 @@ 
 			$menuItems = array();
 			foreach($output as $key=>$value)
 			{
-				if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
-				else
+				if($value->title == $oAdmin->getAdminMenuName()) {
+					unset($output[$key]);
+				} else
 				{
 					unset($menu, $menuItems);
 					//$value->xml_file = sprintf('./files/cache/menu/%s.xml.php',$value->menu_srl);
 					$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl);
-					if(file_exists($value->php_file)) include($value->php_file);
+					if(file_exists($value->php_file)) {
+						include($value->php_file);
+					}
 
 					if(count($menu->list)>0)
 					{
@@ -102,8 +110,7 @@ 
 		{
 			include($theme_file);
 			Context::set('current_layout', $theme_info->layout);
-		}
-		else
+		} else
 		{
 			$oModuleModel = getModel('module');
 			$default_mid = $oModuleModel->getDefaultMid();

modules/menu/menu.class.php

Indentation +7 added lines, -7 removed lines

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

Spacing +34 added lines, -34 removed lines

@@ -30,12 +30,12 @@ 
 	{
 		$oDB = &DB::getInstance();
 		// 2009. 02. 11 menu added to the table site_srl
-		if(!$oDB->isColumnExists('menu', 'site_srl')) return true;
+		if (!$oDB->isColumnExists('menu', 'site_srl')) return true;
 
 		// 2012. 02. 01 title index check
-		if(!$oDB->isIndexExists("menu", "idx_title")) return true;
+		if (!$oDB->isIndexExists("menu", "idx_title")) return true;
 
-		if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+		if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 		{
 			return TRUE;
 		}
@@ -45,10 +45,10 @@ 
 		$args = new stdClass();
 		$args->title = array("Temporary menu");
 		$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
-		if($temp_menus->toBool() && count($temp_menus->data)) return true;
+		if ($temp_menus->toBool() && count($temp_menus->data)) return true;
 		
 		// 2015. 06. 15 add column desc
-		if(!$oDB->isColumnExists('menu_item', 'desc'))
+		if (!$oDB->isColumnExists('menu_item', 'desc'))
 		{
 			return true;
 		}
@@ -63,25 +63,25 @@ 
 	function moduleUpdate() {
 		$oDB = &DB::getInstance();
 		// 2009. 02. 11 menu added to the table site_srl
-		if(!$oDB->isColumnExists('menu', 'site_srl'))
+		if (!$oDB->isColumnExists('menu', 'site_srl'))
 		{
-			$oDB->addColumn('menu','site_srl','number',11,0,true);
+			$oDB->addColumn('menu', 'site_srl', 'number', 11, 0, true);
 		}
 
 		// 2012. 02. 01 title index check
-		if(!$oDB->isIndexExists("menu","idx_title"))
+		if (!$oDB->isIndexExists("menu", "idx_title"))
 		{
 			$oDB->addIndex('menu', 'idx_title', array('title'));
 		}
 		
 		// 2015. 06. 15 add column desc
-		if(!$oDB->isColumnExists('menu_item', 'desc'))
+		if (!$oDB->isColumnExists('menu_item', 'desc'))
 		{
-			$oDB->addColumn('menu_item', 'desc','varchar',250,"",true);
+			$oDB->addColumn('menu_item', 'desc', 'varchar', 250, "", true);
 		}
 
 		// 1.7(maserati) shortcut column add and mirgration
-		if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+		if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 		{
 			$oDB->addColumn('menu_item', 'is_shortcut', 'char', 1, 'N');
 
@@ -89,27 +89,27 @@ 
 			$oMenuAdminModel = getAdminModel('menu');
 			$output = $oMenuAdminModel->getMenus();
 
-			if(is_array($output))
+			if (is_array($output))
 			{
 				$menuItemUniqueList = array();
 				$menuItemAllList = array();
-				foreach($output  AS $key=>$value)
+				foreach ($output  AS $key=>$value)
 				{
 					unset($args);
 					$args->menu_srl = $value->menu_srl;
 					$output2 = executeQueryArray('menu.getMenuItems', $args);
-					if(is_array($output2->data))
+					if (is_array($output2->data))
 					{
-						foreach($output2->data AS $key2=>$value2)
+						foreach ($output2->data AS $key2=>$value2)
 						{
 							$menuItemAllList[$value2->menu_item_srl] = $value2->url;
-							if(!in_array($value2->url, $menuItemUniqueList))
+							if (!in_array($value2->url, $menuItemUniqueList))
 							{
 								$menuItemUniqueList[$value2->menu_item_srl] = $value2->url;
 							}
 
 							// if url is empty, change type to shortcurt
-							if($value2->is_shortcut == 'N' && (!$value2->url || strncasecmp('http', $value2->url, 4) === 0))
+							if ($value2->is_shortcut == 'N' && (!$value2->url || strncasecmp('http', $value2->url, 4) === 0))
 							{
 								$value2->is_shortcut = 'Y';
 								$output3 = executeQuery('menu.updateMenuItem', $value2);
@@ -121,29 +121,29 @@ 
 				$oModuleModel = getModel('module');
 				// if duplicate reference, change type to shortcut
 				$shortcutItemList = array_diff_assoc($menuItemAllList, $menuItemUniqueList);
-				foreach($output AS $key=>$value)
+				foreach ($output AS $key=>$value)
 				{
 					unset($args);
 					$args->menu_srl = $value->menu_srl;
 					$output2 = executeQueryArray('menu.getMenuItems', $args);
-					if(is_array($output2->data))
+					if (is_array($output2->data))
 					{
-						foreach($output2->data AS $key2=>$value2)
+						foreach ($output2->data AS $key2=>$value2)
 						{
-							if(!empty($value2->url) && strncasecmp('http', $value2->url, 4) !== 0)
+							if (!empty($value2->url) && strncasecmp('http', $value2->url, 4) !== 0)
 							{
 								$moduleInfo = $oModuleModel->getModuleInfoByMid($value2->url);
-								if(!$moduleInfo->module_srl)
+								if (!$moduleInfo->module_srl)
 								{
 									$value2->url = Context::getDefaultUrl();
-									if(!$value2->url) $value2->url = '#';
+									if (!$value2->url) $value2->url = '#';
 									$value2->is_shortcut = 'Y';
 
 									$updateOutput = executeQuery('menu.updateMenuItem', $value2);
 								}
 							}
 
-							if($shortcutItemList[$value2->menu_item_srl])
+							if ($shortcutItemList[$value2->menu_item_srl])
 							{
 								$value2->is_shortcut = 'Y';
 								$output3 = executeQuery('menu.updateMenuItem', $value2);
@@ -163,17 +163,17 @@ 
 		$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
 		
 		$args = new stdClass();
-		if($temp_menus->toBool() && count($temp_menus->data))
+		if ($temp_menus->toBool() && count($temp_menus->data))
 		{
 			
 			$oMenuAdminController = getAdminController('menu');
-			foreach($temp_menus->data as $menu)
+			foreach ($temp_menus->data as $menu)
 			{
 				$args->current_menu_srl = $menu->menu_srl;
 				$args->menu_srl = $oMenuAdminController->getUnlinkedMenu();
 				$output3 = executeQuery('menu.updateMenuItems', $args);
 					
-				if($output3->toBool())
+				if ($output3->toBool())
 				{
 					// delete
 					$oMenuAdminController->deleteMenu($menu->menu_srl);
@@ -205,23 +205,23 @@ 
 		// Wanted list of all the blog module
 		$output = executeQueryArray("menu.getMenus");
 		$list = $output->data;
-		if(!count($list)) return;
+		if (!count($list)) return;
 		// The menu module is used in the re-create all the menu list
-		foreach($list as $menu_item)
+		foreach ($list as $menu_item)
 		{
 			$menu_srl = $menu_item->menu_srl;
 			$oMenuAdminController->makeXmlFile($menu_srl);
 
 			// for homeSitemap.php regenrate
-			if(!$homeMenuSrl)
+			if (!$homeMenuSrl)
 			{
 				$menuItemList = $oMenuAdminModel->getMenuItems($menu_srl);
 
-				if(is_array($menuItemList->data))
+				if (is_array($menuItemList->data))
 				{
-					foreach($menuItemList->data AS $key=>$value)
+					foreach ($menuItemList->data AS $key=>$value)
 					{
-						if($homeModuleMid == $value->url)
+						if ($homeModuleMid == $value->url)
 						{
 							$homeMenuSrl = $menu_srl;
 							break;
@@ -231,7 +231,7 @@ 
 			}
 		}
 
-		if($homeMenuSrl)
+		if ($homeMenuSrl)
 		{
 			$oMenuAdminController->makeHomemenuCacheFile($homeMenuSrl);
 		}

Braces +15 added lines, -5 removed lines

@@ -30,10 +30,14 @@ 
 	{
 		$oDB = &DB::getInstance();
 		// 2009. 02. 11 menu added to the table site_srl
-		if(!$oDB->isColumnExists('menu', 'site_srl')) return true;
+		if(!$oDB->isColumnExists('menu', 'site_srl')) {
+			return true;
+		}
 
 		// 2012. 02. 01 title index check
-		if(!$oDB->isIndexExists("menu", "idx_title")) return true;
+		if(!$oDB->isIndexExists("menu", "idx_title")) {
+			return true;
+		}
 
 		if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 		{
@@ -45,7 +49,9 @@ 
 		$args = new stdClass();
 		$args->title = array("Temporary menu");
 		$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
-		if($temp_menus->toBool() && count($temp_menus->data)) return true;
+		if($temp_menus->toBool() && count($temp_menus->data)) {
+			return true;
+		}
 		
 		// 2015. 06. 15 add column desc
 		if(!$oDB->isColumnExists('menu_item', 'desc'))
@@ -136,7 +142,9 @@ 
 								if(!$moduleInfo->module_srl)
 								{
 									$value2->url = Context::getDefaultUrl();
-									if(!$value2->url) $value2->url = '#';
+									if(!$value2->url) {
+										$value2->url = '#';
+									}
 									$value2->is_shortcut = 'Y';
 
 									$updateOutput = executeQuery('menu.updateMenuItem', $value2);
@@ -205,7 +213,9 @@ 
 		// Wanted list of all the blog module
 		$output = executeQueryArray("menu.getMenus");
 		$list = $output->data;
-		if(!count($list)) return;
+		if(!count($list)) {
+			return;
+		}
 		// The menu module is used in the re-create all the menu list
 		foreach($list as $menu_item)
 		{

modules/message/message.admin.controller.php

Indentation +4 added lines, -4 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 		$args = Context::gets('skin', 'mskin', 'colorset', 'mcolorset');
 		// Create a module Controller object
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('message',$args);
-		if(!$output->toBool()) return $output;
+		$output = $oModuleController->insertModuleConfig('message', $args);
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_updated');
 

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 		// Create a module Controller object
 		$oModuleController = getController('module');
 		$output = $oModuleController->insertModuleConfig('message',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_updated');