xpressengine / xe-core

modules/member/member.controller.php

Doc Comments +19 added lines, -8 removed lines

@@ -757,7 +757,7 @@ 
 	 * @param int $member_srl
 	 * @param object $target_file
 	 *
-	 * @return void
+	 * @return BaseObject
 	 */
 	function insertProfileImage($member_srl, $target_file)
 	{
@@ -869,7 +869,7 @@ 
 	 * @param int $member_srl
 	 * @param object $target_file
 	 *
-	 * @return void
+	 * @return BaseObject
 	 */
 	function insertImageName($member_srl, $target_file)
 	{
@@ -957,7 +957,7 @@ 
 	/**
 	 * Delete Image name
 	 *
-	 * @return void
+	 * @return BaseObject
 	 */
 	function procMemberDeleteImageName($_memberSrl = 0)
 	{
@@ -1012,7 +1012,7 @@ 
 	 * @param int $member_srl
 	 * @param object $target_file
 	 *
-	 * @return void
+	 * @return BaseObject
 	 */
 	function insertImageMark($member_srl, $target_file)
 	{
@@ -1532,6 +1532,9 @@ 
 		$this->setRedirectUrl($returnUrl);
 	}
 
+	/**
+	 * @param stdClass $auth_args
+	 */
 	function _sendAuthMail($auth_args, $member_info)
 	{
 		$oMemberModel = getModel('member');
@@ -1664,7 +1667,7 @@ 
 	 * @param int $member_srl
 	 * @param string $signature
 	 *
-	 * @return void
+	 * @return boolean|null
 	 */
 	function putSignature($member_srl, $signature)
 	{
@@ -2066,6 +2069,8 @@ 
 	/**
 	 * Logged method for providing a personalized menu
 	 * Login information is used in the output widget, or personalized page
+	 * @param string $act
+	 * @param string $str
 	 */
 	function addMemberMenu($act, $str)
 	{
@@ -2096,6 +2101,7 @@ 
 
 	/**
 	 * Add users to the member table
+	 * @param stdClass $args
 	 */
 	function insertMember(&$args, $password_is_hashed = false)
 	{
@@ -2296,6 +2302,7 @@ 
 	 * Modify member information
 	 *
 	 * @param bool $is_admin , modified 2013-11-22
+	 * @param stdClass $args
 	 */
 	function updateMember($args, $is_admin = FALSE)
 	{
@@ -2500,6 +2507,7 @@ 
 
 	/**
 	 * Modify member password
+	 * @param stdClass $args
 	 */
 	function updateMemberPassword($args)
 	{
@@ -2534,6 +2542,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $answer
+	 */
 	function updateFindAccountAnswer($member_srl, $answer)
 	{
 		$oPassword =  new Password();
@@ -2793,7 +2804,7 @@ 
 	 *
 	 * @param array &$menu_list
 	 *
-	 * @return object
+	 * @return BaseObject
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
@@ -2823,7 +2834,7 @@ 
 	 *
 	 * @param array &$menu_list
 	 *
-	 * @return object
+	 * @return BaseObject
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
@@ -2851,7 +2862,7 @@ 
 	/**
 	 * Spammer manage. Denied user login. And delete or trash all documents. Response Ajax string
 	 *
-	 * @return object
+	 * @return BaseObject
 	**/
 	function procMemberSpammerManage()
 	{

Spacing +470 added lines, -470 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);
 
@@ -1327,7 +1327,7 @@ 
 			$auth_args->is_register = 'Y';
 
 			$output = executeQuery('member.insertAuthMail', $auth_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			// resend auth mail.
 			$this->_sendAuthMail($auth_args, $memberInfo);
@@ -1341,7 +1341,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';
 		}
@@ -1354,13 +1354,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);
 
@@ -1379,33 +1379,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
@@ -1416,12 +1416,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};
 				}
@@ -1440,19 +1440,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);
@@ -1467,23 +1467,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
@@ -1491,7 +1491,7 @@ 
 		$args->member_srl = $memberInfo->member_srl;
 		$output = executeQuery('member.deleteAuthMail', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1501,7 +1501,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());
 		}
@@ -1518,7 +1518,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;
 
@@ -1542,12 +1542,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};
 				}
@@ -1562,25 +1562,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();
 	}
 
@@ -1593,7 +1593,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');
@@ -1612,13 +1612,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);
 	}
@@ -1632,25 +1632,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);
@@ -1671,11 +1671,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);
@@ -1704,15 +1704,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);
@@ -1732,18 +1732,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);
@@ -1753,7 +1753,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);
 		}
@@ -1775,9 +1775,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;
 		}
 
@@ -1787,9 +1787,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;
 		}
 
@@ -1799,7 +1799,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');
@@ -1807,12 +1807,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);
 				}
@@ -1821,7 +1821,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;
 				}
 
@@ -1832,14 +1832,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);
 		}
 	}
 
@@ -1855,13 +1855,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');
 
@@ -1871,12 +1871,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
@@ -1884,24 +1884,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
 			{
@@ -1911,13 +1911,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);
@@ -1925,12 +1925,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);
@@ -1940,36 +1940,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();
 					}
@@ -1979,9 +1979,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();
@@ -1993,12 +1993,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';
 			}
