xpressengine / xe-core

modules/admin/admin.admin.view.php

Spacing +77 added lines, -77 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$xe_default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -48,13 +48,13 @@ 
 		// forbit access if the user is not an administrator
 		$oMemberModel = getModel('member');
 		$logged_info = $oMemberModel->getLoggedInfo();
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			return $this->stop("msg_is_not_administrator");
 		}
 
 		// change into administration layout
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setLayoutPath($this->getTemplatePath());
 		$this->setLayoutFile('layout.html');
 
@@ -74,11 +74,11 @@ 
 		Context::set('use_db_session', $db_info->use_db_session == 'N' ? 'N' : 'Y');
 		Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N');
 		Context::set('use_ssl', $db_info->use_ssl ? $db_info->use_ssl : "none");
-		if($db_info->http_port)
+		if ($db_info->http_port)
 		{
 			Context::set('http_port', $db_info->http_port);
 		}
-		if($db_info->https_port)
+		if ($db_info->https_port)
 		{
 			Context::set('https_port', $db_info->https_port);
 		}
@@ -94,7 +94,7 @@ 
 	function checkEasyinstall()
 	{
 		$lastTime = (int) FileHandler::readFile($this->easyinstallCheckFile);
-		if($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
+		if ($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
 		{
 			return;
 		}
@@ -108,14 +108,14 @@ 
 		$lUpdateDoc = $xml_lUpdate->parse($buff);
 		$updateDate = $lUpdateDoc->response->updatedate->body;
 
-		if(!$updateDate)
+		if (!$updateDate)
 		{
 			$this->_markingCheckEasyinstall();
 			return;
 		}
 
 		$item = $oAutoinstallModel->getLatestPackage();
-		if(!$item || $item->updatedate < $updateDate)
+		if (!$item || $item->updatedate < $updateDate)
 		{
 			$oController = getAdminController('autoinstall');
 			$oController->_updateinfo();
@@ -144,7 +144,7 @@ 
 
 		// Check is_shortcut column
 		$oDB = DB::getInstance();
-		if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+		if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 		{
 			return;
 		}
@@ -162,9 +162,9 @@ 
 		$currentAct = Context::get('act');
 		$subMenuTitle = '';
 
-		foreach((array) $moduleActionInfo->menu as $key => $value)
+		foreach ((array) $moduleActionInfo->menu as $key => $value)
 		{
-			if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
+			if (isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
 			{
 				$subMenuTitle = $value->title;
 				break;
@@ -173,21 +173,21 @@ 
 		// get current menu's srl(=parentSrl)
 		$parentSrl = 0;
 		$oMenuAdminConroller = getAdminController('menu');
-		foreach((array) $menu->list as $parentKey => $parentMenu)
+		foreach ((array) $menu->list as $parentKey => $parentMenu)
 		{
-			if(!is_array($parentMenu['list']) || !count($parentMenu['list']))
+			if (!is_array($parentMenu['list']) || !count($parentMenu['list']))
 			{
 				continue;
 			}
-			if($parentMenu['href'] == '#' && count($parentMenu['list']))
+			if ($parentMenu['href'] == '#' && count($parentMenu['list']))
 			{
 				$firstChild = current($parentMenu['list']);
 				$menu->list[$parentKey]['href'] = $firstChild['href'];
 			}
 
-			foreach($parentMenu['list'] as $childKey => $childMenu)
+			foreach ($parentMenu['list'] as $childKey => $childMenu)
 			{
-				if($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
+				if ($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
 				{
 					$parentSrl = $childMenu['parent_srl'];
 				}
@@ -200,7 +200,7 @@ 
 		$gnbTitleInfo->adminTitle = $objConfig->adminTitle ? $objConfig->adminTitle : 'XE Admin';
 		$gnbTitleInfo->adminLogo = $objConfig->adminLogo ? $objConfig->adminLogo : 'modules/admin/tpl/img/xe.h1.png';
 
-		$browserTitle = ($subMenuTitle ? $subMenuTitle : 'Dashboard') . ' - ' . $gnbTitleInfo->adminTitle;
+		$browserTitle = ($subMenuTitle ? $subMenuTitle : 'Dashboard').' - '.$gnbTitleInfo->adminTitle;
 
 		// Get list of favorite
 		$oAdminAdminModel = getAdminModel('admin');
@@ -211,7 +211,7 @@ 
 		// move from index method, because use in admin footer
 		$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_);
 		$cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_);
-		if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
+		if (!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
 		{
 			// Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page
 			// Ensure to access the administration page even though news cannot be displayed
@@ -219,20 +219,20 @@ 
 			FileHandler::getRemoteFile($newest_news_url, $cache_file, null, 1, 'GET', 'text/html', array('REQUESTURL' => getFullUrl('')));
 		}
 
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$oXml = new XmlParser();
 			$buff = $oXml->parse(FileHandler::readFile($cache_file));
 
 			$item = $buff->zbxe_news->item;
-			if($item)
+			if ($item)
 			{
-				if(!is_array($item))
+				if (!is_array($item))
 				{
 					$item = array($item);
 				}
 
-				foreach($item as $key => $val)
+				foreach ($item as $key => $val)
 				{
 					$obj = new stdClass();
 					$obj->title = $val->body;
@@ -241,7 +241,7 @@ 
 					$news[] = $obj;
 				}
 				Context::set('news', $news);
-				if(isset($news) && is_array($news))
+				if (isset($news) && is_array($news))
 				{
 					Context::set('latestVersion', array_shift($news));
 				}
@@ -264,7 +264,7 @@ 
 	function dispAdminIndex()
 	{
 		$db_info = Context::getDBInfo();
-		Context::set('db_info',$db_info);
+		Context::set('db_info', $db_info);
 
 		// Get statistics
 		$args = new stdClass();
@@ -301,9 +301,9 @@ 
 		$args = new stdClass();
 		$args->list_count = 5;
 		$output = $oCommentModel->getNewestCommentList($args, $columnList);
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key => $value)
+			foreach ($output AS $key => $value)
 			{
 				$value->content = strip_tags($value->content);
 			}
@@ -314,17 +314,17 @@ 
 		// Get list of modules
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if(is_array($module_list))
+		if (is_array($module_list))
 		{
 			$needUpdate = FALSE;
 			$addTables = FALSE;
-			foreach($module_list AS $key => $value)
+			foreach ($module_list AS $key => $value)
 			{
-				if($value->need_install)
+				if ($value->need_install)
 				{
 					$addTables = TRUE;
 				}
-				if($value->need_update)
+				if ($value->need_update)
 				{
 					$needUpdate = TRUE;
 				}
@@ -335,12 +335,12 @@ 
 		$oAutoinstallAdminModel = getAdminModel('autoinstall');
 		$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
 
-		if(is_array($needUpdateList))
+		if (is_array($needUpdateList))
 		{
-			foreach($needUpdateList AS $key => $value)
+			foreach ($needUpdateList AS $key => $value)
 			{
 				$helpUrl = './admin/help/index.html#';
-				switch($value->type)
+				switch ($value->type)
 				{
 					case 'addon':
 						$helpUrl .= 'UMAN_terminology_addon';
@@ -367,8 +367,8 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 		$oAddonAdminModel = getAdminModel('addon');
-		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl );
-		if(!$counterAddonActivated)
+		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl);
+		if (!$counterAddonActivated)
 		{
 			$columnList = array('member_srl', 'nick_name', 'user_name', 'user_id', 'email_address');
 			$args = new stdClass;
@@ -391,9 +391,9 @@ 
 
 		// gathering enviroment check
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
-		$path = FileHandler::getRealPath('./files/env/' . $mainVersion);
+		$path = FileHandler::getRealPath('./files/env/'.$mainVersion);
 		$isEnviromentGatheringAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isEnviromentGatheringAgreement = TRUE;
 		}
@@ -403,7 +403,7 @@ 
 		$isLicenseAgreement = FALSE;
 		$path = FileHandler::getRealPath('./files/env/license_agreement');
 		$isLicenseAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isLicenseAgreement = TRUE;
 		}
@@ -425,7 +425,7 @@ 
 
 		Context::set('selected_lang', $db_info->lang_type);
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$db_info->default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -434,9 +434,9 @@ 
 
 		// site lock
 		Context::set('IP', $_SERVER['REMOTE_ADDR']);
-		if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
-		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
-		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		if (!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
+		if (!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
+		if (!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
 		$db_info->sitelock_whitelist = array_unique($db_info->sitelock_whitelist);
 		Context::set('remote_addr', $_SERVER['REMOTE_ADDR']);
 		Context::set('use_sitelock', $db_info->use_sitelock);
@@ -447,7 +447,7 @@ 
 		Context::set('sitelock_whitelist', $whitelist);
 
 
-		if($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
+		if ($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
 		else $admin_ip_list = '';
 		Context::set('admin_ip_list', $admin_ip_list);
 
@@ -470,7 +470,7 @@ 
 		Context::set('htmlFooter', htmlspecialchars($config->htmlFooter));
 
 		// embed filter
-		require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+		require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 		$oEmbedFilter = EmbedFilter::getInstance();
 		context::set('embed_white_object', implode(PHP_EOL, $oEmbedFilter->whiteUrlList));
 		context::set('embed_white_iframe', implode(PHP_EOL, $oEmbedFilter->whiteIframeUrlList));
@@ -529,36 +529,36 @@ 
 	 */
 	function showSendEnv()
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
 
 		$server = 'http://collect.xpressengine.com/env/img.php?';
 		$path = './files/env/';
-		$install_env = $path . 'install';
+		$install_env = $path.'install';
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
 
-		if(file_exists(FileHandler::getRealPath($install_env)))
+		if (file_exists(FileHandler::getRealPath($install_env)))
 		{
 			$oAdminAdminModel = getAdminModel('admin');
 			$params = $oAdminAdminModel->getEnv('INSTALL');
-			$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
+			$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server.$params);
 			Context::addHtmlFooter($img);
 
-			FileHandler::writeFile($path . $mainVersion, '1');
+			FileHandler::writeFile($path.$mainVersion, '1');
 		}
-		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
+		else if (isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path.$mainVersion)))
 		{
-			if($_SESSION['enviroment_gather'] == 'Y')
+			if ($_SESSION['enviroment_gather'] == 'Y')
 			{
 				$oAdminAdminModel = getAdminModel('admin');
 				$params = $oAdminAdminModel->getEnv();
-				$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
+				$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server.$params);
 				Context::addHtmlFooter($img);
 			}
 
-			FileHandler::writeFile($path . $mainVersion, '1');
+			FileHandler::writeFile($path.$mainVersion, '1');
 			unset($_SESSION['enviroment_gather']);
 		}
 	}
@@ -576,64 +576,64 @@ 
 		$tmp = explode("&", $envInfo);
 		$arrInfo = array();
 		$xe_check_env = array();
-		foreach($tmp as $value) {
+		foreach ($tmp as $value) {
 			$arr = explode("=", $value);
-			if($arr[0]=="type") {
+			if ($arr[0] == "type") {
 				continue;
-			}elseif($arr[0]=="phpext" ) {
+			}elseif ($arr[0] == "phpext") {
 				$str = urldecode($arr[1]);
-				$xe_check_env[$arr[0]]= str_replace("|", ", ", $str);
-			} elseif($arr[0]=="module" ) {
+				$xe_check_env[$arr[0]] = str_replace("|", ", ", $str);
+			} elseif ($arr[0] == "module") {
 				$str = urldecode($arr[1]);
 				$arrModuleName = explode("|", $str);
 				$oModuleModel = getModel("module");
 				$mInfo = array();
-				foreach($arrModuleName as $moduleName) {
+				foreach ($arrModuleName as $moduleName) {
 					$moduleInfo = $oModuleModel->getModuleInfoXml($moduleName);
 					$mInfo[] = "{$moduleName}({$moduleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="addon") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "addon") {
 				$str = urldecode($arr[1]);
 				$arrAddonName = explode("|", $str);
 				$oAddonModel = getAdminModel("addon");
 				$mInfo = array();
-				foreach($arrAddonName as $addonName) {
+				foreach ($arrAddonName as $addonName) {
 					$addonInfo = $oAddonModel->getAddonInfoXml($addonName);
 					$mInfo[] = "{$addonName}({$addonInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widget") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widget") {
 				$str = urldecode($arr[1]);
 				$arrWidgetName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetName as $widgetName) {
+				foreach ($arrWidgetName as $widgetName) {
 					$widgetInfo = $oWidgetModel->getWidgetInfo($widgetName);
 					$mInfo[] = "{$widgetName}({$widgetInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widgetstyle") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widgetstyle") {
 				$str = urldecode($arr[1]);
 				$arrWidgetstyleName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetstyleName as $widgetstyleName) {
+				foreach ($arrWidgetstyleName as $widgetstyleName) {
 					$widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyleName);
 					$mInfo[] = "{$widgetstyleName}({$widgetstyleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 
-			} elseif($arr[0]=="layout") {
+			} elseif ($arr[0] == "layout") {
 				$str = urldecode($arr[1]);
 				$arrLayoutName = explode("|", $str);
 				$oLayoutModel = getModel("layout");
 				$mInfo = array();
-				foreach($arrLayoutName as $layoutName) {
+				foreach ($arrLayoutName as $layoutName) {
 					$layoutInfo = $oLayoutModel->getLayoutInfo($layoutName);
 					$mInfo[] = "{$layoutName}({$layoutInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 			} else {
 				$xe_check_env[$arr[0]] = urldecode($arr[1]);
 			}
@@ -647,15 +647,15 @@ 
 		$php_core['memory_limit'] = "{$ini_info['memory_limit']['local_value']}";
 		$info['PHP_Core'] = $php_core;
 
-		$str_info = "[XE Server Environment " . date("Y-m-d") . "]\n\n";
+		$str_info = "[XE Server Environment ".date("Y-m-d")."]\n\n";
 		$str_info .= "realpath : ".realpath('./')."\n";
-		foreach( $info as $key=>$value )
+		foreach ($info as $key=>$value)
 		{
-			if( is_array( $value ) == false ) {
+			if (is_array($value) == false) {
 				$str_info .= "{$key} : {$value}\n";
 			} else {
 				//$str_info .= "\n{$key} \n";
-				foreach( $value as $key2=>$value2 )
+				foreach ($value as $key2=>$value2)
 					$str_info .= "{$key2} : {$value2}\n";
 			}
 		}
@@ -672,7 +672,7 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if ($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
 		
 		Context::set('useable', $oInstallController->checkInstallEnv());
 		$this->setTemplateFile('check_env.html');

config/func.inc.php

Spacing +182 added lines, -182 removed lines

@@ -6,13 +6,13 @@ 
  *
  * @author NAVER (developers@xpressengine.com)
  */
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
 
 // define an empty function to avoid errors when iconv function doesn't exist
-if(!function_exists('iconv'))
+if (!function_exists('iconv'))
 {
 	eval('
 		function iconv($in_charset, $out_charset, $str)
@@ -220,7 +220,7 @@ 
 {
 	$oDB = DB::getInstance();
 	$output = $oDB->executeQuery($query_id, $args, $arg_columns);
-	if(!is_array($output->data) && count($output->data) > 0)
+	if (!is_array($output->data) && count($output->data) > 0)
 	{
 		$output->data = array($output->data);
 	}
@@ -250,7 +250,7 @@ 
 function setUserSequence($seq)
 {
 	$arr_seq = array();
-	if(isset($_SESSION['seq']))
+	if (isset($_SESSION['seq']))
 	{
 		$arr_seq = $_SESSION['seq'];
 	}
@@ -266,11 +266,11 @@ 
  */
 function checkUserSequence($seq)
 {
-	if(!isset($_SESSION['seq']))
+	if (!isset($_SESSION['seq']))
 	{
 		return false;
 	}
-	if(!in_array($seq, $_SESSION['seq']))
+	if (!in_array($seq, $_SESSION['seq']))
 	{
 		return false;
 	}
@@ -296,7 +296,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 		$url = Context::getUrl($num_args, $args_list);
 	else
 		$url = Context::getRequestUri();
@@ -315,7 +315,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
 	}
@@ -338,7 +338,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, TRUE, TRUE);
 	}
@@ -360,16 +360,16 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -384,17 +384,17 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -410,7 +410,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -432,7 +432,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -454,7 +454,7 @@ 
 	$args_list = func_get_args();
 
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
@@ -463,10 +463,10 @@ 
 	$num_args = count($args_list);
 
 	$url = Context::getUrl($num_args, $args_list, $domain);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -479,7 +479,7 @@ 
 function getCurrentPageUrl()
 {
 	$protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
-	$url = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+	$url = $protocol.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 	return htmlspecialchars($url, ENT_COMPAT, 'UTF-8', FALSE);
 }
 
@@ -504,12 +504,12 @@ 
  */
 function cut_str($string, $cut_size = 0, $tail = '...')
 {
-	if($cut_size < 1 || !$string)
+	if ($cut_size < 1 || !$string)
 	{
 		return $string;
 	}
 
-	if($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
+	if ($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
 	{
 		$GLOBALS['use_mb_strimwidth'] = TRUE;
 		return mb_strimwidth($string, 0, $cut_size + 4, $tail, 'utf-8');
@@ -523,16 +523,16 @@ 
 	$char_count = 0;
 
 	$idx = 0;
-	while($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
+	while ($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
 	{
 		$c = ord(substr($string, $idx, 1));
 		$char_count++;
-		if($c < 128)
+		if ($c < 128)
 		{
 			$char_width += (int) $chars[$c - 32];
 			$idx++;
 		}
-		else if(191 < $c && $c < 224)
+		else if (191 < $c && $c < 224)
 		{
 			$char_width += $chars[4];
 			$idx += 2;
@@ -545,7 +545,7 @@ 
 	}
 
 	$output = substr($string, 0, $idx);
-	if(strlen($output) < $string_length)
+	if (strlen($output) < $string_length)
 	{
 		$output .= $tail;
 	}
@@ -561,7 +561,7 @@ 
 function zgap()
 {
 	$time_zone = $GLOBALS['_time_zone'];
-	if($time_zone < 0)
+	if ($time_zone < 0)
 	{
 		$to = -1;
 	}
@@ -574,7 +574,7 @@ 
 	$t_min = substr($time_zone, 3, 2) * $to;
 
 	$server_time_zone = date("O");
-	if($server_time_zone < 0)
+	if ($server_time_zone < 0)
 	{
 		$so = -1;
 	}
@@ -601,7 +601,7 @@ 
  */
 function ztime($str)
 {
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
@@ -612,7 +612,7 @@ 
 	$year = (int) substr($str, 0, 4);
 	$month = (int) substr($str, 4, 2);
 	$day = (int) substr($str, 6, 2);
-	if(strlen($str) <= 8)
+	if (strlen($str) <= 8)
 	{
 		$gap = 0;
 	}
@@ -636,19 +636,19 @@ 
 	$gap = $_SERVER['REQUEST_TIME'] + zgap() - ztime($date);
 
 	$lang_time_gap = Context::getLang('time_gap');
-	if($gap < 60)
+	if ($gap < 60)
 	{
 		$buff = sprintf($lang_time_gap['min'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60)
+	elseif ($gap < 60 * 60)
 	{
 		$buff = sprintf($lang_time_gap['mins'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 2)
+	elseif ($gap < 60 * 60 * 2)
 	{
 		$buff = sprintf($lang_time_gap['hour'], (int) ($gap / 60 / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 24)
+	elseif ($gap < 60 * 60 * 24)
 	{
 		$buff = sprintf($lang_time_gap['hours'], (int) ($gap / 60 / 60) + 1);
 	}
@@ -685,40 +685,40 @@ 
 function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE)
 {
 	// return null if no target time is specified
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
 	// convert the date format according to the language
-	if($conversion == TRUE)
+	if ($conversion == TRUE)
 	{
-		switch(Context::getLangType())
+		switch (Context::getLangType())
 		{
 			case 'en' :
 			case 'es' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'M d, Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'M d, Y H:i:s';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'M d, Y H:i';
 				}
 				break;
 			case 'vi' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'd-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'H:i:s d-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'H:i d-m-Y';
 				}
@@ -727,7 +727,7 @@ 
 	}
 
 	// If year value is less than 1970, handle it separately.
-	if((int) substr($str, 0, 4) < 1970)
+	if ((int) substr($str, 0, 4) < 1970)
 	{
 		$hour = (int) substr($str, 8, 2);
 		$min = (int) substr($str, 10, 2);
@@ -777,9 +777,9 @@ 
 function getEncodeEmailAddress($email)
 {
 	$return = '';
-	for($i = 0, $c = strlen($email); $i < $c; $i++)
+	for ($i = 0, $c = strlen($email); $i < $c; $i++)
 	{
-		$return .= '&#' . (rand(0, 1) == 0 ? ord($email[$i]) : 'X' . dechex(ord($email[$i]))) . ';';
+		$return .= '&#'.(rand(0, 1) == 0 ? ord($email[$i]) : 'X'.dechex(ord($email[$i]))).';';
 	}
 	return $return;
 }
@@ -799,25 +799,25 @@ 
 {
 	static $debug_file;
 
-	if(!(__DEBUG__ & 1))
+	if (!(__DEBUG__ & 1))
 	{
 		return;
 	}
 
 	static $firephp;
 	$bt = debug_backtrace();
-	if(is_array($bt))
+	if (is_array($bt))
 	{
 		$bt_debug_print = array_shift($bt);
 		$bt_called_function = array_shift($bt);
 	}
 	$file_name = str_replace(_XE_PATH_, '', $bt_debug_print['file']);
 	$line_num = $bt_debug_print['line'];
-	$function = $bt_called_function['class'] . $bt_called_function['type'] . $bt_called_function['function'];
+	$function = $bt_called_function['class'].$bt_called_function['type'].$bt_called_function['function'];
 
-	if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+	if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 	{
-		if(!isset($firephp))
+		if (!isset($firephp))
 		{
 			$firephp = FirePHP::getInstance(TRUE);
 		}
@@ -826,16 +826,16 @@ 
 		$label = sprintf('[%s:%d] %s() (Memory usage: current=%s, peak=%s)', $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()), FileHandler::filesize(memory_get_peak_usage()));
 
 		// Check a FirePHP option
-		if($display_option === 'TABLE')
+		if ($display_option === 'TABLE')
 		{
 			$label = $display_option;
 		}
-		if($display_option === 'ERROR')
+		if ($display_option === 'ERROR')
 		{
 			$type = $display_option;
 		}
 		// Check if the IP specified by __DEBUG_PROTECT__ option is same as the access IP.
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			$debug_output = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
 			$label = NULL;
@@ -845,52 +845,52 @@ 
 	}
 	else
 	{
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			return;
 		}
 
 		$print = array();
-		if(!$debug_file)
+		if (!$debug_file)
 		{
-			$debug_file = _XE_PATH_ . 'files/' . $file;
+			$debug_file = _XE_PATH_.'files/'.$file;
 		}
-		if(!file_exists($debug_file)) $print[] = '<?php exit() ?>';
+		if (!file_exists($debug_file)) $print[] = '<?php exit() ?>';
 
-		if($display_option === TRUE || $display_option === 'ERROR')
+		if ($display_option === TRUE || $display_option === 'ERROR')
 		{
-			$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()));;
+			$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage())); ;
 			$print[] = str_repeat('=', 80);
 		}
 		$type = gettype($debug_output);
-		if(!in_array($type, array('array', 'object', 'resource')))
+		if (!in_array($type, array('array', 'object', 'resource')))
 		{
-			if($display_option === 'ERROR')
+			if ($display_option === 'ERROR')
 			{
-				$print[] = 'ERROR : ' . var_export($debug_output, TRUE);
+				$print[] = 'ERROR : '.var_export($debug_output, TRUE);
 			}
 			else
 			{
-				$print[] = 'DEBUG : ' . $type . '(' . var_export($debug_output, TRUE) . ')';
+				$print[] = 'DEBUG : '.$type.'('.var_export($debug_output, TRUE).')';
 			}
 		}
 		else
 		{
-			$print[] = 'DEBUG : ' . trim(preg_replace('/\r?\n/', "\n" . '        ', print_r($debug_output, true)));
+			$print[] = 'DEBUG : '.trim(preg_replace('/\r?\n/', "\n".'        ', print_r($debug_output, true)));
 		}
 		$backtrace_args = defined('\DEBUG_BACKTRACE_IGNORE_ARGS') ? \DEBUG_BACKTRACE_IGNORE_ARGS : 0;
 		$backtrace = debug_backtrace($backtrace_args);
 
-		if(count($backtrace) > 1 && $backtrace[1]['function'] === 'debugPrint' && !$backtrace[1]['class'])
+		if (count($backtrace) > 1 && $backtrace[1]['function'] === 'debugPrint' && !$backtrace[1]['class'])
 		{
 			array_shift($backtrace);
 		}
-		foreach($backtrace as $val)
+		foreach ($backtrace as $val)
 		{
-			$print[] = '        - ' . $val['file'] . ' : ' . $val['line'];
+			$print[] = '        - '.$val['file'].' : '.$val['line'];
 		}
 		$print[] = PHP_EOL;
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 	}
 }
 
@@ -901,7 +901,7 @@ 
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
-	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
+	if (!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
 
 	static $log_filename = array(
 		'query' => 'files/_slowlog_query.php',
@@ -911,47 +911,47 @@ 
 	);
 	$write_file = true;
 
-	$log_file = _XE_PATH_ . $log_filename[$type];
+	$log_file = _XE_PATH_.$log_filename[$type];
 
 	$buff = array();
 	$buff[] = '<?php exit(); ?>';
 	$buff[] = date('c');
 
-	if($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
+	if ($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
 	{
-		$buff[] = "\tCaller : " . $obj->caller;
-		$buff[] = "\tCalled : " . $obj->called;
+		$buff[] = "\tCaller : ".$obj->caller;
+		$buff[] = "\tCalled : ".$obj->called;
 	}
-	else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
+	else if ($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
 	{
-		$buff[] = "\tAddon : " . $obj->called;
-		$buff[] = "\tCalled position : " . $obj->caller;
+		$buff[] = "\tAddon : ".$obj->called;
+		$buff[] = "\tCalled position : ".$obj->caller;
 	}
-	else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
+	else if ($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
 	{
-		$buff[] = "\tWidget : " . $obj->called;
+		$buff[] = "\tWidget : ".$obj->called;
 	}
-	else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
+	else if ($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
 	{
 
 		$buff[] = $obj->query;
-		$buff[] = "\tQuery ID   : " . $obj->query_id;
-		$buff[] = "\tCaller     : " . $obj->caller;
-		$buff[] = "\tConnection : " . $obj->connection;
+		$buff[] = "\tQuery ID   : ".$obj->query_id;
+		$buff[] = "\tCaller     : ".$obj->caller;
+		$buff[] = "\tConnection : ".$obj->connection;
 	}
 	else
 	{
 		$write_file = false;
 	}
 
-	if($write_file)
+	if ($write_file)
 	{
 		$buff[] = sprintf("\t%0.6f sec", $elapsed_time);
-		$buff[] = PHP_EOL . PHP_EOL;
+		$buff[] = PHP_EOL.PHP_EOL;
 		file_put_contents($log_file, implode(PHP_EOL, $buff), FILE_APPEND);
 	}
 
-	if($type != 'query')
+	if ($type != 'query')
 	{
 		$trigger_args = $obj;
 		$trigger_args->_log_type = $type;
@@ -991,11 +991,11 @@ 
  */
 function delObjectVars($target_obj, $del_obj)
 {
-	if(!is_object($target_obj))
+	if (!is_object($target_obj))
 	{
 		return;
 	}
-	if(!is_object($del_obj))
+	if (!is_object($del_obj))
 	{
 		return;
 	}
@@ -1005,7 +1005,7 @@ 
 
 	$target = array_keys($target_vars);
 	$del = array_keys($del_vars);
-	if(!count($target) || !count($del))
+	if (!count($target) || !count($del))
 	{
 		return $target_obj;
 	}
@@ -1013,10 +1013,10 @@ 
 	$return_obj = new stdClass();
 
 	$target_count = count($target);
-	for($i = 0; $i < $target_count; $i++)
+	for ($i = 0; $i < $target_count; $i++)
 	{
 		$target_key = $target[$i];
-		if(!in_array($target_key, $del))
+		if (!in_array($target_key, $del))
 		{
 			$return_obj->{$target_key} = $target_obj->{$target_key};
 		}
@@ -1029,10 +1029,10 @@ 
 {
 	$del_vars = array('error_return_url', 'success_return_url', 'ruleset', 'xe_validator_id');
 
-	foreach($del_vars as $var)
+	foreach ($del_vars as $var)
 	{
-		if(is_array($vars)) unset($vars[$var]);
-		else if(is_object($vars)) unset($vars->$var);
+		if (is_array($vars)) unset($vars[$var]);
+		else if (is_object($vars)) unset($vars->$var);
 	}
 
 	return $vars;
@@ -1049,12 +1049,12 @@ 
  */
 function handleError($errno, $errstr, $file, $line)
 {
-	if(!__DEBUG__)
+	if (!__DEBUG__)
 	{
 		return;
 	}
 	$errors = array(E_USER_ERROR, E_ERROR, E_PARSE);
-	if(!in_array($errno, $errors))
+	if (!in_array($errno, $errors))
 	{
 		return;
 	}
@@ -1074,8 +1074,8 @@ 
 function getNumberingPath($no, $size = 3)
 {
 	$mod = pow(10, $size);
-	$output = sprintf('%0' . $size . 'd/', $no % $mod);
-	if($no >= $mod)
+	$output = sprintf('%0'.$size.'d/', $no % $mod);
+	if ($no >= $mod)
 	{
 		$output .= getNumberingPath((int) $no / $mod, $size);
 	}
@@ -1095,7 +1095,7 @@ 
 
 function purifierHtml(&$content)
 {
-	require_once(_XE_PATH_ . 'classes/security/Purifier.class.php');
+	require_once(_XE_PATH_.'classes/security/Purifier.class.php');
 	$oPurifier = Purifier::getInstance();
 	$oPurifier->purify($content);
 }
@@ -1108,7 +1108,7 @@ 
  */
 function removeHackTag($content)
 {
-	require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 	$oEmbedFilter = EmbedFilter::getInstance();
 	$oEmbedFilter->check($content);
 
@@ -1150,7 +1150,7 @@ 
  */
 function checkUploadedFile($file)
 {
-	require_once(_XE_PATH_ . 'classes/security/UploadFileFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/UploadFileFilter.class.php');
 	return UploadFileFilter::check($file);
 }
 
@@ -1164,13 +1164,13 @@ 
 {
 	$content = preg_replace('@<(/?)xmp.*?>@i', '<\1xmp>', $content);
 
-	if(($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
+	if (($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
 	{
-		if(($close_xmp = strrpos($content, '</xmp>')) === FALSE)
+		if (($close_xmp = strrpos($content, '</xmp>')) === FALSE)
 		{
 			$content .= '</xmp>';
 		}
-		else if($close_xmp < $start_xmp)
+		else if ($close_xmp < $start_xmp)
 		{
 			$content .= '</xmp>';
 		}
@@ -1190,33 +1190,33 @@ 
 	$tag = strtolower($match[2]);
 
 	// xmp tag ?뺣━
-	if($tag == 'xmp')
+	if ($tag == 'xmp')
 	{
 		return "<{$match[1]}xmp>";
 	}
-	if($match[1])
+	if ($match[1])
 	{
 		return $match[0];
 	}
-	if($match[4])
+	if ($match[4])
 	{
-		$match[4] = ' ' . $match[4];
+		$match[4] = ' '.$match[4];
 	}
 
 	$attrs = array();
-	if(preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
+	if (preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
 	{
-		foreach($m[1] as $idx => $name)
+		foreach ($m[1] as $idx => $name)
 		{
-			if(strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
+			if (strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
 			{
 				continue;
 			}
 
-			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00' . $n[1]) : ($n[2] + 0)); }, $m[3][$idx] . $m[4][$idx]);
+			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00'.$n[1]) : ($n[2] + 0)); }, $m[3][$idx].$m[4][$idx]);
 			$val = preg_replace('/^\s+|[\t\n\r]+/', '', $val);
 
-			if(preg_match('/^[a-z]+script:/i', $val))
+			if (preg_match('/^[a-z]+script:/i', $val))
 			{
 				continue;
 			}
@@ -1227,60 +1227,60 @@ 
 
 	$filter_arrts = array('style', 'src', 'href');
 
-	if($tag === 'object') array_push($filter_arrts, 'data');
-	if($tag === 'param') array_push($filter_arrts, 'value');
+	if ($tag === 'object') array_push($filter_arrts, 'data');
+	if ($tag === 'param') array_push($filter_arrts, 'value');
 
-	foreach($filter_arrts as $attr)
+	foreach ($filter_arrts as $attr)
 	{
-		if(!isset($attrs[$attr])) continue;
+		if (!isset($attrs[$attr])) continue;
 
 		$attr_value = rawurldecode($attrs[$attr]);
 		$attr_value = htmlspecialchars_decode($attr_value, ENT_COMPAT);
 		$attr_value = preg_replace('/\s+|[\t\n\r]+/', '', $attr_value);
-		if(preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
+		if (preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
 		{
 			unset($attrs[$attr]);
 		}
 	}
 
-	if(isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
+	if (isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
 	{
 		unset($attrs['style']);
 	}
 
 	$attr = array();
-	foreach($attrs as $name => $val)
+	foreach ($attrs as $name => $val)
 	{
-		if($tag == 'object' || $tag == 'embed' || $tag == 'a')
+		if ($tag == 'object' || $tag == 'embed' || $tag == 'a')
 		{
 			$attribute = strtolower(trim($name));
-			if($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
+			if ($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
 			{
-				if(stripos($val, 'data:') === 0)
+				if (stripos($val, 'data:') === 0)
 				{
 					continue;
 				}
 			}
 		}
 
-		if($tag == 'img')
+		if ($tag == 'img')
 		{
 			$attribute = strtolower(trim($name));
-			if(stripos($val, 'data:') === 0)
+			if (stripos($val, 'data:') === 0)
 			{
 				continue;
 			}
 		}
 		$val = str_replace('"', '&quot;', $val);
-		$attr[] = $name . "=\"{$val}\"";
+		$attr[] = $name."=\"{$val}\"";
 	}
-	$attr = count($attr) ? ' ' . implode(' ', $attr) : '';
+	$attr = count($attr) ? ' '.implode(' ', $attr) : '';
 
 	return "<{$match[1]}{$tag}{$attr}{$match[4]}>";
 }
 
 // convert hexa value to RGB
-if(!function_exists('hexrgb'))
+if (!function_exists('hexrgb'))
 {
 
 	/**
@@ -1316,9 +1316,9 @@ 
 
 	settype($password, "string");
 
-	for($i = 0; $i < strlen($password); $i++)
+	for ($i = 0; $i < strlen($password); $i++)
 	{
-		if($password[$i] == ' ' || $password[$i] == '\t')
+		if ($password[$i] == ' ' || $password[$i] == '\t')
 		{
 			continue;
 		}
@@ -1330,11 +1330,11 @@ 
 	$result1 = sprintf("%08lx", $nr & ((1 << 31) - 1));
 	$result2 = sprintf("%08lx", $nr2 & ((1 << 31) - 1));
 
-	if($result1 == '80000000')
+	if ($result1 == '80000000')
 	{
 		$nr += 0x80000000;
 	}
-	if($result2 == '80000000')
+	if ($result2 == '80000000')
 	{
 		$nr2 += 0x80000000;
 	}
@@ -1350,7 +1350,7 @@ 
 function getScriptPath()
 {
 	static $url = NULL;
-	if($url == NULL)
+	if ($url == NULL)
 	{
 		$script_path = filter_var($_SERVER['SCRIPT_NAME'], FILTER_SANITIZE_STRING);
 		$url = str_ireplace('/tools/', '/', preg_replace('/index.php.*/i', '', str_replace('\\', '/', $script_path)));
@@ -1381,14 +1381,14 @@ 
 	$decodedStr = '';
 	$pos = 0;
 	$len = strlen($source);
-	while($pos < $len)
+	while ($pos < $len)
 	{
 		$charAt = substr($source, $pos, 1);
-		if($charAt == '%')
+		if ($charAt == '%')
 		{
 			$pos++;
 			$charAt = substr($source, $pos, 1);
-			if($charAt == 'u')
+			if ($charAt == 'u')
 			{
 				// we got a unicode character
 				$pos++;
@@ -1422,21 +1422,21 @@ 
  */
 function _code2utf($num)
 {
-	if($num < 128)
+	if ($num < 128)
 	{
 		return chr($num);
 	}
-	if($num < 2048)
+	if ($num < 2048)
 	{
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		return chr(($num >> 6) + 192).chr(($num & 63) + 128);
 	}
-	if($num < 65536)
+	if ($num < 65536)
 	{
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
-	if($num < 2097152)
+	if ($num < 2097152)
 	{
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
 	return '';
 }
@@ -1451,7 +1451,7 @@ 
  */
 function detectUTF8($string, $return_convert = FALSE, $urldecode = TRUE)
 {
-	if($urldecode)
+	if ($urldecode)
 	{
 		$string = urldecode($string);
 	}
@@ -1459,12 +1459,12 @@ 
 	$sample = iconv('utf-8', 'utf-8', $string);
 	$is_utf8 = (md5($sample) === md5($string));
 
-	if(!$urldecode)
+	if (!$urldecode)
 	{
 		$string = urldecode($string);
 	}
 
-	if($return_convert)
+	if ($return_convert)
 	{
 		return ($is_utf8) ? $string : iconv('euc-kr', 'utf-8', $string);
 	}
@@ -1480,7 +1480,7 @@ 
  */
 function json_encode2($data)
 {
-	switch(gettype($data))
+	switch (gettype($data))
 	{
 		case 'boolean':
 			return $data ? 'true' : 'false';
@@ -1488,15 +1488,15 @@ 
 		case 'double':
 			return $data;
 		case 'string':
-			return '"' . strtr($data, array('\\' => '\\\\', '"' => '\\"')) . '"';
+			return '"'.strtr($data, array('\\' => '\\\\', '"' => '\\"')).'"';
 		case 'object':
 			$data = get_object_vars($data);
 		case 'array':
 			$rel = FALSE; // relative array?
 			$key = array_keys($data);
-			foreach($key as $v)
+			foreach ($key as $v)
 			{
-				if(!is_int($v))
+				if (!is_int($v))
 				{
 					$rel = TRUE;
 					break;
@@ -1504,12 +1504,12 @@ 
 			}
 
 			$arr = array();
-			foreach($data as $k => $v)
+			foreach ($data as $k => $v)
 			{
-				$arr[] = ($rel ? '"' . strtr($k, array('\\' => '\\\\', '"' => '\\"')) . '":' : '') . json_encode2($v);
+				$arr[] = ($rel ? '"'.strtr($k, array('\\' => '\\\\', '"' => '\\"')).'":' : '').json_encode2($v);
 			}
 
-			return $rel ? '{' . join(',', $arr) . '}' : '[' . join(',', $arr) . ']';
+			return $rel ? '{'.join(',', $arr).'}' : '['.join(',', $arr).']';
 		default:
 			return '""';
 	}
@@ -1523,7 +1523,7 @@ 
  */
 function isCrawler($agent = NULL)
 {
-	if(!$agent)
+	if (!$agent)
 	{
 		$agent = $_SERVER['HTTP_USER_AGENT'];
 	}
@@ -1533,9 +1533,9 @@ 
 		/*'211.245.21.110-211.245.21.119' mixsh is closed */
 	);
 
-	foreach($check_agent as $str)
+	foreach ($check_agent as $str)
 	{
-		if(stristr($agent, $str) != FALSE)
+		if (stristr($agent, $str) != FALSE)
 		{
 			return TRUE;
 		}
@@ -1553,7 +1553,7 @@ 
  */
 function stripEmbedTagForAdmin(&$content, $writer_member_srl)
 {
-	if(!Context::get('is_logged'))
+	if (!Context::get('is_logged'))
 	{
 		return;
 	}
@@ -1561,18 +1561,18 @@ 
 	$oModuleModel = getModel('module');
 	$logged_info = Context::get('logged_info');
 
-	if($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
+	if ($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
 	{
-		if($writer_member_srl)
+		if ($writer_member_srl)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($writer_member_srl);
-			if($member_info->is_admin == "Y")
+			if ($member_info->is_admin == "Y")
 			{
 				return;
 			}
 		}
-		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . Context::getLang('security_warning_embed') . "</p></div>";
+		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>".Context::getLang('security_warning_embed')."</p></div>";
 		$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
 		$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
 		$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);
@@ -1589,18 +1589,18 @@ 
 function requirePear()
 {
 	static $required = false;
-	if($required)
+	if ($required)
 	{
 		return;
 	}
 
-	if(version_compare(PHP_VERSION, "5.3.0") < 0)
+	if (version_compare(PHP_VERSION, "5.3.0") < 0)
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR".PATH_SEPARATOR.get_include_path());
 	}
 	else
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR.1.9.5".PATH_SEPARATOR.get_include_path());
 	}
 
 	$required = true;
@@ -1608,7 +1608,7 @@ 
 
 function checkCSRF()
 {
-	if($_SERVER['REQUEST_METHOD'] != 'POST')
+	if ($_SERVER['REQUEST_METHOD'] != 'POST')
 	{
 		return FALSE;
 	}
@@ -1616,9 +1616,9 @@ 
 	$default_url = Context::getDefaultUrl();
 	$referer = $_SERVER["HTTP_REFERER"];
 
-	if(strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
+	if (strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
 	{
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$referer = $IDN->encode($referer);
 	}
@@ -1629,9 +1629,9 @@ 
 	$oModuleModel = getModel('module');
 	$siteModuleInfo = $oModuleModel->getDefaultMid();
 
-	if($siteModuleInfo->site_srl == 0)
+	if ($siteModuleInfo->site_srl == 0)
 	{
-		if($default_url['host'] !== $referer['host'])
+		if ($default_url['host'] !== $referer['host'])
 		{
 			return FALSE;
 		}
@@ -1639,7 +1639,7 @@ 
 	else
 	{
 		$virtualSiteInfo = $oModuleModel->getSiteInfo($siteModuleInfo->site_srl);
-		if(strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
+		if (strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
 		{
 			return FALSE;
 		}
@@ -1655,15 +1655,15 @@ 
  */
 function recurciveExposureCheck(&$menu)
 {
-	if(is_array($menu))
+	if (is_array($menu))
 	{
-		foreach($menu AS $key=>$value)
+		foreach ($menu AS $key=>$value)
 		{
-			if(!$value['isShow'])
+			if (!$value['isShow'])
 			{
 				unset($menu[$key]);
 			}
-			if(is_array($value['list']) && count($value['list']) > 0)
+			if (is_array($value['list']) && count($value['list']) > 0)
 			{
 				recurciveExposureCheck($menu[$key]['list']);
 			}
@@ -1673,14 +1673,14 @@ 
 
 function changeValueInUrl($key, $requestKey, $dbKey, $urlName = 'success_return_url')
 {
-	if($requestKey != $dbKey)
+	if ($requestKey != $dbKey)
 	{
 		$arrayUrl = parse_url(Context::get('success_return_url'));
-		if($arrayUrl['query'])
+		if ($arrayUrl['query'])
 		{
 			parse_str($arrayUrl['query'], $parsedStr);
 
-			if(isset($parsedStr[$key]))
+			if (isset($parsedStr[$key]))
 			{
 				$parsedStr[$key] = $requestKey;
 				$successReturnUrl .= $arrayUrl['path'].'?'.http_build_query($parsedStr);
@@ -1723,14 +1723,14 @@ 
  */
 function alertScript($msg)
 {
-	if(!$msg)
+	if (!$msg)
 	{
 		return;
 	}
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-alert("' . $msg . '");
+alert("' . $msg.'");
 //]]>
 </script>';
 }
@@ -1761,7 +1761,7 @@ 
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-' . $reloadScript . '
+' . $reloadScript.'
 //]]>
 </script>';
 }

classes/mobile/Mobile.class.php

Spacing +28 added lines, -28 removed lines

@@ -23,7 +23,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance;
-		if(!isset($theInstance))
+		if (!isset($theInstance))
 		{
 			$theInstance = new Mobile();
 		}
@@ -48,11 +48,11 @@ 
 	 */
 	function _isFromMobilePhone()
 	{
-		if($this->ismobile !== NULL)
+		if ($this->ismobile !== NULL)
 		{
 			return $this->ismobile;
 		}
-		if(Mobile::isMobileEnabled() === false || Context::get('full_browse') || $_COOKIE["FullBrowse"])
+		if (Mobile::isMobileEnabled() === false || Context::get('full_browse') || $_COOKIE["FullBrowse"])
 		{
 			return ($this->ismobile = false);
 		}
@@ -63,22 +63,22 @@ 
 		$this->ismobile = FALSE;
 
 		$m = Context::get('m');
-		if(strlen($m) == 1)
+		if (strlen($m) == 1)
 		{
-			if($m == "1")
+			if ($m == "1")
 			{
 				$this->ismobile = TRUE;
 			}
-			elseif($m == "0")
+			elseif ($m == "0")
 			{
 				$this->ismobile = FALSE;
 			}
 		}
-		elseif(isset($_COOKIE['mobile']))
+		elseif (isset($_COOKIE['mobile']))
 		{
-			if($_COOKIE['user-agent'] == md5($_SERVER['HTTP_USER_AGENT']))
+			if ($_COOKIE['user-agent'] == md5($_SERVER['HTTP_USER_AGENT']))
 			{
-				if($_COOKIE['mobile'] == 'true')
+				if ($_COOKIE['mobile'] == 'true')
 				{
 					$this->ismobile = TRUE;
 				}
@@ -92,7 +92,7 @@ 
 				$this->ismobile = FALSE;
 				setcookie("mobile", FALSE);
 				setcookie("user-agent", FALSE);
-				if(!$this->isMobilePadCheckByAgent() && $this->isMobileCheckByAgent())
+				if (!$this->isMobilePadCheckByAgent() && $this->isMobileCheckByAgent())
 				{
 					$this->ismobile = TRUE;
 				}
@@ -100,36 +100,36 @@ 
 		}
 		else
 		{
-			if($this->isMobilePadCheckByAgent())
+			if ($this->isMobilePadCheckByAgent())
 			{
 				$this->ismobile = FALSE;
 			}
 			else
 			{
-				if($this->isMobileCheckByAgent())
+				if ($this->isMobileCheckByAgent())
 				{
 					$this->ismobile = TRUE;
 				}
 			}
 		}
 
-		if($this->ismobile !== NULL)
+		if ($this->ismobile !== NULL)
 		{
-			if($this->ismobile == TRUE)
+			if ($this->ismobile == TRUE)
 			{
-				if($_COOKIE['mobile'] != 'true')
+				if ($_COOKIE['mobile'] != 'true')
 				{
 					$_COOKIE['mobile'] = 'true';
 					setcookie("mobile", 'true');
 				}
 			}
-			elseif($_COOKIE['mobile'] != 'false')
+			elseif ($_COOKIE['mobile'] != 'false')
 			{
 				$_COOKIE['mobile'] = 'false';
 				setcookie("mobile", 'false');
 			}
 
-			if($_COOKIE['user-agent'] != md5($_SERVER['HTTP_USER_AGENT']))
+			if ($_COOKIE['user-agent'] != md5($_SERVER['HTTP_USER_AGENT']))
 			{
 				setcookie("user-agent", md5($_SERVER['HTTP_USER_AGENT']));
 			}
@@ -146,7 +146,7 @@ 
 	function isMobileCheckByAgent()
 	{
 		static $UACheck;
-		if(isset($UACheck))
+		if (isset($UACheck))
 		{
 			return $UACheck;
 		}
@@ -154,15 +154,15 @@ 
 		$oMobile = Mobile::getInstance();
 		$mobileAgent = array('iPod', 'iPhone', 'Android', 'BlackBerry', 'SymbianOS', 'Bada', 'Tizen', 'Kindle', 'Wii', 'SCH-', 'SPH-', 'CANU-', 'Windows Phone', 'Windows CE', 'POLARIS', 'Palm', 'Dorothy Browser', 'Mobile', 'Opera Mobi', 'Opera Mini', 'Minimo', 'AvantGo', 'NetFront', 'Nokia', 'LGPlayer', 'SonyEricsson', 'HTC');
 
-		if($oMobile->isMobilePadCheckByAgent())
+		if ($oMobile->isMobilePadCheckByAgent())
 		{
 			$UACheck = TRUE;
 			return TRUE;
 		}
 
-		foreach($mobileAgent as $agent)
+		foreach ($mobileAgent as $agent)
 		{
-			if(stripos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE)
+			if (stripos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE)
 			{
 				$UACheck = TRUE;
 				return TRUE;
@@ -180,7 +180,7 @@ 
 	function isMobilePadCheckByAgent()
 	{
 		static $UACheck;
-		if(isset($UACheck))
+		if (isset($UACheck))
 		{
 			return $UACheck;
 		}
@@ -190,21 +190,21 @@ 
 		// $exceptionAgent[0] contains exception agents for all exceptions.
 		$exceptionAgent = array(0 => array('Opera Mini', 'Opera Mobi'), 'Android' => 'Mobile');
 
-		foreach($padAgent as $agent)
+		foreach ($padAgent as $agent)
 		{
-			if(strpos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE)
+			if (strpos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE)
 			{
-				if(!isset($exceptionAgent[$agent]))
+				if (!isset($exceptionAgent[$agent]))
 				{
 					$UACheck = TRUE;
 					return TRUE;
 				}
-				elseif(strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE)
+				elseif (strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE)
 				{
 					// If the agent is the Android, that can be either tablet and mobile phone.
-					foreach($exceptionAgent[0] as $val)
+					foreach ($exceptionAgent[0] as $val)
 					{
-						if(strpos($_SERVER['HTTP_USER_AGENT'], $val) !== FALSE)
+						if (strpos($_SERVER['HTTP_USER_AGENT'], $val) !== FALSE)
 						{
 							$UACheck = FALSE;
 							return FALSE;

Braces +8 added lines, -16 removed lines

@@ -68,26 +68,22 @@ 
 			if($m == "1")
 			{
 				$this->ismobile = TRUE;
-			}
-			elseif($m == "0")
+			} elseif($m == "0")
 			{
 				$this->ismobile = FALSE;
 			}
-		}
-		elseif(isset($_COOKIE['mobile']))
+		} elseif(isset($_COOKIE['mobile']))
 		{
 			if($_COOKIE['user-agent'] == md5($_SERVER['HTTP_USER_AGENT']))
 			{
 				if($_COOKIE['mobile'] == 'true')
 				{
 					$this->ismobile = TRUE;
-				}
-				else
+				} else
 				{
 					$this->ismobile = FALSE;
 				}
-			}
-			else
+			} else
 			{
 				$this->ismobile = FALSE;
 				setcookie("mobile", FALSE);
@@ -97,14 +93,12 @@ 
 					$this->ismobile = TRUE;
 				}
 			}
-		}
-		else
+		} else
 		{
 			if($this->isMobilePadCheckByAgent())
 			{
 				$this->ismobile = FALSE;
-			}
-			else
+			} else
 			{
 				if($this->isMobileCheckByAgent())
 				{
@@ -122,8 +116,7 @@ 
 					$_COOKIE['mobile'] = 'true';
 					setcookie("mobile", 'true');
 				}
-			}
-			elseif($_COOKIE['mobile'] != 'false')
+			} elseif($_COOKIE['mobile'] != 'false')
 			{
 				$_COOKIE['mobile'] = 'false';
 				setcookie("mobile", 'false');
@@ -198,8 +191,7 @@ 
 				{
 					$UACheck = TRUE;
 					return TRUE;
-				}
-				elseif(strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE)
+				} elseif(strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE)
 				{
 					// If the agent is the Android, that can be either tablet and mobile phone.
 					foreach($exceptionAgent[0] as $val)

classes/context/Context.class.php

Braces +112 added lines, -112 removed lines

@@ -230,7 +230,9 @@ 
 		$this->loadDBInfo();
 		if($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if(is_array($this->db_info->sitelock_whitelist)) {
+				$whitelist = $this->db_info->sitelock_whitelist;
+			}
 
 			if(!IpFilter::filter($whitelist))
 			{
@@ -245,8 +247,7 @@ 
 				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
-				}
-				else
+				} else
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.html';
 				}
@@ -303,8 +304,7 @@ 
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000);
 			}
-		}
-		elseif($_COOKIE['lang_type'])
+		} elseif($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
@@ -341,7 +341,9 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if($sess = $_POST[session_name()]) {
+			session_id($sess);
+		}
 		session_start();
 
 		// set authentication information in Context and session
@@ -394,22 +396,21 @@ 
 						{
 							$url[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif($val)
+					} elseif($val)
 					{
 						$url[] = $key . '=' . urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
-			}
-			else
+				if($url) {
+					$current_url .= '?' . join('&', $url);
+				}
+			} else
 			{
 				$current_url = $this->getUrl();
 			}
-		}
-		else
+		} else
 		{
 			$current_url = self::getRequestUri();
 		}
@@ -490,18 +491,22 @@ 
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
-			$db_info->time_zone = date('O');
+		if(!$db_info->time_zone) {
+					$db_info->time_zone = date('O');
+		}
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
-			$db_info->qmail_compatibility = 'N';
+		if($db_info->qmail_compatibility != 'Y') {
+					$db_info->qmail_compatibility = 'N';
+		}
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
-			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
-			$db_info->use_ssl = 'none';
+		if(!$db_info->use_db_session) {
+					$db_info->use_db_session = 'N';
+		}
+		if(!$db_info->use_ssl) {
+					$db_info->use_ssl = 'none';
+		}
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
@@ -618,8 +623,7 @@ 
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
 				$lang_selected = self::loadLangSupported();
-			}
-			else
+			} else
 			{
 				$langs = file($selected_lang_file);
 				foreach($langs as $val)
@@ -678,15 +682,16 @@ 
 
 				$oModuleModel = getModel('module');
 				$domain = $url_info['host'] . $url_info['path'];
-				if(substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
+				if(substr_compare($domain, '/', -1) === 0) {
+					$domain = substr($domain, 0, -1);
+				}
 				$site_info = $oModuleModel->getSiteInfoByDomain($domain);
 
 				if($site_info->site_srl)
 				{
 				$url_info['query'].= ($url_info['query'] ? '&' : '') . 'SSOID=' . urlencode(session_id()) . '&sig=' . urlencode(Password::createSignature(session_id()));
 				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':' . $url_info['port'] : '', $url_info['path'], $url_info['query']);
-				}
-				else
+				} else
 				{
 					$redirect_url = $url;
 				}
@@ -695,8 +700,7 @@ 
 				return FALSE;
 			}
 			// for sites requesting SSO validation
-		}
-		else
+		} else
 		{
 			// result handling : set session_name()
 			if($session_name = self::get('SSOID'))
@@ -713,8 +717,7 @@ 
 				header('location:' . $url);
 				return FALSE;
 				// send SSO request
-			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			} else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()));
 				$origin_url = self::getRequestUrl();
@@ -774,8 +777,7 @@ 
 		if($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
-		}
-		else
+		} else
 		{
 			$self->site_title = $site_title;
 		}
@@ -875,8 +877,7 @@ 
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
-		}
-		else
+		} else
 		{
 			$self->_evalxmlLang($path);
 		}
@@ -892,7 +893,9 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$_path = 'eval://' . $path;
 
@@ -924,7 +927,9 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
@@ -938,7 +943,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if(substr_compare($path, '/', -1) !== 0)
 		{
@@ -1074,12 +1081,14 @@ 
 		static $flag = TRUE;
 		if($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
-			else $flag = FALSE;
-		}
-		else
+			if(is_array($val)) {
+							array_walk($val,'Context::checkConvertFlag',$charset);
+			} else if($val && iconv($charset,$charset,$val)!=$val) {
+				$flag = FALSE;
+			} else {
+				$flag = FALSE;
+			}
+		} else
 		{
 			$return = $flag;
 			$flag = TRUE;
@@ -1101,8 +1110,9 @@ 
 		if (is_array($val))
 		{
 			array_walk($val,'Context::doConvertEncoding',$charset);
+		} else {
+			$val = iconv($charset,'UTF-8',$val);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
 	}
 
 	/**
@@ -1113,7 +1123,9 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if(!$str) {
+        	return null;
+        }
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1226,16 +1238,13 @@ 
 			if($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			} elseif($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			} elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
-			}
-			else
+			} else
 			{
 				$set_to_vars = FALSE;
 			}
@@ -1261,8 +1270,7 @@ 
 					return;
 				}
 			}
-		}
-		else if(is_array($val))
+		} else if(is_array($val))
 		{
 			foreach($val as $val2)
 			{
@@ -1402,24 +1410,19 @@ 
 			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
-			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			} elseif($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
-			}
-			elseif($key === 'vid')
+			} elseif($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
-			}
-			elseif($key === 'xe_validator_id')
+			} elseif($key === 'xe_validator_id')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
-			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			} elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
-			}
-			else
+			} else
 			{
 				$result[$k] = $v;
 
@@ -1428,8 +1431,7 @@ 
 					if (is_array($result[$k]))
 					{
 						array_walk_recursive($result[$k], function(&$val) { $val = stripslashes($val); });
-					}
-					else
+					} else
 					{
 						$result[$k] = stripslashes($result[$k]);
 					}
@@ -1438,8 +1440,7 @@ 
 				if(is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
-				}
-				else
+				} else
 				{
 					$result[$k] = trim($result[$k]);
 				}
@@ -1484,8 +1485,7 @@ 
 				$val['name'] = htmlspecialchars($val['name'], ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 				$this->set($key, $val, TRUE);
 				$this->is_uploaded = TRUE;
-			}
-			else
+			} else
 			{
 				$files = array();
 				$count_files = count($tmp_name);
@@ -1503,7 +1503,9 @@ 
 						$files[] = $file;
 					}
 				}
-				if($files) $this->set($key, $files, TRUE);
+				if($files) {
+					$this->set($key, $files, TRUE);
+				}
 			}
 		}
 	}
@@ -1595,8 +1597,7 @@ 
 			if($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
-			}
-			else
+			} else
 			{
 				$domain = $site_module_info->domain;
 			}
@@ -1613,8 +1614,7 @@ 
 			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
 			{
 				unset($domain);
-			}
-			else
+			} else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
 				if(substr_compare($domain, '/', -1) !== 0)
@@ -1634,23 +1634,35 @@ 
 			{
 				array_shift($args_list);
 			}
-		}
-		elseif($_SERVER['REQUEST_METHOD'] == 'GET')
+		} elseif($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
-		}
-		else
+		} else
 		{
-			if(!!$self->get_vars->module) $get_vars['module'] = $self->get_vars->module;
-			if(!!$self->get_vars->mid) $get_vars['mid'] = $self->get_vars->mid;
-			if(!!$self->get_vars->act) $get_vars['act'] = $self->get_vars->act;
-			if(!!$self->get_vars->page) $get_vars['page'] = $self->get_vars->page;
-			if(!!$self->get_vars->search_target) $get_vars['search_target'] = $self->get_vars->search_target;
-			if(!!$self->get_vars->search_keyword) $get_vars['search_keyword'] = $self->get_vars->search_keyword;
+			if(!!$self->get_vars->module) {
+				$get_vars['module'] = $self->get_vars->module;
+			}
+			if(!!$self->get_vars->mid) {
+				$get_vars['mid'] = $self->get_vars->mid;
+			}
+			if(!!$self->get_vars->act) {
+				$get_vars['act'] = $self->get_vars->act;
+			}
+			if(!!$self->get_vars->page) {
+				$get_vars['page'] = $self->get_vars->page;
+			}
+			if(!!$self->get_vars->search_target) {
+				$get_vars['search_target'] = $self->get_vars->search_target;
+			}
+			if(!!$self->get_vars->search_keyword) {
+				$get_vars['search_keyword'] = $self->get_vars->search_keyword;
+			}
 			if($get_vars['act'] == 'IS')
 			{
-				if(!!$self->get_vars->is_keyword) $get_vars['is_keyword'] = $self->get_vars->is_keyword;
+				if(!!$self->get_vars->is_keyword) {
+					$get_vars['is_keyword'] = $self->get_vars->is_keyword;
+				}
 			}
 		}
 
@@ -1675,8 +1687,7 @@ 
 		if($vid)
 		{
 			$get_vars['vid'] = $vid;
-		}
-		else
+		} else
 		{
 			unset($get_vars['vid']);
 		}
@@ -1748,8 +1759,7 @@ 
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif(!is_array($val))
+					} elseif(!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
@@ -1767,25 +1777,23 @@ 
 		{
 			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			// optional SSL use
-		}
-		elseif($_use_ssl == 'optional')
+		} elseif($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
 			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
 			// no SSL
-		}
-		else
+		} else
 		{
 			// currently on SSL but target is not based on SSL
 			if($_SERVER['HTTPS'] == 'on')
 			{
 				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
-			}
-			else if($domain) // if $domain is set
+			} else if($domain) {
+				// if $domain is set
 			{
 				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
 			}
-			else
+			} else
 			{
 				$query = getScriptPath() . $query;
 			}
@@ -1842,8 +1850,7 @@ 
 		if($domain)
 		{
 			$domain_key = md5($domain);
-		}
-		else
+		} else
 		{
 			$domain_key = 'default';
 		}
@@ -1872,8 +1879,7 @@ 
 			{
 				$target_url.= '/';
 			}
-		}
-		else
+		} else
 		{
 			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
 		}
@@ -1891,20 +1897,17 @@ 
 			if($port && $port != 443)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 443)
+			} elseif($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
-		}
-		else
+		} else
 		{
 			$port = self::get('_http_port');
 			if($port && $port != 80)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 80)
+			} elseif($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
@@ -2141,8 +2144,7 @@ 
 		if(strpos($file, './') === 0)
 		{
 			$file = $script_path . substr($file, 2);
-		}
-		elseif(strpos($file, '../') === 0)
+		} elseif(strpos($file, '../') === 0)
 		{
 			$file = self::normalizeFilePath($script_path . $file);
 		}
@@ -2404,8 +2406,7 @@ 
 			if(substr_compare($filename, '.js', -3) === 0)
 			{
 				$result->jsList[] = $plugin_path . $filename;
-			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			} elseif(substr_compare($filename, '.css', -4) === 0)
 			{
 				$result->cssList[] = $plugin_path . $filename;
 			}
@@ -2662,8 +2663,7 @@ 
 			if(count($_base) > 0)
 			{
 				array_shift($_base);
-			}
-			else
+			} else
 			{
 				array_unshift($_base, '..');
 			}

Spacing +310 added lines, -310 removed lines

@@ -162,7 +162,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance = null;
-		if(!$theInstance)
+		if (!$theInstance)
 		{
 			$theInstance = new Context();
 		}
@@ -182,10 +182,10 @@ 
 
 		// include ssl action cache file
 		$this->sslActionCacheFile = FileHandler::getRealPath($this->sslActionCacheFile);
-		if(is_readable($this->sslActionCacheFile))
+		if (is_readable($this->sslActionCacheFile))
 		{
 			require($this->sslActionCacheFile);
-			if(isset($sslActions))
+			if (isset($sslActions))
 			{
 				$this->ssl_actions = $sslActions;
 			}
@@ -201,12 +201,12 @@ 
 	function init()
 	{
 		// fix missing HTTP_RAW_POST_DATA in PHP 5.6 and above
-		if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
+		if (!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
 		{
 			$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
 			
 			// If content is not XML JSON, unset
-			if(!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
+			if (!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
 			{
 				unset($GLOBALS['HTTP_RAW_POST_DATA']);
 			}
@@ -228,11 +228,11 @@ 
 		$this->_setUploadedArgument();
 
 		$this->loadDBInfo();
-		if($this->db_info->use_sitelock == 'Y')
+		if ($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if (is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
 
-			if(!IpFilter::filter($whitelist))
+			if (!IpFilter::filter($whitelist))
 			{
 				$title = ($this->db_info->sitelock_title) ? $this->db_info->sitelock_title : 'Maintenance in progress...';
 				$message = $this->db_info->sitelock_message;
@@ -242,52 +242,52 @@ 
 				define('_XE_SITELOCK_MESSAGE_', $message);
 
 				header("HTTP/1.1 403 Forbidden");
-				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
+				if (FileHandler::exists(_XE_PATH_.'common/tpl/sitelock.user.html'))
 				{
-					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
+					include _XE_PATH_.'common/tpl/sitelock.user.html';
 				}
 				else
 				{
-					include _XE_PATH_ . 'common/tpl/sitelock.html';
+					include _XE_PATH_.'common/tpl/sitelock.html';
 				}
 				exit;
 			}
 		}
 
 		// If XE is installed, get virtual site information
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$site_module_info = $oModuleModel->getDefaultMid();
 
-			if(!isset($site_module_info))
+			if (!isset($site_module_info))
 			{
 				$site_module_info = new stdClass();
 			}
 
 			// if site_srl of site_module_info is 0 (default site), compare the domain to default_url of db_config
-			if($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
+			if ($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
 			{
 				$site_module_info->domain = $this->db_info->default_url;
 			}
 
 			$this->set('site_module_info', $site_module_info);
-			if($site_module_info->site_srl && isSiteID($site_module_info->domain))
+			if ($site_module_info->site_srl && isSiteID($site_module_info->domain))
 			{
 				$this->set('vid', $site_module_info->domain, TRUE);
 			}
 
-			if(!isset($this->db_info))
+			if (!isset($this->db_info))
 			{
 				$this->db_info = new stdClass();
 			}
 
 			$this->db_info->lang_type = $site_module_info->default_language;
-			if(!$this->db_info->lang_type)
+			if (!$this->db_info->lang_type)
 			{
 				$this->db_info->lang_type = 'en';
 			}
-			if(!$this->db_info->use_db_session)
+			if (!$this->db_info->use_db_session)
 			{
 				$this->db_info->use_db_session = 'N';
 			}
@@ -297,30 +297,30 @@ 
 		$lang_supported = $this->loadLangSelected();
 
 		// Retrieve language type set in user's cookie
-		if($this->lang_type = $this->get('l'))
+		if ($this->lang_type = $this->get('l'))
 		{
-			if($_COOKIE['lang_type'] != $this->lang_type)
+			if ($_COOKIE['lang_type'] != $this->lang_type)
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000);
 			}
 		}
-		elseif($_COOKIE['lang_type'])
+		elseif ($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
 
 		// If it's not exists, follow default language type set in db_info
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = $this->db_info->lang_type;
 		}
 
 		// if still lang_type has not been set or has not-supported type , set as English.
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = 'en';
 		}
-		if(is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
+		if (is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
 		{
 			$this->lang_type = 'en';
 		}
@@ -329,10 +329,10 @@ 
 		$this->setLangType($this->lang_type);
 
 		// load module module's language file according to language setting
-		$this->loadLang(_XE_PATH_ . 'modules/module/lang');
+		$this->loadLang(_XE_PATH_.'modules/module/lang');
 
 		// set session handler
-		if(self::isInstalled() && $this->db_info->use_db_session == 'Y')
+		if (self::isInstalled() && $this->db_info->use_db_session == 'Y')
 		{
 			$oSessionModel = getModel('session');
 			$oSessionController = getController('session');
@@ -341,11 +341,11 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if ($sess = $_POST[session_name()]) session_id($sess);
 		session_start();
 
 		// set authentication information in Context and session
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$oModuleModel->loadModuleExtends();
@@ -353,15 +353,15 @@ 
 			$oMemberModel = getModel('member');
 			$oMemberController = getController('member');
 
-			if($oMemberController && $oMemberModel)
+			if ($oMemberController && $oMemberModel)
 			{
 				// if signed in, validate it.
-				if($oMemberModel->isLogged())
+				if ($oMemberModel->isLogged())
 				{
 					$oMemberController->setSessionInfo();
 				}
 				// check auto sign-in
-				elseif($_COOKIE['xeak'])
+				elseif ($_COOKIE['xeak'])
 				{
 					$oMemberController->doAutologin();
 				}
@@ -373,7 +373,7 @@ 
 
 		// load common language file
 		$this->lang = &$GLOBALS['lang'];
-		$this->loadLang(_XE_PATH_ . 'common/lang/');
+		$this->loadLang(_XE_PATH_.'common/lang/');
 
 		// check if using rewrite module
 		$this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE);
@@ -381,28 +381,28 @@ 
 		// set locations for javascript use
 		$url = array();
 		$current_url = self::getRequestUri();
-		if($_SERVER['REQUEST_METHOD'] == 'GET')
+		if ($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
-			if($this->get_vars)
+			if ($this->get_vars)
 			{
 				$url = array();
-				foreach($this->get_vars as $key => $val)
+				foreach ($this->get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
-							$url[] = $key . '[' . $k . ']=' . urlencode($v);
+							$url[] = $key.'['.$k.']='.urlencode($v);
 						}
 					}
-					elseif($val)
+					elseif ($val)
 					{
-						$url[] = $key . '=' . urlencode($val);
+						$url[] = $key.'='.urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
+				if ($url) $current_url .= '?'.join('&', $url);
 			}
 			else
 			{
@@ -417,12 +417,12 @@ 
 		$this->set('current_url', $current_url);
 		$this->set('request_uri', self::getRequestUri());
 
-		if(strpos($current_url, 'xn--') !== FALSE)
+		if (strpos($current_url, 'xn--') !== FALSE)
 		{
 			$this->set('current_url', self::decodeIdna($current_url));
 		}
 
-		if(strpos(self::getRequestUri(), 'xn--') !== FALSE)
+		if (strpos(self::getRequestUri(), 'xn--') !== FALSE)
 		{
 			$this->set('request_uri', self::decodeIdna(self::getRequestUri()));
 		}
@@ -447,7 +447,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isInstalled())
+		if (!$self->isInstalled())
 		{
 			return;
 		}
@@ -457,7 +457,7 @@ 
 		ob_end_clean();
 
 		// If master_db information does not exist, the config file needs to be updated
-		if(!isset($db_info->master_db))
+		if (!isset($db_info->master_db))
 		{
 			$db_info->master_db = array();
 			$db_info->master_db["db_type"] = $db_info->db_type;
@@ -475,7 +475,7 @@ 
 			$db_info->master_db["db_table_prefix"] = $db_info->db_table_prefix;
 			unset($db_info->db_table_prefix);
 
-			if(isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
+			if (isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
 			{
 				$db_info->master_db["db_table_prefix"] .= '_';
 			}
@@ -487,33 +487,33 @@ 
 			$oInstallController->makeConfigFile();
 		}
 
-		if(!$db_info->use_prepared_statements)
+		if (!$db_info->use_prepared_statements)
 		{
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
+		if (!$db_info->time_zone)
 			$db_info->time_zone = date('O');
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
+		if ($db_info->qmail_compatibility != 'Y')
 			$db_info->qmail_compatibility = 'N';
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
+		if (!$db_info->use_db_session)
 			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
+		if (!$db_info->use_ssl)
 			$db_info->use_ssl = 'none';
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
 		$self->set('_https_port', ($db_info->https_port) ? $db_info->https_port : NULL);
 
-		if(!$db_info->sitelock_whitelist) {
+		if (!$db_info->sitelock_whitelist) {
 			$db_info->sitelock_whitelist = '127.0.0.1';
 		}
 
-		if(is_string($db_info->sitelock_whitelist)) {
+		if (is_string($db_info->sitelock_whitelist)) {
 			$db_info->sitelock_whitelist = explode(',', $db_info->sitelock_whitelist);
 		}
 
@@ -584,10 +584,10 @@ 
 	function loadLangSupported()
 	{
 		static $lang_supported = null;
-		if(!$lang_supported)
+		if (!$lang_supported)
 		{
-			$langs = file(_XE_PATH_ . 'common/lang/lang.info');
-			foreach($langs as $val)
+			$langs = file(_XE_PATH_.'common/lang/lang.info');
+			foreach ($langs as $val)
 			{
 				list($lang_prefix, $lang_text) = explode(',', $val);
 				$lang_text = trim($lang_text);
@@ -605,17 +605,17 @@ 
 	function loadLangSelected()
 	{
 		static $lang_selected = null;
-		if(!$lang_selected)
+		if (!$lang_selected)
 		{
-			$orig_lang_file = _XE_PATH_ . 'common/lang/lang.info';
-			$selected_lang_file = _XE_PATH_ . 'files/config/lang_selected.info';
-			if(!FileHandler::hasContent($selected_lang_file))
+			$orig_lang_file = _XE_PATH_.'common/lang/lang.info';
+			$selected_lang_file = _XE_PATH_.'files/config/lang_selected.info';
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
-				$old_selected_lang_file = _XE_PATH_ . 'files/cache/lang_selected.info';
+				$old_selected_lang_file = _XE_PATH_.'files/cache/lang_selected.info';
 				FileHandler::moveFile($old_selected_lang_file, $selected_lang_file);
 			}
 
-			if(!FileHandler::hasContent($selected_lang_file))
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
@@ -624,7 +624,7 @@ 
 			else
 			{
 				$langs = file($selected_lang_file);
-				foreach($langs as $val)
+				foreach ($langs as $val)
 				{
 					list($lang_prefix, $lang_text) = explode(',', $val);
 					$lang_text = trim($lang_text);
@@ -643,56 +643,56 @@ 
 	function checkSSO()
 	{
 		// pass if it's not GET request or XE is not yet installed
-		if($this->db_info->use_sso != 'Y' || isCrawler())
+		if ($this->db_info->use_sso != 'Y' || isCrawler())
 		{
 			return TRUE;
 		}
 		$checkActList = array('rss' => 1, 'atom' => 1);
-		if(self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
+		if (self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
 		{
 			return TRUE;
 		}
 
 		// pass if default URL is not set
 		$default_url = trim($this->db_info->default_url);
-		if(!$default_url)
+		if (!$default_url)
 		{
 			return TRUE;
 		}
 
-		if(substr_compare($default_url, '/', -1) !== 0)
+		if (substr_compare($default_url, '/', -1) !== 0)
 		{
 			$default_url .= '/';
 		}
 
 		// for sites recieving SSO valdiation
-		if($default_url == self::getRequestUri())
+		if ($default_url == self::getRequestUri())
 		{
-			if(self::get('url'))
+			if (self::get('url'))
 			{
 				$url = base64_decode(self::get('url'));
 				$url_info = parse_url($url);
-				if(!Password::checkSignature($url, self::get('sig')))
+				if (!Password::checkSignature($url, self::get('sig')))
 				{
 					echo self::get('lang')->msg_invalid_request;
 					return false;
 				}
 
 				$oModuleModel = getModel('module');
-				$domain = $url_info['host'] . $url_info['path'];
-				if(substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
+				$domain = $url_info['host'].$url_info['path'];
+				if (substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
 				$site_info = $oModuleModel->getSiteInfoByDomain($domain);
 
-				if($site_info->site_srl)
+				if ($site_info->site_srl)
 				{
-				$url_info['query'].= ($url_info['query'] ? '&' : '') . 'SSOID=' . urlencode(session_id()) . '&sig=' . urlencode(Password::createSignature(session_id()));
-				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':' . $url_info['port'] : '', $url_info['path'], $url_info['query']);
+				$url_info['query'] .= ($url_info['query'] ? '&' : '').'SSOID='.urlencode(session_id()).'&sig='.urlencode(Password::createSignature(session_id()));
+				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':'.$url_info['port'] : '', $url_info['path'], $url_info['query']);
 				}
 				else
 				{
 					$redirect_url = $url;
 				}
-				header('location:' . $redirect_url);
+				header('location:'.$redirect_url);
 
 				return FALSE;
 			}
@@ -701,9 +701,9 @@ 
 		else
 		{
 			// result handling : set session_name()
-			if($session_name = self::get('SSOID'))
+			if ($session_name = self::get('SSOID'))
 			{
-				if(!Password::checkSignature($session_name, self::get('sig')))
+				if (!Password::checkSignature($session_name, self::get('sig')))
 				{
 					echo self::get('lang')->msg_invalid_request;
 					return false;
@@ -712,17 +712,17 @@ 
 				setcookie(session_name(), $session_name);
 
 				$url = preg_replace('/[\?\&]SSOID=.+$/', '', self::getRequestUrl());
-				header('location:' . $url);
+				header('location:'.$url);
 				return FALSE;
 				// send SSO request
 			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			else if (!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()));
 				$origin_url = self::getRequestUrl();
 				$origin_sig = Password::createSignature($origin_url);
 				$url = sprintf("%s?url=%s&sig=%s", $default_url, urlencode(base64_encode($origin_url)), urlencode($origin_sig));
-				header('location:' . $url);
+				header('location:'.$url);
 				return FALSE;
 			}
 		}
@@ -749,7 +749,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isFTPRegisted())
+		if (!$self->isFTPRegisted())
 		{
 			return null;
 		}
@@ -767,15 +767,15 @@ 
 	 */
 	function addBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
 		$self = self::getInstance();
 
-		if($self->site_title)
+		if ($self->site_title)
 		{
-			$self->site_title .= ' - ' . $site_title;
+			$self->site_title .= ' - '.$site_title;
 		}
 		else
 		{
@@ -791,7 +791,7 @@ 
 	 */
 	function setBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
@@ -823,7 +823,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
 
-		if(isset($moduleConfig->siteTitle))
+		if (isset($moduleConfig->siteTitle))
 		{
 			return $moduleConfig->siteTitle;
 		}
@@ -850,30 +850,30 @@ 
 		global $lang;
 
 		$self = self::getInstance();
-		if(!$self->lang_type)
+		if (!$self->lang_type)
 		{
 			return;
 		}
-		if(!is_object($lang))
+		if (!is_object($lang))
 		{
 			$lang = new stdClass;
 		}
 
-		if(!($filename = $self->_loadXmlLang($path)))
+		if (!($filename = $self->_loadXmlLang($path)))
 		{
 			$filename = $self->_loadPhpLang($path);
 		}
 
-		if(!is_array($self->loaded_lang_files))
+		if (!is_array($self->loaded_lang_files))
 		{
 			$self->loaded_lang_files = array();
 		}
-		if(in_array($filename, $self->loaded_lang_files))
+		if (in_array($filename, $self->loaded_lang_files))
 		{
 			return;
 		}
 
-		if($filename && is_readable($filename))
+		if ($filename && is_readable($filename))
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
@@ -894,24 +894,24 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if (!$path) return;
 
-		$_path = 'eval://' . $path;
+		$_path = 'eval://'.$path;
 
-		if(in_array($_path, $this->loaded_lang_files))
+		if (in_array($_path, $this->loaded_lang_files))
 		{
 			return;
 		}
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
 
-		$oXmlLangParser = new XmlLangParser($path . 'lang.xml', $this->lang_type);
+		$oXmlLangParser = new XmlLangParser($path.'lang.xml', $this->lang_type);
 		$content = $oXmlLangParser->getCompileContent();
 
-		if($content)
+		if ($content)
 		{
 			$this->loaded_lang_files[] = $_path;
 			eval($content);
@@ -926,9 +926,9 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
+		$oXmlLangParser = new XmlLangParser($path.((substr_compare($path, '/', -1) !== 0) ? '/' : '').'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
 	}
 
@@ -940,22 +940,22 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
-		$path_tpl = $path . '%s.lang.php';
+		$path_tpl = $path.'%s.lang.php';
 		$file = sprintf($path_tpl, $this->lang_type);
 
 		$langs = array('ko', 'en'); // this will be configurable.
-		while(!is_readable($file) && $langs[0])
+		while (!is_readable($file) && $langs[0])
 		{
 			$file = sprintf($path_tpl, array_shift($langs));
 		}
 
-		if(!is_readable($file))
+		if (!is_readable($file))
 		{
 			return FALSE;
 		}
@@ -997,11 +997,11 @@ 
 	 */
 	function getLang($code)
 	{
-		if(!$code)
+		if (!$code)
 		{
 			return;
 		}
-		if($GLOBALS['lang']->{$code})
+		if ($GLOBALS['lang']->{$code})
 		{
 			return $GLOBALS['lang']->{$code};
 		}
@@ -1017,7 +1017,7 @@ 
 	 */
 	function setLang($code, $val)
 	{
-		if(!isset($GLOBALS['lang']))
+		if (!isset($GLOBALS['lang']))
 		{
 			$GLOBALS['lang'] = new stdClass();
 		}
@@ -1045,17 +1045,17 @@ 
 
 		$obj = clone $source_obj;
 
-		foreach($charset_list as $charset)
+		foreach ($charset_list as $charset)
 		{
-			array_walk($obj,'Context::checkConvertFlag',$charset);
+			array_walk($obj, 'Context::checkConvertFlag', $charset);
 			$flag = self::checkConvertFlag($flag = TRUE);
-			if($flag)
+			if ($flag)
 			{
-				if($charset == 'UTF-8')
+				if ($charset == 'UTF-8')
 				{
 					return $obj;
 				}
-				array_walk($obj,'Context::doConvertEncoding',$charset);
+				array_walk($obj, 'Context::doConvertEncoding', $charset);
 				return $obj;
 			}
 		}
@@ -1074,11 +1074,11 @@ 
 	function checkConvertFlag(&$val, $key = null, $charset = null)
 	{
 		static $flag = TRUE;
-		if($charset)
+		if ($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
+			if (is_array($val))
+				array_walk($val, 'Context::checkConvertFlag', $charset);
+			else if ($val && iconv($charset, $charset, $val) != $val) $flag = FALSE;
 			else $flag = FALSE;
 		}
 		else
@@ -1102,9 +1102,9 @@ 
 	{
 		if (is_array($val))
 		{
-			array_walk($val,'Context::doConvertEncoding',$charset);
+			array_walk($val, 'Context::doConvertEncoding', $charset);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
+		else $val = iconv($charset, 'UTF-8', $val);
 	}
 
 	/**
@@ -1115,7 +1115,7 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if (!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1124,9 +1124,9 @@ 
 
 	function decodeIdna($domain)
 	{
-		if(strpos($domain, 'xn--') !== FALSE)
+		if (strpos($domain, 'xn--') !== FALSE)
 		{
-			require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+			require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 			$IDN = new idna_convert(array('idn_version' => 2008));
 			$domain = $IDN->decode($domain);
 		}
@@ -1157,7 +1157,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->response_method)
+		if ($self->response_method)
 		{
 			return $self->response_method;
 		}
@@ -1197,7 +1197,7 @@ 
 		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
 
 		$pattern = "/[\,\"\'\{\}\[\]\(\);$]/";
-		if(preg_match($pattern, $_SERVER['HTTP_HOST']))
+		if (preg_match($pattern, $_SERVER['HTTP_HOST']))
 		{
 			$this->isSuccessInit = FALSE;
 		}
@@ -1210,30 +1210,30 @@ 
 	 */
 	function _setRequestArgument()
 	{
-		if(!count($_REQUEST))
+		if (!count($_REQUEST))
 		{
 			return;
 		}
 
 		$requestMethod = $this->getRequestMethod();
-		foreach($_REQUEST as $key => $val)
+		foreach ($_REQUEST as $key => $val)
 		{
-			if($val === '' || self::get($key))
+			if ($val === '' || self::get($key))
 			{
 				continue;
 			}
 			$key = htmlentities($key);
 			$val = $this->_filterRequestVar($key, $val);
 
-			if($requestMethod == 'GET' && isset($_GET[$key]))
+			if ($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			elseif ($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			elseif ($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
 			}
@@ -1242,7 +1242,7 @@ 
 				$set_to_vars = FALSE;
 			}
 
-			if($set_to_vars)
+			if ($set_to_vars)
 			{
 				$this->_recursiveCheckVar($val);
 			}
@@ -1253,20 +1253,20 @@ 
 
 	function _recursiveCheckVar($val)
 	{
-		if(is_string($val))
+		if (is_string($val))
 		{
-			foreach($this->patterns as $pattern)
+			foreach ($this->patterns as $pattern)
 			{
-				if(preg_match($pattern, $val))
+				if (preg_match($pattern, $val))
 				{
 					$this->isSuccessInit = FALSE;
 					return;
 				}
 			}
 		}
-		else if(is_array($val))
+		else if (is_array($val))
 		{
-			foreach($val as $val2)
+			foreach ($val as $val2)
 			{
 				$this->_recursiveCheckVar($val2);
 			}
@@ -1280,7 +1280,7 @@ 
 	 */
 	function _setJSONRequestArgument()
 	{
-		if($this->getRequestMethod() != 'JSON')
+		if ($this->getRequestMethod() != 'JSON')
 		{
 			return;
 		}
@@ -1288,7 +1288,7 @@ 
 		$params = array();
 		parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $params);
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterRequestVar($key, $val, 1), TRUE);
 		}
@@ -1301,13 +1301,13 @@ 
 	 */
 	function _setXmlRpcArgument()
 	{
-		if($this->getRequestMethod() != 'XMLRPC')
+		if ($this->getRequestMethod() != 'XMLRPC')
 		{
 			return;
 		}
 
 		$xml = $GLOBALS['HTTP_RAW_POST_DATA'];
-		if(Security::detectingXEE($xml))
+		if (Security::detectingXEE($xml))
 		{
 			header("HTTP/1.0 400 Bad Request");
 			exit;
@@ -1319,12 +1319,12 @@ 
 		$params = $xml_obj->methodcall->params;
 		unset($params->node_name, $params->attrs, $params->body);
 
-		if(!count(get_object_vars($params)))
+		if (!count(get_object_vars($params)))
 		{
 			return;
 		}
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterXmlVars($key, $val), TRUE);
 		}
@@ -1339,10 +1339,10 @@ 
 	 */
 	function _filterXmlVars($key, $val)
 	{
-		if(is_array($val))
+		if (is_array($val))
 		{
 			$stack = array();
-			foreach($val as $k => $v)
+			foreach ($val as $k => $v)
 			{
 				$stack[$k] = $this->_filterXmlVars($k, $v);
 			}
@@ -1352,20 +1352,20 @@ 
 
 		$body = $val->body;
 		unset($val->node_name, $val->attrs, $val->body);
-		if(!count(get_object_vars($val)))
+		if (!count(get_object_vars($val)))
 		{
 			return $this->_filterRequestVar($key, $body, 0);
 		}
 
 		$stack = new stdClass();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$output = $this->_filterXmlVars($k, $v);
-			if(is_object($v) && $v->attrs->type == 'array')
+			if (is_object($v) && $v->attrs->type == 'array')
 			{
 				$output = array($output);
 			}
-			if($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
+			if ($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
 			{
 				return $output;
 			}
@@ -1373,7 +1373,7 @@ 
 			$stack->{$k} = $output;
 		}
 
-		if(!count(get_object_vars($stack)))
+		if (!count(get_object_vars($stack)))
 		{
 			return NULL;
 		}
@@ -1392,32 +1392,32 @@ 
 	 */
 	function _filterRequestVar($key, $val, $do_stripslashes = 1)
 	{
-		if(!($isArray = is_array($val)))
+		if (!($isArray = is_array($val)))
 		{
 			$val = array($val);
 		}
 
 		$result = array();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$k = htmlentities($k);
-			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
+			if ($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
 			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			elseif ($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
-			elseif($key === 'vid')
+			elseif ($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
 			}
-			elseif($key === 'xe_validator_id')
+			elseif ($key === 'xe_validator_id')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			elseif (stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
 			}
@@ -1425,7 +1425,7 @@ 
 			{
 				$result[$k] = $v;
 
-				if($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
+				if ($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
 				{
 					if (is_array($result[$k]))
 					{
@@ -1437,7 +1437,7 @@ 
 					}
 				}
 
-				if(is_array($result[$k]))
+				if (is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
 				}
@@ -1469,17 +1469,17 @@ 
 	 */
 	function _setUploadedArgument()
 	{
-		if($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
+		if ($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
 		{
 			return;
 		}
 
-		foreach($_FILES as $key => $val)
+		foreach ($_FILES as $key => $val)
 		{
 			$tmp_name = $val['tmp_name'];
-			if(!is_array($tmp_name))
+			if (!is_array($tmp_name))
 			{
-				if(!$tmp_name || !is_uploaded_file($tmp_name))
+				if (!$tmp_name || !is_uploaded_file($tmp_name))
 				{
 					continue;
 				}
@@ -1492,9 +1492,9 @@ 
 				$files = array();
 				$count_files = count($tmp_name);
 
-				for($i = 0; $i < $count_files; $i++)
+				for ($i = 0; $i < $count_files; $i++)
 				{
-					if($val['size'][$i] > 0)
+					if ($val['size'][$i] > 0)
 					{
 						$file = array();
 						$file['name'] = $val['name'][$i];
@@ -1505,7 +1505,7 @@ 
 						$files[] = $file;
 					}
 				}
-				if($files) $this->set($key, $files, TRUE);
+				if ($files) $this->set($key, $files, TRUE);
 			}
 		}
 	}
@@ -1527,16 +1527,16 @@ 
 	function getRequestUrl()
 	{
 		static $url = null;
-		if(is_null($url))
+		if (is_null($url))
 		{
 			$url = self::getRequestUri();
-			if(count($_GET) > 0)
+			if (count($_GET) > 0)
 			{
-				foreach($_GET as $key => $val)
+				foreach ($_GET as $key => $val)
 				{
-					$vars[] = $key . '=' . ($val ? urlencode(self::convertEncodingStr($val)) : '');
+					$vars[] = $key.'='.($val ? urlencode(self::convertEncodingStr($val)) : '');
 				}
-				$url .= '?' . join('&', $vars);
+				$url .= '?'.join('&', $vars);
 			}
 		}
 		return $url;
@@ -1551,7 +1551,7 @@ 
 		$self = self::getInstance();
 		$js_callback_func = isset($_GET['xe_js_callback']) ? $_GET['xe_js_callback'] : $_POST['xe_js_callback'];
 
-		if(!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
+		if (!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
 		{
 			unset($js_callback_func);
 			unset($_GET['xe_js_callback']);
@@ -1579,22 +1579,22 @@ 
 		$self = self::getInstance();
 
 		// retrieve virtual site information
-		if(is_null($site_module_info))
+		if (is_null($site_module_info))
 		{
 			$site_module_info = self::get('site_module_info');
 		}
 
 		// If $domain is set, handle it (if $domain is vid type, remove $domain and handle with $vid)
-		if($domain && isSiteID($domain))
+		if ($domain && isSiteID($domain))
 		{
 			$vid = $domain;
 			$domain = '';
 		}
 
 		// If $domain, $vid are not set, use current site information
-		if(!$domain && !$vid)
+		if (!$domain && !$vid)
 		{
-			if($site_module_info->domain && isSiteID($site_module_info->domain))
+			if ($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
 			}
@@ -1605,21 +1605,21 @@ 
 		}
 
 		// if $domain is set, compare current URL. If they are same, remove the domain, otherwise link to the domain.
-		if($domain)
+		if ($domain)
 		{
 			$domain_info = parse_url($domain);
-			if(is_null($current_info))
+			if (is_null($current_info))
 			{
-				$current_info = parse_url(($_SERVER['HTTPS'] == 'on' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . getScriptPath());
+				$current_info = parse_url(($_SERVER['HTTPS'] == 'on' ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].getScriptPath());
 			}
-			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
+			if ($domain_info['host'].$domain_info['path'] == $current_info['host'].$current_info['path'])
 			{
 				unset($domain);
 			}
 			else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
-				if(substr_compare($domain, '/', -1) !== 0)
+				if (substr_compare($domain, '/', -1) !== 0)
 				{
 					$domain .= '/';
 				}
@@ -1629,41 +1629,41 @@ 
 		$get_vars = array();
 
 		// If there is no GET variables or first argument is '' to reset variables
-		if(!$self->get_vars || $args_list[0] == '')
+		if (!$self->get_vars || $args_list[0] == '')
 		{
 			// rearrange args_list
-			if(is_array($args_list) && $args_list[0] == '')
+			if (is_array($args_list) && $args_list[0] == '')
 			{
 				array_shift($args_list);
 			}
 		}
-		elseif($_SERVER['REQUEST_METHOD'] == 'GET')
+		elseif ($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
 		}
 		else
 		{
-			if(!!$self->get_vars->module) $get_vars['module'] = $self->get_vars->module;
-			if(!!$self->get_vars->mid) $get_vars['mid'] = $self->get_vars->mid;
-			if(!!$self->get_vars->act) $get_vars['act'] = $self->get_vars->act;
-			if(!!$self->get_vars->page) $get_vars['page'] = $self->get_vars->page;
-			if(!!$self->get_vars->search_target) $get_vars['search_target'] = $self->get_vars->search_target;
-			if(!!$self->get_vars->search_keyword) $get_vars['search_keyword'] = $self->get_vars->search_keyword;
-			if($get_vars['act'] == 'IS')
+			if (!!$self->get_vars->module) $get_vars['module'] = $self->get_vars->module;
+			if (!!$self->get_vars->mid) $get_vars['mid'] = $self->get_vars->mid;
+			if (!!$self->get_vars->act) $get_vars['act'] = $self->get_vars->act;
+			if (!!$self->get_vars->page) $get_vars['page'] = $self->get_vars->page;
+			if (!!$self->get_vars->search_target) $get_vars['search_target'] = $self->get_vars->search_target;
+			if (!!$self->get_vars->search_keyword) $get_vars['search_keyword'] = $self->get_vars->search_keyword;
+			if ($get_vars['act'] == 'IS')
 			{
-				if(!!$self->get_vars->is_keyword) $get_vars['is_keyword'] = $self->get_vars->is_keyword;
+				if (!!$self->get_vars->is_keyword) $get_vars['is_keyword'] = $self->get_vars->is_keyword;
 			}
 		}
 
 		// arrange args_list
-		for($i = 0, $c = count($args_list); $i < $c; $i += 2)
+		for ($i = 0, $c = count($args_list); $i < $c; $i += 2)
 		{
 			$key = $args_list[$i];
 			$val = trim($args_list[$i + 1]);
 
 			// If value is not set, remove the key
-			if(!isset($val) || !strlen($val))
+			if (!isset($val) || !strlen($val))
 			{
 				unset($get_vars[$key]);
 				continue;
@@ -1674,7 +1674,7 @@ 
 
 		// remove vid, rnd
 		unset($get_vars['rnd']);
-		if($vid)
+		if ($vid)
 		{
 			$get_vars['vid'] = $vid;
 		}
@@ -1691,17 +1691,17 @@ 
 			'dispDocumentAdminManageDocument' => 'dispDocumentManageDocument',
 			'dispModuleAdminSelectList' => 'dispModuleSelectList'
 		);
-		if($act_alias[$act])
+		if ($act_alias[$act])
 		{
 			$get_vars['act'] = $act_alias[$act];
 		}
 
 		// organize URL
 		$query = '';
-		if(count($get_vars) > 0)
+		if (count($get_vars) > 0)
 		{
 			// if using rewrite mod
-			if($self->allow_rewrite)
+			if ($self->allow_rewrite)
 			{
 				$var_keys = array_keys($get_vars);
 				sort($var_keys);
@@ -1721,8 +1721,8 @@ 
 					'vid' => $vid,
 					'mid' => $mid,
 					'mid.vid' => "$vid/$mid",
-					'entry.mid' => "$mid/entry/" . $get_vars['entry'],
-					'entry.mid.vid' => "$vid/$mid/entry/" . $get_vars['entry'],
+					'entry.mid' => "$mid/entry/".$get_vars['entry'],
+					'entry.mid.vid' => "$vid/$mid/entry/".$get_vars['entry'],
 					'document_srl' => $srl,
 					'document_srl.mid' => "$mid/$srl",
 					'document_srl.vid' => "$vid/$srl",
@@ -1739,66 +1739,66 @@ 
 				$query = $target_map[$target];
 			}
 
-			if(!$query)
+			if (!$query)
 			{
 				$queries = array();
-				foreach($get_vars as $key => $val)
+				foreach ($get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
-							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
+							$queries[] = $key.'['.$k.']='.urlencode($v);
 						}
 					}
-					elseif(!is_array($val))
+					elseif (!is_array($val))
 					{
-						$queries[] = $key . '=' . urlencode($val);
+						$queries[] = $key.'='.urlencode($val);
 					}
 				}
-				if(count($queries) > 0)
+				if (count($queries) > 0)
 				{
-					$query = 'index.php?' . join('&', $queries);
+					$query = 'index.php?'.join('&', $queries);
 				}
 			}
 		}
 
 		// If using SSL always
 		$_use_ssl = $self->get('_use_ssl');
-		if($_use_ssl == 'always')
+		if ($_use_ssl == 'always')
 		{
-			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
+			$query = $self->getRequestUri(ENFORCE_SSL, $domain).$query;
 			// optional SSL use
 		}
-		elseif($_use_ssl == 'optional')
+		elseif ($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
-			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
+			$query = $self->getRequestUri($ssl_mode, $domain).$query;
 			// no SSL
 		}
 		else
 		{
 			// currently on SSL but target is not based on SSL
-			if($_SERVER['HTTPS'] == 'on')
+			if ($_SERVER['HTTPS'] == 'on')
 			{
-				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
+				$query = $self->getRequestUri(ENFORCE_SSL, $domain).$query;
 			}
-			else if($domain) // if $domain is set
+			else if ($domain) // if $domain is set
 			{
-				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
+				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain).$query;
 			}
 			else
 			{
-				$query = getScriptPath() . $query;
+				$query = getScriptPath().$query;
 			}
 		}
 
-		if(!$encode)
+		if (!$encode)
 		{
 			return $query;
 		}
 
-		if(!$autoEncode)
+		if (!$autoEncode)
 		{
 			return htmlspecialchars($query, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 		}
@@ -1807,16 +1807,16 @@ 
 		$encode_queries = array();
 		$parsedUrl = parse_url($query);
 		parse_str($parsedUrl['query'], $output);
-		foreach($output as $key => $value)
+		foreach ($output as $key => $value)
 		{
-			if(preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
+			if (preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
 			{
 				$value = urlencode(htmlspecialchars_decode(urldecode($value)));
 			}
-			$encode_queries[] = $key . '=' . $value;
+			$encode_queries[] = $key.'='.$value;
 		}
 
-		return htmlspecialchars($parsedUrl['path'] . '?' . join('&', $encode_queries), ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
+		return htmlspecialchars($parsedUrl['path'].'?'.join('&', $encode_queries), ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 	}
 
 	/**
@@ -1831,17 +1831,17 @@ 
 		static $url = array();
 
 		// Check HTTP Request
-		if(!isset($_SERVER['SERVER_PROTOCOL']))
+		if (!isset($_SERVER['SERVER_PROTOCOL']))
 		{
 			return;
 		}
 
-		if(self::get('_use_ssl') == 'always')
+		if (self::get('_use_ssl') == 'always')
 		{
 			$ssl_mode = ENFORCE_SSL;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$domain_key = md5($domain);
 		}
@@ -1850,14 +1850,14 @@ 
 			$domain_key = 'default';
 		}
 
-		if(isset($url[$ssl_mode][$domain_key]))
+		if (isset($url[$ssl_mode][$domain_key]))
 		{
 			return $url[$ssl_mode][$domain_key];
 		}
 
 		$current_use_ssl = ($_SERVER['HTTPS'] == 'on');
 
-		switch($ssl_mode)
+		switch ($ssl_mode)
 		{
 			case FOLLOW_REQUEST_SSL: $use_ssl = $current_use_ssl;
 				break;
@@ -1867,34 +1867,34 @@ 
 				break;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$target_url = trim($domain);
-			if(substr_compare($target_url, '/', -1) !== 0)
+			if (substr_compare($target_url, '/', -1) !== 0)
 			{
-				$target_url.= '/';
+				$target_url .= '/';
 			}
 		}
 		else
 		{
-			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
+			$target_url = $_SERVER['HTTP_HOST'].getScriptPath();
 		}
 
-		$url_info = parse_url('http://' . $target_url);
+		$url_info = parse_url('http://'.$target_url);
 
-		if($current_use_ssl != $use_ssl)
+		if ($current_use_ssl != $use_ssl)
 		{
 			unset($url_info['port']);
 		}
 
-		if($use_ssl)
+		if ($use_ssl)
 		{
 			$port = self::get('_https_port');
-			if($port && $port != 443)
+			if ($port && $port != 443)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 443)
+			elseif ($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
@@ -1902,17 +1902,17 @@ 
 		else
 		{
 			$port = self::get('_http_port');
-			if($port && $port != 80)
+			if ($port && $port != 80)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 80)
+			elseif ($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
 		}
 
-		$url[$ssl_mode][$domain_key] = sprintf('%s://%s%s%s', $use_ssl ? 'https' : $url_info['scheme'], $url_info['host'], $url_info['port'] && $url_info['port'] != 80 ? ':' . $url_info['port'] : '', $url_info['path']);
+		$url[$ssl_mode][$domain_key] = sprintf('%s://%s%s%s', $use_ssl ? 'https' : $url_info['scheme'], $url_info['host'], $url_info['port'] && $url_info['port'] != 80 ? ':'.$url_info['port'] : '', $url_info['path']);
 
 		return $url[$ssl_mode][$domain_key];
 	}
@@ -1929,16 +1929,16 @@ 
 	{
 		$self = self::getInstance();
 		$self->context->{$key} = $val;
-		if($set_to_get_vars === FALSE)
+		if ($set_to_get_vars === FALSE)
 		{
 			return;
 		}
-		if($val === NULL || $val === '')
+		if ($val === NULL || $val === '')
 		{
 			unset($self->get_vars->{$key});
 			return;
 		}
-		if($set_to_get_vars || $self->get_vars->{$key})
+		if ($set_to_get_vars || $self->get_vars->{$key})
 		{
 			$self->get_vars->{$key} = $val;
 		}
@@ -1954,7 +1954,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!isset($self->context->{$key}))
+		if (!isset($self->context->{$key}))
 		{
 			return null;
 		}
@@ -1969,7 +1969,7 @@ 
 	function gets()
 	{
 		$num_args = func_num_args();
-		if($num_args < 1)
+		if ($num_args < 1)
 		{
 			return;
 		}
@@ -1977,7 +1977,7 @@ 
 
 		$args_list = func_get_args();
 		$output = new stdClass();
-		foreach($args_list as $v)
+		foreach ($args_list as $v)
 		{
 			$output->{$v} = $self->get($v);
 		}
@@ -2003,7 +2003,7 @@ 
 	function getRequestVars()
 	{
 		$self = self::getInstance();
-		if($self->get_vars)
+		if ($self->get_vars)
 		{
 			return clone($self->get_vars);
 		}
@@ -2020,13 +2020,13 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		if(!isset($self->ssl_actions[$action]))
+		if (!isset($self->ssl_actions[$action]))
 		{
 			$self->ssl_actions[$action] = 1;
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -2044,16 +2044,16 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			unset($self->ssl_actions);
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		foreach($action_array as $action)
+		foreach ($action_array as $action)
 		{
-			if(!isset($self->ssl_actions[$action]))
+			if (!isset($self->ssl_actions[$action]))
 			{
 				$self->ssl_actions[$action] = 1;
 				$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -2072,7 +2072,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->isExistsSSLAction($action))
+		if ($self->isExistsSSLAction($action))
 		{
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
 			$buff = FileHandler::readFile($self->sslActionCacheFile);
@@ -2089,7 +2089,7 @@ 
 	function getSSLActions()
 	{
 		$self = self::getInstance();
-		if($self->getSslStatus() == 'optional')
+		if ($self->getSslStatus() == 'optional')
 		{
 			return $self->ssl_actions;
 		}
@@ -2116,12 +2116,12 @@ 
 	 */
 	function normalizeFilePath($file)
 	{
-		if($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
+		if ($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
 		{
-			$file = './' . $file;
+			$file = './'.$file;
 		}
 		$file = preg_replace('@/\./|(?<!:)\/\/@', '/', $file);
-		while(strpos($file, '/../') !== FALSE)
+		while (strpos($file, '/../') !== FALSE)
 		{
 			$file = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $file, 1);
 		}
@@ -2140,13 +2140,13 @@ 
 	{
 		$file = self::normalizeFilePath($file);
 		$script_path = getScriptPath();
-		if(strpos($file, './') === 0)
+		if (strpos($file, './') === 0)
 		{
-			$file = $script_path . substr($file, 2);
+			$file = $script_path.substr($file, 2);
 		}
-		elseif(strpos($file, '../') === 0)
+		elseif (strpos($file, '../') === 0)
 		{
-			$file = self::normalizeFilePath($script_path . $file);
+			$file = self::normalizeFilePath($script_path.$file);
 		}
 
 		return $file;
@@ -2216,12 +2216,12 @@ 
 	 */
 	function addJsFile($file, $optimized = FALSE, $targetie = '', $index = 0, $type = 'head', $isRuleset = FALSE, $autoPath = null)
 	{
-		if($isRuleset)
+		if ($isRuleset)
 		{
-			if(strpos($file, '#') !== FALSE)
+			if (strpos($file, '#') !== FALSE)
 			{
 				$file = str_replace('#', '', $file);
-				if(!is_readable($file))
+				if (!is_readable($file))
 				{
 					$file = $autoPath;
 				}
@@ -2286,9 +2286,9 @@ 
 		ksort($files);
 		$files = array_values($files);
 		$filenames = array();
-		for($i = 0, $c = count($files); $i < $c; ++$i)
+		for ($i = 0, $c = count($files); $i < $c; ++$i)
 		{
-			if(in_array($files[$i]['file'], $filenames))
+			if (in_array($files[$i]['file'], $filenames))
 			{
 				unset($files[$i]);
 			}
@@ -2373,14 +2373,14 @@ 
 	 */
 	function getJavascriptPluginInfo($pluginName)
 	{
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
-		$plugin_path = './common/js/plugins/' . $pluginName . '/';
-		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		$plugin_path = './common/js/plugins/'.$pluginName.'/';
+		$info_file = $plugin_path.'plugin.load';
+		if (!is_readable($info_file))
 		{
 			return;
 		}
@@ -2390,32 +2390,32 @@ 
 		$result->jsList = array();
 		$result->cssList = array();
 
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
 
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
-				$result->jsList[] = $plugin_path . $filename;
+				$result->jsList[] = $plugin_path.$filename;
 			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			elseif (substr_compare($filename, '.css', -4) === 0)
 			{
-				$result->cssList[] = $plugin_path . $filename;
+				$result->cssList[] = $plugin_path.$filename;
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path.'lang'))
 		{
-			$result->langPath = $plugin_path . 'lang';
+			$result->langPath = $plugin_path.'lang';
 		}
 
 		return $result;
@@ -2431,50 +2431,50 @@ 
 		static $loaded_plugins = array();
 
 		$self = self::getInstance();
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
-		if($loaded_plugins[$plugin_name])
+		if ($loaded_plugins[$plugin_name])
 		{
 			return;
 		}
 		$loaded_plugins[$plugin_name] = TRUE;
 
-		$plugin_path = './common/js/plugins/' . $plugin_name . '/';
-		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		$plugin_path = './common/js/plugins/'.$plugin_name.'/';
+		$info_file = $plugin_path.'plugin.load';
+		if (!is_readable($info_file))
 		{
 			return;
 		}
 
 		$list = file($info_file);
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
-				$self->loadFile(array($plugin_path . $filename, 'body', '', 0), TRUE);
+				$self->loadFile(array($plugin_path.$filename, 'body', '', 0), TRUE);
 			}
-			if(substr_compare($filename, '.css', -4) === 0)
+			if (substr_compare($filename, '.css', -4) === 0)
 			{
-				$self->loadFile(array($plugin_path . $filename, 'all', '', 0), TRUE);
+				$self->loadFile(array($plugin_path.$filename, 'all', '', 0), TRUE);
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path.'lang'))
 		{
-			$self->loadLang($plugin_path . 'lang');
+			$self->loadLang($plugin_path.'lang');
 		}
 	}
 
@@ -2487,7 +2487,7 @@ 
 	function addHtmlHeader($header)
 	{
 		$self = self::getInstance();
-		$self->html_header .= "\n" . $header;
+		$self->html_header .= "\n".$header;
 	}
 
 	function clearHtmlHeader()
@@ -2539,7 +2539,7 @@ 
 	function addBodyHeader($header)
 	{
 		$self = self::getInstance();
-		$self->body_header .= "\n" . $header;
+		$self->body_header .= "\n".$header;
 	}
 
 	/**
@@ -2561,7 +2561,7 @@ 
 	function addHtmlFooter($footer)
 	{
 		$self = self::getInstance();
-		$self->html_footer .= ($self->Htmlfooter ? "\n" : '') . $footer;
+		$self->html_footer .= ($self->Htmlfooter ? "\n" : '').$footer;
 	}
 
 	/**
@@ -2582,7 +2582,7 @@ 
 	 */
 	function getConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/db.config.php';
+		return _XE_PATH_.'files/config/db.config.php';
 	}
 
 	/**
@@ -2592,7 +2592,7 @@ 
 	 */
 	function getFTPConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/ftp.config.php';
+		return _XE_PATH_.'files/config/ftp.config.php';
 	}
 
 	/**
@@ -2644,14 +2644,14 @@ 
 		$_path = explode('/', $path);
 		$_base = explode('/', $base_url);
 
-		if(!$_base[count($_base) - 1])
+		if (!$_base[count($_base) - 1])
 		{
 			array_pop($_base);
 		}
 
-		foreach($_xe as $idx => $dir)
+		foreach ($_xe as $idx => $dir)
 		{
-			if($_path[0] != $dir)
+			if ($_path[0] != $dir)
 			{
 				break;
 			}
@@ -2659,9 +2659,9 @@ 
 		}
 
 		$idx = count($_xe) - $idx - 1;
-		while($idx--)
+		while ($idx--)
 		{
-			if(count($_base) > 0)
+			if (count($_base) > 0)
 			{
 				array_shift($_base);
 			}
@@ -2671,13 +2671,13 @@ 
 			}
 		}
 
-		if(count($_base) > 0)
+		if (count($_base) > 0)
 		{
 			array_unshift($_path, join('/', $_base));
 		}
 
-		$path = '/' . join('/', $_path);
-		if(substr_compare($path, '/', -1) !== 0)
+		$path = '/'.join('/', $_path);
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -2692,13 +2692,13 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_array($self->meta_tags))
+		if (!is_array($self->meta_tags))
 		{
 			$self->meta_tags = array();
 		}
 
 		$ret = array();
-		foreach($self->meta_tags as $key => $val)
+		foreach ($self->meta_tags as $key => $val)
 		{
 			list($name, $is_http_equiv) = explode("\t", $key);
 			$ret[] = array('name' => $name, 'is_http_equiv' => $is_http_equiv, 'content' => $val);
@@ -2718,7 +2718,7 @@ 
 	function addMetaTag($name, $content, $is_http_equiv = FALSE)
 	{
 		$self = self::getInstance();
-		$self->meta_tags[$name . "\t" . ($is_http_equiv ? '1' : '0')] = $content;
+		$self->meta_tags[$name."\t".($is_http_equiv ? '1' : '0')] = $content;
 	}
 
 }

modules/install/install.controller.php

Spacing +118 added lines, -118 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// Error occurs if already installed
-		if($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
+		if ($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
 		{
 			$this->stop('msg_already_installed');
 		}
@@ -86,7 +86,7 @@ 
 	function _procDBSetting()
 	{
 		// Get DB-related variables
-		$con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix');
+		$con_string = Context::gets('db_type', 'db_port', 'db_hostname', 'db_userid', 'db_password', 'db_database', 'db_table_prefix');
 
 		$db_info = new stdClass();
 		$db_info->master_db = get_object_vars($con_string);
@@ -101,13 +101,13 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$output->toBool()) return $output;
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallConfigForm');
 			header('location:'.$returnUrl);
@@ -121,13 +121,13 @@ 
 	function procConfigSetting()
 	{
 		// Get variables
-		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		$config_info = Context::gets('use_rewrite', 'time_zone');
+		if ($config_info->use_rewrite != 'Y') $config_info->use_rewrite = 'N';
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallManagerForm');
 			header('location:'.$returnUrl);
@@ -141,13 +141,13 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if (Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
 
 		Context::loadLang('modules/member/lang');
 		$oMemberModel = getModel('member');
 		$vars = Context::getRequestVars();
 
-		if(!$oMemberModel->checkPasswordStrength($vars->password, 'high'))
+		if (!$oMemberModel->checkPasswordStrength($vars->password, 'high'))
 		{
 			Context::loadLang('modules/member/lang');
 			$message = Context::getLang('about_password_strength');
@@ -160,15 +160,15 @@ 
 		Context::set('logged_info', $logged_info);
 
 		// check install config
-		if(Context::get('install_config'))
+		if (Context::get('install_config'))
 		{
 			$db_info = $this->_makeDbInfoByInstallConfig();
 		}
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if (FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
+			if (FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
 		}
 
 		// Set DB type and information
@@ -176,30 +176,30 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Install all the modules
 		try {
 			$oDB->begin();
 			$this->installDownloadedModule();
 			$oDB->commit();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$oDB->rollback();
 			return new BaseObject(-1, $e->getMessage());
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
 
 		// load script
-		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
-		if(count($scripts)>0)
+		$scripts = FileHandler::readDir(_XE_PATH_.'modules/install/script', '/(\.php)$/');
+		if (count($scripts) > 0)
 		{
 			sort($scripts);
-			foreach($scripts as $script)
+			foreach ($scripts as $script)
 			{
 				$script_path = FileHandler::getRealPath('./modules/install/script/');
-				$output = include($script_path . $script);
+				$output = include($script_path.$script);
 			}
 		}
 
@@ -212,7 +212,7 @@ 
 
 		unset($_SESSION['use_rewrite']);
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('');
 			header('location:'.$returnUrl);
@@ -242,7 +242,7 @@ 
 		$db_info->use_rewrite = Context::get('use_rewrite');
 		$db_info->time_zone = Context::get('time_zone');
 
-		if($_SERVER['HTTPS'] == 'on')
+		if ($_SERVER['HTTPS'] == 'on')
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
@@ -252,8 +252,8 @@ 
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if ($http_port) $db_info->http_port = $http_port;
+		if ($https_port) $db_info->https_port = $https_port;
 
 		return $db_info;
 	}
@@ -263,57 +263,57 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
-		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if (Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		$ftp_info = Context::gets('ftp_host', 'ftp_user', 'ftp_password', 'ftp_port', 'ftp_root_path');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
+		if (!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
-		foreach($ftp_info as $key => $val)
+		foreach ($ftp_info as $key => $val)
 		{
-			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val));
+			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'", "\\'", $val));
 		}
 
 		// If safe_mode
-		if(ini_get('safe_mode'))
+		if (ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1, 'msg_safe_mode_ftp_needed');
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 
-			if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
+			if (!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_mkdir_fail');
+				return new BaseObject(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_chmod_fail');
+				return new BaseObject(-1, 'msg_ftp_chmod_fail');
 			}
 
-			if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
+			if (!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_mkdir_fail');
+				return new BaseObject(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_chmod_fail');
+				return new BaseObject(-1, 'msg_ftp_chmod_fail');
 			}
 
 			$oFtp->ftp_quit();
@@ -324,31 +324,31 @@ 
 
 	function procInstallCheckFtp()
 	{
-		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		$ftp_info = Context::gets('ftp_user', 'ftp_password', 'ftp_port', 'sftp');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->sftp) $ftp_info->sftp = 'N';
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1, 'msg_safe_mode_ftp_needed');
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
 			$connection = ssh2_connect('localhost', $ftp_info->ftp_port);
-			if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 		}
 		else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if (!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 			$oFtp->ftp_quit();
 		}
@@ -365,36 +365,36 @@ 
 		$checklist = array();
 		// 0. check your version of php (5.2.4 or higher)
 		$checklist['php_version'] = true;
-		if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
 		{
 			$checklist['php_version'] = false;
 		}
 
-		if(version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
 		{
 			Context::set('phpversion_warning', true);
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
+		if (is_writable('./') || is_writable('./files')) $checklist['permission'] = true;
 		else $checklist['permission'] = false;
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
+		if (function_exists('xml_parser_create')) $checklist['xml'] = true;
 		else $checklist['xml'] = false;
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
+		if (ini_get('session.auto_start') != 1) $checklist['session'] = true;
 		else $checklist['session'] = false;
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
+		if (function_exists('iconv')) $checklist['iconv'] = true;
 		else $checklist['iconv'] = false;
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
+		if (function_exists('imagecreatefromgif')) $checklist['gd'] = true;
 		else $checklist['gd'] = false;
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
+		if (DB::getEnableList()) $checklist['db'] = true;
 		else $checklist['db'] = false;
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
+		if (!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
 		else $install_enable = true;
 
 		// Save the checked result to the Context
@@ -414,7 +414,7 @@ 
 
 		$license_agreement = ($vars->license_agreement == 'Y') ? true : false;
 
-		if($license_agreement)
+		if ($license_agreement)
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
@@ -425,7 +425,7 @@ 
 			return new BaseObject(-1, 'msg_must_accept_license_agreement');
 		}
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
 			$this->setRedirectUrl($returnUrl);
@@ -448,25 +448,25 @@ 
 		$hostname = $_SERVER['SERVER_NAME'];
 		$port = $_SERVER['SERVER_PORT'];
 		$str_port = '';
-		if($port)
+		if ($port)
 		{
-			$str_port = ':' . $port;
+			$str_port = ':'.$port;
 		}
 
 		$tmpPath = $_SERVER['DOCUMENT_ROOT'];
 
 		//if DIRECTORY_SEPARATOR is not /(IIS)
-		if(DIRECTORY_SEPARATOR !== '/')
+		if (DIRECTORY_SEPARATOR !== '/')
 		{
 			//change to slash for compare
 			$tmpPath = str_replace(DIRECTORY_SEPARATOR, '/', $_SERVER['DOCUMENT_ROOT']);
 		}
 
-		$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
+		$query = "/JUST/CHECK/REWRITE/".$checkFilePath;
 		$currentPath = str_replace($tmpPath, "", _XE_PATH_);
-		if($currentPath != "")
+		if ($currentPath != "")
 		{
-			$query = $currentPath . $query;
+			$query = $currentPath.$query;
 		}
 		$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
 		$requestConfig = array();
@@ -491,7 +491,7 @@ 
 			'./files/cache/template_compiled',
 		);
 
-		foreach($directory_list as $dir)
+		foreach ($directory_list as $dir)
 		{
 			FileHandler::makeDir($dir);
 		}
@@ -507,57 +507,57 @@ 
 		$oModuleModel = getModel('module');
 		// Create a table ny finding schemas/*.xml file in each module
 		$module_list = FileHandler::readDir('./modules/', NULL, false, true);
-		foreach($module_list as $module_path)
+		foreach ($module_list as $module_path)
 		{
 			// Get module name
-			$tmp_arr = explode('/',$module_path);
-			$module = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('/', $module_path);
+			$module = $tmp_arr[count($tmp_arr) - 1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if (!$xml_info) continue;
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
-		$this->installModule('module','./modules/module');
+		$this->installModule('module', './modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 		// Determine the order of module installation depending on category
-		$install_step = array('system','content','member');
+		$install_step = array('system', 'content', 'member');
 		// Install all the remaining modules
-		foreach($install_step as $category)
+		foreach ($install_step as $category)
 		{
-			if(count($modules[$category]))
+			if (count($modules[$category]))
 			{
-				foreach($modules[$category] as $module)
+				foreach ($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if ($module == 'module') continue;
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
-					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
+					if (is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 					}
 				}
 				unset($modules[$category]);
 			}
 		}
 		// Install all the remaining modules
-		if(count($modules))
+		if (count($modules))
 		{
-			foreach($modules as $category => $module_list)
+			foreach ($modules as $category => $module_list)
 			{
-				if(count($module_list))
+				if (count($module_list))
 				{
-					foreach($module_list as $module)
+					foreach ($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if ($module == 'module') continue;
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
-						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
+						if ($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 						}
 					}
 				}
@@ -579,31 +579,31 @@ 
 		$schema_files = FileHandler::readDir($schema_dir, NULL, false, true);
 
 		$file_cnt = count($schema_files);
-		for($i=0;$i<$file_cnt;$i++)
+		for ($i = 0; $i < $file_cnt; $i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if (!$file || substr($file, -4) != '.xml') continue;
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
+			if ($output === false)
 				throw new Exception('msg_create_table_failed');
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if (method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
 		return new BaseObject();
 	}
 
 	function _getDBConfigFileContents($db_info)
 	{
-		if(substr($db_info->master_db['db_table_prefix'], -1) != '_')
+		if (substr($db_info->master_db['db_table_prefix'], -1) != '_')
 		{
 			$db_info->master_db['db_table_prefix'] .= '_';
 		}
 
-		foreach($db_info->slave_db as &$slave)
+		foreach ($db_info->slave_db as &$slave)
 		{
-			if(substr($slave['db_table_prefix'], -1) != '_')
+			if (substr($slave['db_table_prefix'], -1) != '_')
 			{
 				$slave['db_table_prefix'] .= '_';
 			}
@@ -611,7 +611,7 @@ 
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
-		$buff[] = '$db_info = (object)' . var_export(get_object_vars($db_info), TRUE) . ';';
+		$buff[] = '$db_info = (object)'.var_export(get_object_vars($db_info), TRUE).';';
 
 		return implode(PHP_EOL, $buff);
 	}
@@ -625,13 +625,13 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if (!$db_info) return;
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if (@file_exists($db_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -644,14 +644,14 @@ 
 		$etc_tmp_config_file = $this->etc_tmp_config_file;
 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n";
-		foreach($config_info as $key => $val)
+		foreach ($config_info as $key => $val)
 		{
-			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'", "\\'", $val));
 		}
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if (@file_exists($etc_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -666,13 +666,13 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if (!$db_info) return;
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
 			FileHandler::writeFile($config_file, $buff);
 
-			if(@file_exists($config_file))
+			if (@file_exists($config_file))
 			{
 				FileHandler::removeFile($this->db_tmp_config_file);
 				FileHandler::removeFile($this->etc_tmp_config_file);
@@ -687,7 +687,7 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if (!is_array($auto_config)) return false;
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -695,22 +695,22 @@ 
 		$fstr = "<%s><![CDATA[%s]]></%s>\r\n";
 		$fheader = "POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: application/xml\r\nContent-Length: %s\r\n\r\n%s\r\n";
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
-		foreach($auto_config as $k => $v)
+		foreach ($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if (!in_array($k, array('host', 'port', 'path'))) $body .= sprintf($fstr, $k, $v, $k);
 		}
 		$body .= "</params>\r\n</methodCall>";
 
-		$header = sprintf($fheader,$auto_config['path'],$auto_config['host'],strlen($body),$body);
+		$header = sprintf($fheader, $auto_config['path'], $auto_config['host'], strlen($body), $body);
 		$fp = @fsockopen($auto_config['host'], $auto_config['port'], $errno, $errstr, 5);
 
-		if($fp)
+		if ($fp)
 		{
 			fputs($fp, $header);
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$line = trim(fgets($fp, 4096));
-				if(strncmp('<error>', $line, 7) === 0)
+				if (strncmp('<error>', $line, 7) === 0)
 				{
 					fclose($fp);
 					return false;

modules/install/install.admin.controller.php

Spacing +63 added lines, -63 removed lines

@@ -20,7 +20,7 @@ 
 	function procInstallAdminInstall()
 	{
 		$module_name = Context::get('module_name');
-		if(!$module_name) return new BaseObject(-1, 'invalid_request');
+		if (!$module_name) return new BaseObject(-1, 'invalid_request');
 
 		$oInstallController = getController('install');
 		$oInstallController->installModule($module_name, './modules/'.$module_name);
@@ -35,10 +35,10 @@ 
 	{
 		@set_time_limit(0);
 		$module_name = Context::get('module_name');
-		if(!$module_name) return new BaseObject(-1, 'invalid_request');
+		if (!$module_name) return new BaseObject(-1, 'invalid_request');
 
 		$oModule = getModule($module_name, 'class');
-		if($oModule) $output = $oModule->moduleUpdate();
+		if ($oModule) $output = $oModule->moduleUpdate();
 		else $output = new BaseObject(-1, 'invalid_request');
 
 		return $output;
@@ -53,51 +53,51 @@ 
 
 		$admin_ip_list = Context::get('admin_ip_list');
 
-		if($admin_ip_list)
+		if ($admin_ip_list)
 		{
-			$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/",",",$admin_ip_list);
-			$admin_ip_list = preg_replace("/\s+/","",$admin_ip_list);
-			if(preg_match('/(<\?|<\?php|\?>)/xsm', $admin_ip_list))
+			$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/", ",", $admin_ip_list);
+			$admin_ip_list = preg_replace("/\s+/", "", $admin_ip_list);
+			if (preg_match('/(<\?|<\?php|\?>)/xsm', $admin_ip_list))
 			{
 				$admin_ip_list = '';
 			}
-			$admin_ip_list .= ',127.0.0.1,' . $_SERVER['REMOTE_ADDR'];
-			$admin_ip_list = explode(',',trim($admin_ip_list, ','));
+			$admin_ip_list .= ',127.0.0.1,'.$_SERVER['REMOTE_ADDR'];
+			$admin_ip_list = explode(',', trim($admin_ip_list, ','));
 			$admin_ip_list = array_unique($admin_ip_list);
-			if(!IpFilter::validate($admin_ip_list)) {
+			if (!IpFilter::validate($admin_ip_list)) {
 				return new BaseObject(-1, 'msg_invalid_ip');
 			}
 		}
 		
 		$default_url = Context::get('default_url');
-		if($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) $default_url = 'http://'.$default_url;
-		if($default_url && substr($default_url, -1) !== '/') $default_url = $default_url.'/';
+		if ($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) $default_url = 'http://'.$default_url;
+		if ($default_url && substr($default_url, -1) !== '/') $default_url = $default_url.'/';
 
 		/* convert NON Alphabet URL to punycode URL - Alphabet URL will not be changed */
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$default_url = $IDN->encode($default_url);
 
 		$use_ssl = Context::get('use_ssl');
-		if(!$use_ssl) $use_ssl = 'none';
+		if (!$use_ssl) $use_ssl = 'none';
 
 		$http_port = Context::get('http_port');
 		$https_port = Context::get('https_port');
 
 		$use_rewrite = Context::get('use_rewrite');
-		if($use_rewrite!='Y') $use_rewrite = 'N';
+		if ($use_rewrite != 'Y') $use_rewrite = 'N';
 
 		$use_sso = Context::get('use_sso');
-		if($use_sso !='Y') $use_sso = 'N';
+		if ($use_sso != 'Y') $use_sso = 'N';
 
 		$use_db_session = Context::get('use_db_session');
-		if($use_db_session!='Y') $use_db_session = 'N';
+		if ($use_db_session != 'Y') $use_db_session = 'N';
 
 		$qmail_compatibility = Context::get('qmail_compatibility');
-		if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
+		if ($qmail_compatibility != 'Y') $qmail_compatibility = 'N';
 
 		$use_html5 = Context::get('use_html5');
-		if(!$use_html5) $use_html5 = 'N';
+		if (!$use_html5) $use_html5 = 'N';
 
 		$db_info->default_url = $default_url;
 		$db_info->qmail_compatibility = $qmail_compatibility;
@@ -108,23 +108,23 @@ 
 		$db_info->use_html5 = $use_html5;
 		$db_info->admin_ip_list = $admin_ip_list;
 
-		if($http_port) $db_info->http_port = (int) $http_port;
-		else if($db_info->http_port) unset($db_info->http_port);
+		if ($http_port) $db_info->http_port = (int) $http_port;
+		else if ($db_info->http_port) unset($db_info->http_port);
 
-		if($https_port) $db_info->https_port = (int) $https_port;
-		else if($db_info->https_port) unset($db_info->https_port);
+		if ($https_port) $db_info->https_port = (int) $https_port;
+		else if ($db_info->https_port) unset($db_info->https_port);
 
 		unset($db_info->lang_type);
 
 		$oInstallController = getController('install');
-		if(!$oInstallController->makeConfigFile())
+		if (!$oInstallController->makeConfigFile())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 		else
 		{
 			Context::setDBInfo($db_info);
-			if($default_url)
+			if ($default_url)
 			{
 				$site_args = new stdClass;
 				$site_args->site_srl = 0;
@@ -138,7 +138,7 @@ 
 
 	function procInstallAdminUpdateIndexModule()
 	{
-		if(!Context::get('index_module_srl') || !Context::get('menu_item_srl'))
+		if (!Context::get('index_module_srl') || !Context::get('menu_item_srl'))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -157,12 +157,12 @@ 
 		// update homeSitemap.php cache file
 		$oMenuAdminController = getAdminController('menu');
 		$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
-		if(file_exists($homeMenuCacheFile))
+		if (file_exists($homeMenuCacheFile))
 		{
 			include($homeMenuCacheFile);
 		}
 
-		if(!$homeMenuSrl || $homeMenuSrl != $output->menu_srl)
+		if (!$homeMenuSrl || $homeMenuSrl != $output->menu_srl)
 		{
 			$oMenuAdminController->makeHomemenuCacheFile($output->menu_srl);
 		}
@@ -173,8 +173,8 @@ 
 	function procInstallAdminRemoveFTPInfo()
 	{
 		$ftp_config_file = Context::getFTPConfigFile();
-		if(file_exists($ftp_config_file)) unlink($ftp_config_file);
-		if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+		if (file_exists($ftp_config_file)) unlink($ftp_config_file);
+		if ($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
 		$this->setMessage('success_deleted');
 	}
 
@@ -185,11 +185,11 @@ 
 		$ftp_info->ftp_port = Context::get('ftp_port');
 		$ftp_info->ftp_host = Context::get('ftp_host');
 		$ftp_info->ftp_pasv = Context::get('ftp_pasv');
-		if(!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N";
+		if (!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N";
 		$ftp_info->sftp = Context::get('sftp');
 
 		$ftp_root_path = Context::get('ftp_root_path');
-		if(substr($ftp_root_path, strlen($ftp_root_path)-1) == "/")
+		if (substr($ftp_root_path, strlen($ftp_root_path) - 1) == "/")
 		{
 			$ftp_info->ftp_root_path = $ftp_root_path;
 		}
@@ -198,25 +198,25 @@ 
 			$ftp_info->ftp_root_path = $ftp_root_path.'/';
 		}
 
-		if(ini_get('safe_mode'))
+		if (ini_get('safe_mode'))
 		{
 			$ftp_info->ftp_password = Context::get('ftp_password');
 		}
 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n\$ftp_info = new stdClass;\n";
-		foreach($ftp_info as $key => $val)
+		foreach ($ftp_info as $key => $val)
 		{
-			if(!$val) continue;
-			if(preg_match('/(<\?|<\?php|\?>|fputs|fopen|fwrite|fgets|fread|file_get_contents|file_put_contents|exec|proc_open|popen|passthru|show_source|phpinfo|system|\/\*|\*\/|chr\()/xsm', preg_replace('/\s/', '', $val)))
+			if (!$val) continue;
+			if (preg_match('/(<\?|<\?php|\?>|fputs|fopen|fwrite|fgets|fread|file_get_contents|file_put_contents|exec|proc_open|popen|passthru|show_source|phpinfo|system|\/\*|\*\/|chr\()/xsm', preg_replace('/\s/', '', $val)))
 			{
 				continue;
 			}
-			$buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+			$buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'", "\\'", $val));
 		}
 		$buff .= "?>";
 		$config_file = Context::getFTPConfigFile();
 		FileHandler::WriteFile($config_file, $buff);
-		if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+		if ($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
 
 		$this->setMessage('success_updated');
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp');
@@ -226,7 +226,7 @@ 
 	function procInstallAdminConfig()
 	{
 		$use_mobile_view = Context::get('use_mobile_view');
-		if($use_mobile_view!='Y') $use_mobile_view = 'N';
+		if ($use_mobile_view != 'Y') $use_mobile_view = 'N';
 
 		$time_zone = Context::get('time_zone');
 
@@ -237,15 +237,15 @@ 
 		unset($db_info->lang_type);
 		Context::setDBInfo($db_info);
 		$oInstallController = getController('install');
-		if(!$oInstallController->makeConfigFile())
+		if (!$oInstallController->makeConfigFile())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$site_args = new stdClass();
 		$site_args->site_srl = 0;
-		$site_args->index_module_srl = Context::get('index_module_srl');//
-		$site_args->default_language = Context::get('change_lang_type');//
+		$site_args->index_module_srl = Context::get('index_module_srl'); //
+		$site_args->default_language = Context::get('change_lang_type'); //
 		$oModuleController = getController('module');
 		$oModuleController->updateSite($site_args);
 
@@ -257,8 +257,8 @@ 
 		$deleteFavicon = Context::get('is_delete_favicon');
 		$deleteMobicon = Context::get('is_delete_mobicon');
 
-		$this->updateIcon('favicon.ico',$deleteFavicon);
-		$this->updateIcon('mobicon.png',$deleteMobicon);
+		$this->updateIcon('favicon.ico', $deleteFavicon);
+		$this->updateIcon('mobicon.png', $deleteMobicon);
 
 		//모듈 설정 저장(썸네일, 풋터스크립트)
 		$config = new stdClass();
@@ -276,16 +276,16 @@ 
 
 		$favicon = Context::get('favicon');
 		$mobicon = Context::get('mobicon');
-		if(!$favicon && !$mobicon) {
+		if (!$favicon && !$mobicon) {
 			Context::set('msg', Context::getLang("msg_invalid_format"));
 			return;
 		}
-		if($favicon) {
+		if ($favicon) {
 			$name = 'favicon';
-			$tmpFileName = $this->saveIconTmp($favicon,'favicon.ico');
+			$tmpFileName = $this->saveIconTmp($favicon, 'favicon.ico');
 		} else {
 			$name = 'mobicon';
-			$tmpFileName = $this->saveIconTmp($mobicon,'mobicon.png');
+			$tmpFileName = $this->saveIconTmp($mobicon, 'mobicon.png');
 		}
 
 		Context::set('name', $name);
@@ -301,7 +301,7 @@ 
 
 		$lang_supported = Context::loadLangSupported();
 		$buff = null;
-		for($i=0;$i<count($langs);$i++)
+		for ($i = 0; $i < count($langs); $i++)
 		{
 			$buff .= sprintf("%s,%s\n", $langs[$i], $lang_supported[$langs[$i]]);
 
@@ -329,12 +329,12 @@ 
 		}
 
 		$oModuleController = getController('module');
-		$oModuleController->insertModuleConfig('document',$documentConfig);
+		$oModuleController->insertModuleConfig('document', $documentConfig);
 
 		$args = new stdClass;
 		$args->htmlFooter = $config->htmlFooter;
 		$args->siteTitle = $config->siteTitle;
-		$oModuleController->updateModuleConfig('module',$args);
+		$oModuleController->updateModuleConfig('module', $args);
 	}
 
 	private function saveIconTmp($icon, $iconname)
@@ -342,9 +342,9 @@ 
 
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
-		if($site_info->site_srl) 
+		if ($site_info->site_srl) 
 		{
-			$virtual_site = $site_info->site_srl . '/';
+			$virtual_site = $site_info->site_srl.'/';
 		}
 
 		$target_file = $icon['tmp_name'];
@@ -353,20 +353,20 @@ 
 		$target_filename = _XE_PATH_.$relative_filename;
 
 		list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
-		if($iconname == 'favicon.ico')
+		if ($iconname == 'favicon.ico')
 		{
-			if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) {
+			if (!preg_match('/^.*(x-icon|\.icon)$/i', $type)) {
 				Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
 				return;
 			}
 		}
-		else if($iconname == 'mobicon.png')
+		else if ($iconname == 'mobicon.png')
 		{
-			if(!preg_match('/^.*(png).*$/',$type)) {
+			if (!preg_match('/^.*(png).*$/', $type)) {
 				Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
 				return;
 			}
-			if(!(($height == '57' && $width == '57') || ($height == '114' && $width == '114'))) {
+			if (!(($height == '57' && $width == '57') || ($height == '114' && $width == '114'))) {
 				Context::set('msg', Context::getLang('msg_invalid_format').' (size : 57x57, 114x114)');
 				return;
 			}
@@ -387,21 +387,21 @@ 
 
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
-		if($site_info->site_srl) 
+		if ($site_info->site_srl) 
 		{
-			$virtual_site = $site_info->site_srl . '/';
+			$virtual_site = $site_info->site_srl.'/';
 		}
 
-		$image_filepath = _XE_PATH_.'files/attach/xeicon/' . $virtual_site;
+		$image_filepath = _XE_PATH_.'files/attach/xeicon/'.$virtual_site;
 
-		if($deleteIcon) {
+		if ($deleteIcon) {
 			FileHandler::removeFile($image_filepath.$iconname);
 			return;
 		}
 
 		$tmpicon_filepath = $image_filepath.'tmp/'.$iconname;
 		$icon_filepath = $image_filepath.$iconname;
-		if(file_exists($tmpicon_filepath))
+		if (file_exists($tmpicon_filepath))
 		{
 			FileHandler::moveFile($tmpicon_filepath, $icon_filepath);
 		}

Braces +68 added lines, -32 removed lines

@@ -20,7 +20,9 @@ 
 	function procInstallAdminInstall()
 	{
 		$module_name = Context::get('module_name');
-		if(!$module_name) return new BaseObject(-1, 'invalid_request');
+		if(!$module_name) {
+			return new BaseObject(-1, 'invalid_request');
+		}
 
 		$oInstallController = getController('install');
 		$oInstallController->installModule($module_name, './modules/'.$module_name);
@@ -35,11 +37,16 @@ 
 	{
 		@set_time_limit(0);
 		$module_name = Context::get('module_name');
-		if(!$module_name) return new BaseObject(-1, 'invalid_request');
+		if(!$module_name) {
+			return new BaseObject(-1, 'invalid_request');
+		}
 
 		$oModule = getModule($module_name, 'class');
-		if($oModule) $output = $oModule->moduleUpdate();
-		else $output = new BaseObject(-1, 'invalid_request');
+		if($oModule) {
+			$output = $oModule->moduleUpdate();
+		} else {
+			$output = new BaseObject(-1, 'invalid_request');
+		}
 
 		return $output;
 	}
@@ -70,8 +77,12 @@ 
 		}
 		
 		$default_url = Context::get('default_url');
-		if($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) $default_url = 'http://'.$default_url;
-		if($default_url && substr($default_url, -1) !== '/') $default_url = $default_url.'/';
+		if($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) {
+			$default_url = 'http://'.$default_url;
+		}
+		if($default_url && substr($default_url, -1) !== '/') {
+			$default_url = $default_url.'/';
+		}
 
 		/* convert NON Alphabet URL to punycode URL - Alphabet URL will not be changed */
 		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
@@ -79,25 +90,37 @@ 
 		$default_url = $IDN->encode($default_url);
 
 		$use_ssl = Context::get('use_ssl');
-		if(!$use_ssl) $use_ssl = 'none';
+		if(!$use_ssl) {
+			$use_ssl = 'none';
+		}
 
 		$http_port = Context::get('http_port');
 		$https_port = Context::get('https_port');
 
 		$use_rewrite = Context::get('use_rewrite');
-		if($use_rewrite!='Y') $use_rewrite = 'N';
+		if($use_rewrite!='Y') {
+			$use_rewrite = 'N';
+		}
 
 		$use_sso = Context::get('use_sso');
-		if($use_sso !='Y') $use_sso = 'N';
+		if($use_sso !='Y') {
+			$use_sso = 'N';
+		}
 
 		$use_db_session = Context::get('use_db_session');
-		if($use_db_session!='Y') $use_db_session = 'N';
+		if($use_db_session!='Y') {
+			$use_db_session = 'N';
+		}
 
 		$qmail_compatibility = Context::get('qmail_compatibility');
-		if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
+		if($qmail_compatibility!='Y') {
+			$qmail_compatibility = 'N';
+		}
 
 		$use_html5 = Context::get('use_html5');
-		if(!$use_html5) $use_html5 = 'N';
+		if(!$use_html5) {
+			$use_html5 = 'N';
+		}
 
 		$db_info->default_url = $default_url;
 		$db_info->qmail_compatibility = $qmail_compatibility;
@@ -108,11 +131,17 @@ 
 		$db_info->use_html5 = $use_html5;
 		$db_info->admin_ip_list = $admin_ip_list;
 
-		if($http_port) $db_info->http_port = (int) $http_port;
-		else if($db_info->http_port) unset($db_info->http_port);
+		if($http_port) {
+			$db_info->http_port = (int) $http_port;
+		} else if($db_info->http_port) {
+			unset($db_info->http_port);
+		}
 
-		if($https_port) $db_info->https_port = (int) $https_port;
-		else if($db_info->https_port) unset($db_info->https_port);
+		if($https_port) {
+			$db_info->https_port = (int) $https_port;
+		} else if($db_info->https_port) {
+			unset($db_info->https_port);
+		}
 
 		unset($db_info->lang_type);
 
@@ -120,8 +149,7 @@ 
 		if(!$oInstallController->makeConfigFile())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
-		}
-		else
+		} else
 		{
 			Context::setDBInfo($db_info);
 			if($default_url)
@@ -173,8 +201,12 @@ 
 	function procInstallAdminRemoveFTPInfo()
 	{
 		$ftp_config_file = Context::getFTPConfigFile();
-		if(file_exists($ftp_config_file)) unlink($ftp_config_file);
-		if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+		if(file_exists($ftp_config_file)) {
+			unlink($ftp_config_file);
+		}
+		if($_SESSION['ftp_password']) {
+			unset($_SESSION['ftp_password']);
+		}
 		$this->setMessage('success_deleted');
 	}
 
@@ -185,15 +217,16 @@ 
 		$ftp_info->ftp_port = Context::get('ftp_port');
 		$ftp_info->ftp_host = Context::get('ftp_host');
 		$ftp_info->ftp_pasv = Context::get('ftp_pasv');
-		if(!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N";
+		if(!$ftp_info->ftp_pasv) {
+			$ftp_info->ftp_pasv = "N";
+		}
 		$ftp_info->sftp = Context::get('sftp');
 
 		$ftp_root_path = Context::get('ftp_root_path');
 		if(substr($ftp_root_path, strlen($ftp_root_path)-1) == "/")
 		{
 			$ftp_info->ftp_root_path = $ftp_root_path;
-		}
-		else
+		} else
 		{
 			$ftp_info->ftp_root_path = $ftp_root_path.'/';
 		}
@@ -206,7 +239,9 @@ 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n\$ftp_info = new stdClass;\n";
 		foreach($ftp_info as $key => $val)
 		{
-			if(!$val) continue;
+			if(!$val) {
+				continue;
+			}
 			if(preg_match('/(<\?|<\?php|\?>|fputs|fopen|fwrite|fgets|fread|file_get_contents|file_put_contents|exec|proc_open|popen|passthru|show_source|phpinfo|system|\/\*|\*\/|chr\()/xsm', preg_replace('/\s/', '', $val)))
 			{
 				continue;
@@ -216,7 +251,9 @@ 
 		$buff .= "?>";
 		$config_file = Context::getFTPConfigFile();
 		FileHandler::WriteFile($config_file, $buff);
-		if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+		if($_SESSION['ftp_password']) {
+			unset($_SESSION['ftp_password']);
+		}
 
 		$this->setMessage('success_updated');
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp');
@@ -226,7 +263,9 @@ 
 	function procInstallAdminConfig()
 	{
 		$use_mobile_view = Context::get('use_mobile_view');
-		if($use_mobile_view!='Y') $use_mobile_view = 'N';
+		if($use_mobile_view!='Y') {
+			$use_mobile_view = 'N';
+		}
 
 		$time_zone = Context::get('time_zone');
 
@@ -322,8 +361,7 @@ 
 		if (!$config->thumbnail_type || $config->thumbnail_type != 'ratio')
 		{
 			$documentConfig->thumbnail_type = 'crop';
-		}
-		else
+		} else
 		{
 			$documentConfig->thumbnail_type = 'ratio';
 		}
@@ -359,8 +397,7 @@ 
 				Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
 				return;
 			}
-		}
-		else if($iconname == 'mobicon.png')
+		} else if($iconname == 'mobicon.png')
 		{
 			if(!preg_match('/^.*(png).*$/',$type)) {
 				Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
@@ -370,8 +407,7 @@ 
 				Context::set('msg', Context::getLang('msg_invalid_format').' (size : 57x57, 114x114)');
 				return;
 			}
-		}
-		else
+		} else
 		{
 			Context::set('msg', Context::getLang('msg_invalid_format'));
 			return;

modules/member/member.class.php

Spacing +103 added lines, -103 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');
@@ -184,76 +184,76 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 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;
 
-			foreach($config->signupForm as $form)
+			foreach ($config->signupForm as $form)
 			{
-				if($form->name === 'email_address' && $form->isPublic !== 'N')
+				if ($form->name === 'email_address' && $form->isPublic !== 'N')
 				{
 					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;
 
 			// 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;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		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;
 
-		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) return true;
+		if ($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) return true;
 
 		return false;
 	}
@@ -271,7 +271,7 @@ 
 		$oMemberAdminController = getAdminController('member');
 		$config = $oModuleModel->getModuleConfig('member');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// Check member directory
 			FileHandler::makeDir('./files/member_extra_info/image_name');
@@ -279,74 +279,74 @@ 
 			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"));
 			}
 
 			$config = $oModuleModel->getModuleConfig('member');
 
 			// 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;
@@ -354,7 +354,7 @@ 
 			}
 
 			// check signup form ordering info
-			if(!$config->signupForm || !is_array($config->signupForm))
+			if (!$config->signupForm || !is_array($config->signupForm))
 			{
 				$identifier = 'email_address';
 
@@ -365,9 +365,9 @@ 
 
 			// 회원정보에서 이메일 노출 제거
 			// @see https://github.com/xpressengine/xe-core/issues/2177
-			foreach($config->signupForm as $form)
+			foreach ($config->signupForm as $form)
 			{
-				if($form->name === 'email_address')
+				if ($form->name === 'email_address')
 				{
 					$form->isPublic = 'N';
 					break;
@@ -375,13 +375,13 @@ 
 			}
 			$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');
@@ -391,15 +391,15 @@ 
 			}
 			
 			// 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');
 
-			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';
+				$target_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
 
 				FileHandler::rename($source_file, $target_file);
 			}
@@ -408,14 +408,14 @@ 
 		}
 
 		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);
 
-		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset'))
+		if ($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset'))
 		{
 			$oMemberAdminController->_createSignupRuleset($config->signupForm);
 			$oModuleController->insertUpdatedLog('member.1.8.43.recreate_signup_ruleset');
@@ -438,7 +438,7 @@ 
 	 */
 	function recordLoginError($error = 0, $message = 'success')
 	{
-		if($error == 0) return new BaseObject($error, $message);
+		if ($error == 0) return new BaseObject($error, $message);
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -446,18 +446,18 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
+		if (!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new BaseObject($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;
 			}
@@ -483,7 +483,7 @@ 
 	 */
 	function recordMemberLoginError($error = 0, $message = 'success', $args = NULL)
 	{
-		if($error == 0 || !$args->member_srl) return new BaseObject($error, $message);
+		if ($error == 0 || !$args->member_srl) return new BaseObject($error, $message);
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -491,21 +491,21 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
+		if (!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new BaseObject($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 +138 added lines, -56 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)
 		{
@@ -187,36 +213,64 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 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;
+			}
 
 			foreach($config->signupForm as $form)
 			{
@@ -227,7 +281,9 @@ 
 			}
 
 			// check agreement field exist
-			if($config->agreement) return true;
+			if($config->agreement) {
+				return true;
+			}
 
 			if($config->skin)
 			{
@@ -235,25 +291,41 @@ 
 				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;
+			}
 
 			// 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;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		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;
+		}
 
-		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) return true;
+		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) {
+			return true;
+		}
 
 		return false;
 	}
@@ -391,10 +463,12 @@ 
 			}
 			
 			// 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');
+			}
 
 			if(is_readable('./files/member_extra_info/agreement.txt'))
 			{
@@ -408,12 +482,15 @@ 
 		}
 
 		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);
+		}
 
 		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset'))
 		{
@@ -438,7 +515,9 @@ 
 	 */
 	function recordLoginError($error = 0, $message = 'success')
 	{
-		if($error == 0) return new BaseObject($error, $message);
+		if($error == 0) {
+			return new BaseObject($error, $message);
+		}
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -446,7 +525,9 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
+		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') {
+			return new BaseObject($error, $message);
+		}
 
 		$args = new stdClass();
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
@@ -460,16 +541,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;
@@ -483,7 +562,9 @@ 
 	 */
 	function recordMemberLoginError($error = 0, $message = 'success', $args = NULL)
 	{
-		if($error == 0 || !$args->member_srl) return new BaseObject($error, $message);
+		if($error == 0 || !$args->member_srl) {
+			return new BaseObject($error, $message);
+		}
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -491,7 +572,9 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
+		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') {
+			return new BaseObject($error, $message);
+		}
 
 		$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
 		if($output->data && $output->data->content)
@@ -501,8 +584,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.controller.php

Spacing +469 added lines, -469 removed lines

@@ -34,25 +34,25 @@ 
 	 */
 	function procMemberLogin($user_id = null, $password = null, $keep_signed = null)
 	{
-		if(!$user_id && !$password && Context::getRequestMethod() == 'GET')
+		if (!$user_id && !$password && Context::getRequestMethod() == 'GET')
 		{
 			$this->setRedirectUrl(getNotEncodedUrl(''));
 			return new BaseObject(-1, 'null_user_id');
 		}
 
 		// Variables
-		if(!$user_id) $user_id = Context::get('user_id');
+		if (!$user_id) $user_id = Context::get('user_id');
 		$user_id = trim($user_id);
 
-		if(!$password) $password = Context::get('password');
+		if (!$password) $password = Context::get('password');
 		$password = trim($password);
 
-		if(!$keep_signed) $keep_signed = Context::get('keep_signed');
+		if (!$keep_signed) $keep_signed = Context::get('keep_signed');
 		// Return an error when id and password doesn't exist
-		if(!$user_id) return new BaseObject(-1,'null_user_id');
-		if(!$password) return new BaseObject(-1,'null_password');
+		if (!$user_id) return new BaseObject(-1, 'null_user_id');
+		if (!$password) return new BaseObject(-1, 'null_password');
 
-		$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
+		$output = $this->doLogin($user_id, $password, $keep_signed == 'Y' ?true:false);
 		if (!$output->toBool()) return $output;
 
 		$oModuleModel = getModel('module');
@@ -62,13 +62,13 @@ 
 		$limit_date = $config->change_password_date;
 
 		// Check if change_password_date is set
-		if($limit_date > 0)
+		if ($limit_date > 0)
 		{
 			$oMemberModel = getModel('member');
-			if($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day')))
+			if ($this->memberInfo->change_password_date < date('YmdHis', strtotime('-'.$limit_date.' day')))
 			{
 				$msg = sprintf(Context::getLang('msg_change_password_date'), $limit_date);
-				return $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'), new BaseObject(-1, $msg));
+				return $this->setRedirectUrl(getNotEncodedUrl('', 'vid', Context::get('vid'), 'mid', Context::get('mid'), 'act', 'dispMemberModifyPassword'), new BaseObject(-1, $msg));
 			}
 		}
 
@@ -77,7 +77,7 @@ 
 		$args->member_srl = $this->memberInfo->member_srl;
 		executeQuery('member.deleteAuthMail', $args);
 
-		if(!$config->after_login_url)
+		if (!$config->after_login_url)
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
 		}
@@ -98,18 +98,18 @@ 
 		// Call a trigger before log-out (before)
 		$logged_info = Context::get('logged_info');
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'before', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Destroy session information
 		$this->destroySessionInfo();
 		// Call a trigger after log-out (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		$output = new BaseObject();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($config->after_logout_url)
+		if ($config->after_logout_url)
 			$output->redirect_url = $config->after_logout_url;
 
 		$this->_clearMemberCache($logged_info->member_srl);
@@ -127,18 +127,18 @@ 
 		$oModuleModel = &getModel('module');
 
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) $document_srl = (int)Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) $document_srl = (int) Context::get('target_srl');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		// Get document
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 
-		if($oDocument->isSecret() && !$oDocument->isGranted())
+		if ($oDocument->isSecret() && !$oDocument->isGranted())
 		{
 			return new BaseObject(-1, 'msg_is_secret');
 		}
@@ -147,19 +147,19 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl'));
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->access)
+		if (!$grant->access)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
 		// 게시판 모듈에서 글 목록 보기 권한이 없으면 스크랩 제한
-		if($module_info->module === 'board' && isset($grant->list) && !$grant->list)
+		if ($module_info->module === 'board' && isset($grant->list) && !$grant->list)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
 		// 게시판 모듈에서 상담 기능 사용 시 권한이 없는 게시물(타인의 게시물) 스크랩 제한
-		if($module_info->module === 'board' &&
+		if ($module_info->module === 'board' &&
 			$module_info->consultation === 'Y' &&
 			isset($grant->consultation_read) &&
 			!$grant->consultation_read && !$oDocument->isGranted()
@@ -180,11 +180,11 @@ 
 
 		// Check if already scrapped
 		$output = executeQuery('member.getScrapDocument', $args);
-		if($output->data->count) return new BaseObject(-1, 'msg_alreay_scrapped');
+		if ($output->data->count) return new BaseObject(-1, 'msg_alreay_scrapped');
 
 		// Insert
 		$output = executeQuery('member.addScrapDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setError(-1);
 		$this->setMessage('success_registed');
@@ -198,11 +198,11 @@ 
 	function procMemberDeleteScrap()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 		// Variables
 		$args = new stdClass;
 		$args->member_srl = $logged_info->member_srl;
@@ -228,23 +228,23 @@ 
 	function procMemberDeleteSavedDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		if ($oDocument->get('member_srl') != $logged_info->member_srl)
 		{
-			return new BaseObject(-1,'msg_invalid_request');
+			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$configStatusList = $oDocumentModel->getStatusList();
 		if ($oDocument->get('status') != $configStatusList['temp'])
 		{
-			return new BaseObject(-1,'msg_invalid_request');
+			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$oDocumentController = getController('document');
@@ -260,37 +260,37 @@ 
 	{
 		$name = Context::get('name');
 		$value = Context::get('value');
-		if(!$value) return;
+		if (!$value) return;
 
 		$oMemberModel = getModel('member');
 		// Check if logged-in
 		$logged_info = Context::get('logged_info');
 
 
-		switch($name)
+		switch ($name)
 		{
 			case 'user_id' :
 				// Check denied ID
-				if($oMemberModel->isDeniedID($value)) return new BaseObject(0,'denied_user_id');
+				if ($oMemberModel->isDeniedID($value)) return new BaseObject(0, 'denied_user_id');
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_user_id');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new BaseObject(0, 'msg_exists_user_id');
 				break;
 			case 'nick_name' :
 				// Check denied ID
-				if($oMemberModel->isDeniedNickName($value))
+				if ($oMemberModel->isDeniedNickName($value))
 				{
-					return new BaseObject(0,'denied_nick_name');
+					return new BaseObject(0, 'denied_nick_name');
 				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_nick_name');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new BaseObject(0, 'msg_exists_nick_name');
 
 				break;
 			case 'email_address' :
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_email_address');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new BaseObject(0, 'msg_exists_email_address');
 				break;
 		}
 	}
@@ -302,25 +302,25 @@ 
 	 */
 	function procMemberInsert()
 	{
-		if (Context::getRequestMethod () == "GET") return new BaseObject(-1, "msg_invalid_request");
-		$oMemberModel = &getModel ('member');
+		if (Context::getRequestMethod() == "GET") return new BaseObject(-1, "msg_invalid_request");
+		$oMemberModel = &getModel('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// call a trigger (before)
-		$trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
-		if(!$trigger_output->toBool ()) return $trigger_output;
+		$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'before', $config);
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Check if an administrator allows a membership
-		if($config->enable_join != 'Y') return $this->stop ('msg_signup_disabled');
+		if ($config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
 		// Check if the user accept the license terms (only if terms exist)
-		if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
+		if ($config->agreement && Context::get('accept_agreement') != 'Y') return $this->stop('msg_accept_agreement');
 
 		// Extract the necessary information in advance
 		$getVars = array();
-		if($config->signupForm)
+		if ($config->signupForm)
 		{
-			foreach($config->signupForm as $formInfo)
+			foreach ($config->signupForm as $formInfo)
 			{
-				if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
+				if ($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
 				{
 					$getVars[] = $formInfo->name;
 				}
@@ -328,22 +328,22 @@ 
 		}
 
 		$args = new stdClass;
-		foreach($getVars as $val)
+		foreach ($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if ($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
 		}
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if (!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
 
 		$args->find_account_answer = Context::get('find_account_answer');
 		$args->allow_mailing = Context::get('allow_mailing');
 		$args->allow_message = Context::get('allow_message');
 
-		if($args->password1) $args->password = $args->password1;
+		if ($args->password1) $args->password = $args->password1;
 
 		// check password strength
-		if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+		if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 		{
 			$message = Context::getLang('about_password_strength');
 			return new BaseObject(-1, $message[$config->password_strength]);
@@ -369,58 +369,58 @@ 
 		unset($all_args->secret_text);
 
 		// Set the user state as "denied" when using mail authentication
-		if($config->enable_confirm == 'Y') $args->denied = 'Y';
+		if ($config->enable_confirm == 'Y') $args->denied = 'Y';
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
 
 		// remove whitespace
 		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach ($checkInfos as $val)
 		{
-			if(isset($args->{$val}))
+			if (isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
 		}
 		$output = $this->insertMember($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// insert ProfileImage, ImageName, ImageMark
 		$profile_image = $_FILES['profile_image'];
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$this->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
 		}
 
 		$image_mark = $_FILES['image_mark'];
-		if(is_uploaded_file($image_mark['tmp_name']))
+		if (is_uploaded_file($image_mark['tmp_name']))
 		{
 			$this->insertImageMark($args->member_srl, $image_mark['tmp_name']);
 		}
 
 		$image_name = $_FILES['image_name'];
-		if(is_uploaded_file($image_name['tmp_name']))
+		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$this->insertImageName($args->member_srl, $image_name['tmp_name']);
 		}
 
 		// If a virtual site, join the site
 		$site_module_info = Context::get('site_module_info');
-		if($site_module_info->site_srl > 0)
+		if ($site_module_info->site_srl > 0)
 		{
 			$columnList = array('site_srl', 'group_srl');
 			$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList);
-			if($default_group->group_srl)
+			if ($default_group->group_srl)
 			{
 				$this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl);
 			}
 
 		}
 		// Log-in
-		if($config->enable_confirm != 'Y')
+		if ($config->enable_confirm != 'Y')
 		{
-			if($config->identifier == 'email_address')
+			if ($config->identifier == 'email_address')
 			{
 				$output = $this->doLogin($args->email_address);
 			}
@@ -428,8 +428,8 @@ 
 			{
 				$output = $this->doLogin($args->user_id);
 			}
-			if(!$output->toBool()) {
-				if($output->error == -9)
+			if (!$output->toBool()) {
+				if ($output->error == -9)
 					$output->error = -11;
 				return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), $output);
 			}
@@ -437,8 +437,8 @@ 
 
 		// Results
 		$this->add('member_srl', $args->member_srl);
-		if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
-		if($config->enable_confirm == 'Y')
+		if ($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
+		if ($config->enable_confirm == 'Y')
 		{
 			$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
 			$this->setMessage($msg);
@@ -447,19 +447,19 @@ 
 		else $this->setMessage('success_registed');
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
-		if($config->redirect_url)
+		if ($config->redirect_url)
 		{
 			$returnUrl = $config->redirect_url;
 		}
 		else
 		{
-			if(Context::get('success_return_url'))
+			if (Context::get('success_return_url'))
 			{
 				$returnUrl = Context::get('success_return_url');
 			}
-			else if($_COOKIE['XE_REDIRECT_URL'])
+			else if ($_COOKIE['XE_REDIRECT_URL'])
 			{
 				$returnUrl = $_COOKIE['XE_REDIRECT_URL'];
 				setcookie("XE_REDIRECT_URL", '', 1);
@@ -473,26 +473,26 @@ 
 
 	function procMemberModifyInfoBefore()
 	{
-		if($_SESSION['rechecked_password_step'] != 'INPUT_PASSWORD')
+		if ($_SESSION['rechecked_password_step'] != 'INPUT_PASSWORD')
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
 
 		$password = Context::get('password');
 
-		if(!$password)
+		if (!$password)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$oMemberModel = getModel('member');
 
-		if(!$this->memberInfo->password)
+		if (!$this->memberInfo->password)
 		{
 			// Get information of logged-in user
 			$logged_info = Context::get('logged_info');
@@ -503,14 +503,14 @@ 
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the current password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password))
+		if (!$oMemberModel->isValidPassword($this->memberInfo->password, $password))
 		{
 			return new BaseObject(-1, 'invalid_password');
 		}
 
 		$_SESSION['rechecked_password_step'] = 'VALIDATE_PASSWORD';
 
-		if(Context::get('success_return_url'))
+		if (Context::get('success_return_url'))
 		{
 			$redirectUrl = Context::get('success_return_url');
 		}
@@ -528,12 +528,12 @@ 
 	 */
 	function procMemberModifyInfo()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
 
-		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
+		if ($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -541,13 +541,13 @@ 
 
 		// Extract the necessary information in advance
 		$oMemberModel = getModel('member');
-		$config = $oMemberModel->getMemberConfig ();
-		$getVars = array('find_account_answer','allow_mailing','allow_message');
-		if($config->signupForm)
+		$config = $oMemberModel->getMemberConfig();
+		$getVars = array('find_account_answer', 'allow_mailing', 'allow_message');
+		if ($config->signupForm)
 		{
-			foreach($config->signupForm as $formInfo)
+			foreach ($config->signupForm as $formInfo)
 			{
-				if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
+				if ($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
 				{
 					$getVars[] = $formInfo->name;
 				}
@@ -555,11 +555,11 @@ 
 		}
 
 		$args = new stdClass;
-		foreach($getVars as $val)
+		foreach ($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
-			if($val == 'find_account_answer' && !Context::get($val)) {
+			if ($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if ($val == 'find_account_answer' && !Context::get($val)) {
 				unset($args->{$val});
 			}
 		}
@@ -568,7 +568,7 @@ 
 		$logged_info = Context::get('logged_info');
 		$args->member_srl = $logged_info->member_srl;
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if (!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
 
 		// Remove some unnecessary variables from all the vars
 		$all_args = Context::getRequestVars();
@@ -593,9 +593,9 @@ 
 
 		// remove whitespace
 		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach ($checkInfos as $val)
 		{
-			if(isset($args->{$val}))
+			if (isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
@@ -603,22 +603,22 @@ 
 
 		// Execute insert or update depending on the value of member_srl
 		$output = $this->updateMember($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$profile_image = $_FILES['profile_image'];
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$this->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
 		}
 
 		$image_mark = $_FILES['image_mark'];
-		if(is_uploaded_file($image_mark['tmp_name']))
+		if (is_uploaded_file($image_mark['tmp_name']))
 		{
 			$this->insertImageMark($args->member_srl, $image_mark['tmp_name']);
 		}
 
 		$image_name = $_FILES['image_name'];
-		if(is_uploaded_file($image_name['tmp_name']))
+		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$this->insertImageName($args->member_srl, $image_name['tmp_name']);
 		}
@@ -633,7 +633,7 @@ 
 
 		// Call a trigger after successfully log-in (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberModifyInfo', 'after', $this->memberInfo);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		$this->setSessionInfo();
 		// Return result
@@ -654,7 +654,7 @@ 
 	 */
 	function procMemberModifyPassword()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
 		// Extract the necessary information in advance
 		$current_password = trim(Context::get('current_password'));
 		$password = trim(Context::get('password1'));
@@ -668,17 +668,17 @@ 
 
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new BaseObject(-1, 'invalid_password');
+		if (!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new BaseObject(-1, 'invalid_password');
 
 		// Check if a new password is as same as the previous password
-		if($current_password == $password) return new BaseObject(-1, 'invalid_new_password');
+		if ($current_password == $password) return new BaseObject(-1, 'invalid_new_password');
 
 		// Execute insert or update depending on the value of member_srl
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$args->password = $password;
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->add('member_srl', $args->member_srl);
 		$this->setMessage('success_updated');
@@ -694,7 +694,7 @@ 
 	 */
 	function procMemberLeave()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
 		// Extract the necessary information in advance
 		$password = trim(Context::get('password'));
 		// Get information of logged-in user
@@ -703,17 +703,17 @@ 
 		// Create a member model object
 		$oMemberModel = getModel('member');
 		// Get information of member_srl
-		if(!$this->memberInfo->password)
+		if (!$this->memberInfo->password)
 		{
 			$columnList = array('member_srl', 'password');
 			$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new BaseObject(-1, 'invalid_password');
+		if (!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new BaseObject(-1, 'invalid_password');
 
 		$output = $this->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Destroy all session information
 		$this->destroySessionInfo();
 		// Return success message
@@ -732,20 +732,20 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['profile_image'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
+		if ($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
 
 		$output = $this->insertProfileImage($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		$this->setRedirectUrl($returnUrl);
@@ -766,20 +766,20 @@ 
 		$max_width = $config->profile_image_max_width;
 		$max_height = $config->profile_image_max_height;
 		$max_filesize = $config->profile_image_max_filesize;
-		foreach($config->signupForm as $val)
+		foreach ($config->signupForm as $val)
 		{
-			if($val->name == "profile_image")
+			if ($val->name == "profile_image")
 				$allow_transparent = $val->allow_transparent_thumbnail == 'Y';
 		}
 
-		Context::loadLang(_XE_PATH_ . 'modules/file/lang');
+		Context::loadLang(_XE_PATH_.'modules/file/lang');
 
 		// Get file information
 		FileHandler::clearStatCache($target_file);
 		list($width, $height, $type) = @getimagesize($target_file);
-		if(IMAGETYPE_PNG == $type) $ext = 'png';
-		elseif(IMAGETYPE_JPEG == $type) $ext = 'jpg';
-		elseif(IMAGETYPE_GIF == $type) $ext = 'gif';
+		if (IMAGETYPE_PNG == $type) $ext = 'png';
+		elseif (IMAGETYPE_JPEG == $type) $ext = 'jpg';
+		elseif (IMAGETYPE_GIF == $type) $ext = 'gif';
 		else
 		{
 			return $this->stop('msg_not_uploaded_profile_image');
@@ -791,7 +791,7 @@ 
 		$target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
 
 		// Convert if the image size is larger than a given size or if the format is not a gif
-		if(($width > $max_width || $height > $max_height ) && $type != 1)
+		if (($width > $max_width || $height > $max_height) && $type != 1)
 		{
 			$temp_filename = sprintf('files/cache/tmp/profile_image_%d.%s', $member_srl, $ext);
 			FileHandler::createImageFile($target_file, $temp_filename, $max_width, $max_height, $ext, 'crop', $allow_transparent);
@@ -799,10 +799,10 @@ 
 			// 파일 용량 제한
 			FileHandler::clearStatCache($temp_filename);
 			$filesize = filesize($temp_filename);
-			if($max_filesize && $filesize > ($max_filesize * 1024))
+			if ($max_filesize && $filesize > ($max_filesize * 1024))
 			{
 				FileHandler::removeFile($temp_filename);
-				return $this->stop(implode(' ' , array(
+				return $this->stop(implode(' ', array(
 					Context::getLang('msg_not_uploaded_profile_image'),
 					Context::getLang('msg_exceeds_limit_size')
 				)));
@@ -816,9 +816,9 @@ 
 		{
 			// 파일 용량 제한
 			$filesize = filesize($target_file);
-			if($max_filesize && $filesize > ($max_filesize * 1024))
+			if ($max_filesize && $filesize > ($max_filesize * 1024))
 			{
-				return $this->stop(implode(' ' , array(
+				return $this->stop(implode(' ', array(
 					Context::getLang('msg_not_uploaded_profile_image'),
 					Context::getLang('msg_exceeds_limit_size')
 				)));
@@ -841,20 +841,20 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_name'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_image_name');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
+		if ($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
 
 		$output = $this->insertImageName($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Page refresh
 		//$this->setRefreshPage();
@@ -879,7 +879,7 @@ 
 		$max_height = $config->image_name_max_height;
 		$max_filesize = $config->image_name_max_filesize;
 
-		Context::loadLang(_XE_PATH_ . 'modules/file/lang');
+		Context::loadLang(_XE_PATH_.'modules/file/lang');
 
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
@@ -889,7 +889,7 @@ 
 		// Get file information
 		list($width, $height, $type) = @getimagesize($target_file);
 		// Convert if the image size is larger than a given size or if the format is not a gif
-		if($width > $max_width || $height > $max_height || $type!=1)
+		if ($width > $max_width || $height > $max_height || $type != 1)
 		{
 			$temp_filename = sprintf('files/cache/tmp/image_name_%d.gif', $member_srl, $ext);
 			FileHandler::createImageFile($target_file, $temp_filename, $max_width, $max_height, 'gif');
@@ -897,10 +897,10 @@ 
 			// 파일 용량 제한
 			FileHandler::clearStatCache($temp_filename);
 			$filesize = filesize($temp_filename);
-			if($max_filesize && $filesize > ($max_filesize * 1024))
+			if ($max_filesize && $filesize > ($max_filesize * 1024))
 			{
 				FileHandler::removeFile($temp_filename);
-				return $this->stop(implode(' ' , array(
+				return $this->stop(implode(' ', array(
 					Context::getLang('msg_not_uploaded_image_name'),
 					Context::getLang('msg_exceeds_limit_size')
 				)));
@@ -914,9 +914,9 @@ 
 		{
 			// 파일 용량 제한
 			$filesize = filesize($target_file);
-			if($max_filesize && $filesize > ($max_filesize * 1024))
+			if ($max_filesize && $filesize > ($max_filesize * 1024))
 			{
-				return $this->stop(implode(' ' , array(
+				return $this->stop(implode(' ', array(
 					Context::getLang('msg_not_uploaded_image_name'),
 					Context::getLang('msg_exceeds_limit_size')
 				)));
@@ -938,20 +938,20 @@ 
 	function procMemberDeleteProfileImage($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new BaseObject(0,'success');
+			return new BaseObject(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$profile_image = $oMemberModel->getProfileImage($member_srl);
 			FileHandler::removeFile($profile_image->file);
 		}
-		return new BaseObject(0,'success');
+		return new BaseObject(0, 'success');
 	}
 
 	/**
@@ -962,20 +962,20 @@ 
 	function procMemberDeleteImageName($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new BaseObject(0,'success');
+			return new BaseObject(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$image_name = $oMemberModel->getImageName($member_srl);
 			FileHandler::removeFile($image_name->file);
 		}
-		return new BaseObject(0,'success');
+		return new BaseObject(0, 'success');
 	}
 
 	/**
@@ -987,20 +987,20 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_mark'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
 		// Membership in the images mark the module using the ban was set by an administrator or return;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
+		if ($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
 
 		$this->insertImageMark($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		$this->setRedirectUrl($returnUrl);
@@ -1022,7 +1022,7 @@ 
 		$max_height = $config->image_mark_max_height;
 		$max_filesize = $config->image_mark_max_filesize;
 
-		Context::loadLang(_XE_PATH_ . 'modules/file/lang');
+		Context::loadLang(_XE_PATH_.'modules/file/lang');
 
 		$target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -1031,7 +1031,7 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 
-		if($width > $max_width || $height > $max_height || $type!=1)
+		if ($width > $max_width || $height > $max_height || $type != 1)
 		{
 			$temp_filename = sprintf('files/cache/tmp/image_mark_%d.gif', $member_srl);
 			FileHandler::createImageFile($target_file, $temp_filename, $max_width, $max_height, 'gif');
@@ -1039,10 +1039,10 @@ 
 			// 파일 용량 제한
 			FileHandler::clearStatCache($temp_filename);
 			$filesize = filesize($temp_filename);
-			if($max_filesize && $filesize > ($max_filesize * 1024))
+			if ($max_filesize && $filesize > ($max_filesize * 1024))
 			{
 				FileHandler::removeFile($temp_filename);
-				return $this->stop(implode(' ' , array(
+				return $this->stop(implode(' ', array(
 					Context::getLang('msg_not_uploaded_group_image_mark'),
 					Context::getLang('msg_exceeds_limit_size')
 				)));
@@ -1055,10 +1055,10 @@ 
 		else
 		{
 			$filesize = filesize($target_file);
-			if($max_filesize && $filesize > ($max_filesize * 1024))
+			if ($max_filesize && $filesize > ($max_filesize * 1024))
 			{
 				FileHandler::removeFile($target_file);
-				return $this->stop(implode(' ' , array(
+				return $this->stop(implode(' ', array(
 					Context::getLang('msg_not_uploaded_group_image_mark'),
 					Context::getLang('msg_exceeds_limit_size')
 				)));
@@ -1080,20 +1080,20 @@ 
 	function procMemberDeleteImageMark($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new BaseObject(0,'success');
+			return new BaseObject(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$image_mark = $oMemberModel->getImageMark($member_srl);
 			FileHandler::removeFile($image_mark->file);
 		}
-		return new BaseObject(0,'success');
+		return new BaseObject(0, 'success');
 	}
 
 	/**
@@ -1104,26 +1104,26 @@ 
 	function procMemberFindAccount()
 	{
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$email_address) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$oModuleModel = getModel('module');
 
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new BaseObject(-1, 'msg_email_not_exists');
+		if (!$member_srl) return new BaseObject(-1, 'msg_email_not_exists');
 
 		// Get information of the member
 		$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Check if possible to find member's ID and password
-		if($member_info->denied == 'Y')
+		if ($member_info->denied == 'Y')
 		{
 			$chk_args = new stdClass;
 			$chk_args->member_srl = $member_info->member_srl;
 			$output = executeQuery('member.chkAuthMail', $chk_args);
-			if($output->toBool() && $output->data->count != '0') return new BaseObject(-1, 'msg_user_not_confirmed');
+			if ($output->toBool() && $output->data->count != '0') return new BaseObject(-1, 'msg_user_not_confirmed');
 		}
 
 		// Insert data into the authentication DB
@@ -1136,19 +1136,19 @@ 
 		$args->is_register = 'N';
 
 		$output = executeQuery('member.insertAuthMail', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Get content of the email to send a member
 		Context::set('auth_args', $args);
 
 		$member_config = $oModuleModel->getModuleConfig('member');
 		$memberInfo = array();
 		global $lang;
-		if(is_array($member_config->signupForm))
+		if (is_array($member_config->signupForm))
 		{
-			$exceptForm=array('password', 'find_account_question');
-			foreach($member_config->signupForm as $form)
+			$exceptForm = array('password', 'find_account_question');
+			foreach ($member_config->signupForm as $form)
 			{
-				if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
+				if (!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
 				{
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
@@ -1163,15 +1163,15 @@ 
 		}
 		Context::set('memberInfo', $memberInfo);
 
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if (!$member_config->skin) $member_config->skin = "default";
+		if (!$member_config->colorset) $member_config->colorset = "white";
 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if (!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
-		$find_url = getFullUrl ('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $args->auth_key);
+		$find_url = getFullUrl('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $args->auth_key);
 		Context::set('find_url', $find_url);
 
 		$oTemplate = &TemplateHandler::getInstance();
@@ -1181,19 +1181,19 @@ 
 		$member_config = $oModuleModel->getModuleConfig('member');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_find_account_title') );
+		$oMail->setTitle(Context::getLang('msg_find_account_title'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($member_info->user_name, $member_info->email_address);
 		$oMail->send();
 		// Return message
 		$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberFindAccount');
 			$this->setRedirectUrl($returnUrl);
 		}
-		return new BaseObject(0,$msg);
+		return new BaseObject(0, $msg);
 	}
 
 	/**
@@ -1204,7 +1204,7 @@ 
 	function procMemberFindAccountByQuestion()
 	{
 		$oMemberModel = getModel('member');
-		$oPassword =  new Password();
+		$oPassword = new Password();
 		$config = $oMemberModel->getMemberConfig();
 
 		$email_address = Context::get('email_address');
@@ -1212,49 +1212,49 @@ 
 		$find_account_question = trim(Context::get('find_account_question'));
 		$find_account_answer = trim(Context::get('find_account_answer'));
 
-		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new BaseObject(-1, 'msg_invalid_request');
+		if (($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new BaseObject(-1, 'msg_email_not_exists');
+		if (!$member_srl) return new BaseObject(-1, 'msg_email_not_exists');
 
 		// Get information of the member
 		$columnList = array('member_srl', 'find_account_question', 'find_account_answer');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Display a message if no answer is entered
-		if(!$member_info->find_account_question || !$member_info->find_account_answer) return new BaseObject(-1, 'msg_question_not_exists');
+		if (!$member_info->find_account_question || !$member_info->find_account_answer) return new BaseObject(-1, 'msg_question_not_exists');
 
 		// 답변 확인
 		$hashed = $oPassword->checkAlgorithm($member_info->find_account_answer);
 		$authed = true;
 		$member_info->find_account_question = trim($member_info->find_account_question);
-		if($member_info->find_account_question != $find_account_question)
+		if ($member_info->find_account_question != $find_account_question)
 		{
 			$authed = false;
 		}
-		else if($hashed && !$oPassword->checkPassword($find_account_answer, $member_info->find_account_answer))
+		else if ($hashed && !$oPassword->checkPassword($find_account_answer, $member_info->find_account_answer))
 		{
 			$authed = false;
 		}
-		else if(!$hashed && $find_account_answer != $member_info->find_account_answer)
+		else if (!$hashed && $find_account_answer != $member_info->find_account_answer)
 		{
 			$authed = false;
 		}
 
-		if(!$authed)
+		if (!$authed)
 		{
 			return new BaseObject(-1, 'msg_answer_not_matches');
 		}
 
 		// answer가 동일하고 hash 되지 않았으면 hash 값으로 저장
-		if($authed && !$hashed)
+		if ($authed && !$hashed)
 		{
 			$this->updateFindAccountAnswer($member_srl, $find_account_answer);
 		}
 
-		if($config->identifier == 'email_address')
+		if ($config->identifier == 'email_address')
 		{
 			$user_id = $email_address;
 		}
@@ -1267,11 +1267,11 @@ 
 		$args->password = $temp_password;
 		$args->change_password_date = '1';
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$_SESSION['xe_temp_password_' . $user_id] = $temp_password;
+		$_SESSION['xe_temp_password_'.$user_id] = $temp_password;
 
-		$this->add('user_id',$user_id);
+		$this->add('user_id', $user_id);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
 		$this->setRedirectUrl($returnUrl.'&user_id='.$user_id);
@@ -1291,7 +1291,7 @@ 
 		$member_srl = Context::get('member_srl');
 		$auth_key = Context::get('auth_key');
 
-		if(!$member_srl || !$auth_key)
+		if (!$member_srl || !$auth_key)
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -1302,9 +1302,9 @@ 
 		$args->auth_key = $auth_key;
 		$output = executeQuery('member.getAuthMail', $args);
 
-		if(!$output->toBool() || $output->data->auth_key != $auth_key)
+		if (!$output->toBool() || $output->data->auth_key != $auth_key)
 		{
-			if(strlen($output->data->auth_key) !== strlen($auth_key))
+			if (strlen($output->data->auth_key) !== strlen($auth_key))
 			{
 				executeQuery('member.deleteAuthMail', $args);
 			}
@@ -1312,7 +1312,7 @@ 
 			return $this->stop('msg_invalid_auth_key');
 		}
 
-		if(ztime($output->data->regdate) < $_SERVER['REQUEST_TIME'] + zgap() - 86400)
+		if (ztime($output->data->regdate) < $_SERVER['REQUEST_TIME'] + zgap() - 86400)
 		{
 			executeQuery('member.deleteAuthMail', $args);
 			return $this->stop('msg_invalid_auth_key');
@@ -1321,7 +1321,7 @@ 
 		$args->password = $output->data->new_password;
 
 		// If credentials are correct, change the password to a new one
-		if($output->data->is_register == 'Y')
+		if ($output->data->is_register == 'Y')
 		{
 			$args->denied = 'N';
 		}
@@ -1334,13 +1334,13 @@ 
 		$is_register = $output->data->is_register;
 
 		$output = executeQuery('member.updateMemberPassword', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $this->stop($output->getMessage());
 		}
 
 		// Remove all values having the member_srl from authentication table
-		executeQuery('member.deleteAuthMail',$args);
+		executeQuery('member.deleteAuthMail', $args);
 
 		$this->_clearMemberCache($args->member_srl);
 
@@ -1359,33 +1359,33 @@ 
 	{
 		// Get an email_address
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$email_address) return new BaseObject(-1, 'msg_invalid_request');
 		// Log test by using email_address
 		$oMemberModel = getModel('member');
 
 		$args = new stdClass;
 		$args->email_address = $email_address;
 		$memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$memberSrl) return new BaseObject(-1, 'msg_not_exists_member');
+		if (!$memberSrl) return new BaseObject(-1, 'msg_not_exists_member');
 
 		$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if (!$member_config->skin) $member_config->skin = "default";
+		if (!$member_config->colorset) $member_config->colorset = "white";
 
 		// Check if a authentication mail has been sent previously
 		$chk_args = new stdClass;
 		$chk_args->member_srl = $member_info->member_srl;
 		$output = executeQuery('member.chkAuthMail', $chk_args);
-		if($output->toBool() && $output->data->count == '0') return new BaseObject(-1, 'msg_invalid_request');
+		if ($output->toBool() && $output->data->count == '0') return new BaseObject(-1, 'msg_invalid_request');
 
 		$auth_args = new stdClass;
 		$auth_args->member_srl = $member_info->member_srl;
 		$output = executeQueryArray('member.getAuthMailInfo', $auth_args);
-		if(!$output->data || !$output->data[0]->auth_key)  return new BaseObject(-1, 'msg_invalid_request');
+		if (!$output->data || !$output->data[0]->auth_key)  return new BaseObject(-1, 'msg_invalid_request');
 		$auth_info = $output->data[0];
 
 		// Update the regdate of authmail entry
@@ -1396,12 +1396,12 @@ 
 
 		$memberInfo = array();
 		global $lang;
-		if(is_array($member_config->signupForm))
+		if (is_array($member_config->signupForm))
 		{
-			$exceptForm=array('password', 'find_account_question');
-			foreach($member_config->signupForm as $form)
+			$exceptForm = array('password', 'find_account_question');
+			foreach ($member_config->signupForm as $form)
 			{
-				if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
+				if (!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
 				{
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
@@ -1420,19 +1420,19 @@ 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if (!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
-		$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_info->auth_key);
+		$auth_url = getFullUrl('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $auth_info->auth_key);
 		Context::set('auth_url', $auth_url);
 
 		$oTemplate = &TemplateHandler::getInstance();
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+		$oMail->setTitle(Context::getLang('msg_confirm_account_title'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $args->user_name, $args->email_address );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($args->user_name, $args->email_address);
 		$oMail->send();
 
 		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
@@ -1447,23 +1447,23 @@ 
 		$memberInfo = $_SESSION['auth_member_info'];
 		unset($_SESSION['auth_member_info']);
 
-		if(!$memberInfo)
+		if (!$memberInfo)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail)
+		if (!$newEmail)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new BaseObject(-1,'msg_exists_email_address');
+			return new BaseObject(-1, 'msg_exists_email_address');
 		}
 
 		// remove all key by member_srl
@@ -1471,7 +1471,7 @@ 
 		$args->member_srl = $memberInfo->member_srl;
 		$output = executeQuery('member.deleteAuthMail', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1481,7 +1481,7 @@ 
 		list($args->email_id, $args->email_host) = explode('@', $newEmail);
 
 		$output = executeQuery('member.updateMemberEmailAddress', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $this->stop($output->getMessage());
 		}
@@ -1498,7 +1498,7 @@ 
 		$auth_args->is_register = 'Y';
 
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$memberInfo->email_address = $newEmail;
 
@@ -1522,12 +1522,12 @@ 
 		$memberInfo = array();
 
 		global $lang;
-		if(is_array($member_config->signupForm))
+		if (is_array($member_config->signupForm))
 		{
-			$exceptForm=array('password', 'find_account_question');
-			foreach($member_config->signupForm as $form)
+			$exceptForm = array('password', 'find_account_question');
+			foreach ($member_config->signupForm as $form)
 			{
-				if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
+				if (!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
 				{
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
@@ -1542,25 +1542,25 @@ 
 		}
 		Context::set('memberInfo', $memberInfo);
 
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if (!$member_config->skin) $member_config->skin = "default";
+		if (!$member_config->colorset) $member_config->colorset = "white";
 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if (!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
-		$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
+		$auth_url = getFullUrl('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $auth_args->auth_key);
 		Context::set('auth_url', $auth_url);
 
 		$oTemplate = &TemplateHandler::getInstance();
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+		$oMail->setTitle(Context::getLang('msg_confirm_account_title'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($member_info->user_name, $member_info->email_address);
 		$oMail->send();
 	}
 
@@ -1573,7 +1573,7 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new BaseObject(-1,'msg_invalid_request');
+		if (!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list)) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$columnList = array('site_srl', 'group_srl', 'title');
@@ -1592,13 +1592,13 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new BaseObject(-1,'msg_invalid_request');
+		if (!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list)) return new BaseObject(-1, 'msg_invalid_request');
 
 		$args = new stdClass;
-		$args->site_srl= $site_module_info->site_srl;
+		$args->site_srl = $site_module_info->site_srl;
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		$this->setMessage('success_deleted');
 		$this->_clearMemberCache($args->member_srl, $site_module_info->site_srl);
 	}
@@ -1612,25 +1612,25 @@ 
 	 */
 	function setMemberConfig($args)
 	{
-		if(!$args->skin) $args->skin = "default";
-		if(!$args->colorset) $args->colorset = "white";
-		if(!$args->editor_skin) $args->editor_skin= "ckeditor";
-		if(!$args->editor_colorset) $args->editor_colorset = "moono";
-		if($args->enable_join!='Y') $args->enable_join = 'N';
-		$args->enable_openid= 'N';
-		if($args->profile_image !='Y') $args->profile_image = 'N';
-		if($args->image_name!='Y') $args->image_name = 'N';
-		if($args->image_mark!='Y') $args->image_mark = 'N';
-		if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
-		if(!trim(strip_tags($args->agreement))) $args->agreement = null;
-		$args->limit_day = (int)$args->limit_day;
+		if (!$args->skin) $args->skin = "default";
+		if (!$args->colorset) $args->colorset = "white";
+		if (!$args->editor_skin) $args->editor_skin = "ckeditor";
+		if (!$args->editor_colorset) $args->editor_colorset = "moono";
+		if ($args->enable_join != 'Y') $args->enable_join = 'N';
+		$args->enable_openid = 'N';
+		if ($args->profile_image != 'Y') $args->profile_image = 'N';
+		if ($args->image_name != 'Y') $args->image_name = 'N';
+		if ($args->image_mark != 'Y') $args->image_mark = 'N';
+		if ($args->group_image_mark != 'Y') $args->group_image_mark = 'N';
+		if (!trim(strip_tags($args->agreement))) $args->agreement = null;
+		$args->limit_day = (int) $args->limit_day;
 
 		$agreement = trim($args->agreement);
 		unset($args->agreement);
 
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('member',$args);
-		if(!$output->toBool()) return $output;
+		$output = $oModuleController->insertModuleConfig('member', $args);
+		if (!$output->toBool()) return $output;
 
 		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
 		FileHandler::writeFile($agreement_file, $agreement);
@@ -1651,11 +1651,11 @@ 
 		$signature = trim(removeHackTag($signature));
 		$signature = preg_replace('/<(\/?)(embed|object|param)/is', '&lt;$1$2', $signature);
 
-		$check_signature = trim(str_replace(array('&nbsp;',"\n","\r"), '', strip_tags($signature, '<img><object>')));
+		$check_signature = trim(str_replace(array('&nbsp;', "\n", "\r"), '', strip_tags($signature, '<img><object>')));
 		$path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($member_srl));
 		$filename = sprintf('%s%d.signature.php', $path, $member_srl);
 
-		if(!$check_signature) return FileHandler::removeFile($filename);
+		if (!$check_signature) return FileHandler::removeFile($filename);
 
 		$buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);
 		FileHandler::makeDir($path);
@@ -1684,15 +1684,15 @@ 
 	 *
 	 * @return BaseObject
 	 */
-	function addMemberToGroup($member_srl, $group_srl, $site_srl=0)
+	function addMemberToGroup($member_srl, $group_srl, $site_srl = 0)
 	{
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$args->group_srl = $group_srl;
-		if($site_srl) $args->site_srl = $site_srl;
+		if ($site_srl) $args->site_srl = $site_srl;
 
 		// Add
-		$output = executeQuery('member.addMemberToGroup',$args);
+		$output = executeQuery('member.addMemberToGroup', $args);
 		$output2 = ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args);
 
 		$this->_clearMemberCache($member_srl, $site_srl);
@@ -1712,18 +1712,18 @@ 
 	{
 		$obj = new stdClass;
 		$obj->site_srl = $args->site_srl;
-		$obj->member_srl = implode(',',$args->member_srl);
+		$obj->member_srl = implode(',', $args->member_srl);
 
 		$output = executeQueryArray('member.getMembersGroup', $obj);
-		if($output->data) foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
+		if ($output->data) foreach ($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
 
 		$output = executeQuery('member.deleteMembersGroup', $obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$inserted_members = array();
-		foreach($args->member_srl as $key => $val)
+		foreach ($args->member_srl as $key => $val)
 		{
-			if($inserted_members[$val]) continue;
+			if ($inserted_members[$val]) continue;
 			$inserted_members[$val] = true;
 
 			unset($obj);
@@ -1733,7 +1733,7 @@ 
 			$obj->site_srl = $args->site_srl;
 			$obj->regdate = $date[$obj->member_srl];
 			$output = executeQuery('member.addMemberToGroup', $obj);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$this->_clearMemberCache($obj->member_srl, $args->site_srl);
 		}
@@ -1755,9 +1755,9 @@ 
 		// Get information of the key
 		$output = executeQuery('member.getAutologin', $args);
 		// If no information exists, delete a cookie
-		if(!$output->toBool() || !$output->data)
+		if (!$output->toBool() || !$output->data)
 		{
-			setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365);
+			setCookie('xeak', null, $_SERVER['REQUEST_TIME'] + 60 * 60 * 24 * 365);
 			return;
 		}
 
@@ -1767,9 +1767,9 @@ 
 		$user_id = ($config->identifier == 'user_id') ? $output->data->user_id : $output->data->email_address;
 		$password = $output->data->password;
 
-		if(!$user_id || !$password)
+		if (!$user_id || !$password)
 		{
-			setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365);
+			setCookie('xeak', null, $_SERVER['REQUEST_TIME'] + 60 * 60 * 24 * 365);
 			return;
 		}
 
@@ -1779,7 +1779,7 @@ 
 		$check_key = strtolower($user_id).$password.$_SERVER['HTTP_USER_AGENT'];
 		$check_key = substr(hash_hmac('sha256', $check_key, substr($args->autologin_key, 0, 32)), 0, 32);
 
-		if($check_key === substr($args->autologin_key, 32))
+		if ($check_key === substr($args->autologin_key, 32))
 		{
 			// Check change_password_date
 			$oModuleModel = getModel('module');
@@ -1787,12 +1787,12 @@ 
 			$limit_date = $member_config->change_password_date;
 
 			// Check if change_password_date is set
-			if($limit_date > 0)
+			if ($limit_date > 0)
 			{
 				$oMemberModel = getModel('member');
 				$columnList = array('member_srl', 'change_password_date');
 
-				if($config->identifier == 'user_id')
+				if ($config->identifier == 'user_id')
 				{
 					$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
 				}
@@ -1801,7 +1801,7 @@ 
 					$member_info = $oMemberModel->getMemberInfoByEmailAddress($user_id, $columnList);
 				}
 
-				if($member_info->change_password_date >= date('YmdHis', strtotime('-'.$limit_date.' day')) ){
+				if ($member_info->change_password_date >= date('YmdHis', strtotime('-'.$limit_date.' day'))) {
 					$do_auto_login = true;
 				}
 
@@ -1812,14 +1812,14 @@ 
 			}
 		}
 
-		if($do_auto_login)
+		if ($do_auto_login)
 		{
 			$output = $this->doLogin($user_id);
 		}
 		else
 		{
 			executeQuery('member.deleteAutologin', $args);
-			setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365);
+			setCookie('xeak', null, $_SERVER['REQUEST_TIME'] + 60 * 60 * 24 * 365);
 		}
 	}
 
@@ -1835,13 +1835,13 @@ 
 	function doLogin($user_id, $password = '', $keep_signed = false)
 	{
 		$user_id = strtolower($user_id);
-		if(!$user_id) return new BaseObject(-1, 'null_user_id');
+		if (!$user_id) return new BaseObject(-1, 'null_user_id');
 		// Call a trigger before log-in (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->user_id = $user_id;
 		$trigger_obj->password = $password;
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Create a member model object
 		$oMemberModel = getModel('member');
 
@@ -1851,12 +1851,12 @@ 
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 
 		// check identifier
-		if($config->identifier == 'email_address')
+		if ($config->identifier == 'email_address')
 		{
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_email_address');
+			if (!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_email_address');
 
 		}
 		else
@@ -1864,24 +1864,24 @@ 
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_user_id');
+			if (!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_user_id');
 		}
 
 		$output = executeQuery('member.getLoginCountByIp', $args);
 		$errorCount = $output->data->count;
-		if($errorCount >= $config->max_error_count)
+		if ($errorCount >= $config->max_error_count)
 		{
 			$last_update = strtotime($output->data->last_update);
-			$term = intval($_SERVER['REQUEST_TIME']-$last_update);
-			if($term < $config->max_error_count_time)
+			$term = intval($_SERVER['REQUEST_TIME'] - $last_update);
+			if ($term < $config->max_error_count_time)
 			{
 				$term = $config->max_error_count_time - $term;
-				if($term < 60) $term = intval($term).Context::getLang('unit_sec');
-				elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
-				elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
-				else $term = intval($term/86400).Context::getLang('unit_day');
+				if ($term < 60) $term = intval($term).Context::getLang('unit_sec');
+				elseif (60 <= $term && $term < 3600) $term = intval($term / 60).Context::getLang('unit_min');
+				elseif (3600 <= $term && $term < 86400) $term = intval($term / 3600).Context::getLang('unit_hour');
+				else $term = intval($term / 86400).Context::getLang('unit_day');
 
-				return new BaseObject(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
+				return new BaseObject(-1, sprintf(Context::getLang('excess_ip_access_count'), $term));
 			}
 			else
 			{
@@ -1891,13 +1891,13 @@ 
 		}
 
 		// Password Check
-		if($password && !$oMemberModel->isValidPassword($this->memberInfo->password, $password, $this->memberInfo->member_srl))
+		if ($password && !$oMemberModel->isValidPassword($this->memberInfo->password, $password, $this->memberInfo->member_srl))
 		{
-			return $this->recordMemberLoginError(-1, 'invalid_password',$this->memberInfo);
+			return $this->recordMemberLoginError(-1, 'invalid_password', $this->memberInfo);
 		}
 
 		// If denied == 'Y', notify
-		if($this->memberInfo->denied == 'Y')
+		if ($this->memberInfo->denied == 'Y')
 		{
 			$args->member_srl = $this->memberInfo->member_srl;
 			$output = executeQuery('member.chkAuthMail', $args);
@@ -1905,12 +1905,12 @@ 
 			{
 				$_SESSION['auth_member_srl'] = $this->memberInfo->member_srl;
 				$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
-				return $this->setRedirectUrl($redirectUrl, new BaseObject(-1,'msg_user_not_confirmed'));
+				return $this->setRedirectUrl($redirectUrl, new BaseObject(-1, 'msg_user_not_confirmed'));
 			}
-			return new BaseObject(-1,'msg_user_denied');
+			return new BaseObject(-1, 'msg_user_denied');
 		}
 		// Notify if denied_date is less than the current time
-		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new BaseObject(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		if ($this->memberInfo->limit_date && substr($this->memberInfo->limit_date, 0, 8) >= date("Ymd")) return new BaseObject(-9, sprintf(Context::getLang('msg_user_limited'), zdate($this->memberInfo->limit_date, "Y-m-d")));
 		// Update the latest login time
 		$args->member_srl = $this->memberInfo->member_srl;
 		$output = executeQuery('member.updateLastLogin', $args);
@@ -1920,36 +1920,36 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if($oDB->isTableExists('member_count_history') && $config->enable_login_fail_report != 'N')
+		if ($oDB->isTableExists('member_count_history') && $config->enable_login_fail_report != 'N')
 		{
 			// check if there is login fail records.
 			$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
-			if($output->data && $output->data->content)
+			if ($output->data && $output->data->content)
 			{
 				$title = Context::getLang('login_fail_report');
 				$message = '<ul>';
 				$content = unserialize($output->data->content);
-				if(count($content) > $config->max_error_count)
+				if (count($content) > $config->max_error_count)
 				{
-					foreach($content as $val)
+					foreach ($content as $val)
 					{
-						$message .= '<li>'.Context::getLang('regdate').': '.date('Y-m-d h:i:sa',$val[2]).'<ul><li>'.Context::getLang('ipaddress').': '.$val[0].'</li><li>'.Context::getLang('message').': '.$val[1].'</li></ul></li>';
+						$message .= '<li>'.Context::getLang('regdate').': '.date('Y-m-d h:i:sa', $val[2]).'<ul><li>'.Context::getLang('ipaddress').': '.$val[0].'</li><li>'.Context::getLang('message').': '.$val[1].'</li></ul></li>';
 					}
 					$message .= '</ul>';
-					$content = sprintf(Context::getLang('login_fail_report_contents'),$message,date('Y-m-d h:i:sa'));
+					$content = sprintf(Context::getLang('login_fail_report_contents'), $message, date('Y-m-d h:i:sa'));
 
 					//send message
 					$oCommunicationController = getController('communication');
 					$oCommunicationController->sendMessage($args->member_srl, $args->member_srl, $title, $content, true);
 
-					if($this->memberInfo->email_address && $this->memberInfo->allow_mailing == 'Y')
+					if ($this->memberInfo->email_address && $this->memberInfo->allow_mailing == 'Y')
 					{
 						$view_url = Context::getRequestUri();
-						$content = sprintf("%s<hr /><p>From: <a href=\"%s\" target=\"_blank\">%s</a><br />To: %s(%s)</p>",$content, $view_url, $view_url, $this->memberInfo->nick_name, $this->memberInfo->email_id);
+						$content = sprintf("%s<hr /><p>From: <a href=\"%s\" target=\"_blank\">%s</a><br />To: %s(%s)</p>", $content, $view_url, $view_url, $this->memberInfo->nick_name, $this->memberInfo->email_id);
 						$oMail = new Mail();
 						$oMail->setTitle($title);
 						$oMail->setContent($content);
-						$oMail->setSender($config->webmaster_name?$config->webmaster_name:'webmaster', $config->webmaster_email);
+						$oMail->setSender($config->webmaster_name ? $config->webmaster_name : 'webmaster', $config->webmaster_email);
 						$oMail->setReceiptor($this->memberInfo->email_id.'('.$this->memberInfo->nick_name.')', $this->memberInfo->email_address);
 						$oMail->send();
 					}
@@ -1959,9 +1959,9 @@ 
 		}
 		// Call a trigger after successfully log-in (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $this->memberInfo);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// When user checked to use auto-login
-		if($keep_signed)
+		if ($keep_signed)
 		{
 			// Key generate for auto login
 			$oPassword = new Password();
@@ -1973,12 +1973,12 @@ 
 			$autologin_args->member_srl = $this->memberInfo->member_srl;
 			executeQuery('member.deleteAutologin', $autologin_args);
 			$autologin_output = executeQuery('member.insertAutologin', $autologin_args);
-			if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, $_SERVER['REQUEST_TIME']+31536000);
+			if ($autologin_output->toBool()) setCookie('xeak', $autologin_args->autologin_key, $_SERVER['REQUEST_TIME'] + 31536000);
 		}
-		if($this->memberInfo->is_admin == 'Y')
+		if ($this->memberInfo->is_admin == 'Y')
 		{
 			$oMemberAdminModel = getAdminModel('member');
-			if(!$oMemberAdminModel->getMemberAdminIPCheck())
+			if (!$oMemberAdminModel->getMemberAdminIPCheck())
 			{
 				$_SESSION['denied_admin'] = 'Y';
 			}
@@ -1996,18 +1996,18 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// If your information came through the current session information to extract information from the users
-		if(!$this->memberInfo && $_SESSION['member_srl'] && $oMemberModel->isLogged() )
+		if (!$this->memberInfo && $_SESSION['member_srl'] && $oMemberModel->isLogged())
 		{
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($_SESSION['member_srl']);
 			// If you do not destroy the session Profile
-			if($this->memberInfo->member_srl != $_SESSION['member_srl'])
+			if ($this->memberInfo->member_srl != $_SESSION['member_srl'])
 			{
 				$this->destroySessionInfo();
 				return;
 			}
 		}
 		// Stop using the session id is destroyed
-		if($this->memberInfo->denied=='Y')
+		if ($this->memberInfo->denied == 'Y')
 		{
 			$this->destroySessionInfo();
 			return;
@@ -2037,10 +2037,10 @@ 
 		Context::set('logged_info', $this->memberInfo);
 
 		// Only the menu configuration of the user (such as an add-on to the menu can be changed)
-		$this->addMemberMenu( 'dispMemberInfo', 'cmd_view_member_info');
-		$this->addMemberMenu( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document');
-		$this->addMemberMenu( 'dispMemberSavedDocument', 'cmd_view_saved_document');
-		$this->addMemberMenu( 'dispMemberOwnDocument', 'cmd_view_own_document');
+		$this->addMemberMenu('dispMemberInfo', 'cmd_view_member_info');
+		$this->addMemberMenu('dispMemberScrappedDocument', 'cmd_view_scrapped_document');
+		$this->addMemberMenu('dispMemberSavedDocument', 'cmd_view_saved_document');
+		$this->addMemberMenu('dispMemberOwnDocument', 'cmd_view_own_document');
 	}
 
 	/**
@@ -2062,7 +2062,7 @@ 
 	function addMemberPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$member_popup_menu_list = Context::get('member_popup_menu_list');
-		if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
+		if (!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
 
 		$obj = new stdClass;
 		$obj->url = $url;
@@ -2081,33 +2081,33 @@ 
 	{
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('member.insertMember', 'before', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Terms and Conditions portion of the information set up by members reaffirmed
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
 		$logged_info = Context::get('logged_info');
 		// If the date of the temporary restrictions limit further information on the date of
-		if($config->limit_day) $args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME']+$config->limit_day*60*60*24);
+		if ($config->limit_day) $args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME'] + $config->limit_day * 60 * 60 * 24);
 
 		$args->member_srl = getNextSequence();
 		$args->list_order = -1 * $args->member_srl;
 
 		// Execute insert or update depending on the value of member_srl
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
+		if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
 		// Enter the user's identity changed to lowercase
 		else $args->user_id = strtolower($args->user_id);
-		if(!$args->user_name) $args->user_name = $args->member_srl;
-		if(!$args->nick_name) $args->nick_name = $args->member_srl;
+		if (!$args->user_name) $args->user_name = $args->member_srl;
+		if (!$args->nick_name) $args->nick_name = $args->member_srl;
 
 		// Control of essential parameters
-		if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-		if($args->denied!='Y') $args->denied = 'N';
-		if(!$args->allow_message || ($args->allow_message && !in_array($args->allow_message, array('Y','N','F')))) $args->allow_message = 'Y';
+		if ($args->allow_mailing != 'Y') $args->allow_mailing = 'N';
+		if ($args->denied != 'Y') $args->denied = 'N';
+		if (!$args->allow_message || ($args->allow_message && !in_array($args->allow_message, array('Y', 'N', 'F')))) $args->allow_message = 'Y';
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
-			if($args->is_admin!='Y') $args->is_admin = 'N';
+			if ($args->is_admin != 'Y') $args->is_admin = 'N';
 		}
 		else
 		{
@@ -2122,97 +2122,97 @@ 
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if ($args->homepage && !preg_match("/^[a-z]+:\/\//i", $args->homepage)) $args->homepage = 'http://'.$args->homepage;
+		if ($args->blog && !preg_match("/^[a-z]+:\/\//i", $args->blog)) $args->blog = 'http://'.$args->blog;
 
 		// Create a model object
 		$oMemberModel = getModel('member');
 
 		// Check password strength
-		if($args->password && !$password_is_hashed)
+		if ($args->password && !$password_is_hashed)
 		{
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new BaseObject(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
-		elseif(!$args->password)
+		elseif (!$args->password)
 		{
 			unset($args->password);
 		}
 
-		if($args->find_account_answer && !$password_is_hashed)
+		if ($args->find_account_answer && !$password_is_hashed)
 		{
 			$args->find_account_answer = $oMemberModel->hashPassword($args->find_account_answer);
 		}
-		elseif(!$args->find_account_answer)
+		elseif (!$args->find_account_answer)
 		{
 			unset($args->find_account_answer);
 		}
 
 		// Check if ID is prohibited
-		if($oMemberModel->isDeniedID($args->user_id))
+		if ($oMemberModel->isDeniedID($args->user_id))
 		{
-			return new BaseObject(-1,'denied_user_id');
+			return new BaseObject(-1, 'denied_user_id');
 		}
 
 		// Check if ID is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new BaseObject(-1,'msg_exists_user_id');
+			return new BaseObject(-1, 'msg_exists_user_id');
 		}
 
 		// Check if nickname is prohibited
-		if($oMemberModel->isDeniedNickName($args->nick_name))
+		if ($oMemberModel->isDeniedNickName($args->nick_name))
 		{
-			return new BaseObject(-1,'denied_nick_name');
+			return new BaseObject(-1, 'denied_nick_name');
 		}
 
 		// Check if nickname is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new BaseObject(-1,'msg_exists_nick_name');
+			return new BaseObject(-1, 'msg_exists_nick_name');
 		}
 
 		// Check if email address is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new BaseObject(-1,'msg_exists_email_address');
+			return new BaseObject(-1, 'msg_exists_email_address');
 		}
 
 		// Insert data into the DB
 		$args->list_order = -1 * $args->member_srl;
 
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
-		if(!$args->user_name) $args->user_name = $args->member_srl;
+		if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
+		if (!$args->user_name) $args->user_name = $args->member_srl;
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$output = executeQuery('member.insertMember', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
+		if (is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
 		else $group_srl_list = explode('|@|', $args->group_srl_list);
 		// If no value is entered the default group, the value of group registration
-		if(!$args->group_srl_list)
+		if (!$args->group_srl_list)
 		{
 			$columnList = array('site_srl', 'group_srl');
 			$default_group = $oMemberModel->getDefaultGroup(0, $columnList);
-			if($default_group)
+			if ($default_group)
 			{
 				// Add to the default group
-				$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
-				if(!$output->toBool())
+				$output = $this->addMemberToGroup($args->member_srl, $default_group->group_srl);
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -2222,11 +2222,11 @@ 
 		}
 		else
 		{
-			for($i=0;$i<count($group_srl_list);$i++)
+			for ($i = 0; $i < count($group_srl_list); $i++)
 			{
-				$output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
+				$output = $this->addMemberToGroup($args->member_srl, $group_srl_list[$i]);
 
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -2236,7 +2236,7 @@ 
 
 		$member_config = $oModuleModel->getModuleConfig('member');
 		// When using email authentication mode (when you subscribed members denied a) certified mail sent
-		if($args->denied == 'Y')
+		if ($args->denied == 'Y')
 		{
 			// Insert data into the authentication DB
 			$oPassword = new Password();
@@ -2248,7 +2248,7 @@ 
 			$auth_args->is_register = 'Y';
 
 			$output = executeQuery('member.insertAuthMail', $auth_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -2256,10 +2256,10 @@ 
 			$this->_sendAuthMail($auth_args, $args);
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('member.insertMember', 'after', $args);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -2281,41 +2281,41 @@ 
 	{
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Create a model object
 		$oMemberModel = getModel('member');
 
 		$logged_info = Context::get('logged_info');
 		// Get what you want to modify the original information
-		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		if (!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
 		// Control of essential parameters
-		if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-		if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+		if ($args->allow_mailing != 'Y') $args->allow_mailing = 'N';
+		if ($args->allow_message && !in_array($args->allow_message, array('Y', 'N', 'F'))) $args->allow_message = 'Y';
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
-			if($args->denied!='Y') $args->denied = 'N';
-			if($args->is_admin!='Y' && $logged_info->member_srl != $args->member_srl) $args->is_admin = 'N';
+			if ($args->denied != 'Y') $args->denied = 'N';
+			if ($args->is_admin != 'Y' && $logged_info->member_srl != $args->member_srl) $args->is_admin = 'N';
 		}
 		else
 		{
 			unset($args->is_admin);
-			if($is_admin == false)
+			if ($is_admin == false)
 				unset($args->denied);
-			if($logged_info->member_srl != $args->member_srl && $is_admin == false)
+			if ($logged_info->member_srl != $args->member_srl && $is_admin == false)
 			{
 				return $this->stop('msg_invalid_request');
 			}
 		}
 
 		// Sanitize user ID, username, nickname, homepage, blog
-		if($args->user_id) $args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		if ($args->user_id) $args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->user_name = htmlspecialchars($args->user_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if ($args->homepage && !preg_match("/^[a-z]+:\/\//is", $args->homepage)) $args->homepage = 'http://'.$args->homepage;
+		if ($args->blog && !preg_match("/^[a-z]+:\/\//is", $args->blog)) $args->blog = 'http://'.$args->blog;
 
 		// check member identifier form
 		$config = $oMemberModel->getMemberConfig();
@@ -2324,56 +2324,56 @@ 
 		$orgMemberInfo = $output->data;
 
 		// Check if email address or user ID is duplicate
-		if($config->identifier == 'email_address')
+		if ($config->identifier == 'email_address')
 		{
 			$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new BaseObject(-1,'msg_exists_email_address');
+				return new BaseObject(-1, 'msg_exists_email_address');
 			}
 			$args->email_address = $orgMemberInfo->email_address;
 		}
 		else
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new BaseObject(-1,'msg_exists_user_id');
+				return new BaseObject(-1, 'msg_exists_user_id');
 			}
 
 			$args->user_id = $orgMemberInfo->user_id;
 		}
 
-		if($logged_info->is_admin !== 'Y')
+		if ($logged_info->is_admin !== 'Y')
 		{
 			// Check if ID is prohibited
-			if($args->user_id && $oMemberModel->isDeniedID($args->user_id))
+			if ($args->user_id && $oMemberModel->isDeniedID($args->user_id))
 			{
-				return new BaseObject(-1,'denied_user_id');
+				return new BaseObject(-1, 'denied_user_id');
 			}
 
 			// Check if nickname is prohibited
-			if($args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
+			if ($args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
 			{
 				return new BaseObject(-1, 'denied_nick_name');
 			}
 		}
 
 		// Check if ID is duplicate
-		if($args->user_id)
+		if ($args->user_id)
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new BaseObject(-1,'msg_exists_user_id');
+				return new BaseObject(-1, 'msg_exists_user_id');
 			}
 		}
 
 		// Check if nickname is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
- 		if($member_srl && $args->member_srl != $member_srl)
+ 		if ($member_srl && $args->member_srl != $member_srl)
  		{
- 			return new BaseObject(-1,'msg_exists_nick_name');
+ 			return new BaseObject(-1, 'msg_exists_nick_name');
  		}
 
 		list($args->email_id, $args->email_host) = explode('@', $args->email_address);
@@ -2382,9 +2382,9 @@ 
 		$oDB->begin();
 
 		// Check password strength
-		if($args->password)
+		if ($args->password)
 		{
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new BaseObject(-1, $message[$config->password_strength]);
@@ -2396,55 +2396,55 @@ 
 			$args->password = $orgMemberInfo->password;
 		}
 
-		if($args->find_account_answer) {
+		if ($args->find_account_answer) {
 			$args->find_account_answer = $oMemberModel->hashPassword($args->find_account_answer);
 		}
 		else
 		{
-			$oPassword =  new Password();
+			$oPassword = new Password();
 			$hashed = $oPassword->checkAlgorithm($orgMemberInfo->find_account_answer);
 
-			if($hashed) {
+			if ($hashed) {
 				$args->find_account_answer = $orgMemberInfo->find_account_answer;
 			} else {
 				$args->find_account_answer = $oPassword->createHash($orgMemberInfo->find_account_answer);
 			}
 		}
 
-		if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
-		if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
-		if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
-		if(!$args->description) $args->description = $orgMemberInfo->description;
-		if(!$args->birthday) $args->birthday = '';
+		if (!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
+		if (!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
+		if (!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
+		if (!$args->description) $args->description = $orgMemberInfo->description;
+		if (!$args->birthday) $args->birthday = '';
 
 		$output = executeQuery('member.updateMember', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($args->group_srl_list)
+		if ($args->group_srl_list)
 		{
-			if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
+			if (is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
 			else $group_srl_list = explode('|@|', $args->group_srl_list);
 			// If the group information, group information changes
-			if(count($group_srl_list) > 0)
+			if (count($group_srl_list) > 0)
 			{
 				$args->site_srl = 0;
 				// One of its members to delete all the group
 				$output = executeQuery('member.deleteMemberGroupMember', $args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
 				}
 				// Enter one of the loop a
-				for($i=0;$i<count($group_srl_list);$i++)
+				for ($i = 0; $i < count($group_srl_list); $i++)
 				{
-					$output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
-					if(!$output->toBool())
+					$output = $this->addMemberToGroup($args->member_srl, $group_srl_list[$i]);
+					if (!$output->toBool())
 					{
 						$oDB->rollback();
 						return $output;
@@ -2456,9 +2456,9 @@ 
 			}
 		}
 		// Call a trigger (after)
-		if($output->toBool()) {
+		if ($output->toBool()) {
 			$trigger_output = ModuleHandler::triggerCall('member.updateMember', 'after', $args);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -2471,7 +2471,7 @@ 
 		$this->_clearMemberCache($args->member_srl, $args->site_srl);
 
 		// Save Session
-		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		if (!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
 		$logged_info = Context::get('logged_info');
 
 		$output->add('member_srl', $args->member_srl);
@@ -2483,14 +2483,14 @@ 
 	 */
 	function updateMemberPassword($args)
 	{
-		if($args->password)
+		if ($args->password)
 		{
 
 			// check password strength
 			$oMemberModel = getModel('member');
 			$config = $oMemberModel->getMemberConfig();
 
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new BaseObject(-1, $message[$config->password_strength]);
@@ -2498,13 +2498,13 @@ 
 
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
-		else if($args->hashed_password)
+		else if ($args->hashed_password)
 		{
 			$args->password = $args->hashed_password;
 		}
 
 		$output = executeQuery('member.updateMemberPassword', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$result = executeQuery('member.updateChangePasswordDate', $args);
 		}
@@ -2516,7 +2516,7 @@ 
 
 	function updateFindAccountAnswer($member_srl, $answer)
 	{
-		$oPassword =  new Password();
+		$oPassword = new Password();
 
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
@@ -2533,18 +2533,18 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->member_srl = $member_srl;
 		$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Create a model object
 		$oMemberModel = getModel('member');
 		// Bringing the user's information
-		if(!$this->memberInfo || $this->memberInfo->member_srl != $member_srl || !isset($this->memberInfo->is_admin))
+		if (!$this->memberInfo || $this->memberInfo->member_srl != $member_srl || !isset($this->memberInfo->is_admin))
 		{
 			$columnList = array('member_srl', 'is_admin');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		}
-		if(!$this->memberInfo) return new BaseObject(-1, 'msg_not_exists_member');
+		if (!$this->memberInfo) return new BaseObject(-1, 'msg_not_exists_member');
 		// If managers can not be deleted
-		if($this->memberInfo->is_admin == 'Y') return new BaseObject(-1, 'msg_cannot_delete_admin');
+		if ($this->memberInfo->is_admin == 'Y') return new BaseObject(-1, 'msg_cannot_delete_admin');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2553,7 +2553,7 @@ 
 		$args->member_srl = $member_srl;
 		// Delete the entries in member_auth_mail
 		$output = executeQuery('member.deleteAuthMail', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -2568,23 +2568,23 @@ 
 		 */
 		// Delete the entries in member_group_member
 		$output = executeQuery('member.deleteMemberGroupMember', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// member removed from the table
 		$output = executeQuery('member.deleteMember', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('member.deleteMember', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -2608,23 +2608,23 @@ 
 	 */
 	function destroySessionInfo()
 	{
-		if(!$_SESSION || !is_array($_SESSION)) return;
+		if (!$_SESSION || !is_array($_SESSION)) return;
 
 		$memberInfo = Context::get('logged_info');
 		$memberSrl = $memberInfo->member_srl;
 
-		foreach($_SESSION as $key => $val)
+		foreach ($_SESSION as $key => $val)
 		{
 			$_SESSION[$key] = '';
 		}
 
 		session_destroy();
-		setcookie(session_name(), '', $_SERVER['REQUEST_TIME']-42000);
-		setcookie('sso','',$_SERVER['REQUEST_TIME']-42000);
-		setcookie('xeak','',$_SERVER['REQUEST_TIME']-42000);
+		setcookie(session_name(), '', $_SERVER['REQUEST_TIME'] - 42000);
+		setcookie('sso', '', $_SERVER['REQUEST_TIME'] - 42000);
+		setcookie('xeak', '', $_SERVER['REQUEST_TIME'] - 42000);
 		setcookie('xe_logged', 'false', $_SERVER['REQUEST_TIME'] - 42000);
 
-		if($memberSrl || $_COOKIE['xeak'])
+		if ($memberSrl || $_COOKIE['xeak'])
 		{
 			$args = new stdClass();
 			$args->member_srl = $memberSrl;
@@ -2640,22 +2640,22 @@ 
 		$pointGroup = $pointModuleConfig->point_group;
 
 		$levelGroup = array();
-		if(is_array($pointGroup) && count($pointGroup)>0)
+		if (is_array($pointGroup) && count($pointGroup) > 0)
 		{
 			$levelGroup = array_flip($pointGroup);
 			ksort($levelGroup);
 		}
 		$maxLevel = 0;
 		$resultGroup = array_intersect($levelGroup, $groupSrlList);
-		if(count($resultGroup) > 0)
+		if (count($resultGroup) > 0)
 			$maxLevel = max(array_flip($resultGroup));
 
-		if($maxLevel > 0)
+		if ($maxLevel > 0)
 		{
 			$oPointModel = getModel('point');
 			$originPoint = $oPointModel->getPoint($memberSrl);
 
-			if($pointModuleConfig->level_step[$maxLevel] > $originPoint)
+			if ($pointModuleConfig->level_step[$maxLevel] > $originPoint)
 			{
 				$oPointController = getController('point');
 				$oPointController->setPoint($memberSrl, $pointModuleConfig->level_step[$maxLevel], 'update');
@@ -2665,18 +2665,18 @@ 
 
 	function procMemberModifyEmailAddress()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
 
 		$member_info = Context::get('logged_info');
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail) return $this->stop('msg_invalid_request');
+		if (!$newEmail) return $this->stop('msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl) return new BaseObject(-1,'msg_exists_email_address');
+		if ($member_srl) return new BaseObject(-1, 'msg_exists_email_address');
 
-		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
+		if ($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -2692,7 +2692,7 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -2702,7 +2702,7 @@ 
 		$member_config = $oModuleModel->getModuleConfig('member');
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if (!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
 		global $lang;
 
@@ -2714,17 +2714,17 @@ 
 
 		Context::set('newEmail', $newEmail);
 
-		$auth_url = getFullUrl('','module','member','act','procMemberAuthEmailAddress','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
+		$auth_url = getFullUrl('', 'module', 'member', 'act', 'procMemberAuthEmailAddress', 'member_srl', $member_info->member_srl, 'auth_key', $auth_args->auth_key);
 		Context::set('auth_url', $auth_url);
 
 		$oTemplate = &TemplateHandler::getInstance();
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_new_email');
 
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('title_modify_email_address') );
+		$oMail->setTitle(Context::getLang('title_modify_email_address'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->nick_name, $newEmail );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($member_info->nick_name, $newEmail);
 		$result = $oMail->send();
 
 		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
@@ -2738,16 +2738,16 @@ 
 	{
 		$member_srl = Context::get('member_srl');
 		$auth_key = Context::get('auth_key');
-		if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
+		if (!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
 
 		// Test logs for finding password by user_id and authkey
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$args->auth_key = $auth_key;
 		$output = executeQuery('member.getAuthMail', $args);
-		if(!$output->toBool() || $output->data->auth_key != $auth_key)
+		if (!$output->toBool() || $output->data->auth_key != $auth_key)
 		{
-			if(strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthChangeEmailAddress', $args);
+			if (strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthChangeEmailAddress', $args);
 			return $this->stop('msg_invalid_modify_email_auth_key');
 		}
 
@@ -2756,10 +2756,10 @@ 
 		list($args->email_id, $args->email_host) = explode('@', $newEmail);
 
 		$output = executeQuery('member.updateMemberEmailAddress', $args);
-		if(!$output->toBool()) return $this->stop($output->getMessage());
+		if (!$output->toBool()) return $this->stop($output->getMessage());
 
 		// Remove all values having the member_srl and new_password equal to 'XE_change_emaill_address' from authentication table
-		executeQuery('member.deleteAuthChangeEmailAddress',$args);
+		executeQuery('member.deleteAuthChangeEmailAddress', $args);
 
 		$this->_clearMemberCache($args->member_srl);
 
@@ -2777,7 +2777,7 @@ 
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new BaseObject();
+		if (!Context::get('is_logged')) return new BaseObject();
 
 		$logged_info = Context::get('logged_info');
 		$document_srl = Context::get('target_srl');
@@ -2788,12 +2788,12 @@ 
 		$member_srl = $oDocument->get('member_srl');
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$member_srl) return new BaseObject();
-		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new BaseObject();
+		if (!$member_srl) return new BaseObject();
+		if ($oDocumentModel->grant->manager != 1 || $member_srl == $logged_info->member_srl) return new BaseObject();
 
 		$oDocumentController = getController('document');
-		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
-		$oDocumentController->addDocumentPopupMenu($url,'cmd_spammer','','popup');
+		$url = getUrl('', 'module', 'member', 'act', 'dispMemberSpammer', 'member_srl', $member_srl, 'module_srl', $module_srl);
+		$oDocumentController->addDocumentPopupMenu($url, 'cmd_spammer', '', 'popup');
 
 		return new BaseObject();
 	}
@@ -2807,7 +2807,7 @@ 
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new BaseObject();
+		if (!Context::get('is_logged')) return new BaseObject();
 
 		$logged_info = Context::get('logged_info');
 		$comment_srl = Context::get('target_srl');
@@ -2818,12 +2818,12 @@ 
 		$module_srl = $oComment->get('module_srl');
 		$member_srl = $oComment->get('member_srl');
 
-		if(!$member_srl) return new BaseObject();
-		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new BaseObject();
+		if (!$member_srl) return new BaseObject();
+		if ($oCommentModel->grant->manager != 1 || $member_srl == $logged_info->member_srl) return new BaseObject();
 
 		$oCommentController = getController('comment');
-		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
-		$oCommentController->addCommentPopupMenu($url,'cmd_spammer','','popup');
+		$url = getUrl('', 'module', 'member', 'act', 'dispMemberSpammer', 'member_srl', $member_srl, 'module_srl', $module_srl);
+		$oCommentController->addCommentPopupMenu($url, 'cmd_spammer', '', 'popup');
 
 		return new BaseObject();
 	}
@@ -2835,7 +2835,7 @@ 
 	**/
 	function procMemberSpammerManage()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = Context::get('member_srl');
@@ -2843,7 +2843,7 @@ 
 		$cnt_loop = Context::get('cnt_loop');
 		$proc_type = Context::get('proc_type');
 		$isMoveToTrash = true;
-		if($proc_type == "delete")
+		if ($proc_type == "delete")
 			$isMoveToTrash = false;
 
 		// check grant
@@ -2852,7 +2852,7 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		$proc_msg = "";
 
@@ -2861,10 +2861,10 @@ 
 
 		// delete or trash destination
 		// proc member
-		if($cnt_loop == 1)
+		if ($cnt_loop == 1)
 			$this->_spammerMember($member_srl);
 		// proc document and comment
-		elseif($cnt_loop>1)
+		elseif ($cnt_loop > 1)
 			$this->_spammerDocuments($member_srl, $isMoveToTrash);
 
 		// get destination count
@@ -2873,11 +2873,11 @@ 
 
 		$total_count = Context::get('total_count');
 		$remain_count = $cnt_document + $cnt_comment;
-		if($cnt_loop == 1) $total_count = $remain_count;
+		if ($cnt_loop == 1) $total_count = $remain_count;
 
 		// get progress percent
-		if($total_count > 0)
-			$progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 );
+		if ($total_count > 0)
+			$progress = intval((($total_count - $remain_count) / $total_count) * 100);
 		else
 			$progress = 100;
 
@@ -2901,7 +2901,7 @@ 
 	**/
 	private function _spammerMember($member_srl) {
 		$logged_info = Context::get('logged_info');
-		$spam_description = trim( Context::get('spam_description') );
+		$spam_description = trim(Context::get('spam_description'));
 
 		$oMemberModel = getModel('member');
 		$columnList = array('member_srl', 'email_address', 'user_id', 'nick_name', 'description');
@@ -2920,10 +2920,10 @@ 
 		$args->user_id = $member_info->user_id;
 		$args->nick_name = $member_info->nick_name;
 		$args->denied = "Y";
-		$args->description = trim( $member_info->description );
-		if( $args->description != "" ) $args->description .= "\n";	// add new line
+		$args->description = trim($member_info->description);
+		if ($args->description != "") $args->description .= "\n"; // add new line
 
-		$args->description .= Context::getLang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . " docuemnts count:" . $total_count . "]";
+		$args->description .= Context::getLang('cmd_spammer')."[".date("Y-m-d H:i:s")." from:".$logged_info->user_id." info:".$spam_description." docuemnts count:".$total_count."]";
 
 		$output = $this->updateMember($args, true);
 
@@ -2952,21 +2952,21 @@ 
 		// 1. proc comment, 2. proc document
 		$cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl);
 		$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl);
-		if($cnt_comment > 0)
+		if ($cnt_comment > 0)
 		{
 			$columnList = array();
 			$commentList = $oCommentModel->getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
-			if($commentList) {
-				foreach($commentList as $v) {
+			if ($commentList) {
+				foreach ($commentList as $v) {
 					$oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash);
 				}
 			}
-		} elseif($cnt_document > 0) {
+		} elseif ($cnt_document > 0) {
 			$columnList = array();
 			$documentList = $oDocumentModel->getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
-			if($documentList) {
-				foreach($documentList as $v) {
-					if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v);
+			if ($documentList) {
+				foreach ($documentList as $v) {
+					if ($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v);
 					else $oDocumentController->deleteDocument($v->document_srl);
 				}
 			}
@@ -2978,24 +2978,24 @@ 
 	function _clearMemberCache($member_srl, $site_srl = 0)
 	{
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_' . $site_srl;
+			$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_'.$site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 
-			if($site_srl !== 0)
+			if ($site_srl !== 0)
 			{
-				$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
+				$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_0';
 				$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 				$oCacheHandler->delete($cache_key);
 			}
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
+			$object_key = 'member_info:'.getNumberingPath($member_srl).$member_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}

Braces +568 added lines, -250 removed lines

@@ -41,19 +41,31 @@ 
 		}
 
 		// Variables
-		if(!$user_id) $user_id = Context::get('user_id');
+		if(!$user_id) {
+			$user_id = Context::get('user_id');
+		}
 		$user_id = trim($user_id);
 
-		if(!$password) $password = Context::get('password');
+		if(!$password) {
+			$password = Context::get('password');
+		}
 		$password = trim($password);
 
-		if(!$keep_signed) $keep_signed = Context::get('keep_signed');
+		if(!$keep_signed) {
+			$keep_signed = Context::get('keep_signed');
+		}
 		// Return an error when id and password doesn't exist
-		if(!$user_id) return new BaseObject(-1,'null_user_id');
-		if(!$password) return new BaseObject(-1,'null_password');
+		if(!$user_id) {
+			return new BaseObject(-1,'null_user_id');
+		}
+		if(!$password) {
+			return new BaseObject(-1,'null_password');
+		}
 
 		$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
-		if (!$output->toBool()) return $output;
+		if (!$output->toBool()) {
+			return $output;
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
@@ -80,8 +92,7 @@ 
 		if(!$config->after_login_url)
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
-		}
-		else
+		} else
 		{
 			$returnUrl = $config->after_login_url;
 		}
@@ -98,19 +109,24 @@ 
 		// Call a trigger before log-out (before)
 		$logged_info = Context::get('logged_info');
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'before', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// Destroy session information
 		$this->destroySessionInfo();
 		// Call a trigger after log-out (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$output = new BaseObject();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($config->after_logout_url)
-			$output->redirect_url = $config->after_logout_url;
+		if($config->after_logout_url) {
+					$output->redirect_url = $config->after_logout_url;
+		}
 
 		$this->_clearMemberCache($logged_info->member_srl);
 
@@ -127,12 +143,18 @@ 
 		$oModuleModel = &getModel('module');
 
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) $document_srl = (int)Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			$document_srl = (int)Context::get('target_srl');
+		}
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		// Get document
 		$oDocumentModel = getModel('document');
@@ -180,11 +202,15 @@ 
 
 		// Check if already scrapped
 		$output = executeQuery('member.getScrapDocument', $args);
-		if($output->data->count) return new BaseObject(-1, 'msg_alreay_scrapped');
+		if($output->data->count) {
+			return new BaseObject(-1, 'msg_alreay_scrapped');
+		}
 
 		// Insert
 		$output = executeQuery('member.addScrapDocument', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setError(-1);
 		$this->setMessage('success_registed');
@@ -198,11 +224,15 @@ 
 	function procMemberDeleteScrap()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// Variables
 		$args = new stdClass;
 		$args->member_srl = $logged_info->member_srl;
@@ -228,11 +258,15 @@ 
 	function procMemberDeleteSavedDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
@@ -260,7 +294,9 @@ 
 	{
 		$name = Context::get('name');
 		$value = Context::get('value');
-		if(!$value) return;
+		if(!$value) {
+			return;
+		}
 
 		$oMemberModel = getModel('member');
 		// Check if logged-in
@@ -271,10 +307,14 @@ 
 		{
 			case 'user_id' :
 				// Check denied ID
-				if($oMemberModel->isDeniedID($value)) return new BaseObject(0,'denied_user_id');
+				if($oMemberModel->isDeniedID($value)) {
+					return new BaseObject(0,'denied_user_id');
+				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_user_id');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new BaseObject(0,'msg_exists_user_id');
+				}
 				break;
 			case 'nick_name' :
 				// Check denied ID
@@ -284,13 +324,17 @@ 
 				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_nick_name');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new BaseObject(0,'msg_exists_nick_name');
+				}
 
 				break;
 			case 'email_address' :
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_email_address');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new BaseObject(0,'msg_exists_email_address');
+				}
 				break;
 		}
 	}
@@ -302,17 +346,25 @@ 
 	 */
 	function procMemberInsert()
 	{
-		if (Context::getRequestMethod () == "GET") return new BaseObject(-1, "msg_invalid_request");
+		if (Context::getRequestMethod () == "GET") {
+			return new BaseObject(-1, "msg_invalid_request");
+		}
 		$oMemberModel = &getModel ('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// call a trigger (before)
 		$trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
-		if(!$trigger_output->toBool ()) return $trigger_output;
+		if(!$trigger_output->toBool ()) {
+			return $trigger_output;
+		}
 		// Check if an administrator allows a membership
-		if($config->enable_join != 'Y') return $this->stop ('msg_signup_disabled');
+		if($config->enable_join != 'Y') {
+			return $this->stop ('msg_signup_disabled');
+		}
 		// Check if the user accept the license terms (only if terms exist)
-		if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
+		if($config->agreement && Context::get('accept_agreement')!='Y') {
+			return $this->stop('msg_accept_agreement');
+		}
 
 		// Extract the necessary information in advance
 		$getVars = array();
@@ -331,16 +383,22 @@ 
 		foreach($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if($val == 'birthday') {
+				$args->birthday_ui = Context::get('birthday_ui');
+			}
 		}
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if(!$args->birthday && $args->birthday_ui) {
+			$args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		}
 
 		$args->find_account_answer = Context::get('find_account_answer');
 		$args->allow_mailing = Context::get('allow_mailing');
 		$args->allow_message = Context::get('allow_message');
 
-		if($args->password1) $args->password = $args->password1;
+		if($args->password1) {
+			$args->password = $args->password1;
+		}
 
 		// check password strength
 		if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
@@ -369,7 +427,9 @@ 
 		unset($all_args->secret_text);
 
 		// Set the user state as "denied" when using mail authentication
-		if($config->enable_confirm == 'Y') $args->denied = 'Y';
+		if($config->enable_confirm == 'Y') {
+			$args->denied = 'Y';
+		}
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
@@ -384,7 +444,9 @@ 
 			}
 		}
 		$output = $this->insertMember($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// insert ProfileImage, ImageName, ImageMark
 		$profile_image = $_FILES['profile_image'];
@@ -423,43 +485,46 @@ 
 			if($config->identifier == 'email_address')
 			{
 				$output = $this->doLogin($args->email_address);
-			}
-			else
+			} else
 			{
 				$output = $this->doLogin($args->user_id);
 			}
 			if(!$output->toBool()) {
-				if($output->error == -9)
-					$output->error = -11;
+				if($output->error == -9) {
+									$output->error = -11;
+				}
 				return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), $output);
 			}
 		}
 
 		// Results
 		$this->add('member_srl', $args->member_srl);
-		if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
+		if($config->redirect_url) {
+			$this->add('redirect_url', $config->redirect_url);
+		}
 		if($config->enable_confirm == 'Y')
 		{
 			$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
 			$this->setMessage($msg);
 			return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new BaseObject(-12, $msg));
+		} else {
+			$this->setMessage('success_registed');
 		}
-		else $this->setMessage('success_registed');
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		if($config->redirect_url)
 		{
 			$returnUrl = $config->redirect_url;
-		}
-		else
+		} else
 		{
 			if(Context::get('success_return_url'))
 			{
 				$returnUrl = Context::get('success_return_url');
-			}
-			else if($_COOKIE['XE_REDIRECT_URL'])
+			} else if($_COOKIE['XE_REDIRECT_URL'])
 			{
 				$returnUrl = $_COOKIE['XE_REDIRECT_URL'];
 				setcookie("XE_REDIRECT_URL", '', 1);
@@ -513,8 +578,7 @@ 
 		if(Context::get('success_return_url'))
 		{
 			$redirectUrl = Context::get('success_return_url');
-		}
-		else
+		} else
 		{
 			$redirectUrl = getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		}
@@ -558,7 +622,9 @@ 
 		foreach($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if($val == 'birthday') {
+				$args->birthday_ui = Context::get('birthday_ui');
+			}
 			if($val == 'find_account_answer' && !Context::get($val)) {
 				unset($args->{$val});
 			}
@@ -568,7 +634,9 @@ 
 		$logged_info = Context::get('logged_info');
 		$args->member_srl = $logged_info->member_srl;
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if(!$args->birthday && $args->birthday_ui) {
+			$args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		}
 
 		// Remove some unnecessary variables from all the vars
 		$all_args = Context::getRequestVars();
@@ -603,7 +671,9 @@ 
 
 		// Execute insert or update depending on the value of member_srl
 		$output = $this->updateMember($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$profile_image = $_FILES['profile_image'];
 		if(is_uploaded_file($profile_image['tmp_name']))
@@ -633,7 +703,9 @@ 
 
 		// Call a trigger after successfully log-in (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberModifyInfo', 'after', $this->memberInfo);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$this->setSessionInfo();
 		// Return result
@@ -654,7 +726,9 @@ 
 	 */
 	function procMemberModifyPassword()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return $this->stop('msg_not_logged');
+		}
 		// Extract the necessary information in advance
 		$current_password = trim(Context::get('current_password'));
 		$password = trim(Context::get('password1'));
@@ -668,17 +742,23 @@ 
 
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new BaseObject(-1, 'invalid_password');
+		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) {
+			return new BaseObject(-1, 'invalid_password');
+		}
 
 		// Check if a new password is as same as the previous password
-		if($current_password == $password) return new BaseObject(-1, 'invalid_new_password');
+		if($current_password == $password) {
+			return new BaseObject(-1, 'invalid_new_password');
+		}
 
 		// Execute insert or update depending on the value of member_srl
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$args->password = $password;
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('member_srl', $args->member_srl);
 		$this->setMessage('success_updated');
@@ -694,7 +774,9 @@ 
 	 */
 	function procMemberLeave()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return $this->stop('msg_not_logged');
+		}
 		// Extract the necessary information in advance
 		$password = trim(Context::get('password'));
 		// Get information of logged-in user
@@ -710,10 +792,14 @@ 
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new BaseObject(-1, 'invalid_password');
+		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) {
+			return new BaseObject(-1, 'invalid_password');
+		}
 
 		$output = $this->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Destroy all session information
 		$this->destroySessionInfo();
 		// Return success message
@@ -732,20 +818,30 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['profile_image'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
+		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 
 		$output = $this->insertProfileImage($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		$this->setRedirectUrl($returnUrl);
@@ -768,8 +864,9 @@ 
 		$max_filesize = $config->profile_image_max_filesize;
 		foreach($config->signupForm as $val)
 		{
-			if($val->name == "profile_image")
-				$allow_transparent = $val->allow_transparent_thumbnail == 'Y';
+			if($val->name == "profile_image") {
+							$allow_transparent = $val->allow_transparent_thumbnail == 'Y';
+			}
 		}
 
 		Context::loadLang(_XE_PATH_ . 'modules/file/lang');
@@ -777,10 +874,13 @@ 
 		// Get file information
 		FileHandler::clearStatCache($target_file);
 		list($width, $height, $type) = @getimagesize($target_file);
-		if(IMAGETYPE_PNG == $type) $ext = 'png';
-		elseif(IMAGETYPE_JPEG == $type) $ext = 'jpg';
-		elseif(IMAGETYPE_GIF == $type) $ext = 'gif';
-		else
+		if(IMAGETYPE_PNG == $type) {
+			$ext = 'png';
+		} elseif(IMAGETYPE_JPEG == $type) {
+			$ext = 'jpg';
+		} elseif(IMAGETYPE_GIF == $type) {
+			$ext = 'gif';
+		} else
 		{
 			return $this->stop('msg_not_uploaded_profile_image');
 		}
@@ -811,8 +911,7 @@ 
 			FileHandler::removeFilesInDir($target_path);
 			FileHandler::moveFile($temp_filename, $target_filename);
 			FileHandler::clearStatCache($target_filename);
-		}
-		else
+		} else
 		{
 			// 파일 용량 제한
 			$filesize = filesize($target_file);
@@ -841,20 +940,30 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_name'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
+		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 
 		$output = $this->insertImageName($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Page refresh
 		//$this->setRefreshPage();
@@ -909,8 +1018,7 @@ 
 			FileHandler::removeFilesInDir($target_path);
 			FileHandler::moveFile($temp_filename, $target_filename);
 			FileHandler::clearStatCache($target_filename);
-		}
-		else
+		} else
 		{
 			// 파일 용량 제한
 			$filesize = filesize($target_file);
@@ -987,20 +1095,30 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_mark'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 		// Membership in the images mark the module using the ban was set by an administrator or return;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
+		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 
 		$this->insertImageMark($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		$this->setRedirectUrl($returnUrl);
@@ -1051,8 +1169,7 @@ 
 			FileHandler::removeFilesInDir($target_path);
 			FileHandler::moveFile($temp_filename, $target_filename);
 			FileHandler::clearStatCache($target_filename);
-		}
-		else
+		} else
 		{
 			$filesize = filesize($target_file);
 			if($max_filesize && $filesize > ($max_filesize * 1024))
@@ -1104,14 +1221,18 @@ 
 	function procMemberFindAccount()
 	{
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$email_address) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$oModuleModel = getModel('module');
 
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new BaseObject(-1, 'msg_email_not_exists');
+		if(!$member_srl) {
+			return new BaseObject(-1, 'msg_email_not_exists');
+		}
 
 		// Get information of the member
 		$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
@@ -1123,7 +1244,9 @@ 
 			$chk_args = new stdClass;
 			$chk_args->member_srl = $member_info->member_srl;
 			$output = executeQuery('member.chkAuthMail', $chk_args);
-			if($output->toBool() && $output->data->count != '0') return new BaseObject(-1, 'msg_user_not_confirmed');
+			if($output->toBool() && $output->data->count != '0') {
+				return new BaseObject(-1, 'msg_user_not_confirmed');
+			}
 		}
 
 		// Insert data into the authentication DB
@@ -1136,7 +1259,9 @@ 
 		$args->is_register = 'N';
 
 		$output = executeQuery('member.insertAuthMail', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Get content of the email to send a member
 		Context::set('auth_args', $args);
 
@@ -1153,8 +1278,7 @@ 
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
 			}
-		}
-		else
+		} else
 		{
 			$memberInfo[$lang->user_id] = $args->user_id;
 			$memberInfo[$lang->user_name] = $args->user_name;
@@ -1163,13 +1287,19 @@ 
 		}
 		Context::set('memberInfo', $memberInfo);
 
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if(!$member_config->skin) {
+			$member_config->skin = "default";
+		}
+		if(!$member_config->colorset) {
+			$member_config->colorset = "white";
+		}
 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if(!is_dir($tpl_path)) {
+			$tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		}
 
 		$find_url = getFullUrl ('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $args->auth_key);
 		Context::set('find_url', $find_url);
@@ -1212,19 +1342,25 @@ 
 		$find_account_question = trim(Context::get('find_account_question'));
 		$find_account_answer = trim(Context::get('find_account_answer'));
 
-		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new BaseObject(-1, 'msg_invalid_request');
+		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new BaseObject(-1, 'msg_email_not_exists');
+		if(!$member_srl) {
+			return new BaseObject(-1, 'msg_email_not_exists');
+		}
 
 		// Get information of the member
 		$columnList = array('member_srl', 'find_account_question', 'find_account_answer');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Display a message if no answer is entered
-		if(!$member_info->find_account_question || !$member_info->find_account_answer) return new BaseObject(-1, 'msg_question_not_exists');
+		if(!$member_info->find_account_question || !$member_info->find_account_answer) {
+			return new BaseObject(-1, 'msg_question_not_exists');
+		}
 
 		// 답변 확인
 		$hashed = $oPassword->checkAlgorithm($member_info->find_account_answer);
@@ -1233,12 +1369,10 @@ 
 		if($member_info->find_account_question != $find_account_question)
 		{
 			$authed = false;
-		}
-		else if($hashed && !$oPassword->checkPassword($find_account_answer, $member_info->find_account_answer))
+		} else if($hashed && !$oPassword->checkPassword($find_account_answer, $member_info->find_account_answer))
 		{
 			$authed = false;
-		}
-		else if(!$hashed && $find_account_answer != $member_info->find_account_answer)
+		} else if(!$hashed && $find_account_answer != $member_info->find_account_answer)
 		{
 			$authed = false;
 		}
@@ -1267,7 +1401,9 @@ 
 		$args->password = $temp_password;
 		$args->change_password_date = '1';
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$_SESSION['xe_temp_password_' . $user_id] = $temp_password;
 
@@ -1324,8 +1460,7 @@ 
 		if($output->data->is_register == 'Y')
 		{
 			$args->denied = 'N';
-		}
-		else
+		} else
 		{
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
@@ -1359,33 +1494,45 @@ 
 	{
 		// Get an email_address
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$email_address) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		// Log test by using email_address
 		$oMemberModel = getModel('member');
 
 		$args = new stdClass;
 		$args->email_address = $email_address;
 		$memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$memberSrl) return new BaseObject(-1, 'msg_not_exists_member');
+		if(!$memberSrl) {
+			return new BaseObject(-1, 'msg_not_exists_member');
+		}
 
 		$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if(!$member_config->skin) {
+			$member_config->skin = "default";
+		}
+		if(!$member_config->colorset) {
+			$member_config->colorset = "white";
+		}
 
 		// Check if a authentication mail has been sent previously
 		$chk_args = new stdClass;
 		$chk_args->member_srl = $member_info->member_srl;
 		$output = executeQuery('member.chkAuthMail', $chk_args);
-		if($output->toBool() && $output->data->count == '0') return new BaseObject(-1, 'msg_invalid_request');
+		if($output->toBool() && $output->data->count == '0') {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$auth_args = new stdClass;
 		$auth_args->member_srl = $member_info->member_srl;
 		$output = executeQueryArray('member.getAuthMailInfo', $auth_args);
-		if(!$output->data || !$output->data[0]->auth_key)  return new BaseObject(-1, 'msg_invalid_request');
+		if(!$output->data || !$output->data[0]->auth_key) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		$auth_info = $output->data[0];
 
 		// Update the regdate of authmail entry
@@ -1406,8 +1553,7 @@ 
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
 			}
-		}
-		else
+		} else
 		{
 			$memberInfo[$lang->user_id] = $member_info->user_id;
 			$memberInfo[$lang->user_name] = $member_info->user_name;
@@ -1420,7 +1566,9 @@ 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if(!is_dir($tpl_path)) {
+			$tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		}
 
 		$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_info->auth_key);
 		Context::set('auth_url', $auth_url);
@@ -1498,7 +1646,9 @@ 
 		$auth_args->is_register = 'Y';
 
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$memberInfo->email_address = $newEmail;
 
@@ -1532,8 +1682,7 @@ 
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
 			}
-		}
-		else
+		} else
 		{
 			$memberInfo[$lang->user_id] = $member_info->user_id;
 			$memberInfo[$lang->user_name] = $member_info->user_name;
@@ -1542,13 +1691,19 @@ 
 		}
 		Context::set('memberInfo', $memberInfo);
 
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if(!$member_config->skin) {
+			$member_config->skin = "default";
+		}
+		if(!$member_config->colorset) {
+			$member_config->colorset = "white";
+		}
 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if(!is_dir($tpl_path)) {
+			$tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		}
 
 		$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
 		Context::set('auth_url', $auth_url);
@@ -1573,7 +1728,9 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new BaseObject(-1,'msg_invalid_request');
+		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$columnList = array('site_srl', 'group_srl', 'title');
@@ -1592,13 +1749,17 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new BaseObject(-1,'msg_invalid_request');
+		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$args = new stdClass;
 		$args->site_srl= $site_module_info->site_srl;
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		$this->setMessage('success_deleted');
 		$this->_clearMemberCache($args->member_srl, $site_module_info->site_srl);
 	}
@@ -1612,17 +1773,37 @@ 
 	 */
 	function setMemberConfig($args)
 	{
-		if(!$args->skin) $args->skin = "default";
-		if(!$args->colorset) $args->colorset = "white";
-		if(!$args->editor_skin) $args->editor_skin= "ckeditor";
-		if(!$args->editor_colorset) $args->editor_colorset = "moono";
-		if($args->enable_join!='Y') $args->enable_join = 'N';
+		if(!$args->skin) {
+			$args->skin = "default";
+		}
+		if(!$args->colorset) {
+			$args->colorset = "white";
+		}
+		if(!$args->editor_skin) {
+			$args->editor_skin= "ckeditor";
+		}
+		if(!$args->editor_colorset) {
+			$args->editor_colorset = "moono";
+		}
+		if($args->enable_join!='Y') {
+			$args->enable_join = 'N';
+		}
 		$args->enable_openid= 'N';
-		if($args->profile_image !='Y') $args->profile_image = 'N';
-		if($args->image_name!='Y') $args->image_name = 'N';
-		if($args->image_mark!='Y') $args->image_mark = 'N';
-		if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
-		if(!trim(strip_tags($args->agreement))) $args->agreement = null;
+		if($args->profile_image !='Y') {
+			$args->profile_image = 'N';
+		}
+		if($args->image_name!='Y') {
+			$args->image_name = 'N';
+		}
+		if($args->image_mark!='Y') {
+			$args->image_mark = 'N';
+		}
+		if($args->group_image_mark!='Y') {
+			$args->group_image_mark = 'N';
+		}
+		if(!trim(strip_tags($args->agreement))) {
+			$args->agreement = null;
+		}
 		$args->limit_day = (int)$args->limit_day;
 
 		$agreement = trim($args->agreement);
@@ -1630,7 +1811,9 @@ 
 
 		$oModuleController = getController('module');
 		$output = $oModuleController->insertModuleConfig('member',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
 		FileHandler::writeFile($agreement_file, $agreement);
@@ -1655,7 +1838,9 @@ 
 		$path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($member_srl));
 		$filename = sprintf('%s%d.signature.php', $path, $member_srl);
 
-		if(!$check_signature) return FileHandler::removeFile($filename);
+		if(!$check_signature) {
+			return FileHandler::removeFile($filename);
+		}
 
 		$buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);
 		FileHandler::makeDir($path);
@@ -1689,7 +1874,9 @@ 
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$args->group_srl = $group_srl;
-		if($site_srl) $args->site_srl = $site_srl;
+		if($site_srl) {
+			$args->site_srl = $site_srl;
+		}
 
 		// Add
 		$output = executeQuery('member.addMemberToGroup',$args);
@@ -1715,15 +1902,21 @@ 
 		$obj->member_srl = implode(',',$args->member_srl);
 
 		$output = executeQueryArray('member.getMembersGroup', $obj);
-		if($output->data) foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
+		if($output->data) {
+			foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
+		}
 
 		$output = executeQuery('member.deleteMembersGroup', $obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$inserted_members = array();
 		foreach($args->member_srl as $key => $val)
 		{
-			if($inserted_members[$val]) continue;
+			if($inserted_members[$val]) {
+				continue;
+			}
 			$inserted_members[$val] = true;
 
 			unset($obj);
@@ -1733,7 +1926,9 @@ 
 			$obj->site_srl = $args->site_srl;
 			$obj->regdate = $date[$obj->member_srl];
 			$output = executeQuery('member.addMemberToGroup', $obj);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$this->_clearMemberCache($obj->member_srl, $args->site_srl);
 		}
@@ -1795,8 +1990,7 @@ 
 				if($config->identifier == 'user_id')
 				{
 					$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
-				}
-				else
+				} else
 				{
 					$member_info = $oMemberModel->getMemberInfoByEmailAddress($user_id, $columnList);
 				}
@@ -1805,8 +1999,7 @@ 
 					$do_auto_login = true;
 				}
 
-			}
-			else
+			} else
 			{
 				$do_auto_login = true;
 			}
@@ -1815,8 +2008,7 @@ 
 		if($do_auto_login)
 		{
 			$output = $this->doLogin($user_id);
-		}
-		else
+		} else
 		{
 			executeQuery('member.deleteAutologin', $args);
 			setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365);
@@ -1835,13 +2027,17 @@ 
 	function doLogin($user_id, $password = '', $keep_signed = false)
 	{
 		$user_id = strtolower($user_id);
-		if(!$user_id) return new BaseObject(-1, 'null_user_id');
+		if(!$user_id) {
+			return new BaseObject(-1, 'null_user_id');
+		}
 		// Call a trigger before log-in (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->user_id = $user_id;
 		$trigger_obj->password = $password;
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// Create a member model object
 		$oMemberModel = getModel('member');
 
@@ -1856,15 +2052,18 @@ 
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_email_address');
+			if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) {
+				return $this->recordLoginError(-1, 'invalid_email_address');
+			}
 
-		}
-		else
+		} else
 		{
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_user_id');
+			if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) {
+				return $this->recordLoginError(-1, 'invalid_user_id');
+			}
 		}
 
 		$output = executeQuery('member.getLoginCountByIp', $args);
@@ -1876,14 +2075,18 @@ 
 			if($term < $config->max_error_count_time)
 			{
 				$term = $config->max_error_count_time - $term;
-				if($term < 60) $term = intval($term).Context::getLang('unit_sec');
-				elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
-				elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
-				else $term = intval($term/86400).Context::getLang('unit_day');
+				if($term < 60) {
+					$term = intval($term).Context::getLang('unit_sec');
+				} elseif(60 <= $term && $term < 3600) {
+					$term = intval($term/60).Context::getLang('unit_min');
+				} elseif(3600 <= $term && $term < 86400) {
+					$term = intval($term/3600).Context::getLang('unit_hour');
+				} else {
+					$term = intval($term/86400).Context::getLang('unit_day');
+				}
 
 				return new BaseObject(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
-			}
-			else
+			} else
 			{
 				$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 				$output = executeQuery('member.deleteLoginCountByIp', $args);
@@ -1910,7 +2113,9 @@ 
 			return new BaseObject(-1,'msg_user_denied');
 		}
 		// Notify if denied_date is less than the current time
-		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new BaseObject(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) {
+			return new BaseObject(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		}
 		// Update the latest login time
 		$args->member_srl = $this->memberInfo->member_srl;
 		$output = executeQuery('member.updateLastLogin', $args);
@@ -1959,7 +2164,9 @@ 
 		}
 		// Call a trigger after successfully log-in (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $this->memberInfo);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// When user checked to use auto-login
 		if($keep_signed)
 		{
@@ -1973,7 +2180,9 @@ 
 			$autologin_args->member_srl = $this->memberInfo->member_srl;
 			executeQuery('member.deleteAutologin', $autologin_args);
 			$autologin_output = executeQuery('member.insertAutologin', $autologin_args);
-			if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, $_SERVER['REQUEST_TIME']+31536000);
+			if($autologin_output->toBool()) {
+				setCookie('xeak',$autologin_args->autologin_key, $_SERVER['REQUEST_TIME']+31536000);
+			}
 		}
 		if($this->memberInfo->is_admin == 'Y')
 		{
@@ -2062,7 +2271,9 @@ 
 	function addMemberPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$member_popup_menu_list = Context::get('member_popup_menu_list');
-		if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
+		if(!is_array($member_popup_menu_list)) {
+			$member_popup_menu_list = array();
+		}
 
 		$obj = new stdClass;
 		$obj->url = $url;
@@ -2081,35 +2292,54 @@ 
 	{
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('member.insertMember', 'before', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Terms and Conditions portion of the information set up by members reaffirmed
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
 		$logged_info = Context::get('logged_info');
 		// If the date of the temporary restrictions limit further information on the date of
-		if($config->limit_day) $args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME']+$config->limit_day*60*60*24);
+		if($config->limit_day) {
+			$args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME']+$config->limit_day*60*60*24);
+		}
 
 		$args->member_srl = getNextSequence();
 		$args->list_order = -1 * $args->member_srl;
 
 		// Execute insert or update depending on the value of member_srl
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
+		if(!$args->user_id) {
+			$args->user_id = 't'.$args->member_srl;
+		}
 		// Enter the user's identity changed to lowercase
-		else $args->user_id = strtolower($args->user_id);
-		if(!$args->user_name) $args->user_name = $args->member_srl;
-		if(!$args->nick_name) $args->nick_name = $args->member_srl;
+		else {
+			$args->user_id = strtolower($args->user_id);
+		}
+		if(!$args->user_name) {
+			$args->user_name = $args->member_srl;
+		}
+		if(!$args->nick_name) {
+			$args->nick_name = $args->member_srl;
+		}
 
 		// Control of essential parameters
-		if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-		if($args->denied!='Y') $args->denied = 'N';
-		if(!$args->allow_message || ($args->allow_message && !in_array($args->allow_message, array('Y','N','F')))) $args->allow_message = 'Y';
+		if($args->allow_mailing!='Y') {
+			$args->allow_mailing = 'N';
+		}
+		if($args->denied!='Y') {
+			$args->denied = 'N';
+		}
+		if(!$args->allow_message || ($args->allow_message && !in_array($args->allow_message, array('Y','N','F')))) {
+			$args->allow_message = 'Y';
+		}
 
 		if($logged_info->is_admin == 'Y')
 		{
-			if($args->is_admin!='Y') $args->is_admin = 'N';
-		}
-		else
+			if($args->is_admin!='Y') {
+				$args->is_admin = 'N';
+			}
+		} else
 		{
 			unset($args->is_admin);
 		}
@@ -2122,8 +2352,12 @@ 
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) {
+			$args->homepage = 'http://'.$args->homepage;
+		}
+		if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) {
+			$args->blog = 'http://'.$args->blog;
+		}
 
 		// Create a model object
 		$oMemberModel = getModel('member');
@@ -2137,8 +2371,7 @@ 
 				return new BaseObject(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		elseif(!$args->password)
+		} elseif(!$args->password)
 		{
 			unset($args->password);
 		}
@@ -2146,8 +2379,7 @@ 
 		if($args->find_account_answer && !$password_is_hashed)
 		{
 			$args->find_account_answer = $oMemberModel->hashPassword($args->find_account_answer);
-		}
-		elseif(!$args->find_account_answer)
+		} elseif(!$args->find_account_answer)
 		{
 			unset($args->find_account_answer);
 		}
@@ -2188,8 +2420,12 @@ 
 		// Insert data into the DB
 		$args->list_order = -1 * $args->member_srl;
 
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
-		if(!$args->user_name) $args->user_name = $args->member_srl;
+		if(!$args->user_id) {
+			$args->user_id = 't'.$args->member_srl;
+		}
+		if(!$args->user_name) {
+			$args->user_name = $args->member_srl;
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2201,8 +2437,11 @@ 
 			return $output;
 		}
 
-		if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
-		else $group_srl_list = explode('|@|', $args->group_srl_list);
+		if(is_array($args->group_srl_list)) {
+			$group_srl_list = $args->group_srl_list;
+		} else {
+			$group_srl_list = explode('|@|', $args->group_srl_list);
+		}
 		// If no value is entered the default group, the value of group registration
 		if(!$args->group_srl_list)
 		{
@@ -2219,8 +2458,7 @@ 
 				}
 			}
 			// If the value is the value of the group entered the group registration
-		}
-		else
+		} else
 		{
 			for($i=0;$i<count($group_srl_list);$i++)
 			{
@@ -2281,27 +2519,39 @@ 
 	{
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Create a model object
 		$oMemberModel = getModel('member');
 
 		$logged_info = Context::get('logged_info');
 		// Get what you want to modify the original information
-		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		if(!$this->memberInfo) {
+			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		}
 		// Control of essential parameters
-		if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-		if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+		if($args->allow_mailing!='Y') {
+			$args->allow_mailing = 'N';
+		}
+		if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) {
+			$args->allow_message = 'Y';
+		}
 
 		if($logged_info->is_admin == 'Y')
 		{
-			if($args->denied!='Y') $args->denied = 'N';
-			if($args->is_admin!='Y' && $logged_info->member_srl != $args->member_srl) $args->is_admin = 'N';
-		}
-		else
+			if($args->denied!='Y') {
+				$args->denied = 'N';
+			}
+			if($args->is_admin!='Y' && $logged_info->member_srl != $args->member_srl) {
+				$args->is_admin = 'N';
+			}
+		} else
 		{
 			unset($args->is_admin);
-			if($is_admin == false)
-				unset($args->denied);
+			if($is_admin == false) {
+							unset($args->denied);
+			}
 			if($logged_info->member_srl != $args->member_srl && $is_admin == false)
 			{
 				return $this->stop('msg_invalid_request');
@@ -2309,13 +2559,19 @@ 
 		}
 
 		// Sanitize user ID, username, nickname, homepage, blog
-		if($args->user_id) $args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		if($args->user_id) {
+			$args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		}
 		$args->user_name = htmlspecialchars($args->user_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) {
+			$args->homepage = 'http://'.$args->homepage;
+		}
+		if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) {
+			$args->blog = 'http://'.$args->blog;
+		}
 
 		// check member identifier form
 		$config = $oMemberModel->getMemberConfig();
@@ -2332,8 +2588,7 @@ 
 				return new BaseObject(-1,'msg_exists_email_address');
 			}
 			$args->email_address = $orgMemberInfo->email_address;
-		}
-		else
+		} else
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
 			if($member_srl && $args->member_srl != $member_srl)
@@ -2390,16 +2645,14 @@ 
 				return new BaseObject(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		else
+		} else
 		{
 			$args->password = $orgMemberInfo->password;
 		}
 
 		if($args->find_account_answer) {
 			$args->find_account_answer = $oMemberModel->hashPassword($args->find_account_answer);
-		}
-		else
+		} else
 		{
 			$oPassword =  new Password();
 			$hashed = $oPassword->checkAlgorithm($orgMemberInfo->find_account_answer);
@@ -2411,11 +2664,21 @@ 
 			}
 		}
 
-		if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
-		if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
-		if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
-		if(!$args->description) $args->description = $orgMemberInfo->description;
-		if(!$args->birthday) $args->birthday = '';
+		if(!$args->user_name) {
+			$args->user_name = $orgMemberInfo->user_name;
+		}
+		if(!$args->user_id) {
+			$args->user_id = $orgMemberInfo->user_id;
+		}
+		if(!$args->nick_name) {
+			$args->nick_name = $orgMemberInfo->nick_name;
+		}
+		if(!$args->description) {
+			$args->description = $orgMemberInfo->description;
+		}
+		if(!$args->birthday) {
+			$args->birthday = '';
+		}
 
 		$output = executeQuery('member.updateMember', $args);
 
@@ -2427,8 +2690,11 @@ 
 
 		if($args->group_srl_list)
 		{
-			if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
-			else $group_srl_list = explode('|@|', $args->group_srl_list);
+			if(is_array($args->group_srl_list)) {
+				$group_srl_list = $args->group_srl_list;
+			} else {
+				$group_srl_list = explode('|@|', $args->group_srl_list);
+			}
 			// If the group information, group information changes
 			if(count($group_srl_list) > 0)
 			{
@@ -2471,7 +2737,9 @@ 
 		$this->_clearMemberCache($args->member_srl, $args->site_srl);
 
 		// Save Session
-		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		if(!$this->memberInfo) {
+			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		}
 		$logged_info = Context::get('logged_info');
 
 		$output->add('member_srl', $args->member_srl);
@@ -2497,8 +2765,7 @@ 
 			}
 
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		else if($args->hashed_password)
+		} else if($args->hashed_password)
 		{
 			$args->password = $args->hashed_password;
 		}
@@ -2533,7 +2800,9 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->member_srl = $member_srl;
 		$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Create a model object
 		$oMemberModel = getModel('member');
 		// Bringing the user's information
@@ -2542,9 +2811,13 @@ 
 			$columnList = array('member_srl', 'is_admin');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		}
-		if(!$this->memberInfo) return new BaseObject(-1, 'msg_not_exists_member');
+		if(!$this->memberInfo) {
+			return new BaseObject(-1, 'msg_not_exists_member');
+		}
 		// If managers can not be deleted
-		if($this->memberInfo->is_admin == 'Y') return new BaseObject(-1, 'msg_cannot_delete_admin');
+		if($this->memberInfo->is_admin == 'Y') {
+			return new BaseObject(-1, 'msg_cannot_delete_admin');
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2608,7 +2881,9 @@ 
 	 */
 	function destroySessionInfo()
 	{
-		if(!$_SESSION || !is_array($_SESSION)) return;
+		if(!$_SESSION || !is_array($_SESSION)) {
+			return;
+		}
 
 		$memberInfo = Context::get('logged_info');
 		$memberSrl = $memberInfo->member_srl;
@@ -2647,8 +2922,9 @@ 
 		}
 		$maxLevel = 0;
 		$resultGroup = array_intersect($levelGroup, $groupSrlList);
-		if(count($resultGroup) > 0)
-			$maxLevel = max(array_flip($resultGroup));
+		if(count($resultGroup) > 0) {
+					$maxLevel = max(array_flip($resultGroup));
+		}
 
 		if($maxLevel > 0)
 		{
@@ -2665,16 +2941,22 @@ 
 
 	function procMemberModifyEmailAddress()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return $this->stop('msg_not_logged');
+		}
 
 		$member_info = Context::get('logged_info');
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail) return $this->stop('msg_invalid_request');
+		if(!$newEmail) {
+			return $this->stop('msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl) return new BaseObject(-1,'msg_exists_email_address');
+		if($member_srl) {
+			return new BaseObject(-1,'msg_exists_email_address');
+		}
 
 		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
@@ -2702,7 +2984,9 @@ 
 		$member_config = $oModuleModel->getModuleConfig('member');
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if(!is_dir($tpl_path)) {
+			$tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		}
 
 		global $lang;
 
@@ -2738,7 +3022,9 @@ 
 	{
 		$member_srl = Context::get('member_srl');
 		$auth_key = Context::get('auth_key');
-		if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
+		if(!$member_srl || !$auth_key) {
+			return $this->stop('msg_invalid_request');
+		}
 
 		// Test logs for finding password by user_id and authkey
 		$args = new stdClass;
@@ -2747,7 +3033,9 @@ 
 		$output = executeQuery('member.getAuthMail', $args);
 		if(!$output->toBool() || $output->data->auth_key != $auth_key)
 		{
-			if(strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthChangeEmailAddress', $args);
+			if(strlen($output->data->auth_key) !== strlen($auth_key)) {
+				executeQuery('member.deleteAuthChangeEmailAddress', $args);
+			}
 			return $this->stop('msg_invalid_modify_email_auth_key');
 		}
 
@@ -2756,7 +3044,9 @@ 
 		list($args->email_id, $args->email_host) = explode('@', $newEmail);
 
 		$output = executeQuery('member.updateMemberEmailAddress', $args);
-		if(!$output->toBool()) return $this->stop($output->getMessage());
+		if(!$output->toBool()) {
+			return $this->stop($output->getMessage());
+		}
 
 		// Remove all values having the member_srl and new_password equal to 'XE_change_emaill_address' from authentication table
 		executeQuery('member.deleteAuthChangeEmailAddress',$args);
@@ -2777,7 +3067,9 @@ 
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new BaseObject();
+		if(!Context::get('is_logged')) {
+			return new BaseObject();
+		}
 
 		$logged_info = Context::get('logged_info');
 		$document_srl = Context::get('target_srl');
@@ -2788,8 +3080,12 @@ 
 		$member_srl = $oDocument->get('member_srl');
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$member_srl) return new BaseObject();
-		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new BaseObject();
+		if(!$member_srl) {
+			return new BaseObject();
+		}
+		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) {
+			return new BaseObject();
+		}
 
 		$oDocumentController = getController('document');
 		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@@ -2807,7 +3103,9 @@ 
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new BaseObject();
+		if(!Context::get('is_logged')) {
+			return new BaseObject();
+		}
 
 		$logged_info = Context::get('logged_info');
 		$comment_srl = Context::get('target_srl');
@@ -2818,8 +3116,12 @@ 
 		$module_srl = $oComment->get('module_srl');
 		$member_srl = $oComment->get('member_srl');
 
-		if(!$member_srl) return new BaseObject();
-		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new BaseObject();
+		if(!$member_srl) {
+			return new BaseObject();
+		}
+		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) {
+			return new BaseObject();
+		}
 
 		$oCommentController = getController('comment');
 		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@@ -2835,7 +3137,9 @@ 
 	**/
 	function procMemberSpammerManage()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = Context::get('member_srl');
@@ -2843,8 +3147,9 @@ 
 		$cnt_loop = Context::get('cnt_loop');
 		$proc_type = Context::get('proc_type');
 		$isMoveToTrash = true;
-		if($proc_type == "delete")
-			$isMoveToTrash = false;
+		if($proc_type == "delete") {
+					$isMoveToTrash = false;
+		}
 
 		// check grant
 		$oModuleModel = getModel('module');
@@ -2852,7 +3157,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$proc_msg = "";
 
@@ -2861,11 +3168,13 @@ 
 
 		// delete or trash destination
 		// proc member
-		if($cnt_loop == 1)
-			$this->_spammerMember($member_srl);
+		if($cnt_loop == 1) {
+					$this->_spammerMember($member_srl);
+		}
 		// proc document and comment
-		elseif($cnt_loop>1)
-			$this->_spammerDocuments($member_srl, $isMoveToTrash);
+		elseif($cnt_loop>1) {
+					$this->_spammerDocuments($member_srl, $isMoveToTrash);
+		}
 
 		// get destination count
 		$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl);
@@ -2873,13 +3182,16 @@ 
 
 		$total_count = Context::get('total_count');
 		$remain_count = $cnt_document + $cnt_comment;
-		if($cnt_loop == 1) $total_count = $remain_count;
+		if($cnt_loop == 1) {
+			$total_count = $remain_count;
+		}
 
 		// get progress percent
-		if($total_count > 0)
-			$progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 );
-		else
-			$progress = 100;
+		if($total_count > 0) {
+					$progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 );
+		} else {
+					$progress = 100;
+		}
 
 		$this->add('total_count', $total_count);
 		$this->add('remain_count', $remain_count);
@@ -2921,7 +3233,10 @@ 
 		$args->nick_name = $member_info->nick_name;
 		$args->denied = "Y";
 		$args->description = trim( $member_info->description );
-		if( $args->description != "" ) $args->description .= "\n";	// add new line
+		if( $args->description != "" ) {
+			$args->description .= "\n";
+		}
+		// add new line
 
 		$args->description .= Context::getLang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . " docuemnts count:" . $total_count . "]";
 
@@ -2966,8 +3281,11 @@ 
 			$documentList = $oDocumentModel->getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
 			if($documentList) {
 				foreach($documentList as $v) {
-					if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v);
-					else $oDocumentController->deleteDocument($v->document_srl);
+					if($isMoveToTrash) {
+						$oDocumentController->moveDocumentToTrash($v);
+					} else {
+						$oDocumentController->deleteDocument($v->document_srl);
+					}
 				}
 			}
 		}

modules/module/module.class.php

Spacing +113 added lines, -113 removed lines

@@ -16,8 +16,8 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"), true);
-		$oDB->addIndex('sites','unique_domain',array('domain'),true);
+		$oDB->addIndex("modules", "idx_site_mid", array("site_srl", "mid"), true);
+		$oDB->addIndex('sites', 'unique_domain', array('domain'), true);
 		// Create a directory to use in the module module
 		FileHandler::makeDir('./files/cache/module_info');
 		FileHandler::makeDir('./files/cache/triggers');
@@ -27,21 +27,21 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = $oDB->executeQuery('module.getSite', $args);
-		if(!$output->data || !$output->data->index_module_srl)
+		if (!$output->data || !$output->data->index_module_srl)
 		{
 			$db_info = Context::getDBInfo();
 			$domain = Context::getDefaultUrl();
 			$url_info = parse_url($domain);
-			$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+			$domain = $url_info['host'].((!empty($url_info['port']) && $url_info['port'] != 80) ? ':'.$url_info['port'] : '').$url_info['path'];
 
 			$site_args = new stdClass;
 			$site_args->site_srl = 0;
-			$site_args->index_module_srl  = 0;
+			$site_args->index_module_srl = 0;
 			$site_args->domain = $domain;
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		return new BaseObject();
@@ -56,68 +56,68 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 Add multi-index in the table, the module_part_config
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+			if (!$oDB->isIndexExists("module_part_config", "idx_module_part_config")) return true;
 			// 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
-			if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+			if (!$oDB->isIndexExists('modules', "idx_site_mid")) return true;
 			// Move permissions/skin information of all modules to the table, grants.
-			if($oDB->isColumnExists('modules', 'grants')) return true;
+			if ($oDB->isColumnExists('modules', 'grants')) return true;
 			// Move permissions/skin information of all modules to the table, grants.
-			if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+			if (!$oDB->isColumnExists('sites', 'default_language')) return true;
 			// Delete extra_vars* column
-			for($i=1;$i<=20;$i++)
+			for ($i = 1; $i <= 20; $i++)
 			{
-				if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+				if ($oDB->isColumnExists("documents", "extra_vars".$i)) return true;
 			}
 			// Insert site information to the table, sites
 			$args = new stdClass();
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data) return true;
+			if (!$output->data) return true;
 
 			// If domain index is defined on the table, sites
-			if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-			if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+			if ($oDB->isIndexExists('sites', 'idx_domain')) return true;
+			if (!$oDB->isIndexExists('sites', 'unique_domain')) return true;
 
-			if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-			if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-			if(!$oDB->isColumnExists("modules", "mskin")) return true;
+			if (!$oDB->isColumnExists("modules", "use_mobile")) return true;
+			if (!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
+			if (!$oDB->isColumnExists("modules", "mcontent")) return true;
+			if (!$oDB->isColumnExists("modules", "mskin")) return true;
 
 			// check fix skin
-			if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+			if (!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
 
-			if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+			if (!$oDB->isColumnExists("module_config", "site_srl")) return true;
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
-			if($output->data && count($output->data) > 0)
+			if ($output->data && count($output->data) > 0)
 			{
-				foreach($output->data as $item)
+				foreach ($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
+					if (count($skin_path) != 2) continue;
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
 				}
 			}
 
 			// XE 1.7
 
 			// check fix mskin
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
+			if (!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
 
-			if(!$oDB->isIndexExists("module_part_config", "unique_module_part_config")) return true;
+			if (!$oDB->isIndexExists("module_part_config", "unique_module_part_config")) return true;
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue) return true;
+			if (!$moduleConfig->isUpdateFixedValue) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if (!is_dir('./files/ruleset')) return true;
 
 		return false;
 	}
@@ -131,22 +131,22 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 module_part_config Add a multi-index to the table and check all information of module_configg
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config"))
+			if (!$oDB->isIndexExists("module_part_config", "idx_module_part_config"))
 			{
 				$oModuleModel = getModel('module');
 				$oModuleController = getController('module');
 				$modules = $oModuleModel->getModuleList();
-				foreach($modules as $key => $module_info)
+				foreach ($modules as $key => $module_info)
 				{
 					$module = $module_info->module;
-					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+					if (!in_array($module, array('point', 'trackback', 'layout', 'rss', 'file', 'comment', 'editor'))) continue;
 					$config = $oModuleModel->getModuleConfig($module);
 
 					$module_config = null;
-					switch($module)
+					switch ($module)
 					{
 						case 'point' :
 							$module_config = $config->module_point;
@@ -159,21 +159,21 @@ 
 						case 'editor' :
 							$module_config = $config->module_config;
 							unset($config->module_config);
-							if(is_array($module_config) && count($module_config))
+							if (is_array($module_config) && count($module_config))
 							{
-								foreach($module_config as $key => $val)
+								foreach ($module_config as $key => $val)
 								{
-									if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+									if (isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
 								}
 							}
 							break;
 						case 'layout' :
 							$tmp = $config->header_script;
-							if(is_array($tmp) && count($tmp))
+							if (is_array($tmp) && count($tmp))
 							{
-								foreach($tmp as $k => $v)
+								foreach ($tmp as $k => $v)
 								{
-									if(!$v && !trim($v)) continue;
+									if (!$v && !trim($v)) continue;
 									$module_config[$k]->header_script = $v;
 								}
 							}
@@ -183,29 +183,29 @@ 
 
 					$oModuleController->insertModuleConfig($module, $config);
 
-					if(is_array($module_config) && count($module_config))
+					if (is_array($module_config) && count($module_config))
 					{
-						foreach($module_config as $module_srl => $module_part_config)
+						foreach ($module_config as $module_srl => $module_part_config)
 						{
-							$oModuleController->insertModulePartConfig($module,$module_srl,$module_part_config);
+							$oModuleController->insertModulePartConfig($module, $module_srl, $module_part_config);
 						}
 					}
 				}
-				$oDB->addIndex("module_part_config","idx_module_part_config", array("module","module_srl"));
+				$oDB->addIndex("module_part_config", "idx_module_part_config", array("module", "module_srl"));
 			}
 			// 2008. 11. 13 drop index(unique_mid). Add a column and index on site_srl and mid columns
-			if(!$oDB->isIndexExists('modules',"idx_site_mid"))
+			if (!$oDB->isIndexExists('modules', "idx_site_mid"))
 			{
-				$oDB->dropIndex("modules","unique_mid",true);
-				$oDB->addColumn('modules','site_srl','number',11,0,true);
-				$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
+				$oDB->dropIndex("modules", "unique_mid", true);
+				$oDB->addColumn('modules', 'site_srl', 'number', 11, 0, true);
+				$oDB->addIndex("modules", "idx_site_mid", array("site_srl", "mid"), true);
 			}
 			// document extra vars
-			if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			if (!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
 
-			if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			if (!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
 			// Move permission, skin info, extection info, admin ID of all modules to the table, grants
-			if($oDB->isColumnExists('modules', 'grants'))
+			if ($oDB->isColumnExists('modules', 'grants'))
 			{
 				$oModuleController = getController('module');
 				$oDocumentController = getController('document');
@@ -213,26 +213,26 @@ 
 				$lang_code = Context::getLangType();
 				// Get module_info of all modules
 				$output = executeQueryArray('module.getModuleInfos');
-				if(count($output->data))
+				if (count($output->data))
 				{
-					foreach($output->data as $module_info)
+					foreach ($output->data as $module_info)
 					{
 						// Separate information about permission granted to the module, extra vars, skin vars, super-admin's authority
 						$module_srl = trim($module_info->module_srl);
 						// grant an authority
 						$grants = unserialize($module_info->grants);
-						if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+						if ($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
 						// Insert skin vars
 						$skin_vars = unserialize($module_info->skin_vars);
-						if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						if ($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
 						// Insert super admin's ID
 						$admin_id = trim($module_info->admin_id);
-						if($admin_id && $admin_id != 'Array')
+						if ($admin_id && $admin_id != 'Array')
 						{
-							$admin_ids = explode(',',$admin_id);
-							if(count($admin_id))
+							$admin_ids = explode(',', $admin_id);
+							if (count($admin_id))
 							{
-								foreach($admin_ids as $admin_id)
+								foreach ($admin_ids as $admin_id)
 								{
 									$oModuleController->insertAdminId($module_srl, $admin_id);
 								}
@@ -241,20 +241,20 @@ 
 						// Save extra configurations for each module(column data which doesn't exist in the defaut modules)
 						$extra_vars = unserialize($module_info->extra_vars);
 						$document_extra_keys = null;
-						if($extra_vars->extra_vars && count($extra_vars->extra_vars))
+						if ($extra_vars->extra_vars && count($extra_vars->extra_vars))
 						{
 							$document_extra_keys = $extra_vars->extra_vars;
 							unset($extra_vars->extra_vars);
 						}
-						if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
 
 						/**
 						 * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
 						 */
 						// Insert extra vars if planet module is
-						if($module_info->module == 'planet')
+						if ($module_info->module == 'planet')
 						{
-							if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+							if (!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
 							$planet_extra_keys->name = 'postscript';
 							$planet_extra_keys->type = 'text';
 							$planet_extra_keys->is_required = 'N';
@@ -264,9 +264,9 @@ 
 							$document_extra_keys[20] = $planet_extra_keys;
 						}
 						// Register keys for document extra vars
-						if(count($document_extra_keys))
+						if (count($document_extra_keys))
 						{
-							foreach($document_extra_keys as $var_idx => $val)
+							foreach ($document_extra_keys as $var_idx => $val)
 							{
 								$oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc, 'extra_vars'.$var_idx);
 							}
@@ -274,7 +274,7 @@ 
 							$oDocumentModel = getModel('document');
 							$total_count = $oDocumentModel->getDocumentCount($module_srl);
 
-							if($total_count > 0)
+							if ($total_count > 0)
 							{
 								$per_page = 100;
 								$total_pages = (int) (($total_count - 1) / $per_page) + 1;
@@ -285,19 +285,19 @@ 
 								$doc_args->sort_index = 'list_order';
 								$doc_args->order_type = 'asc';
 
-								for($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++)
+								for ($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++)
 								{
 									$output = executeQueryArray('document.getDocumentList', $doc_args);
 
-									if($output->toBool() && $output->data && count($output->data))
+									if ($output->toBool() && $output->data && count($output->data))
 									{
 										foreach ($output->data as $document)
 										{
-											if(!$document) continue;
+											if (!$document) continue;
 											foreach ($document as $key => $var)
 											{
 												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
-												$var_idx = str_replace('extra_vars','',$key);
+												$var_idx = str_replace('extra_vars', '', $key);
 												$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
 											}
 										}
@@ -313,96 +313,96 @@ 
 						executeQuery('module.updateModule', $module_info);
 
 						$oCacheHandler = CacheHandler::getInstance('object', null, true);
-						if($oCacheHandler->isSupport())
+						if ($oCacheHandler->isSupport())
 						{
 							$oCacheHandler->invalidateGroupKey('site_and_module');
 						}
 					}
 				}
 				// Various column drop
-				$oDB->dropColumn('modules','grants');
-				$oDB->dropColumn('modules','admin_id');
-				$oDB->dropColumn('modules','skin_vars');
-				$oDB->dropColumn('modules','extra_vars');
+				$oDB->dropColumn('modules', 'grants');
+				$oDB->dropColumn('modules', 'admin_id');
+				$oDB->dropColumn('modules', 'skin_vars');
+				$oDB->dropColumn('modules', 'extra_vars');
 			}
 			// Rights of all modules/skins transferring the information into a table Update grants
-			if(!$oDB->isColumnExists('sites', 'default_language'))
+			if (!$oDB->isColumnExists('sites', 'default_language'))
 			{
-				$oDB->addColumn('sites','default_language','varchar',255,0,false);
+				$oDB->addColumn('sites', 'default_language', 'varchar', 255, 0, false);
 			}
 			// extra_vars * Remove Column
-			for($i=1;$i<=20;$i++)
+			for ($i = 1; $i <= 20; $i++)
 			{
-				if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
-				$oDB->dropColumn('documents','extra_vars'.$i);
+				if (!$oDB->isColumnExists("documents", "extra_vars".$i)) continue;
+				$oDB->dropColumn('documents', 'extra_vars'.$i);
 			}
 
 			// Enter the main site information sites on the table
 			$args = new stdClass;
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data)
+			if (!$output->data)
 			{
 				// Basic mid, language Wanted
 				$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
 				$db_info = Context::getDBInfo();
 				$domain = Context::getDefaultUrl();
 				$url_info = parse_url($domain);
-				$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+				$domain = $url_info['host'].((!empty($url_info['port']) && $url_info['port'] != 80) ? ':'.$url_info['port'] : '').$url_info['path'];
 				$site_args->site_srl = 0;
-				$site_args->index_module_srl  = $mid_output->data->module_srl;
+				$site_args->index_module_srl = $mid_output->data->module_srl;
 				$site_args->domain = $domain;
 				$site_args->default_language = $db_info->lang_type;
 
 				$output = executeQuery('module.insertSite', $site_args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 
-			if($oDB->isIndexExists('sites','idx_domain'))
+			if ($oDB->isIndexExists('sites', 'idx_domain'))
 			{
-				$oDB->dropIndex('sites','idx_domain');
+				$oDB->dropIndex('sites', 'idx_domain');
 			}
-			if(!$oDB->isIndexExists('sites','unique_domain'))
+			if (!$oDB->isIndexExists('sites', 'unique_domain'))
 			{
 				$this->updateForUniqueSiteDomain();
-				$oDB->addIndex('sites','unique_domain',array('domain'),true);
+				$oDB->addIndex('sites', 'unique_domain', array('domain'), true);
 			}
 
-			if(!$oDB->isColumnExists("modules", "use_mobile"))
+			if (!$oDB->isColumnExists("modules", "use_mobile"))
 			{
-				$oDB->addColumn('modules','use_mobile','char',1,'N');
+				$oDB->addColumn('modules', 'use_mobile', 'char', 1, 'N');
 			}
-			if(!$oDB->isColumnExists("modules", "mlayout_srl"))
+			if (!$oDB->isColumnExists("modules", "mlayout_srl"))
 			{
-				$oDB->addColumn('modules','mlayout_srl','number',11, 0);
+				$oDB->addColumn('modules', 'mlayout_srl', 'number', 11, 0);
 			}
-			if(!$oDB->isColumnExists("modules", "mcontent"))
+			if (!$oDB->isColumnExists("modules", "mcontent"))
 			{
-				$oDB->addColumn('modules','mcontent','bigtext');
+				$oDB->addColumn('modules', 'mcontent', 'bigtext');
 			}
-			if(!$oDB->isColumnExists("modules", "mskin"))
+			if (!$oDB->isColumnExists("modules", "mskin"))
 			{
-				$oDB->addColumn('modules','mskin','varchar',250);
+				$oDB->addColumn('modules', 'mskin', 'varchar', 250);
 			}
-			if(!$oDB->isColumnExists("modules", "is_skin_fix"))
+			if (!$oDB->isColumnExists("modules", "is_skin_fix"))
 			{
 				$oDB->addColumn('modules', 'is_skin_fix', 'char', 1, 'N');
 				$output = executeQuery('module.updateSkinFixModules');
 			}
-			if(!$oDB->isColumnExists("module_config", "site_srl"))
+			if (!$oDB->isColumnExists("module_config", "site_srl"))
 			{
 				$oDB->addColumn('module_config', 'site_srl', 'number', 11, 0, true);
 			}
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
-			if($output->data && count($output->data) > 0)
+			if ($output->data && count($output->data) > 0)
 			{
-				foreach($output->data as $item)
+				foreach ($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
+					if (count($skin_path) != 2) continue;
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 					{
 						unset($args);
 						$args->skin = $item->skin;
@@ -413,7 +413,7 @@ 
 			}
 
 			// XE 1.7
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix"))
+			if (!$oDB->isColumnExists("modules", "is_mskin_fix"))
 			{
 				$oDB->addColumn('modules', 'is_mskin_fix', 'char', 1, 'N');
 				$output = executeQuery('module.updateMobileSkinFixModules');
@@ -421,18 +421,18 @@ 
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue)
+			if (!$moduleConfig->isUpdateFixedValue)
 			{
 				$output = executeQuery('module.updateSkinFixModules');
 				$output = executeQuery('module.updateMobileSkinFixModules');
 
 				$oModuleController = getController('module');
-				if(!$moduleConfig) $moduleConfig = new stdClass;
+				if (!$moduleConfig) $moduleConfig = new stdClass;
 				$moduleConfig->isUpdateFixedValue = TRUE;
 				$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
 			}
 
-			if(!$oDB->isIndexExists("module_part_config", "unique_module_part_config"))
+			if (!$oDB->isIndexExists("module_part_config", "unique_module_part_config"))
 			{
 				$oDB->addIndex("module_part_config", "unique_module_part_config", array("module", "module_srl"), TRUE);
 			}
@@ -440,7 +440,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
+		if (!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
 
 		return new BaseObject(0, 'success_updated');
 	}
@@ -448,18 +448,18 @@ 
 	function updateForUniqueSiteDomain()
 	{
 		$output = executeQueryArray("module.getNonuniqueDomains");
-		if(!$output->data) return;
-		foreach($output->data as $data)
+		if (!$output->data) return;
+		foreach ($output->data as $data)
 		{
-			if($data->count == 1) continue;
+			if ($data->count == 1) continue;
 			$domain = $data->domain;
 			$args = new stdClass;
 			$args->domain = $domain;
 			$output2 = executeQueryArray("module.getSiteByDomain", $args);
 			$bFirst = true;
-			foreach($output2->data as $site)
+			foreach ($output2->data as $site)
 			{
-				if($bFirst)
+				if ($bFirst)
 				{
 					$bFirst = false;
 					continue;

Braces +117 added lines, -39 removed lines

@@ -41,7 +41,9 @@ 
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		return new BaseObject();
@@ -59,37 +61,65 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 Add multi-index in the table, the module_part_config
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) {
+				return true;
+			}
 			// 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
-			if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+			if(!$oDB->isIndexExists('modules',"idx_site_mid")) {
+				return true;
+			}
 			// Move permissions/skin information of all modules to the table, grants.
-			if($oDB->isColumnExists('modules', 'grants')) return true;
+			if($oDB->isColumnExists('modules', 'grants')) {
+				return true;
+			}
 			// Move permissions/skin information of all modules to the table, grants.
-			if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+			if(!$oDB->isColumnExists('sites', 'default_language')) {
+				return true;
+			}
 			// Delete extra_vars* column
 			for($i=1;$i<=20;$i++)
 			{
-				if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+				if($oDB->isColumnExists("documents","extra_vars".$i)) {
+					return true;
+				}
 			}
 			// Insert site information to the table, sites
 			$args = new stdClass();
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data) return true;
+			if(!$output->data) {
+				return true;
+			}
 
 			// If domain index is defined on the table, sites
-			if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-			if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+			if($oDB->isIndexExists('sites', 'idx_domain')) {
+				return true;
+			}
+			if(!$oDB->isIndexExists('sites','unique_domain')) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-			if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-			if(!$oDB->isColumnExists("modules", "mskin")) return true;
+			if(!$oDB->isColumnExists("modules", "use_mobile")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mlayout_srl")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mcontent")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mskin")) {
+				return true;
+			}
 
 			// check fix skin
-			if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+			if(!$oDB->isColumnExists("modules", "is_skin_fix")) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+			if(!$oDB->isColumnExists("module_config", "site_srl")) {
+				return true;
+			}
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
@@ -98,26 +128,38 @@ 
 				foreach($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
+					if(count($skin_path) != 2) {
+						continue;
+					}
+					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) {
+						return true;
+					}
 				}
 			}
 
 			// XE 1.7
 
 			// check fix mskin
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
+			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) {
+				return true;
+			}
 
-			if(!$oDB->isIndexExists("module_part_config", "unique_module_part_config")) return true;
+			if(!$oDB->isIndexExists("module_part_config", "unique_module_part_config")) {
+				return true;
+			}
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue) return true;
+			if(!$moduleConfig->isUpdateFixedValue) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if(!is_dir('./files/ruleset')) {
+			return true;
+		}
 
 		return false;
 	}
@@ -142,7 +184,9 @@ 
 				foreach($modules as $key => $module_info)
 				{
 					$module = $module_info->module;
-					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) {
+						continue;
+					}
 					$config = $oModuleModel->getModuleConfig($module);
 
 					$module_config = null;
@@ -163,7 +207,9 @@ 
 							{
 								foreach($module_config as $key => $val)
 								{
-									if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+									if(isset($module_config[$key]->module_srl)) {
+										unset($module_config[$key]->module_srl);
+									}
 								}
 							}
 							break;
@@ -173,7 +219,9 @@ 
 							{
 								foreach($tmp as $k => $v)
 								{
-									if(!$v && !trim($v)) continue;
+									if(!$v && !trim($v)) {
+										continue;
+									}
 									$module_config[$k]->header_script = $v;
 								}
 							}
@@ -201,9 +249,13 @@ 
 				$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
 			}
 			// document extra vars
-			if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			if(!$oDB->isTableExists('document_extra_vars')) {
+				$oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			}
 
-			if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			if(!$oDB->isTableExists('document_extra_keys')) {
+				$oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			}
 			// Move permission, skin info, extection info, admin ID of all modules to the table, grants
 			if($oDB->isColumnExists('modules', 'grants'))
 			{
@@ -221,10 +273,14 @@ 
 						$module_srl = trim($module_info->module_srl);
 						// grant an authority
 						$grants = unserialize($module_info->grants);
-						if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+						if($grants) {
+							$oModuleController->insertModuleGrants($module_srl, $grants);
+						}
 						// Insert skin vars
 						$skin_vars = unserialize($module_info->skin_vars);
-						if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						if($skin_vars) {
+							$oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						}
 						// Insert super admin's ID
 						$admin_id = trim($module_info->admin_id);
 						if($admin_id && $admin_id != 'Array')
@@ -246,7 +302,9 @@ 
 							$document_extra_keys = $extra_vars->extra_vars;
 							unset($extra_vars->extra_vars);
 						}
-						if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						if($extra_vars) {
+							$oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						}
 
 						/**
 						 * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
@@ -254,7 +312,9 @@ 
 						// Insert extra vars if planet module is
 						if($module_info->module == 'planet')
 						{
-							if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+							if(!$document_extra_keys || !is_array($document_extra_keys)) {
+								$document_extra_keys = array();
+							}
 							$planet_extra_keys->name = 'postscript';
 							$planet_extra_keys->type = 'text';
 							$planet_extra_keys->is_required = 'N';
@@ -293,10 +353,14 @@ 
 									{
 										foreach ($output->data as $document)
 										{
-											if(!$document) continue;
+											if(!$document) {
+												continue;
+											}
 											foreach ($document as $key => $var)
 											{
-												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
+												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') {
+													continue;
+												}
 												$var_idx = str_replace('extra_vars','',$key);
 												$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
 											}
@@ -333,7 +397,9 @@ 
 			// extra_vars * Remove Column
 			for($i=1;$i<=20;$i++)
 			{
-				if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
+				if(!$oDB->isColumnExists("documents","extra_vars".$i)) {
+					continue;
+				}
 				$oDB->dropColumn('documents','extra_vars'.$i);
 			}
 
@@ -355,7 +421,9 @@ 
 				$site_args->default_language = $db_info->lang_type;
 
 				$output = executeQuery('module.insertSite', $site_args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 
 			if($oDB->isIndexExists('sites','idx_domain'))
@@ -401,7 +469,9 @@ 
 				foreach($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
+					if(count($skin_path) != 2) {
+						continue;
+					}
 					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 					{
 						unset($args);
@@ -427,7 +497,9 @@ 
 				$output = executeQuery('module.updateMobileSkinFixModules');
 
 				$oModuleController = getController('module');
-				if(!$moduleConfig) $moduleConfig = new stdClass;
+				if(!$moduleConfig) {
+					$moduleConfig = new stdClass;
+				}
 				$moduleConfig->isUpdateFixedValue = TRUE;
 				$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
 			}
@@ -440,7 +512,9 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
+		if(!is_dir('./files/ruleset')) {
+			FileHandler::makeDir('./files/ruleset');
+		}
 
 		return new BaseObject(0, 'success_updated');
 	}
@@ -448,10 +522,14 @@ 
 	function updateForUniqueSiteDomain()
 	{
 		$output = executeQueryArray("module.getNonuniqueDomains");
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 		foreach($output->data as $data)
 		{
-			if($data->count == 1) continue;
+			if($data->count == 1) {
+				continue;
+			}
 			$domain = $data->domain;
 			$args = new stdClass;
 			$args->domain = $domain;