@@ -2016,18 +2016,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;
@@ -2057,10 +2057,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');
 	}
 
 	/**
@@ -2082,7 +2082,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;
@@ -2101,33 +2101,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
 		{
@@ -2142,97 +2142,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;
@@ -2242,11 +2242,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;
@@ -2256,7 +2256,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();
@@ -2268,7 +2268,7 @@ 
 			$auth_args->is_register = 'Y';
 
 			$output = executeQuery('member.insertAuthMail', $auth_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -2276,10 +2276,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;
@@ -2301,41 +2301,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();
@@ -2344,56 +2344,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);
@@ -2402,9 +2402,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]);
@@ -2416,55 +2416,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;
@@ -2476,9 +2476,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;
@@ -2491,7 +2491,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);
@@ -2503,14 +2503,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]);
@@ -2518,13 +2518,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);
 		}
@@ -2536,7 +2536,7 @@ 
 
 	function updateFindAccountAnswer($member_srl, $answer)
 	{
-		$oPassword =  new Password();
+		$oPassword = new Password();
 
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
@@ -2553,18 +2553,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();
@@ -2573,7 +2573,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;
@@ -2588,23 +2588,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;
@@ -2628,23 +2628,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;
@@ -2660,22 +2660,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');
@@ -2685,18 +2685,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');
 		}
@@ -2712,7 +2712,7 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -2722,7 +2722,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;
 
@@ -2734,17 +2734,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);
@@ -2758,16 +2758,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');
 		}
 
@@ -2776,10 +2776,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);
 
@@ -2797,7 +2797,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');
@@ -2808,12 +2808,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();
 	}
@@ -2827,7 +2827,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');
@@ -2838,12 +2838,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();
 	}
@@ -2855,7 +2855,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');
@@ -2863,7 +2863,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
@@ -2872,7 +2872,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 = "";
 
@@ -2881,10 +2881,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
@@ -2893,11 +2893,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;
 
@@ -2921,7 +2921,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');
@@ -2940,10 +2940,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);
 
@@ -2972,21 +2972,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);
 				}
 			}
@@ -2998,24 +2998,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 +571 added lines, -251 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;
 
@@ -1327,7 +1463,9 @@ 
 			$auth_args->is_register = 'Y';
 
 			$output = executeQuery('member.insertAuthMail', $auth_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// resend auth mail.
 			$this->_sendAuthMail($auth_args, $memberInfo);
@@ -1344,8 +1482,7 @@ 
 		if($output->data->is_register == 'Y')
 		{
 			$args->denied = 'N';
-		}
-		else
+		} else
 		{
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
@@ -1379,33 +1516,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
@@ -1426,8 +1575,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;
@@ -1440,7 +1588,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);
@@ -1518,7 +1668,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;
 
@@ -1552,8 +1704,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;
@@ -1562,13 +1713,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);
@@ -1593,7 +1750,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');
@@ -1612,13 +1771,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);
 	}
@@ -1632,17 +1795,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);
@@ -1650,7 +1833,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);
@@ -1675,7 +1860,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);
@@ -1709,7 +1896,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);
@@ -1735,15 +1924,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);
@@ -1753,7 +1948,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);
 		}
@@ -1815,8 +2012,7 @@ 
 				if($config->identifier == 'user_id')
 				{
 					$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
-				}
-				else
+				} else
 				{
 					$member_info = $oMemberModel->getMemberInfoByEmailAddress($user_id, $columnList);
 				}
@@ -1825,8 +2021,7 @@ 
 					$do_auto_login = true;
 				}
 
-			}
-			else
+			} else
 			{
 				$do_auto_login = true;
 			}
@@ -1835,8 +2030,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);
@@ -1855,13 +2049,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');
 
@@ -1876,15 +2074,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);
@@ -1896,14 +2097,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);
@@ -1930,7 +2135,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);
@@ -1979,7 +2186,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)
 		{
@@ -1993,7 +2202,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')
 		{
@@ -2082,7 +2293,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;
@@ -2101,35 +2314,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);
 		}
@@ -2142,8 +2374,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');
@@ -2157,8 +2393,7 @@ 
 				return new BaseObject(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		elseif(!$args->password)
+		} elseif(!$args->password)
 		{
 			unset($args->password);
 		}
@@ -2166,8 +2401,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);
 		}
@@ -2208,8 +2442,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();
@@ -2221,8 +2459,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)
 		{
@@ -2239,8 +2480,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++)
 			{
@@ -2301,27 +2541,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');
@@ -2329,13 +2581,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();
@@ -2352,8 +2610,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)
@@ -2410,16 +2667,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);
@@ -2431,11 +2686,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);
 
@@ -2447,8 +2712,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)
 			{
@@ -2491,7 +2759,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);
@@ -2517,8 +2787,7 @@ 
 			}
 
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		else if($args->hashed_password)
+		} else if($args->hashed_password)
 		{
 			$args->password = $args->hashed_password;
 		}
@@ -2553,7 +2822,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
@@ -2562,9 +2833,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();
@@ -2628,7 +2903,9 @@ 
 	 */
 	function destroySessionInfo()
 	{
-		if(!$_SESSION || !is_array($_SESSION)) return;
+		if(!$_SESSION || !is_array($_SESSION)) {
+			return;
+		}
 
 		$memberInfo = Context::get('logged_info');
 		$memberSrl = $memberInfo->member_srl;
@@ -2667,8 +2944,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)
 		{
@@ -2685,16 +2963,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')
 		{
@@ -2722,7 +3006,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;
 
@@ -2758,7 +3044,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;
@@ -2767,7 +3055,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');
 		}
 
@@ -2776,7 +3066,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);
@@ -2797,7 +3089,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');
@@ -2808,8 +3102,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);
@@ -2827,7 +3125,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');
@@ -2838,8 +3138,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);
@@ -2855,7 +3159,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');
@@ -2863,8 +3169,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');
@@ -2872,7 +3179,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 = "";
 
@@ -2881,11 +3190,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);
@@ -2893,13 +3204,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);
@@ -2941,7 +3255,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 . "]";
 
@@ -2986,8 +3303,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);
+					}
 				}
 			}
 		}

classes/db/DB.class.php

Spacing +110 added lines, -110 removed lines

@@ -141,24 +141,24 @@ 
 	 */
 	function getInstance($db_type = NULL)
 	{
-		if(!$db_type)
+		if (!$db_type)
 		{
 			$db_type = Context::getDBType();
 		}
-		if(!$db_type && Context::isInstalled())
+		if (!$db_type && Context::isInstalled())
 		{
 			return new BaseObject(-1, 'msg_db_not_setted');
 		}
 
-		if(!isset($GLOBALS['__DB__']))
+		if (!isset($GLOBALS['__DB__']))
 		{
 			$GLOBALS['__DB__'] = array();
 		}
-		if(!isset($GLOBALS['__DB__'][$db_type]))
+		if (!isset($GLOBALS['__DB__'][$db_type]))
 		{
-			$class_name = 'DB' . ucfirst($db_type);
-			$class_file = _XE_PATH_ . "classes/db/$class_name.class.php";
-			if(!file_exists($class_file))
+			$class_name = 'DB'.ucfirst($db_type);
+			$class_file = _XE_PATH_."classes/db/$class_name.class.php";
+			if (!file_exists($class_file))
 			{
 				return new BaseObject(-1, 'msg_db_not_setted');
 			}
@@ -187,8 +187,8 @@ 
 	 */
 	function DB()
 	{
-		$this->count_cache_path = _XE_PATH_ . $this->count_cache_path;
-		$this->cache_file = _XE_PATH_ . $this->cache_file;
+		$this->count_cache_path = _XE_PATH_.$this->count_cache_path;
+		$this->cache_file = _XE_PATH_.$this->cache_file;
 	}
 
 	/**
@@ -210,18 +210,18 @@ 
 	 */
 	public static function getEnableList()
 	{
-		if(!self::$supported_list)
+		if (!self::$supported_list)
 		{
 			$oDB = new DB();
 			self::$supported_list = $oDB->_getSupportedList();
 		}
 
 		$enableList = array();
-		if(is_array(self::$supported_list))
+		if (is_array(self::$supported_list))
 		{
-			foreach(self::$supported_list AS $key => $value)
+			foreach (self::$supported_list AS $key => $value)
 			{
-				if($value->enable)
+				if ($value->enable)
 				{
 					$enableList[] = $value;
 				}
@@ -237,18 +237,18 @@ 
 	 */
 	public static function getDisableList()
 	{
-		if(!self::$supported_list)
+		if (!self::$supported_list)
 		{
 			$oDB = new DB();
 			self::$supported_list = $oDB->_getSupportedList();
 		}
 
 		$disableList = array();
-		if(is_array(self::$supported_list))
+		if (is_array(self::$supported_list))
 		{
-			foreach(self::$supported_list AS $key => $value)
+			foreach (self::$supported_list AS $key => $value)
 			{
-				if(!$value->enable)
+				if (!$value->enable)
 				{
 					$disableList[] = $value;
 				}
@@ -265,24 +265,24 @@ 
 	function _getSupportedList()
 	{
 		static $get_supported_list = '';
-		if(is_array($get_supported_list))
+		if (is_array($get_supported_list))
 		{
 			self::$supported_list = $get_supported_list;
 			return self::$supported_list;
 		}
 		$get_supported_list = array();
-		$db_classes_path = _XE_PATH_ . "classes/db/";
+		$db_classes_path = _XE_PATH_."classes/db/";
 		$filter = "/^DB([^\.]+)\.class\.php/i";
 		$supported_list = FileHandler::readDir($db_classes_path, $filter, TRUE);
 
 		// after creating instance of class, check is supported
-		for($i = 0; $i < count($supported_list); $i++)
+		for ($i = 0; $i < count($supported_list); $i++)
 		{
 			$db_type = $supported_list[$i];
 
 			$class_name = sprintf("DB%s%s", strtoupper(substr($db_type, 0, 1)), strtolower(substr($db_type, 1)));
-			$class_file = sprintf(_XE_PATH_ . "classes/db/%s.class.php", $class_name);
-			if(!file_exists($class_file))
+			$class_file = sprintf(_XE_PATH_."classes/db/%s.class.php", $class_name);
+			if (!file_exists($class_file))
 			{
 				continue;
 			}
@@ -291,7 +291,7 @@ 
 			require_once($class_file);
 			$oDB = new $class_name(FALSE);
 
-			if(!$oDB)
+			if (!$oDB)
 			{
 				continue;
 			}
@@ -315,7 +315,7 @@ 
 	 */
 	function _sortDBMS($a, $b)
 	{
-		if(!isset($this->priority_dbms[$a->db_type]))
+		if (!isset($this->priority_dbms[$a->db_type]))
 		{
 			$priority_a = 0;
 		}
@@ -324,7 +324,7 @@ 
 			$priority_a = $this->priority_dbms[$a->db_type];
 		}
 
-		if(!isset($this->priority_dbms[$b->db_type]))
+		if (!isset($this->priority_dbms[$b->db_type]))
 		{
 			$priority_b = 0;
 		}
@@ -333,7 +333,7 @@ 
 			$priority_b = $this->priority_dbms[$b->db_type];
 		}
 
-		if($priority_a == $priority_b)
+		if ($priority_a == $priority_b)
 		{
 			return 0;
 		}
@@ -359,7 +359,7 @@ 
 	 */
 	function isConnected($type = 'master', $indx = 0)
 	{
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			return $this->master_db["is_connected"] ? TRUE : FALSE;
 		}
@@ -388,7 +388,7 @@ 
 	 */
 	function actFinish()
 	{
-		if(!$this->query)
+		if (!$this->query)
 		{
 			return;
 		}
@@ -409,14 +409,14 @@ 
 
 		$bt = version_compare(PHP_VERSION, '5.3.6', '>=') ? debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) : debug_backtrace();
 
-		foreach($bt as $no => $call)
+		foreach ($bt as $no => $call)
 		{
-			if($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
+			if ($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
 			{
 				$call_no = $no;
 				$call_no++;
 				$log['called_file'] = $bt[$call_no]['file'].':'.$bt[$call_no]['line'];
-				$log['called_file'] = str_replace(_XE_PATH_ , '', $log['called_file']);
+				$log['called_file'] = str_replace(_XE_PATH_, '', $log['called_file']);
 				$call_no++;
 				$log['called_method'] = $bt[$call_no]['class'].$bt[$call_no]['type'].$bt[$call_no]['function'];
 				break;
@@ -424,22 +424,22 @@ 
 		}
 
 		// leave error log if an error occured (if __DEBUG_DB_OUTPUT__ is defined)
-		if($this->isError())
+		if ($this->isError())
 		{
 			$log['result'] = 'Failed';
 			$log['errno'] = $this->errno;
 			$log['errstr'] = $this->errstr;
 
-			if(__DEBUG_DB_OUTPUT__ == 1)
+			if (__DEBUG_DB_OUTPUT__ == 1)
 			{
-				$debug_file = _XE_PATH_ . "files/_debug_db_query.php";
+				$debug_file = _XE_PATH_."files/_debug_db_query.php";
 				$buff = array();
-				if(!file_exists($debug_file))
+				if (!file_exists($debug_file))
 				{
-					$buff[] = '<?php exit(); ?' . '>';
+					$buff[] = '<?php exit(); ?'.'>';
 				}
 				$buff[] = print_r($log, TRUE);
-				@file_put_contents($debug_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
+				@file_put_contents($debug_file, implode("\n", $buff)."\n\n", FILE_APPEND | LOCK_EX);
 			}
 		}
 		else
@@ -452,7 +452,7 @@ 
 		$log_args = new stdClass;
 		$log_args->query = $this->query;
 		$log_args->query_id = $this->query_id;
-		$log_args->caller = $log['called_method'] . '() in ' . $log['called_file'];
+		$log_args->caller = $log['called_method'].'() in '.$log['called_file'];
 		$log_args->connection = $log['connection'];
 		writeSlowlog('query', $elapsed_time, $log_args);
 	}
@@ -510,11 +510,11 @@ 
 	{
 		static $cache_file = array();
 
-		if(!$query_id)
+		if (!$query_id)
 		{
 			return new BaseObject(-1, 'msg_invalid_queryid');
 		}
-		if(!$this->db_type)
+		if (!$this->db_type)
 		{
 			return;
 		}
@@ -523,20 +523,20 @@ 
 
 		$this->query_id = $query_id;
 
-		if(!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id]))
+		if (!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id]))
 		{
 			$id_args = explode('.', $query_id);
-			if(count($id_args) == 2)
+			if (count($id_args) == 2)
 			{
 				$target = 'modules';
 				$module = $id_args[0];
 				$id = $id_args[1];
 			}
-			elseif(count($id_args) == 3)
+			elseif (count($id_args) == 3)
 			{
 				$target = $id_args[0];
 				$typeList = array('addons' => 1, 'widgets' => 1);
-				if(!isset($typeList[$target]))
+				if (!isset($typeList[$target]))
 				{
 					$this->actDBClassFinish();
 					return;
@@ -544,14 +544,14 @@ 
 				$module = $id_args[1];
 				$id = $id_args[2];
 			}
-			if(!$target || !$module || !$id)
+			if (!$target || !$module || !$id)
 			{
 				$this->actDBClassFinish();
 				return new BaseObject(-1, 'msg_invalid_queryid');
 			}
 
 			$xml_file = sprintf('%s%s/%s/queries/%s.xml', _XE_PATH_, $target, $module, $id);
-			if(!file_exists($xml_file))
+			if (!file_exists($xml_file))
 			{
 				$this->actDBClassFinish();
 				return new BaseObject(-1, 'msg_invalid_queryid');
@@ -579,13 +579,13 @@ 
 		$cache_file = sprintf('%s%s%s.%s.%s.cache.php', _XE_PATH_, $this->cache_file, $query_id, __ZBXE_VERSION__, $this->db_type);
 
 		$cache_time = -1;
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$cache_time = filemtime($cache_file);
 		}
 
 		// if there is no cache file or is not new, find original xml query file and parse it
-		if($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_ . 'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php'))
+		if ($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_.'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_.'classes/xml/XmlQueryParser.class.php'))
 		{
 			$oParser = new XmlQueryParser();
 			$oParser->parse($query_id, $xml_file, $cache_file);
@@ -606,27 +606,27 @@ 
 	{
 		global $lang;
 		
-		if(!in_array($type, array('master','slave'))) $type = 'slave';
+		if (!in_array($type, array('master', 'slave'))) $type = 'slave';
 
-		if(!file_exists($cache_file))
+		if (!file_exists($cache_file))
 		{
 			return new BaseObject(-1, 'msg_invalid_queryid');
 		}
 
-		if($source_args)
+		if ($source_args)
 		{
 			$args = clone $source_args;
 		}
 
 		$output = include($cache_file);
 
-		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool())
+		if ((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool())
 		{
 			return $output;
 		}
 
 		// execute appropriate query
-		switch($output->getAction())
+		switch ($output->getAction())
 		{
 			case 'insert' :
 			case 'insert-select' :
@@ -649,11 +649,11 @@ 
 				break;
 		}
 
-		if($this->isError())
+		if ($this->isError())
 		{
 			$output = $this->getError();
 		}
-		else if(!is_a($output, 'BaseObject') && !is_subclass_of($output, 'BaseObject'))
+		else if (!is_a($output, 'BaseObject') && !is_subclass_of($output, 'BaseObject'))
 		{
 			$output = new BaseObject();
 		}
@@ -799,7 +799,7 @@ 
 	 */
 	function dropTable($table_name)
 	{
-		if(!$table_name)
+		if (!$table_name)
 		{
 			return;
 		}
@@ -816,59 +816,59 @@ 
 	function getSelectSql($query, $with_values = TRUE)
 	{
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$select = 'SELECT ' . $select;
+		$select = 'SELECT '.$select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$from = ' FROM ' . $from;
+		$from = ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$tableObjects = $query->getTables();
 		$index_hint_list = '';
-		foreach($tableObjects as $tableObject)
+		foreach ($tableObjects as $tableObject)
 		{
-			if(is_a($tableObject, 'CubridTableWithHint'))
+			if (is_a($tableObject, 'CubridTableWithHint'))
 			{
-				$index_hint_list .= $tableObject->getIndexHintString() . ', ';
+				$index_hint_list .= $tableObject->getIndexHintString().', ';
 			}
 		}
 		$index_hint_list = substr($index_hint_list, 0, -2);
-		if($index_hint_list != '')
+		if ($index_hint_list != '')
 		{
-			$index_hint_list = 'USING INDEX ' . $index_hint_list;
+			$index_hint_list = 'USING INDEX '.$index_hint_list;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
-			$groupBy = ' GROUP BY ' . $groupBy;
+			$groupBy = ' GROUP BY '.$groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
-			$orderBy = ' ORDER BY ' . $orderBy;
+			$orderBy = ' ORDER BY '.$orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
-			$limit = ' LIMIT ' . $limit;
+			$limit = ' LIMIT '.$limit;
 		}
 
-		return $select . ' ' . $from . ' ' . $where . ' ' . $index_hint_list . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+		return $select.' '.$from.' '.$where.' '.$index_hint_list.' '.$groupBy.' '.$orderBy.' '.$limit;
 	}
 
 	/**
@@ -886,7 +886,7 @@ 
 	{
 		$new_update_columns = array();
 		$click_count_columns = $queryObject->getClickCountColumns();
-		foreach($click_count_columns as $click_count_column)
+		foreach ($click_count_columns as $click_count_column)
 		{
 			$click_count_column_name = $click_count_column->column_name;
 
@@ -918,16 +918,16 @@ 
 		$sql .= $tables[0]->getAlias();
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$sql .= ' FROM ' . $from;
+		$sql .= ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$sql .= ' WHERE ' . $where;
+			$sql .= ' WHERE '.$where;
 		}
 
 		return $sql;
@@ -943,26 +943,26 @@ 
 	function getUpdateSql($query, $with_values = TRUE, $with_priority = FALSE)
 	{
 		$columnsList = $query->getUpdateString($with_values);
-		if($columnsList == '')
+		if ($columnsList == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
 
 		$tables = $query->getFromString($with_values);
-		if($tables == '')
+		if ($tables == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$priority = $with_priority ? $query->getPriority() : '';
 
-		return "UPDATE $priority $tables SET $columnsList " . $where;
+		return "UPDATE $priority $tables SET $columnsList ".$where;
 	}
 
 	/**
@@ -1000,27 +1000,27 @@ 
 	 */
 	function _getConnection($type = 'master', $indx = NULL)
 	{
-		if($type == 'master')
+		if ($type == 'master')
 		{
-			if(!$this->master_db['is_connected'])
+			if (!$this->master_db['is_connected'])
 			{
 				$this->_connect($type);
 			}
-			$this->connection = 'Master ' . $this->master_db['db_hostname'];
+			$this->connection = 'Master '.$this->master_db['db_hostname'];
 			return $this->master_db["resource"];
 		}
 
-		if($indx === NULL)
+		if ($indx === NULL)
 		{
 			$indx = $this->_getSlaveConnectionStringIndex($type);
 		}
 
-		if(!$this->slave_db[$indx]['is_connected'])
+		if (!$this->slave_db[$indx]['is_connected'])
 		{
 			$this->_connect($type, $indx);
 		}
 
-		$this->connection = 'Slave ' . $this->slave_db[$indx]['db_hostname'];
+		$this->connection = 'Slave '.$this->slave_db[$indx]['db_hostname'];
 		return $this->slave_db[$indx]["resource"];
 	}
 
@@ -1030,11 +1030,11 @@ 
 	 */
 	function _dbInfoExists()
 	{
-		if(!$this->master_db)
+		if (!$this->master_db)
 		{
 			return FALSE;
 		}
-		if(count($this->slave_db) === 0)
+		if (count($this->slave_db) === 0)
 		{
 			return FALSE;
 		}
@@ -1060,12 +1060,12 @@ 
 	 */
 	function close($type = 'master', $indx = 0)
 	{
-		if(!$this->isConnected($type, $indx))
+		if (!$this->isConnected($type, $indx))
 		{
 			return;
 		}
 
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			$connection = &$this->master_db;
 		}
@@ -1096,12 +1096,12 @@ 
 	 */
 	function begin()
 	{
-		if(!$this->isConnected())
+		if (!$this->isConnected())
 		{
 			return;
 		}
 
-		if($this->_begin($this->transactionNestedLevel))
+		if ($this->_begin($this->transactionNestedLevel))
 		{
 			$this->transaction_started = TRUE;
 			$this->transactionNestedLevel++;
@@ -1124,15 +1124,15 @@ 
 	 */
 	function rollback()
 	{
-		if(!$this->isConnected() || !$this->transaction_started)
+		if (!$this->isConnected() || !$this->transaction_started)
 		{
 			return;
 		}
-		if($this->_rollback($this->transactionNestedLevel))
+		if ($this->_rollback($this->transactionNestedLevel))
 		{
 			$this->transactionNestedLevel--;
 
-			if(!$this->transactionNestedLevel)
+			if (!$this->transactionNestedLevel)
 			{
 				$this->transaction_started = FALSE;
 			}
@@ -1156,11 +1156,11 @@ 
 	 */
 	function commit($force = FALSE)
 	{
-		if(!$force && (!$this->isConnected() || !$this->transaction_started))
+		if (!$force && (!$this->isConnected() || !$this->transaction_started))
 		{
 			return;
 		}
-		if($this->transactionNestedLevel == 1 && $this->_commit())
+		if ($this->transactionNestedLevel == 1 && $this->_commit())
 		{
 			$this->transaction_started = FALSE;
 			$this->transactionNestedLevel = 0;
@@ -1192,7 +1192,7 @@ 
 	 */
 	function _query($query, $connection = NULL)
 	{
-		if($connection == NULL)
+		if ($connection == NULL)
 		{
 			$connection = $this->_getConnection('master');
 		}
@@ -1217,7 +1217,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 		$this->master_db = $db_info->master_db;
-		if($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
+		if ($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
 				&& $db_info->master_db["db_port"] == $db_info->slave_db[0]["db_port"]
 				&& $db_info->master_db["db_userid"] == $db_info->slave_db[0]["db_userid"]
 				&& $db_info->master_db["db_password"] == $db_info->slave_db[0]["db_password"]
@@ -1265,18 +1265,18 @@ 
 	 */
 	function _connect($type = 'master', $indx = 0)
 	{
-		if($this->isConnected($type, $indx))
+		if ($this->isConnected($type, $indx))
 		{
 			return;
 		}
 
 		// Ignore if no DB information exists
-		if(!$this->_dbInfoExists())
+		if (!$this->_dbInfoExists())
 		{
 			return;
 		}
 
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			$connection = &$this->master_db;
 		}
@@ -1286,7 +1286,7 @@ 
 		}
 
 		$result = $this->__connect($connection);
-		if($result === NULL || $result === FALSE)
+		if ($result === NULL || $result === FALSE)
 		{
 			$connection["is_connected"] = FALSE;
 			return;
@@ -1297,7 +1297,7 @@ 
 		$connection["is_connected"] = TRUE;
 
 		// Save connection info for db logs
-		$this->connection = ucfirst($type) . ' ' . $connection["db_hostname"];
+		$this->connection = ucfirst($type).' '.$connection["db_hostname"];
 
 		// regist $this->close callback
 		register_shutdown_function(array($this, "close"));
@@ -1322,7 +1322,7 @@ 
 	 */
 	function actDBClassFinish()
 	{
-		if(!$this->query)
+		if (!$this->query)
 		{
 			return;
 		}
@@ -1345,7 +1345,7 @@ 
 	function getParser($force = FALSE)
 	{
 		static $dbParser = NULL;
-		if(!$dbParser || $force)
+		if (!$dbParser || $force)
 		{
 			$oDB = DB::getInstance();
 			$dbParser = $oDB->getParser();

Braces +13 added lines, -21 removed lines

@@ -318,8 +318,7 @@ 
 		if(!isset($this->priority_dbms[$a->db_type]))
 		{
 			$priority_a = 0;
-		}
-		else
+		} else
 		{
 			$priority_a = $this->priority_dbms[$a->db_type];
 		}
@@ -327,8 +326,7 @@ 
 		if(!isset($this->priority_dbms[$b->db_type]))
 		{
 			$priority_b = 0;
-		}
-		else
+		} else
 		{
 			$priority_b = $this->priority_dbms[$b->db_type];
 		}
@@ -362,8 +360,7 @@ 
 		if($type == 'master')
 		{
 			return $this->master_db["is_connected"] ? TRUE : FALSE;
-		}
-		else
+		} else
 		{
 			return $this->slave_db[$indx]["is_connected"] ? TRUE : FALSE;
 		}
@@ -441,8 +438,7 @@ 
 				$buff[] = print_r($log, TRUE);
 				@file_put_contents($debug_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
 			}
-		}
-		else
+		} else
 		{
 			$log['result'] = 'Success';
 		}
@@ -531,8 +527,7 @@ 
 				$target = 'modules';
 				$module = $id_args[0];
 				$id = $id_args[1];
-			}
-			elseif(count($id_args) == 3)
+			} elseif(count($id_args) == 3)
 			{
 				$target = $id_args[0];
 				$typeList = array('addons' => 1, 'widgets' => 1);
@@ -606,7 +601,9 @@ 
 	{
 		global $lang;
 		
-		if(!in_array($type, array('master','slave'))) $type = 'slave';
+		if(!in_array($type, array('master','slave'))) {
+			$type = 'slave';
+		}
 
 		if(!file_exists($cache_file))
 		{
@@ -652,8 +649,7 @@ 
 		if($this->isError())
 		{
 			$output = $this->getError();
-		}
-		else if(!is_a($output, 'BaseObject') && !is_subclass_of($output, 'BaseObject'))
+		} else if(!is_a($output, 'BaseObject') && !is_subclass_of($output, 'BaseObject'))
 		{
 			$output = new BaseObject();
 		}
@@ -1068,8 +1064,7 @@ 
 		if($type == 'master')
 		{
 			$connection = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$connection = &$this->slave_db[$indx];
 		}
@@ -1164,8 +1159,7 @@ 
 		{
 			$this->transaction_started = FALSE;
 			$this->transactionNestedLevel = 0;
-		}
-		else
+		} else
 		{
 			$this->transactionNestedLevel--;
 		}
@@ -1225,8 +1219,7 @@ 
 		)
 		{
 			$this->slave_db[0] = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$this->slave_db = $db_info->slave_db;
 		}
@@ -1279,8 +1272,7 @@ 
 		if($type == 'master')
 		{
 			$connection = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$connection = &$this->slave_db[$indx];
 		}

modules/admin/admin.admin.controller.php

Spacing +77 added lines, -77 removed lines

@@ -20,7 +20,7 @@ 
 		// 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");
 		}
@@ -33,20 +33,20 @@ 
 	function procAdminMenuReset()
 	{
 		$menuSrl = Context::get('menu_srl');
-		if(!$menuSrl)
+		if (!$menuSrl)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$oMenuAdminController = getAdminController('menu');
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'admin_menu_langs:' . Context::getLangType();
+			$cache_key = 'admin_menu_langs:'.Context::getLangType();
 			$oCacheHandler->delete($cache_key);
 		}
 		$output = $oMenuAdminController->deleteMenu($menuSrl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -63,30 +63,30 @@ 
 	function procAdminRecompileCacheFile()
 	{
 		// rename cache dir
-		$temp_cache_dir = './files/cache_' . $_SERVER['REQUEST_TIME'];
+		$temp_cache_dir = './files/cache_'.$_SERVER['REQUEST_TIME'];
 		FileHandler::rename('./files/cache', $temp_cache_dir);
 		FileHandler::makeDir('./files/cache');
 
 		// remove module extend cache
-		FileHandler::removeFile(_XE_PATH_ . 'files/config/module_extend.php');
+		FileHandler::removeFile(_XE_PATH_.'files/config/module_extend.php');
 
 		// remove debug files
-		FileHandler::removeFile(_XE_PATH_ . 'files/_debug_message.php');
-		FileHandler::removeFile(_XE_PATH_ . 'files/_debug_db_query.php');
-		FileHandler::removeFile(_XE_PATH_ . 'files/_slowlog_query.php');
-		FileHandler::removeFile(_XE_PATH_ . 'files/_slowlog_trigger.php');
-		FileHandler::removeFile(_XE_PATH_ . 'files/_slowlog_addon.php');
-		FileHandler::removeFile(_XE_PATH_ . 'files/_slowlog_widget.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_debug_message.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_debug_db_query.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_slowlog_query.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_slowlog_trigger.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_slowlog_addon.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_slowlog_widget.php');
 
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
 
 		// call recompileCache for each module
-		foreach($module_list as $module)
+		foreach ($module_list as $module)
 		{
 			$oModule = NULL;
 			$oModule = getClass($module->module);
-			if(method_exists($oModule, 'recompileCache'))
+			if (method_exists($oModule, 'recompileCache'))
 			{
 				$oModule->recompileCache();
 			}
@@ -97,37 +97,37 @@ 
 		$oObjectCacheHandler = CacheHandler::getInstance('object');
 		$oTemplateCacheHandler = CacheHandler::getInstance('template');
 
-		if($oObjectCacheHandler->isSupport())
+		if ($oObjectCacheHandler->isSupport())
 		{
 			$truncated[] = $oObjectCacheHandler->truncate();
 		}
 
-		if($oTemplateCacheHandler->isSupport())
+		if ($oTemplateCacheHandler->isSupport())
 		{
 			$truncated[] = $oTemplateCacheHandler->truncate();
 		}
 
-		if(count($truncated) && in_array(FALSE, $truncated))
+		if (count($truncated) && in_array(FALSE, $truncated))
 		{
 			return new BaseObject(-1, 'msg_self_restart_cache_engine');
 		}
 
 		// remove cache dir
 		$tmp_cache_list = FileHandler::readDir('./files', '/(^cache_[0-9]+)/');
-		if($tmp_cache_list)
+		if ($tmp_cache_list)
 		{
-			foreach($tmp_cache_list as $tmp_dir)
+			foreach ($tmp_cache_list as $tmp_dir)
 			{
-				if($tmp_dir)
+				if ($tmp_dir)
 				{
-					FileHandler::removeDir('./files/' . $tmp_dir);
+					FileHandler::removeDir('./files/'.$tmp_dir);
 				}
 			}
 		}
 
 		// remove duplicate indexes (only for CUBRID)
 		$db_type = Context::getDBType();
-		if($db_type == 'cubrid')
+		if ($db_type == 'cubrid')
 		{
 			$db = DB::getInstance();
 			$db->deleteDuplicateIndexes();
@@ -149,13 +149,13 @@ 
 		$oMemberController = getController('member');
 		$oMemberController->procMemberLogout();
 
-		header('Location: ' . getNotEncodedUrl('', 'module', 'admin'));
+		header('Location: '.getNotEncodedUrl('', 'module', 'admin'));
 	}
 
 	public function procAdminInsertDefaultDesignInfo()
 	{
 		$vars = Context::getRequestVars();
-		if(!$vars->site_srl)
+		if (!$vars->site_srl)
 		{
 			$vars->site_srl = 0;
 		}
@@ -167,27 +167,27 @@ 
 
 	public function updateDefaultDesignInfo($vars)
 	{
-		$siteDesignPath = _XE_PATH_ . 'files/site_design/';
+		$siteDesignPath = _XE_PATH_.'files/site_design/';
 
 		$vars->module_skin = json_decode($vars->module_skin);
 
-		if(!is_dir($siteDesignPath))
+		if (!is_dir($siteDesignPath))
 		{
 			FileHandler::makeDir($siteDesignPath);
 		}
 
-		$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $vars->site_srl . '.php';
+		$siteDesignFile = _XE_PATH_.'files/site_design/design_'.$vars->site_srl.'.php';
 
 		$layoutTarget = 'layout_srl';
 		$skinTarget = 'skin';
 
-		if($vars->target_type == 'M')
+		if ($vars->target_type == 'M')
 		{
 			$layoutTarget = 'mlayout_srl';
 			$skinTarget = 'mskin';
 		}
 
-		if(is_readable($siteDesignFile))
+		if (is_readable($siteDesignFile))
 		{
 			include($siteDesignFile);
 		}
@@ -200,14 +200,14 @@ 
 
 		$designInfo->{$layoutTarget} = $layoutSrl;
 
-		foreach($vars->module_skin as $moduleName => $skinName)
+		foreach ($vars->module_skin as $moduleName => $skinName)
 		{
-			if($moduleName == 'ARTICLE')
+			if ($moduleName == 'ARTICLE')
 			{
 				$moduleName = 'page';
 			}
 
-			if(!isset($designInfo->module->{$moduleName})) $designInfo->module->{$moduleName} = new stdClass();
+			if (!isset($designInfo->module->{$moduleName})) $designInfo->module->{$moduleName} = new stdClass();
 			$designInfo->module->{$moduleName}->{$skinTarget} = $skinName;
 		}
 
@@ -222,28 +222,28 @@ 
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
 		$buff[] = '$designInfo = new stdClass;';
 
-		if($designInfo->layout_srl)
+		if ($designInfo->layout_srl)
 		{
 			$buff[] = sprintf('$designInfo->layout_srl = %s; ', $designInfo->layout_srl);
 		}
 
-		if($designInfo->mlayout_srl)
+		if ($designInfo->mlayout_srl)
 		{
 			$buff[] = sprintf('$designInfo->mlayout_srl = %s;', $designInfo->mlayout_srl);
 		}
 
 		$buff[] = '$designInfo->module = new stdClass;';
 
-		foreach($designInfo->module as $moduleName => $skinInfo)
+		foreach ($designInfo->module as $moduleName => $skinInfo)
 		{
 			$buff[] = sprintf('$designInfo->module->%s = new stdClass;', $moduleName);
-			foreach($skinInfo as $target => $skinName)
+			foreach ($skinInfo as $target => $skinName)
 			{
 				$buff[] = sprintf('$designInfo->module->%s->%s = \'%s\';', $moduleName, $target, $skinName);
 			}
 		}
 
-		$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php';
+		$siteDesignFile = _XE_PATH_.'files/site_design/design_'.$site_srl.'.php';
 		FileHandler::writeFile($siteDesignFile, implode(PHP_EOL, $buff));
 	}
 
@@ -259,13 +259,13 @@ 
 		// check favorite exists
 		$oModel = getAdminModel('admin');
 		$output = $oModel->isExistsFavorite($siteSrl, $moduleName);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// if exists, delete favorite
-		if($output->get('result'))
+		if ($output->get('result'))
 		{
 			$favoriteSrl = $output->get('favoriteSrl');
 			$output = $this->_deleteFavorite($favoriteSrl);
@@ -278,7 +278,7 @@ 
 			$result = 'on';
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -296,31 +296,31 @@ 
 	{
 		$oModel = getAdminModel('admin');
 		$output = $oModel->getFavoriteList();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$favoriteList = $output->get('favoriteList');
-		if(!$favoriteList)
+		if (!$favoriteList)
 		{
 			return new BaseObject();
 		}
 
 		$deleteTargets = array();
-		foreach($favoriteList as $favorite)
+		foreach ($favoriteList as $favorite)
 		{
-			if($favorite->type == 'module')
+			if ($favorite->type == 'module')
 			{
-				$modulePath = _XE_PATH_ . 'modules/' . $favorite->module;
-				if(!is_dir($modulePath))
+				$modulePath = _XE_PATH_.'modules/'.$favorite->module;
+				if (!is_dir($modulePath))
 				{
 					$deleteTargets[] = $favorite->admin_favorite_srl;
 				}
 			}
 		}
 
-		if(!count($deleteTargets))
+		if (!count($deleteTargets))
 		{
 			return new BaseObject();
 		}
@@ -328,7 +328,7 @@ 
 		$args = new stdClass();
 		$args->admin_favorite_srls = $deleteTargets;
 		$output = executeQuery('admin.deleteFavorites', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -343,7 +343,7 @@ 
 	function procAdminEnviromentGatheringAgreement()
 	{
 		$isAgree = Context::get('is_agree');
-		if($isAgree == 'true')
+		if ($isAgree == 'true')
 		{
 			$_SESSION['enviroment_gather'] = 'Y';
 		}
@@ -368,23 +368,23 @@ 
 		$oModuleModel = getModel('module');
 		$oAdminConfig = $oModuleModel->getModuleConfig('admin');
 
-		if(!is_object($oAdminConfig))
+		if (!is_object($oAdminConfig))
 		{
 			$oAdminConfig = new stdClass();
 		}
 
-		if($file['tmp_name'])
+		if ($file['tmp_name'])
 		{
 			$target_path = 'files/attach/images/admin/';
 			FileHandler::makeDir($target_path);
 
 			// Get file information
 			list($width, $height, $type, $attrs) = @getimagesize($file['tmp_name']);
-			if($type == 3)
+			if ($type == 3)
 			{
 				$ext = 'png';
 			}
-			elseif($type == 2)
+			elseif ($type == 2)
 			{
 				$ext = 'jpg';
 			}
@@ -398,7 +398,7 @@ 
 
 			$oAdminConfig->adminLogo = $target_filename;
 		}
-		if($adminTitle)
+		if ($adminTitle)
 		{
 			$oAdminConfig->adminTitle = strip_tags($adminTitle);
 		}
@@ -407,7 +407,7 @@ 
 			unset($oAdminConfig->adminTitle);
 		}
 
-		if($oAdminConfig)
+		if ($oAdminConfig)
 		{
 			$oModuleController = getController('module');
 			$oModuleController->insertModuleConfig('admin', $oAdminConfig);
@@ -428,7 +428,7 @@ 
 		$oModuleModel = getModel('module');
 		$oAdminConfig = $oModuleModel->getModuleConfig('admin');
 
-		FileHandler::removeFile(_XE_PATH_ . $oAdminConfig->adminLogo);
+		FileHandler::removeFile(_XE_PATH_.$oAdminConfig->adminLogo);
 		unset($oAdminConfig->adminLogo);
 
 		$oModuleController = getController('module');
@@ -487,16 +487,16 @@ 
 
 		$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.'/';
 		}
 
 		$iconname = Context::get('iconname');
-		$file_exist = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
-		if($file_exist)
+		$file_exist = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$virtual_site.$iconname);
+		if ($file_exist)
 		{
-			@FileHandler::removeFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
+			@FileHandler::removeFile(_XE_PATH_.'files/attach/xeicon/'.$virtual_site.$iconname);
 		}
 		else
 		{
@@ -517,33 +517,33 @@ 
 		$db_info->sitelock_message = $vars->sitelock_message;
 
 		$whitelist = $vars->sitelock_whitelist;
-		$whitelist = preg_replace("/[\r|\n|\r\n]+/",",",$whitelist);
-		$whitelist = preg_replace("/\s+/","",$whitelist);
-		if(preg_match('/(<\?|<\?php|\?>)/xsm', $whitelist))
+		$whitelist = preg_replace("/[\r|\n|\r\n]+/", ",", $whitelist);
+		$whitelist = preg_replace("/\s+/", "", $whitelist);
+		if (preg_match('/(<\?|<\?php|\?>)/xsm', $whitelist))
 		{
 			$whitelist = '';
 		}
-		$whitelist .= ',127.0.0.1,' . $_SERVER['REMOTE_ADDR'];
-		$whitelist = explode(',',trim($whitelist, ','));
+		$whitelist .= ',127.0.0.1,'.$_SERVER['REMOTE_ADDR'];
+		$whitelist = explode(',', trim($whitelist, ','));
 		$whitelist = array_unique($whitelist);
 
-		if(!IpFilter::validate($whitelist)) {
+		if (!IpFilter::validate($whitelist)) {
 			return new BaseObject(-1, 'msg_invalid_ip');
 		}
 
 		$db_info->sitelock_whitelist = $whitelist;
 
 		$oInstallController = getController('install');
-		if(!$oInstallController->makeConfigFile())
+		if (!$oInstallController->makeConfigFile())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url');
-			if(!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
-			header('location:' . $returnUrl);
+			if (!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			header('location:'.$returnUrl);
 			return;
 		}
 	}
@@ -574,20 +574,20 @@ 
 		$db_info->embed_white_iframe = $white_iframe;
 
 		$oInstallController = getController('install');
-		if(!$oInstallController->makeConfigFile())
+		if (!$oInstallController->makeConfigFile())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+		require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 		$oEmbedFilter = EmbedFilter::getInstance();
 		$oEmbedFilter->_makeWhiteDomainList($whitelist);
 
-		if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url');
-			if(!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
-			header('location:' . $returnUrl);
+			if (!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			header('location:'.$returnUrl);
 			return;
 		}
 	}