xpressengine / xe-core

modules/member/member.controller.php

Doc Comments +24 added lines, -13 removed lines

@@ -223,7 +223,7 @@ 
 	/**
 	 * Delete the post
 	 *
-	 * @return void|Object (void : success, Object : fail)
+	 * @return Object|null (void : success, Object : fail)
 	 */
 	function procMemberDeleteSavedDocument()
 	{
@@ -254,7 +254,7 @@ 
 	/**
 	 * Check values when member joining
 	 *
-	 * @return void|Object (void : success, Object : fail)
+	 * @return null|Object (void : success, Object : fail)
 	 */
 	function procMemberCheckValue()
 	{
@@ -726,7 +726,7 @@ 
 	/**
 	 * Add a profile image
 	 *
-	 * @return void|Object (void : success, Object : fail)
+	 * @return ModuleObject|null (void : success, Object : fail)
 	 */
 	function procMemberInsertProfileImage()
 	{
@@ -805,7 +805,7 @@ 
 	/**
 	 * Add an image name
 	 *
-	 * @return void|Object (void : success, Object : fail)
+	 * @return ModuleObject|null (void : success, Object : fail)
 	 */
 	function procMemberInsertImageName()
 	{
@@ -890,7 +890,7 @@ 
 	/**
 	 * Delete Image name
 	 *
-	 * @return void
+	 * @return Object
 	 */
 	function procMemberDeleteImageName($_memberSrl = 0)
 	{
@@ -914,7 +914,7 @@ 
 	/**
 	 * Add an image to mark
 	 *
-	 * @return void|Object (void : success, Object : fail)
+	 * @return ModuleObject|null (void : success, Object : fail)
 	 */
 	function procMemberInsertImageMark()
 	{
@@ -1181,7 +1181,7 @@ 
 	 * Execute finding ID/Passoword
 	 * When clicking the link in the verification email, a method is called to change the old password and to authenticate it
 	 *
-	 * @return void|Object (void : success, Object : fail)
+	 * @return ModuleObject|null (void : success, Object : fail)
 	 */
 	function procMemberAuthAccount()
 	{
@@ -1253,7 +1253,7 @@ 
 	/**
 	 * Request to re-send the authentication mail
 	 *
-	 * @return void|Object (void : success, Object : fail)
+	 * @return Object|null (void : success, Object : fail)
 	 */
 	function procMemberResendAuthMail()
 	{
@@ -1412,6 +1412,9 @@ 
 		$this->setRedirectUrl($returnUrl);
 	}
 
+	/**
+	 * @param stdClass $auth_args
+	 */
 	function _sendAuthMail($auth_args, $member_info)
 	{
 		$oMemberModel = getModel('member');
@@ -1467,7 +1470,7 @@ 
 	/**
 	 * Join a virtual site
 	 *
-	 * @return void|Object (void : success, Object : fail)
+	 * @return Object|null (void : success, Object : fail)
 	 */
 	function procMemberSiteSignUp()
 	{
@@ -1544,7 +1547,7 @@ 
 	 * @param int $member_srl
 	 * @param string $signature
 	 *
-	 * @return void
+	 * @return boolean|null
 	 */
 	function putSignature($member_srl, $signature)
 	{
@@ -1946,6 +1949,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)
 	{
@@ -1976,6 +1981,7 @@ 
 
 	/**
 	 * Add users to the member table
+	 * @param stdClass $args
 	 */
 	function insertMember(&$args, $password_is_hashed = false)
 	{
@@ -2176,6 +2182,7 @@ 
 	 * Modify member information
 	 *
 	 * @param bool $is_admin , modified 2013-11-22
+	 * @param stdClass $args
 	 */
 	function updateMember($args, $is_admin = FALSE)
 	{
@@ -2380,6 +2387,7 @@ 
 
 	/**
 	 * Modify member password
+	 * @param stdClass $args
 	 */
 	function updateMemberPassword($args)
 	{
@@ -2414,6 +2422,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $answer
+	 */
 	function updateFindAccountAnswer($member_srl, $answer)
 	{
 		$oPassword =  new Password();
@@ -2673,7 +2684,7 @@ 
 	 *
 	 * @param array &$menu_list
 	 *
-	 * @return object
+	 * @return Object
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
@@ -2703,7 +2714,7 @@ 
 	 *
 	 * @param array &$menu_list
 	 *
-	 * @return object
+	 * @return Object
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
@@ -2731,7 +2742,7 @@ 
 	/**
 	 * Spammer manage. Denied user login. And delete or trash all documents. Response Ajax string
 	 *
-	 * @return object
+	 * @return Object
 	**/
 	function procMemberSpammerManage()
 	{

Spacing +458 added lines, -458 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 Object(-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 Object(-1,'null_user_id');
-		if(!$password) return new Object(-1,'null_password');
+		if (!$user_id) return new Object(-1, 'null_user_id');
+		if (!$password) return new Object(-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 Object(-1, $msg));
+				return $this->setRedirectUrl(getNotEncodedUrl('', 'vid', Context::get('vid'), 'mid', Context::get('mid'), 'act', 'dispMemberModifyPassword'), new Object(-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 Object();
 
 		$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 Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-1, 'msg_alreay_scrapped');
+		if ($output->data->count) return new Object(-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 Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) return new Object(-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 Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		if ($oDocument->get('member_srl') != $logged_info->member_srl)
 		{
-			return new Object(-1,'msg_invalid_request');
+			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$configStatusList = $oDocumentModel->getStatusList();
 		if ($oDocument->get('status') != $configStatusList['temp'])
 		{
-			return new Object(-1,'msg_invalid_request');
+			return new Object(-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 Object(0,'denied_user_id');
+				if ($oMemberModel->isDeniedID($value)) return new Object(0, 'denied_user_id');
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(0, 'msg_exists_user_id');
 				break;
 			case 'nick_name' :
 				// Check denied ID
-				if($oMemberModel->isDeniedNickName($value))
+				if ($oMemberModel->isDeniedNickName($value))
 				{
-					return new Object(0,'denied_nick_name');
+					return new Object(0, 'denied_nick_name');
 				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(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 Object(0,'msg_exists_email_address');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(0, 'msg_exists_email_address');
 				break;
 		}
 	}
@@ -302,25 +302,25 @@ 
 	 */
 	function procMemberInsert()
 	{
-		if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request");
-		$oMemberModel = &getModel ('member');
+		if (Context::getRequestMethod() == "GET") return new Object(-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 Object(-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 Object(-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 Object(-1, 'invalid_password');
+		if (!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new Object(-1, 'invalid_password');
 
 		// Check if a new password is as same as the previous password
-		if($current_password == $password) return new Object(-1, 'invalid_new_password');
+		if ($current_password == $password) return new Object(-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 Object(-1, 'invalid_password');
+		if (!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-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,17 +732,17 @@ 
 	{
 		// 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 ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		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');
 
 		$this->insertProfileImage($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -764,25 +764,25 @@ 
 	{
 
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// Get an image size
 		$max_width = $config->profile_image_max_width;
-		if(!$max_width) $max_width = "90";
+		if (!$max_width) $max_width = "90";
 		$max_height = $config->profile_image_max_height;
-		if(!$max_height) $max_height = "90";
+		if (!$max_height) $max_height = "90";
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
 
 		// Get file information
 		list($width, $height, $type, $attrs) = @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;
@@ -792,7 +792,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)
 		{
 			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
 		}
@@ -811,17 +811,17 @@ 
 	{
 		// 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 ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		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');
 
 		$this->insertImageName($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -842,15 +842,15 @@ 
 	function insertImageName($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_name_max_width;
-		if(!$max_width) $max_width = "90";
+		if (!$max_width) $max_width = "90";
 		$max_height = $config->image_name_max_height;
-		if(!$max_height) $max_height = "20";
+		if (!$max_height) $max_height = "20";
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -859,7 +859,7 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @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) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		if ($width > $max_width || $height > $max_height || $type != 1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
 		else @copy($target_file, $target_filename);
 	}
 
@@ -871,20 +871,20 @@ 
 	function procMemberDeleteProfileImage($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(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 Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -895,20 +895,20 @@ 
 	function procMemberDeleteImageName($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(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 Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -920,17 +920,17 @@ 
 	{
 		// 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;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		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']);
 		// Page refresh
@@ -951,15 +951,15 @@ 
 	function insertImageMark($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_mark_max_width;
-		if(!$max_width) $max_width = "20";
+		if (!$max_width) $max_width = "20";
 		$max_height = $config->image_mark_max_height;
-		if(!$max_height) $max_height = "20";
+		if (!$max_height) $max_height = "20";
 
 		$target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -968,7 +968,7 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		if ($width > $max_width || $height > $max_height || $type != 1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
 		else @copy($target_file, $target_filename);
 	}
 
@@ -980,20 +980,20 @@ 
 	function procMemberDeleteImageMark($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(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 Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -1004,26 +1004,26 @@ 
 	function procMemberFindAccount()
 	{
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if (!$email_address) return new Object(-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 Object(-1, 'msg_email_not_exists');
+		if (!$member_srl) return new Object(-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 Object(-1, 'msg_user_not_confirmed');
+			if ($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
 		}
 
 		// Insert data into the authentication DB
@@ -1036,19 +1036,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};
 				}
@@ -1063,15 +1063,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();
@@ -1081,19 +1081,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 Object(0,$msg);
+		return new Object(0, $msg);
 	}
 
 	/**
@@ -1104,7 +1104,7 @@ 
 	function procMemberFindAccountByQuestion()
 	{
 		$oMemberModel = getModel('member');
-		$oPassword =  new Password();
+		$oPassword = new Password();
 		$config = $oMemberModel->getMemberConfig();
 
 		$email_address = Context::get('email_address');
@@ -1112,49 +1112,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 Object(-1, 'msg_invalid_request');
+		if (($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-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 Object(-1, 'msg_email_not_exists');
+		if (!$member_srl) return new Object(-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 Object(-1, 'msg_question_not_exists');
+		if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-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 Object(-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;
 		}
@@ -1167,11 +1167,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);
@@ -1191,7 +1191,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');
 		}
@@ -1202,9 +1202,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);
 			}
@@ -1212,7 +1212,7 @@ 
 			return $this->stop('msg_invalid_auth_key');
 		}
 
-		if(ztime($output->data->regdate) < $_SERVER['REQUEST_TIME'] + zgap() - 86400)
+		if (ztime($output->data->regdate) < $_SERVER['REQUEST_TIME'] + zgap() - 86400)
 		{
 			executeQuery('member.deleteAuthMail', $args);
 			return $this->stop('msg_invalid_auth_key');
@@ -1221,7 +1221,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';
 		}
@@ -1234,13 +1234,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);
 
@@ -1259,33 +1259,33 @@ 
 	{
 		// Get an email_address
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if (!$email_address) return new Object(-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 Object(-1, 'msg_not_exists_member');
+		if (!$memberSrl) return new Object(-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 Object(-1, 'msg_invalid_request');
+		if ($output->toBool() && $output->data->count == '0') return new Object(-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 Object(-1, 'msg_invalid_request');
+		if (!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
 		$auth_info = $output->data[0];
 
 		// Update the regdate of authmail entry
@@ -1296,12 +1296,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};
 				}
@@ -1320,19 +1320,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);
@@ -1347,23 +1347,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 Object(-1,'msg_exists_email_address');
+			return new Object(-1, 'msg_exists_email_address');
 		}
 
 		// remove all key by member_srl
@@ -1371,7 +1371,7 @@ 
 		$args->member_srl = $memberInfo->member_srl;
 		$output = executeQuery('member.deleteAuthMail', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1381,7 +1381,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());
 		}
@@ -1398,7 +1398,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;
 
@@ -1422,12 +1422,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};
 				}
@@ -1442,25 +1442,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();
 	}
 
@@ -1473,7 +1473,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 Object(-1,'msg_invalid_request');
+		if (!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list)) return new Object(-1, 'msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$columnList = array('site_srl', 'group_srl', 'title');
@@ -1492,13 +1492,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 Object(-1,'msg_invalid_request');
+		if (!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list)) return new Object(-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);
 	}
@@ -1512,25 +1512,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);
@@ -1551,11 +1551,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);
@@ -1584,15 +1584,15 @@ 
 	 *
 	 * @return Object
 	 */
-	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);
@@ -1612,18 +1612,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);
@@ -1633,7 +1633,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);
 		}
@@ -1655,9 +1655,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;
 		}
 
@@ -1667,9 +1667,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;
 		}
 
@@ -1679,7 +1679,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');
@@ -1687,12 +1687,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);
 				}
@@ -1701,7 +1701,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;
 				}
 
@@ -1712,14 +1712,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);
 		}
 	}
 
@@ -1735,13 +1735,13 @@ 
 	function doLogin($user_id, $password = '', $keep_signed = false)
 	{
 		$user_id = strtolower($user_id);
-		if(!$user_id) return new Object(-1, 'null_user_id');
+		if (!$user_id) return new Object(-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');
 
@@ -1751,12 +1751,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
@@ -1764,24 +1764,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 Object(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
+				return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'), $term));
 			}
 			else
 			{
@@ -1791,13 +1791,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);
@@ -1805,12 +1805,12 @@ 
 			{
 				$_SESSION['auth_member_srl'] = $this->memberInfo->member_srl;
 				$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
-				return $this->setRedirectUrl($redirectUrl, new Object(-1,'msg_user_not_confirmed'));
+				return $this->setRedirectUrl($redirectUrl, new Object(-1, 'msg_user_not_confirmed'));
 			}
-			return new Object(-1,'msg_user_denied');
+			return new Object(-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 Object(-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 Object(-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);
@@ -1820,36 +1820,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();
 					}
@@ -1859,9 +1859,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();
@@ -1873,12 +1873,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';
 			}
@@ -1896,18 +1896,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;
@@ -1937,10 +1937,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');
 	}
 
 	/**
@@ -1962,7 +1962,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;
@@ -1981,33 +1981,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
 		{
@@ -2022,97 +2022,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 Object(-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 Object(-1,'denied_user_id');
+			return new Object(-1, 'denied_user_id');
 		}
 
 		// Check if ID is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_user_id');
+			return new Object(-1, 'msg_exists_user_id');
 		}
 
 		// Check if nickname is prohibited
-		if($oMemberModel->isDeniedNickName($args->nick_name))
+		if ($oMemberModel->isDeniedNickName($args->nick_name))
 		{
-			return new Object(-1,'denied_nick_name');
+			return new Object(-1, 'denied_nick_name');
 		}
 
 		// Check if nickname is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_nick_name');
+			return new Object(-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 Object(-1,'msg_exists_email_address');
+			return new Object(-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;
@@ -2122,11 +2122,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;
@@ -2136,7 +2136,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();
@@ -2148,7 +2148,7 @@ 
 			$auth_args->is_register = 'Y';
 
 			$output = executeQuery('member.insertAuthMail', $auth_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -2156,10 +2156,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;
@@ -2181,41 +2181,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();
@@ -2224,56 +2224,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 Object(-1,'msg_exists_email_address');
+				return new Object(-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 Object(-1,'msg_exists_user_id');
+				return new Object(-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 Object(-1,'denied_user_id');
+				return new Object(-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 Object(-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 Object(-1,'msg_exists_user_id');
+				return new Object(-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 Object(-1,'msg_exists_nick_name');
+ 			return new Object(-1, 'msg_exists_nick_name');
  		}
 
 		list($args->email_id, $args->email_host) = explode('@', $args->email_address);
@@ -2282,9 +2282,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 Object(-1, $message[$config->password_strength]);
@@ -2296,55 +2296,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;
@@ -2356,9 +2356,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;
@@ -2371,7 +2371,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);
@@ -2383,14 +2383,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 Object(-1, $message[$config->password_strength]);
@@ -2398,13 +2398,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);
 		}
@@ -2416,7 +2416,7 @@ 
 
 	function updateFindAccountAnswer($member_srl, $answer)
 	{
-		$oPassword =  new Password();
+		$oPassword = new Password();
 
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
@@ -2433,18 +2433,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 Object(-1, 'msg_not_exists_member');
+		if (!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
 		// If managers can not be deleted
-		if($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
+		if ($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2453,7 +2453,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;
@@ -2468,23 +2468,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;
@@ -2508,23 +2508,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;
@@ -2540,22 +2540,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');
@@ -2565,18 +2565,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 Object(-1,'msg_exists_email_address');
+		if ($member_srl) return new Object(-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');
 		}
@@ -2592,7 +2592,7 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -2602,7 +2602,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;
 
@@ -2614,17 +2614,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);
@@ -2638,16 +2638,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');
 		}
 
@@ -2656,10 +2656,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);
 
@@ -2677,7 +2677,7 @@ 
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if (!Context::get('is_logged')) return new Object();
 
 		$logged_info = Context::get('logged_info');
 		$document_srl = Context::get('target_srl');
@@ -2688,12 +2688,12 @@ 
 		$member_srl = $oDocument->get('member_srl');
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$member_srl) return new Object();
-		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if (!$member_srl) return new Object();
+		if ($oDocumentModel->grant->manager != 1 || $member_srl == $logged_info->member_srl) return new Object();
 
 		$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 Object();
 	}
@@ -2707,7 +2707,7 @@ 
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if (!Context::get('is_logged')) return new Object();
 
 		$logged_info = Context::get('logged_info');
 		$comment_srl = Context::get('target_srl');
@@ -2718,12 +2718,12 @@ 
 		$module_srl = $oComment->get('module_srl');
 		$member_srl = $oComment->get('member_srl');
 
-		if(!$member_srl) return new Object();
-		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if (!$member_srl) return new Object();
+		if ($oCommentModel->grant->manager != 1 || $member_srl == $logged_info->member_srl) return new Object();
 
 		$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 Object();
 	}
@@ -2735,7 +2735,7 @@ 
 	**/
 	function procMemberSpammerManage()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = Context::get('member_srl');
@@ -2743,7 +2743,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
@@ -2752,7 +2752,7 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if (!$grant->manager) return new Object(-1, 'msg_not_permitted');
 
 		$proc_msg = "";
 
@@ -2761,10 +2761,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
@@ -2773,11 +2773,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;
 
@@ -2801,7 +2801,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');
@@ -2820,10 +2820,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);
 
@@ -2852,21 +2852,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);
 				}
 			}
@@ -2878,24 +2878,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 +591 added lines, -254 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 Object(-1,'null_user_id');
-		if(!$password) return new Object(-1,'null_password');
+		if(!$user_id) {
+			return new Object(-1,'null_user_id');
+		}
+		if(!$password) {
+			return new Object(-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 Object();
 
 		$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 Object(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new Object(-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 Object(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			$document_srl = (int)Context::get('target_srl');
+		}
+		if(!$document_srl) {
+			return new Object(-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 Object(-1, 'msg_alreay_scrapped');
+		if($output->data->count) {
+			return new Object(-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 Object(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-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 Object(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-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 Object(0,'denied_user_id');
+				if($oMemberModel->isDeniedID($value)) {
+					return new Object(0,'denied_user_id');
+				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new Object(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 Object(0,'msg_exists_nick_name');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new Object(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 Object(0,'msg_exists_email_address');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new Object(0,'msg_exists_email_address');
+				}
 				break;
 		}
 	}
@@ -302,17 +346,25 @@ 
 	 */
 	function procMemberInsert()
 	{
-		if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request");
+		if (Context::getRequestMethod () == "GET") {
+			return new Object (-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 Object(-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 Object(-1, 'invalid_password');
+		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) {
+			return new Object(-1, 'invalid_password');
+		}
 
 		// Check if a new password is as same as the previous password
-		if($current_password == $password) return new Object(-1, 'invalid_new_password');
+		if($current_password == $password) {
+			return new Object(-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 Object(-1, 'invalid_password');
+		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) {
+			return new Object(-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,17 +818,25 @@ 
 	{
 		// 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 ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		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');
+		}
 
 		$this->insertProfileImage($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -764,26 +858,35 @@ 
 	{
 
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if(!checkUploadedFile($target_file)) {
+			return;
+		}
 
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// Get an image size
 		$max_width = $config->profile_image_max_width;
-		if(!$max_width) $max_width = "90";
+		if(!$max_width) {
+			$max_width = "90";
+		}
 		$max_height = $config->profile_image_max_height;
-		if(!$max_height) $max_height = "90";
+		if(!$max_height) {
+			$max_height = "90";
+		}
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
 
 		// Get file information
 		list($width, $height, $type, $attrs) = @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;
 		}
@@ -795,8 +898,7 @@ 
 		if(($width > $max_width || $height > $max_height ) && $type != 1)
 		{
 			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
-		}
-		else
+		} else
 		{
 			@copy($target_file, $target_filename);
 		}
@@ -811,17 +913,25 @@ 
 	{
 		// 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 ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		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');
+		}
 
 		$this->insertImageName($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -842,15 +952,21 @@ 
 	function insertImageName($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if(!checkUploadedFile($target_file)) {
+			return;
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_name_max_width;
-		if(!$max_width) $max_width = "90";
+		if(!$max_width) {
+			$max_width = "90";
+		}
 		$max_height = $config->image_name_max_height;
-		if(!$max_height) $max_height = "20";
+		if(!$max_height) {
+			$max_height = "20";
+		}
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -859,8 +975,11 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @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) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
-		else @copy($target_file, $target_filename);
+		if($width > $max_width || $height > $max_height || $type!=1) {
+			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		} else {
+			@copy($target_file, $target_filename);
+		}
 	}
 
 	/**
@@ -920,17 +1039,25 @@ 
 	{
 		// 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;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		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']);
 		// Page refresh
@@ -951,15 +1078,21 @@ 
 	function insertImageMark($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if(!checkUploadedFile($target_file)) {
+			return;
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_mark_max_width;
-		if(!$max_width) $max_width = "20";
+		if(!$max_width) {
+			$max_width = "20";
+		}
 		$max_height = $config->image_mark_max_height;
-		if(!$max_height) $max_height = "20";
+		if(!$max_height) {
+			$max_height = "20";
+		}
 
 		$target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -968,8 +1101,11 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
-		else @copy($target_file, $target_filename);
+		if($width > $max_width || $height > $max_height || $type!=1) {
+			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		} else {
+			@copy($target_file, $target_filename);
+		}
 	}
 
 	/**
@@ -1004,14 +1140,18 @@ 
 	function procMemberFindAccount()
 	{
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if(!$email_address) {
+			return new Object(-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 Object(-1, 'msg_email_not_exists');
+		if(!$member_srl) {
+			return new Object(-1, 'msg_email_not_exists');
+		}
 
 		// Get information of the member
 		$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
@@ -1023,7 +1163,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 Object(-1, 'msg_user_not_confirmed');
+			if($output->toBool() && $output->data->count != '0') {
+				return new Object(-1, 'msg_user_not_confirmed');
+			}
 		}
 
 		// Insert data into the authentication DB
@@ -1036,7 +1178,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);
 
@@ -1053,8 +1197,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;
@@ -1063,13 +1206,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);
@@ -1112,19 +1261,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 Object(-1, 'msg_invalid_request');
+		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) {
+			return new Object(-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 Object(-1, 'msg_email_not_exists');
+		if(!$member_srl) {
+			return new Object(-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 Object(-1, 'msg_question_not_exists');
+		if(!$member_info->find_account_question || !$member_info->find_account_answer) {
+			return new Object(-1, 'msg_question_not_exists');
+		}
 
 		// 답변 확인
 		$hashed = $oPassword->checkAlgorithm($member_info->find_account_answer);
@@ -1133,12 +1288,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;
 		}
@@ -1167,7 +1320,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;
 
@@ -1224,8 +1379,7 @@ 
 		if($output->data->is_register == 'Y')
 		{
 			$args->denied = 'N';
-		}
-		else
+		} else
 		{
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
@@ -1259,33 +1413,45 @@ 
 	{
 		// Get an email_address
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if(!$email_address) {
+			return new Object(-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 Object(-1, 'msg_not_exists_member');
+		if(!$memberSrl) {
+			return new Object(-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 Object(-1, 'msg_invalid_request');
+		if($output->toBool() && $output->data->count == '0') {
+			return new Object(-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 Object(-1, 'msg_invalid_request');
+		if(!$output->data || !$output->data[0]->auth_key) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		$auth_info = $output->data[0];
 
 		// Update the regdate of authmail entry
@@ -1306,8 +1472,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;
@@ -1320,7 +1485,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);
@@ -1398,7 +1565,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;
 
@@ -1432,8 +1601,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;
@@ -1442,13 +1610,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);
@@ -1473,7 +1647,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 Object(-1,'msg_invalid_request');
+		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$columnList = array('site_srl', 'group_srl', 'title');
@@ -1492,13 +1668,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 Object(-1,'msg_invalid_request');
+		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) {
+			return new Object(-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);
 	}
@@ -1512,17 +1692,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);
@@ -1530,7 +1730,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);
@@ -1555,7 +1757,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);
@@ -1589,7 +1793,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);
@@ -1615,15 +1821,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);
@@ -1633,7 +1845,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);
 		}
@@ -1695,8 +1909,7 @@ 
 				if($config->identifier == 'user_id')
 				{
 					$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
-				}
-				else
+				} else
 				{
 					$member_info = $oMemberModel->getMemberInfoByEmailAddress($user_id, $columnList);
 				}
@@ -1705,8 +1918,7 @@ 
 					$do_auto_login = true;
 				}
 
-			}
-			else
+			} else
 			{
 				$do_auto_login = true;
 			}
@@ -1715,8 +1927,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);
@@ -1735,13 +1946,17 @@ 
 	function doLogin($user_id, $password = '', $keep_signed = false)
 	{
 		$user_id = strtolower($user_id);
-		if(!$user_id) return new Object(-1, 'null_user_id');
+		if(!$user_id) {
+			return new Object(-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');
 
@@ -1756,15 +1971,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);
@@ -1776,14 +1994,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 Object(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
-			}
-			else
+			} else
 			{
 				$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 				$output = executeQuery('member.deleteLoginCountByIp', $args);
@@ -1810,7 +2032,9 @@ 
 			return new Object(-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 Object(-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 Object(-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);
@@ -1859,7 +2083,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)
 		{
@@ -1873,7 +2099,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')
 		{
@@ -1962,7 +2190,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;
@@ -1981,35 +2211,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);
 		}
@@ -2022,8 +2271,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');
@@ -2037,8 +2290,7 @@ 
 				return new Object(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		elseif(!$args->password)
+		} elseif(!$args->password)
 		{
 			unset($args->password);
 		}
@@ -2046,8 +2298,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);
 		}
@@ -2088,8 +2339,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();
@@ -2101,8 +2356,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)
 		{
@@ -2119,8 +2377,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++)
 			{
@@ -2181,27 +2438,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');
@@ -2209,13 +2478,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();
@@ -2232,8 +2507,7 @@ 
 				return new Object(-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)
@@ -2290,16 +2564,14 @@ 
 				return new Object(-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);
@@ -2311,11 +2583,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);
 
@@ -2327,8 +2609,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)
 			{
@@ -2371,7 +2656,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);
@@ -2397,8 +2684,7 @@ 
 			}
 
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		else if($args->hashed_password)
+		} else if($args->hashed_password)
 		{
 			$args->password = $args->hashed_password;
 		}
@@ -2433,7 +2719,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
@@ -2442,9 +2730,13 @@ 
 			$columnList = array('member_srl', 'is_admin');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		}
-		if(!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
+		if(!$this->memberInfo) {
+			return new Object(-1, 'msg_not_exists_member');
+		}
 		// If managers can not be deleted
-		if($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
+		if($this->memberInfo->is_admin == 'Y') {
+			return new Object(-1, 'msg_cannot_delete_admin');
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2508,7 +2800,9 @@ 
 	 */
 	function destroySessionInfo()
 	{
-		if(!$_SESSION || !is_array($_SESSION)) return;
+		if(!$_SESSION || !is_array($_SESSION)) {
+			return;
+		}
 
 		$memberInfo = Context::get('logged_info');
 		$memberSrl = $memberInfo->member_srl;
@@ -2547,8 +2841,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)
 		{
@@ -2565,16 +2860,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 Object(-1,'msg_exists_email_address');
+		if($member_srl) {
+			return new Object(-1,'msg_exists_email_address');
+		}
 
 		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
@@ -2602,7 +2903,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;
 
@@ -2638,7 +2941,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;
@@ -2647,7 +2952,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');
 		}
 
@@ -2656,7 +2963,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);
@@ -2677,7 +2986,9 @@ 
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if(!Context::get('is_logged')) {
+			return new Object();
+		}
 
 		$logged_info = Context::get('logged_info');
 		$document_srl = Context::get('target_srl');
@@ -2688,8 +2999,12 @@ 
 		$member_srl = $oDocument->get('member_srl');
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$member_srl) return new Object();
-		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if(!$member_srl) {
+			return new Object();
+		}
+		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) {
+			return new Object();
+		}
 
 		$oDocumentController = getController('document');
 		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@@ -2707,7 +3022,9 @@ 
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if(!Context::get('is_logged')) {
+			return new Object();
+		}
 
 		$logged_info = Context::get('logged_info');
 		$comment_srl = Context::get('target_srl');
@@ -2718,8 +3035,12 @@ 
 		$module_srl = $oComment->get('module_srl');
 		$member_srl = $oComment->get('member_srl');
 
-		if(!$member_srl) return new Object();
-		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if(!$member_srl) {
+			return new Object();
+		}
+		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) {
+			return new Object();
+		}
 
 		$oCommentController = getController('comment');
 		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@@ -2735,7 +3056,9 @@ 
 	**/
 	function procMemberSpammerManage()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = Context::get('member_srl');
@@ -2743,8 +3066,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');
@@ -2752,7 +3076,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$proc_msg = "";
 
@@ -2761,11 +3087,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);
@@ -2773,13 +3101,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);
@@ -2821,7 +3152,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 . "]";
 
@@ -2866,8 +3200,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/frontendfile/FrontEndFileHandler.class.php

Spacing +52 added lines, -52 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	function isSsl()
 	{
-		if(!is_null(self::$isSSL))
+		if (!is_null(self::$isSSL))
 		{
 			return self::$isSSL;
 		}
@@ -88,30 +88,30 @@ 
 	 * */
 	function loadFile($args)
 	{
-		if(!is_array($args))
+		if (!is_array($args))
 		{
 			$args = array($args);
 		}
 		$file = $this->getFileInfo($args[0], $args[2], $args[1]);
 
 		$availableExtension = array('css' => 1, 'js' => 1);
-		if(!isset($availableExtension[$file->fileExtension]))
+		if (!isset($availableExtension[$file->fileExtension]))
 		{
 			return;
 		}
 
 		$file->index = (int) $args[3];
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$map = &$this->cssMap;
 			$mapIndex = &$this->cssMapIndex;
 
 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			if($args[1] == 'body')
+			if ($args[1] == 'body')
 			{
 				$map = &$this->jsBodyMap;
 				$mapIndex = &$this->jsBodyMapIndex;
@@ -124,7 +124,7 @@ 
 		}
 
 		(is_null($file->index)) ? $file->index = 0 : $file->index = $file->index;
-		if(!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
+		if (!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
 		{
 			$this->unloadFile($args[0], $args[2], $args[1]);
 			$map[$file->index][$file->key] = $file;
@@ -144,13 +144,13 @@ 
 	{
 		static $existsInfo = array();
 
-		if(isset($existsInfo[$existsKey]))
+		if (isset($existsInfo[$existsKey]))
 		{
 			return $existsInfo[$existsKey];
 		}
 
 		$url_info = parse_url($fileName);
-		$pathInfo = pathinfo(str_replace('?' . $url_info['query'], '', $fileName));
+		$pathInfo = pathinfo(str_replace('?'.$url_info['query'], '', $fileName));
 
 		$file = new stdClass();
 		$file->fileName = basename($url_info['path']);
@@ -163,14 +163,14 @@ 
 		$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));
 		$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);
 
-		if(!$file->external)
+		if (!$file->external)
 		{
-			if(!__DEBUG__ && __XE_VERSION_STABLE__)
+			if (!__DEBUG__ && __XE_VERSION_STABLE__)
 			{
 				// if no debug mode, load minifed file
 				$minifiedFileName = implode('.', array($file->fileNameNoExt, 'min', $file->fileExtension));
 				$minifiedRealPath = implode('/', array($file->fileRealPath, $minifiedFileName));
-				if(file_exists($minifiedRealPath))
+				if (file_exists($minifiedRealPath))
 				{
 					$file->fileName = $minifiedFileName;
 				}
@@ -178,7 +178,7 @@ 
 			else
 			{
 				// Remove .min
-				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
+				if (file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
 				{
 					$file->fileName = $file->keyName;
 				}
@@ -187,18 +187,18 @@ 
 
 		$file->targetIe = $targetIe;
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$file->media = $media;
-			if(!$file->media)
+			if (!$file->media)
 			{
 				$file->media = 'all';
 			}
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe."\t".$file->media;
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe;
 		}
 
 		return $file;
@@ -216,9 +216,9 @@ 
 	{
 		$file = $this->getFileInfo($fileName, $targetIe, $media);
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
-			if(isset($this->cssMapIndex[$file->key]))
+			if (isset($this->cssMapIndex[$file->key]))
 			{
 				$index = $this->cssMapIndex[$file->key];
 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);
@@ -226,12 +226,12 @@ 
 		}
 		else
 		{
-			if(isset($this->jsHeadMapIndex[$file->key]))
+			if (isset($this->jsHeadMapIndex[$file->key]))
 			{
 				$index = $this->jsHeadMapIndex[$file->key];
 				unset($this->jsHeadMap[$index][$file->key], $this->jsHeadMapIndex[$file->key]);
 			}
-			if(isset($this->jsBodyMapIndex[$file->key]))
+			if (isset($this->jsBodyMapIndex[$file->key]))
 			{
 				$index = $this->jsBodyMapIndex[$file->key];
 				unset($this->jsBodyMap[$index][$file->key], $this->jsBodyMapIndex[$file->key]);
@@ -247,13 +247,13 @@ 
 	 */
 	function unloadAllFiles($type = 'all')
 	{
-		if($type == 'css' || $type == 'all')
+		if ($type == 'css' || $type == 'all')
 		{
 			$this->cssMap = array();
 			$this->cssMapIndex = array();
 		}
 
-		if($type == 'js' || $type == 'all')
+		if ($type == 'js' || $type == 'all')
 		{
 			$this->jsHeadMap = array();
 			$this->jsBodyMap = array();
@@ -275,23 +275,23 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'media' => $file->media,
@@ -311,7 +311,7 @@ 
 	 */
 	function getJsFileList($type = 'head')
 	{
-		if($type == 'head')
+		if ($type == 'head')
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
@@ -325,23 +325,23 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'targetie' => $file->targetIe
@@ -372,18 +372,18 @@ 
 	 */
 	function _normalizeFilePath($path)
 	{
-		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
+		if (strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
 		{
-			$path = './' . $path;
+			$path = './'.$path;
 		}
-		elseif(!strncmp($path, '//', 2))
+		elseif (!strncmp($path, '//', 2))
 		{
 			return preg_replace('#^//+#', '//', $path);
 		}
 
 		$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);
 
-		while(strpos($path, '/../'))
+		while (strpos($path, '/../'))
 		{
 			$path = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $path, 1);
 		}
@@ -402,20 +402,20 @@ 
 		$path = $this->_normalizeFilePath($path);
 		$script_path = getScriptPath();
 
-		if(strpos($path, './') === 0)
+		if (strpos($path, './') === 0)
 		{
-			if($script_path == '/' || $script_path == '\\')
+			if ($script_path == '/' || $script_path == '\\')
 			{
-				$path = '/' . substr($path, 2);
+				$path = '/'.substr($path, 2);
 			}
 			else
 			{
-				$path = $script_path . substr($path, 2);
+				$path = $script_path.substr($path, 2);
 			}
 		}
-		else if(strpos($file, '../') === 0)
+		else if (strpos($file, '../') === 0)
 		{
-			$path = $this->_normalizeFilePath($script_path . $path);
+			$path = $this->_normalizeFilePath($script_path.$path);
 		}
 
 		return $path;
@@ -430,7 +430,7 @@ 
 	 */
 	function _arrangeCssIndex($dirName, &$file)
 	{
-		if($file->index !== 0)
+		if ($file->index !== 0)
 		{
 			return;
 		}

Braces +15 added lines, -20 removed lines

@@ -108,15 +108,13 @@ 
 			$mapIndex = &$this->cssMapIndex;
 
 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);
-		}
-		else if($file->fileExtension == 'js')
+		} else if($file->fileExtension == 'js')
 		{
 			if($args[1] == 'body')
 			{
 				$map = &$this->jsBodyMap;
 				$mapIndex = &$this->jsBodyMapIndex;
-			}
-			else
+			} else
 			{
 				$map = &$this->jsHeadMap;
 				$mapIndex = &$this->jsHeadMapIndex;
@@ -174,8 +172,7 @@ 
 				{
 					$file->fileName = $minifiedFileName;
 				}
-			}
-			else
+			} else
 			{
 				// Remove .min
 				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
@@ -195,8 +192,7 @@ 
 				$file->media = 'all';
 			}
 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;
-		}
-		else if($file->fileExtension == 'js')
+		} else if($file->fileExtension == 'js')
 		{
 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;
 		}
@@ -223,8 +219,7 @@ 
 				$index = $this->cssMapIndex[$file->key];
 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);
 			}
-		}
-		else
+		} else
 		{
 			if(isset($this->jsHeadMapIndex[$file->key]))
 			{
@@ -286,7 +281,9 @@ 
 				}
 				if($file->query)
 				{
-					if($query) $query .= '&';
+					if($query) {
+						$query .= '&';
+					}
 					$query .= $file->query;
 				}
 				$query = ($query) ? '?' . $query : '';
@@ -315,8 +312,7 @@ 
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
-		}
-		else
+		} else
 		{
 			$map = &$this->jsBodyMap;
 			$mapIndex = &$this->jsBodyMapIndex;
@@ -336,7 +332,9 @@ 
 				}
 				if($file->query)
 				{
-					if($query) $query .= '&';
+					if($query) {
+						$query .= '&';
+					}
 					$query .= $file->query;
 				}
 				$query = ($query) ? '?' . $query : '';
@@ -375,8 +373,7 @@ 
 		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
 		{
 			$path = './' . $path;
-		}
-		elseif(!strncmp($path, '//', 2))
+		} elseif(!strncmp($path, '//', 2))
 		{
 			return preg_replace('#^//+#', '//', $path);
 		}
@@ -407,13 +404,11 @@ 
 			if($script_path == '/' || $script_path == '\\')
 			{
 				$path = '/' . substr($path, 2);
-			}
-			else
+			} else
 			{
 				$path = $script_path . substr($path, 2);
 			}
-		}
-		else if(strpos($file, '../') === 0)
+		} else if(strpos($file, '../') === 0)
 		{
 			$path = $this->_normalizeFilePath($script_path . $path);
 		}

classes/display/HTMLDisplayHandler.php

Spacing +52 added lines, -52 removed lines

@@ -19,9 +19,9 @@ 
 
 		$template_path = $oModule->getTemplatePath();
 
-		if(!is_dir($template_path))
+		if (!is_dir($template_path))
 		{
-			if($oModule->module_info->module == $oModule->module)
+			if ($oModule->module_info->module == $oModule->module)
 			{
 				$skin = $oModule->origin_module_info->skin;
 			}
@@ -30,17 +30,17 @@ 
 				$skin = $oModule->module_config->skin;
 			}
 
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
 			{
-				if($skin && is_string($skin))
+				if ($skin && is_string($skin))
 				{
 					$theme_skin = explode('|@|', $skin);
 					$template_path = $oModule->getTemplatePath();
-					if(count($theme_skin) == 2)
+					if (count($theme_skin) == 2)
 					{
 						$theme_path = sprintf('./themes/%s', $theme_skin[0]);
 						// FIXME $theme_path $theme_path $theme_path ??
-						if(substr($theme_path, 0, strlen($theme_path)) != $theme_path)
+						if (substr($theme_path, 0, strlen($theme_path)) != $theme_path)
 						{
 							$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
 						}
@@ -61,16 +61,16 @@ 
 		$output = $oTemplate->compile($template_path, $tpl_file);
 
 		// add .x div for adminitration pages
-		if(Context::getResponseMethod() == 'HTML')
+		if (Context::getResponseMethod() == 'HTML')
 		{
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
 			{
-				$output = '<div class="x">' . $output . '</div>';
+				$output = '<div class="x">'.$output.'</div>';
 			}
 
-			if(Context::get('layout') != 'none')
+			if (Context::get('layout') != 'none')
 			{
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$start = getMicroTime();
 				}
@@ -88,11 +88,11 @@ 
 				$layout_srl = $layout_info->layout_srl;
 
 				// compile if connected to the layout
-				if($layout_srl > 0)
+				if ($layout_srl > 0)
 				{
 
 					// handle separately if the layout is faceoff
-					if($layout_info && $layout_info->type == 'faceoff')
+					if ($layout_info && $layout_info->type == 'faceoff')
 					{
 						$oLayoutModel->doActivateFaceOff($layout_info);
 						Context::set('layout_info', $layout_info);
@@ -101,16 +101,16 @@ 
 					// search if the changes CSS exists in the admin layout edit window
 					$edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_srl);
 
-					if(FileHandler::exists($edited_layout_css))
+					if (FileHandler::exists($edited_layout_css))
 					{
 						Context::loadFile(array($edited_layout_css, 'all', '', 100));
 					}
 				}
-				if(!$layout_path)
+				if (!$layout_path)
 				{
 					$layout_path = './common/tpl';
 				}
-				if(!$layout_file)
+				if (!$layout_file)
 				{
 					$layout_file = 'default_layout';
 				}
@@ -118,7 +118,7 @@ 
 
 				// if popup_layout, remove admin bar.
 				$realLayoutPath = FileHandler::getRealPath($layout_path);
-				if(substr_compare($realLayoutPath, '/', -1) !== 0)
+				if (substr_compare($realLayoutPath, '/', -1) !== 0)
 				{
 					$realLayoutPath .= '/';
 				}
@@ -126,12 +126,12 @@ 
 				$pathInfo = pathinfo($layout_file);
 				$onlyLayoutFile = $pathInfo['filename'];
 
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$GLOBALS['__layout_compile_elapsed__'] = getMicroTime() - $start;
 				}
 
-				if(stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
+				if (stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
 				{
 					Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
 				}
@@ -147,12 +147,12 @@ 
 	 */
 	function prepareToPrint(&$output)
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -170,20 +170,20 @@ 
 		$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)-->/is', array($this, '_transMeta'), $output);
 
 		// handles a relative path generated by using the rewrite module
-		if(Context::isAllowRewrite())
+		if (Context::isAllowRewrite())
 		{
 			$url = parse_url(Context::getRequestUri());
 			$real_path = $url['path'];
 
 			$pattern = '/src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/s';
-			$output = preg_replace($pattern, 'src=$1' . $real_path . '$3/$4.$5$6', $output);
+			$output = preg_replace($pattern, 'src=$1'.$real_path.'$3/$4.$5$6', $output);
 
 			$pattern = '/href=("|\'){1}(\?[^"\']+)/s';
-			$output = preg_replace($pattern, 'href=$1' . $real_path . '$2', $output);
+			$output = preg_replace($pattern, 'href=$1'.$real_path.'$2', $output);
 
-			if(Context::get('vid'))
+			if (Context::get('vid'))
 			{
-				$pattern = '/\/' . Context::get('vid') . '\?([^=]+)=/is';
+				$pattern = '/\/'.Context::get('vid').'\?([^=]+)=/is';
 				$output = preg_replace($pattern, '/?$1=', $output);
 			}
 		}
@@ -191,18 +191,18 @@ 
 		// prevent the 2nd request due to url(none) of the background-image
 		$output = preg_replace('/url\((["\']?)none(["\']?)\)/is', 'none', $output);
 
-		if(is_array(Context::get('INPUT_ERROR')))
+		if (is_array(Context::get('INPUT_ERROR')))
 		{
 			$INPUT_ERROR = Context::get('INPUT_ERROR');
 			$keys = array_keys($INPUT_ERROR);
-			$keys = '(' . implode('|', $keys) . ')';
+			$keys = '('.implode('|', $keys).')';
 
-			$output = preg_replace_callback('@(<input)([^>]*?)\sname="' . $keys . '"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
-			$output = preg_replace_callback('@<select[^>]*\sname="' . $keys . '".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
-			$output = preg_replace_callback('@<textarea[^>]*\sname="' . $keys . '".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
+			$output = preg_replace_callback('@(<input)([^>]*?)\sname="'.$keys.'"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
+			$output = preg_replace_callback('@<select[^>]*\sname="'.$keys.'".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
+			$output = preg_replace_callback('@<textarea[^>]*\sname="'.$keys.'".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__trans_content_elapsed__'] = getMicroTime() - $start;
 		}
@@ -220,7 +220,7 @@ 
 		// convert the final layout
 		Context::set('content', $output);
 		$oTemplate = TemplateHandler::getInstance();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$this->_loadMobileJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'mobile_layout');
@@ -245,16 +245,16 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 
-		$str = $match[1] . $match[2] . ' name="' . $match[3] . '"' . $match[4];
+		$str = $match[1].$match[2].' name="'.$match[3].'"'.$match[4];
 
 		// get type
 		$type = 'text';
-		if(preg_match('/\stype="([a-z]+)"/i', $str, $m))
+		if (preg_match('/\stype="([a-z]+)"/i', $str, $m))
 		{
 			$type = strtolower($m[1]);
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'text':
 			case 'hidden':
@@ -272,7 +272,7 @@ 
 			case 'number':
 			case 'range':
 			case 'color':
-				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str) . ' value="' . htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '"';
+				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'"';
 				break;
 			case 'password':
 				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str);
@@ -280,14 +280,14 @@ 
 			case 'radio':
 			case 'checkbox':
 				$str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str);
-				if(@preg_match('@\s(?i:value)="' . $INPUT_ERROR[$match[3]] . '"@', $str))
+				if (@preg_match('@\s(?i:value)="'.$INPUT_ERROR[$match[3]].'"@', $str))
 				{
 					$str .= ' checked="checked"';
 				}
 				break;
 		}
 
-		return $str . ' />';
+		return $str.' />';
 	}
 
 	/**
@@ -304,14 +304,14 @@ 
 		preg_match_all('@<option[^>]*\svalue="([^"]*)".+</option>@isU', $matches[0], $m);
 
 		$key = array_search($INPUT_ERROR[$matches[1]], $m[1]);
-		if($key === FALSE)
+		if ($key === FALSE)
 		{
 			return $matches[0];
 		}
 
 		$m[0][$key] = preg_replace('@(\svalue=".*?")@is', '$1 selected="selected"', $m[0][$key]);
 
-		return $mm[0] . implode('', $m[0]) . '</select>';
+		return $mm[0].implode('', $m[0]).'</select>';
 	}
 
 	/**
@@ -323,7 +323,7 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 		preg_match('@<textarea.*?>@is', $matches[0], $mm);
-		return $mm[0] . $INPUT_ERROR[$matches[1]] . '</textarea>';
+		return $mm[0].$INPUT_ERROR[$matches[1]].'</textarea>';
 	}
 
 	/**
@@ -334,7 +334,7 @@ 
 	 */
 	function _moveStyleToHeader($matches)
 	{
-		if(isset($matches[1]) && stristr($matches[1], 'scoped'))
+		if (isset($matches[1]) && stristr($matches[1], 'scoped'))
 		{
 			return $matches[0];
 		}
@@ -370,7 +370,7 @@ 
 	 */
 	function _transMeta($matches)
 	{
-		if($matches[1])
+		if ($matches[1])
 		{
 			return '';
 		}
@@ -387,7 +387,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -111000), true);
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', 'gte IE 9', -110000), true);
@@ -398,7 +398,7 @@ 
 			$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -1000000), true);
 			}
@@ -413,7 +413,7 @@ 
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', 'gte IE 9', -110000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -100000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -1000000), true);
 			}
@@ -424,9 +424,9 @@ 
 		}
 
 		// for admin page, add admin css
-		if(Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
+		if (Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
 		{
-			if(__DEBUG__ || !__XE_VERSION_STABLE__)
+			if (__DEBUG__ || !__XE_VERSION_STABLE__)
 			{
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.css', '', '', 10), true);
 				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
@@ -458,7 +458,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', '', -110000), true);
 			$oContext->loadFile(array('./common/js/modernizr.js', 'head', '', -100000), true);
@@ -468,7 +468,7 @@ 
 			$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -1000000), true);
 				$oContext->loadFile(array('./common/css/mobile.css', '', '', -1000000), true);
@@ -484,7 +484,7 @@ 
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -110000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -100000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -1000000), true);
 				$oContext->loadFile(array('./common/css/mobile.min.css', '', '', -1000000), true);

modules/widget/widget.class.php

Spacing +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+			if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -49,10 +49,10 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
+			if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
 			{
 				$oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
 			}

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}

modules/message/message.class.php

Spacing +6 added lines, -6 removed lines

@@ -23,17 +23,17 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if (is_dir($template_path)) return true;
 				}
 			}
 
@@ -51,17 +51,17 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						$config->skin = implode('|@|', $config_parse);
 						$oModuleController = getController('module');

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if(is_dir($template_path)) {
+						return true;
+					}
 				}
 			}
 

modules/comment/comment.class.php

Spacing +29 added lines, -29 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-require_once(_XE_PATH_ . 'modules/comment/comment.item.php');
+require_once(_XE_PATH_.'modules/comment/comment.item.php');
 
 /**
  * comment
@@ -36,7 +36,7 @@ 
 		// 2008. 02. 22 add comment setting when a new module added
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -54,63 +54,63 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 			{
 				return TRUE;
 			}
 			// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 			{
 				return TRUE;
 			}
 			// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-			if(!$oDB->isColumnExists("comments", "voted_count"))
+			if (!$oDB->isColumnExists("comments", "voted_count"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("comments", "notify_message"))
+			if (!$oDB->isColumnExists("comments", "notify_message"))
 			{
 				return TRUE;
 			}
 			// 2008. 02. 22 add comment setting when a new module added
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 			{
 				return TRUE;
 			}
 			// 2008. 05. 14 add a column for blamed count
-			if(!$oDB->isColumnExists("comments", "blamed_count"))
+			if (!$oDB->isColumnExists("comments", "blamed_count"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("comment_voted_log", "point"))
+			if (!$oDB->isColumnExists("comment_voted_log", "point"))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+			if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 			{
 				return TRUE;
 			}
 			//2012. 02. 24 add comment published status column and index
-			if(!$oDB->isColumnExists("comments", "status"))
+			if (!$oDB->isColumnExists("comments", "status"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isIndexExists("comments", "idx_status"))
+			if (!$oDB->isIndexExists("comments", "idx_status"))
 			{
 				return TRUE;
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_parent_srl"))
+			if (!$oDB->isIndexExists("comments", "idx_parent_srl"))
 			{
 				return TRUE;
 			}
@@ -131,46 +131,46 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 			{
 				$oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
 			}
 			// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 			{
 				$oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
 			}
 			// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-			if(!$oDB->isColumnExists("comments", "voted_count"))
+			if (!$oDB->isColumnExists("comments", "voted_count"))
 			{
 				$oDB->addColumn("comments", "voted_count", "number", "11");
 				$oDB->addIndex("comments", "idx_voted_count", array("voted_count"));
 			}
 
-			if(!$oDB->isColumnExists("comments", "notify_message"))
+			if (!$oDB->isColumnExists("comments", "notify_message"))
 			{
 				$oDB->addColumn("comments", "notify_message", "char", "1");
 			}
 			// 2008. 02. 22 add comment setting when a new module added
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 			{
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 			}
 			// 2008. 05. 14 add a column for blamed count
-			if(!$oDB->isColumnExists("comments", "blamed_count"))
+			if (!$oDB->isColumnExists("comments", "blamed_count"))
 			{
 				$oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, TRUE);
 				$oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
 			}
-			if(!$oDB->isColumnExists("comment_voted_log", "point"))
+			if (!$oDB->isColumnExists("comment_voted_log", "point"))
 			{
 				$oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, TRUE);
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+			if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 			{
 				$oDB->addIndex(
 						"comments", "idx_module_list_order", array("module_srl", "list_order"), TRUE
@@ -178,11 +178,11 @@ 
 			}
 
 			//2012. 02. 24 add comment published status column and index
-			if(!$oDB->isColumnExists("comments", "status"))
+			if (!$oDB->isColumnExists("comments", "status"))
 			{
 				$oDB->addColumn("comments", "status", "number", 1, 1, TRUE);
 			}
-			if(!$oDB->isIndexExists("comments", "idx_status"))
+			if (!$oDB->isIndexExists("comments", "idx_status"))
 			{
 				$oDB->addIndex(
 						"comments", "idx_status", array("status", "comment_srl", "module_srl", "document_srl"), TRUE
@@ -190,12 +190,12 @@ 
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after');
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_parent_srl"))
+			if (!$oDB->isIndexExists("comments", "idx_parent_srl"))
 			{
 				$oDB->addIndex('comments', 'idx_parent_srl', array('parent_srl'));
 			}
@@ -212,7 +212,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}

modules/member/member.class.php

Spacing +99 added lines, -99 removed lines

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

Braces +138 added lines, -56 removed lines

@@ -20,7 +20,9 @@ 
 	 */
 	function member()
 	{
-		if(!Context::isInstalled()) return;
+		if(!Context::isInstalled()) {
+			return;
+		}
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
@@ -58,18 +60,42 @@ 
 		// Set the basic information
 		$config->enable_join = 'Y';
 		$config->enable_openid = 'N';
-		if(!$config->enable_auth_mail) $config->enable_auth_mail = 'N';
-		if(!$config->image_name) $config->image_name = 'Y';
-		if(!$config->image_mark) $config->image_mark = 'Y';
-		if(!$config->profile_image) $config->profile_image = 'Y';
-		if(!$config->image_name_max_width) $config->image_name_max_width = '90';
-		if(!$config->image_name_max_height) $config->image_name_max_height = '20';
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = '20';
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = '20';
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = '90';
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = '90';
-		if($config->group_image_mark!='Y') $config->group_image_mark = 'N';
-		if(!$config->password_strength) $config->password_strength = 'normal';
+		if(!$config->enable_auth_mail) {
+			$config->enable_auth_mail = 'N';
+		}
+		if(!$config->image_name) {
+			$config->image_name = 'Y';
+		}
+		if(!$config->image_mark) {
+			$config->image_mark = 'Y';
+		}
+		if(!$config->profile_image) {
+			$config->profile_image = 'Y';
+		}
+		if(!$config->image_name_max_width) {
+			$config->image_name_max_width = '90';
+		}
+		if(!$config->image_name_max_height) {
+			$config->image_name_max_height = '20';
+		}
+		if(!$config->image_mark_max_width) {
+			$config->image_mark_max_width = '20';
+		}
+		if(!$config->image_mark_max_height) {
+			$config->image_mark_max_height = '20';
+		}
+		if(!$config->profile_image_max_width) {
+			$config->profile_image_max_width = '90';
+		}
+		if(!$config->profile_image_max_height) {
+			$config->profile_image_max_height = '90';
+		}
+		if($config->group_image_mark!='Y') {
+			$config->group_image_mark = 'N';
+		}
+		if(!$config->password_strength) {
+			$config->password_strength = 'normal';
+		}
 		
 		if(!$config->password_hashing_algorithm)
 		{
@@ -187,39 +213,69 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// check member directory (11/08/2007 added)
-			if(!is_dir("./files/member_extra_info")) return true;
+			if(!is_dir("./files/member_extra_info")) {
+				return true;
+			}
 			// check member directory (22/10/2007 added)
-			if(!is_dir("./files/member_extra_info/profile_image")) return true;
+			if(!is_dir("./files/member_extra_info/profile_image")) {
+				return true;
+			}
 			// Add a column(is_register) to "member_auth_mail" table (22/04/2008)
 			$act = $oDB->isColumnExists("member_auth_mail", "is_register");
-			if(!$act) return true;
+			if(!$act) {
+				return true;
+			}
 			// Add a column(site_srl) to "member_group_member" table (11/15/2008)
-			if(!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
-			if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
-			if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
+			if(!$oDB->isColumnExists("member_group_member", "site_srl")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("member_group", "site_srl")) {
+				return true;
+			}
+			if($oDB->isIndexExists("member_group","uni_member_group_title")) {
+				return true;
+			}
 
 			// Add a column for list_order (05/18/2011)
-			if(!$oDB->isColumnExists("member_group", "list_order")) return true;
+			if(!$oDB->isColumnExists("member_group", "list_order")) {
+				return true;
+			}
 
 			// image_mark 추가 (2009. 02. 14)
-			if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
+			if(!$oDB->isColumnExists("member_group", "image_mark")) {
+				return true;
+			}
 			// Add c column for password expiration date
-			if(!$oDB->isColumnExists("member", "change_password_date")) return true;
+			if(!$oDB->isColumnExists("member", "change_password_date")) {
+				return true;
+			}
 
 			// Add columns of question and answer to verify a password
-			if(!$oDB->isColumnExists("member", "find_account_question")) return true;
-			if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
+			if(!$oDB->isColumnExists("member", "find_account_question")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("member", "find_account_answer")) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("member", "list_order")) return true;
-			if(!$oDB->isIndexExists("member","idx_list_order")) return true;
+			if(!$oDB->isColumnExists("member", "list_order")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("member","idx_list_order")) {
+				return true;
+			}
 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
 			// check signup form ordering info
-			if(!$config->signupForm) return true;
+			if(!$config->signupForm) {
+				return true;
+			}
 
 			// check agreement field exist
-			if($config->agreement) return true;
+			if($config->agreement) {
+				return true;
+			}
 
 			if($config->skin)
 			{
@@ -227,25 +283,41 @@ 
 				if(count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/member/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if(is_dir($template_path)) {
+						return true;
+					}
 				}
 			}
 
 			// supprot multilanguage agreement.
-			if(is_readable('./files/member_extra_info/agreement.txt')) return true;
+			if(is_readable('./files/member_extra_info/agreement.txt')) {
+				return true;
+			}
 
 			// 2013. 11. 22 add menu when popup document menu called
-			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_readable('./files/ruleset/insertMember.xml')) return true;
-		if(!is_readable('./files/ruleset/login.xml')) return true;
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
+		if(!is_readable('./files/ruleset/insertMember.xml')) {
+			return true;
+		}
+		if(!is_readable('./files/ruleset/login.xml')) {
+			return true;
+		}
+		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) {
+			return true;
+		}
 
-		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) return true;
+		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) {
+			return true;
+		}
 
 		return false;
 	}
@@ -372,10 +444,12 @@ 
 			}
 			
 			// 2013. 11. 22 add menu when popup document menu called
-			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'))
-				$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
-			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
-				$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
+			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) {
+							$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
+			}
+			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) {
+							$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
+			}
 
 			if(is_readable('./files/member_extra_info/agreement.txt'))
 			{
@@ -389,12 +463,15 @@ 
 		}
 
 		FileHandler::makeDir('./files/ruleset');
-		if(!is_readable('./files/ruleset/insertMember.xml'))
-			$oMemberAdminController->_createSignupRuleset($config->signupForm);
-		if(!is_readable('./files/ruleset/login.xml'))
-			$oMemberAdminController->_createLoginRuleset($config->identifier);
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml'))
-			$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
+		if(!is_readable('./files/ruleset/insertMember.xml')) {
+					$oMemberAdminController->_createSignupRuleset($config->signupForm);
+		}
+		if(!is_readable('./files/ruleset/login.xml')) {
+					$oMemberAdminController->_createLoginRuleset($config->identifier);
+		}
+		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) {
+					$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
+		}
 
 		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset'))
 		{
@@ -419,7 +496,9 @@ 
 	 */
 	function recordLoginError($error = 0, $message = 'success')
 	{
-		if($error == 0) return new Object($error, $message);
+		if($error == 0) {
+			return new Object($error, $message);
+		}
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -427,7 +506,9 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new Object($error, $message);
+		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') {
+			return new Object($error, $message);
+		}
 
 		$args = new stdClass();
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
@@ -441,16 +522,14 @@ 
 			if($term < $config->max_error_count_time)
 			{
 				$args->count = $output->data->count + 1;
-			}
-			else
+			} else
 			{
 				$args->count = 1;
 			}
 			unset($oMemberModel);
 			unset($config);
 			$output = executeQuery('member.updateLoginCountByIp', $args);
-		}
-		else
+		} else
 		{
 			//insert
 			$args->count = 1;
@@ -464,7 +543,9 @@ 
 	 */
 	function recordMemberLoginError($error = 0, $message = 'success', $args = NULL)
 	{
-		if($error == 0 || !$args->member_srl) return new Object($error, $message);
+		if($error == 0 || !$args->member_srl) {
+			return new Object($error, $message);
+		}
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -472,7 +553,9 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new Object($error, $message);
+		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') {
+			return new Object($error, $message);
+		}
 
 		$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
 		if($output->data && $output->data->content)
@@ -482,8 +565,7 @@ 
 			$content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);
-		}
-		else
+		} else
 		{
 			//insert
 			$content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);

modules/member/member.admin.view.php

Spacing +72 added lines, -72 removed lines

@@ -43,16 +43,16 @@ 
 
 		// if member_srl exists, set memberInfo
 		$member_srl = Context::get('member_srl');
-		if($member_srl) 
+		if ($member_srl) 
 		{
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-			if(!$this->memberInfo)
+			if (!$this->memberInfo)
 			{
-				Context::set('member_srl','');
+				Context::set('member_srl', '');
 			}
 			else
 			{
-				Context::set('member_info',$this->memberInfo);
+				Context::set('member_info', $this->memberInfo);
 			}
 		}
 
@@ -79,30 +79,30 @@ 
 
 		$filter = Context::get('filter_type');
 		global $lang;
-		switch($filter)
+		switch ($filter)
 		{
-			case 'super_admin' : Context::set('filter_type_title', $lang->cmd_show_super_admin_member);break;
-			case 'site_admin' : Context::set('filter_type_title', $lang->cmd_show_site_admin_member);break;
-			default : Context::set('filter_type_title', $lang->cmd_show_all_member);break;
+			case 'super_admin' : Context::set('filter_type_title', $lang->cmd_show_super_admin_member); break;
+			case 'site_admin' : Context::set('filter_type_title', $lang->cmd_show_site_admin_member); break;
+			default : Context::set('filter_type_title', $lang->cmd_show_all_member); break;
 		}
 		// retrieve list of groups for each member
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $member)
+			foreach ($output->data as $key => $member)
 			{
-				$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl,0);
+				$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl, 0);
 			}
 		}
 		$config = $this->memberConfig;
 		$memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');
 		$usedIdentifiers = array();	
 
-		if(is_array($config->signupForm))
+		if (is_array($config->signupForm))
 		{
-			foreach($config->signupForm as $signupItem)
+			foreach ($config->signupForm as $signupItem)
 			{
-				if(!count($memberIdentifiers)) break;
-				if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
+				if (!count($memberIdentifiers)) break;
+				if (in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
 				{
 					unset($memberIdentifiers[$signupItem->name]);
 					$usedIdentifiers[$signupItem->name] = $lang->{$signupItem->name};
@@ -140,14 +140,14 @@ 
 	{
 		$config = $this->memberConfig;
 
-		if($config->redirect_url)
+		if ($config->redirect_url)
 		{
 			$mid = str_ireplace(Context::getDefaultUrl(), '', $config->redirect_url);
 
 			$siteModuleInfo = Context::get('site_module_info');
 
 			$oModuleModel = getModel('module');
-			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int)$siteModuleInfo->site_srl);
+			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int) $siteModuleInfo->site_srl);
 
 			$config->redirect_url = $moduleInfo->module_srl;
 			Context::set('config', $config);
@@ -173,9 +173,9 @@ 
 		Context::set('editor', $editor);
 
 		$signupForm = $config->signupForm;
-		foreach($signupForm as $val)
+		foreach ($signupForm as $val)
 		{
-			if($val->name == 'user_id')
+			if ($val->name == 'user_id')
 			{
 				$userIdInfo = $val;
 				break;
@@ -183,7 +183,7 @@ 
 		}
 
 		$oSecurity = new Security();
-		if($userIdInfo->isUse)
+		if ($userIdInfo->isUse)
 		{
 			// get denied ID list
 			Context::set('useUserID', 1);
@@ -274,16 +274,16 @@ 
 		Context::set('editor', $editor);
 
 		$signupForm = $config->signupForm;
-		foreach($signupForm as $val)
+		foreach ($signupForm as $val)
 		{
-			if($val->name == 'user_id')
+			if ($val->name == 'user_id')
 			{
 				$userIdInfo = $val;
 				break;
 			}
 		}
 
-		if($userIdInfo->isUse)
+		if ($userIdInfo->isUse)
 		{
 			// get denied ID list
 			Context::set('useUserID', 1);
@@ -344,14 +344,14 @@ 
 		$oMemberModel = getModel('member');
 
 		$memberInfo = Context::get('member_info');
-		if(isset($memberInfo))
+		if (isset($memberInfo))
 		{
 			$memberInfo->signature = $oMemberModel->getSignature($this->memberInfo->member_srl);
 		}
 		Context::set('member_info', $memberInfo);
 
 		// get an editor for the signature
-		if($memberInfo->member_srl)
+		if ($memberInfo->member_srl)
 		{
 			$oEditorModel = getModel('editor');
 			$option = new stdClass();
@@ -405,7 +405,7 @@ 
 		}
 
 		$member_config = $this->memberConfig;
-		if(!$this->memberConfig)
+		if (!$this->memberConfig)
 		{
 			$member_config = $this->memberConfig = $oMemberModel->getMemberConfig();
 		}
@@ -416,25 +416,25 @@ 
 		$formTags = array();
 		global $lang;
 
-		foreach($member_config->signupForm as $no=>$formInfo)
+		foreach ($member_config->signupForm as $no=>$formInfo)
 		{
-			if(!$formInfo->isUse)continue;
+			if (!$formInfo->isUse)continue;
 
 			// 회원 본인이 아닌 경우 입력 폼 제거
-			if($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
+			if ($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
 			{
 				unset($member_config->signupForm[$no]);
 				continue;
 			}
 
-			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
+			if ($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
 
 			$formTag = new stdClass();
 			$inputTag = '';
 			$formTag->title = ($formInfo->isDefaultForm) ? $lang->{$formInfo->name} : $formInfo->title;
-			if($isAdmin)
+			if ($isAdmin)
 			{
-				if($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				if ($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
 			}
 			else
 			{
@@ -442,28 +442,28 @@ 
 			}
 			$formTag->name = $formInfo->name;
 
-			if($formInfo->isDefaultForm)
+			if ($formInfo->isDefaultForm)
 			{
-				if($formInfo->imageType)
+				if ($formInfo->imageType)
 				{
 					$formTag->type = 'image';
-					if($formInfo->name == 'profile_image')
+					if ($formInfo->name == 'profile_image')
 					{
 						$target = $memberInfo['profile_image'];
 						$functionName = 'doDeleteProfileImage';
 					}
-					else if($formInfo->name == 'image_name')
+					else if ($formInfo->name == 'image_name')
 					{
 						$target = $memberInfo['image_name'];
 						$functionName = 'doDeleteImageName';
 					}
-					else if($formInfo->name == 'image_mark')
+					else if ($formInfo->name == 'image_mark')
 					{
 						$target = $memberInfo['image_mark'];
 						$functionName = 'doDeleteImageMark';
 					}
 
-					if($target->src)
+					if ($target->src)
 					{
 						$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="true" /><span id="%s"><img src="%s" alt="%s" /> <button type="button" onclick="%s(%d);return false;">%s</button></span>',
 							$formInfo->name,
@@ -486,7 +486,7 @@ 
 						$lang->{$formInfo->name.'_max_height'},
 						$member_config->{$formInfo->name.'_max_height'});
 					}//end imageType
-					else if($formInfo->name == 'birthday')
+					else if ($formInfo->name == 'birthday')
 					{
 						$formTag->type = 'date';
 						$inputTag = sprintf('<input type="hidden" name="birthday" id="date_birthday" value="%s" /><input type="text" placeholder="YYYY-MM-DD" name="birthday_ui" class="inputDate" id="birthday" value="%s" readonly="readonly" /> <input type="button" value="%s" class="btn dateRemover" />',
@@ -494,16 +494,16 @@ 
 							zdate($memberInfo['birthday'], 'Y-m-d', false),
 							$lang->cmd_delete);
 					}
-					else if($formInfo->name == 'find_account_question')
+					else if ($formInfo->name == 'find_account_question')
 					{
 						$disabled = (!!$memberInfo['member_srl']) ? 'disabled="disabled"' : '';
 
 						$formTag->type = 'select';
 						$inputTag = '<select name="find_account_question" id="find_account_question" style="display:block;margin:0 0 8px 0" %s>%s</select>';
 						$optionTag = array();
-						foreach($lang->find_account_question_items as $key=>$val)
+						foreach ($lang->find_account_question_items as $key=>$val)
 						{
-							if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
+							if ($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
 							else $selected = '';
 							$optionTag[] = sprintf('<option value="%s" %s >%s</option>',
 								$key,
@@ -511,24 +511,24 @@ 
 								$val);
 						}
 						$inputTag = sprintf($inputTag, $disabled, implode('', $optionTag));
-						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="" ' . $disabled . ' />';
+						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="" '.$disabled.' />';
 
-						if($disabled) {
-							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> ' . Context::getLang('cmd_modify') . '</label>';
+						if ($disabled) {
+							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> '.Context::getLang('cmd_modify').'</label>';
 							$inputTag .= '<script>(function($) {$(function() {$(\'[name=modify_find_account_answer]\').change(function() {var $this = $(this); if($this.prop(\'checked\')) {$(\'[name=find_account_question],[name=find_account_answer]\').attr(\'disabled\', false); } else {$(\'[name=find_account_question]\').attr(\'disabled\', true); $(\'[name=find_account_answer]\').attr(\'disabled\', true).val(\'\'); } }); }); })(jQuery);</script>';
 						}
 					}
-					else if($formInfo->name == 'email_address')
+					else if ($formInfo->name == 'email_address')
 					{
 						$formTag->type = 'email';
 						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" />';
 					}
-					else if($formInfo->name == 'homepage')
+					else if ($formInfo->name == 'homepage')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="homepage" id="homepage" value="'.$memberInfo['homepage'].'" />';
 					}
-					else if($formInfo->name == 'blog')
+					else if ($formInfo->name == 'blog')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="blog" id="blog" value="'.$memberInfo['blog'].'" />';
@@ -549,92 +549,92 @@ 
 					$extentionReplace = array();
 
 					$formTag->type = $extendForm->column_type;
-					if($extendForm->column_type == 'text')
+					if ($extendForm->column_type == 'text')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'homepage')
+					else if ($extendForm->column_type == 'homepage')
 					{
 						$template = '<input type="url" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'email_address')
+					else if ($extendForm->column_type == 'email_address')
 					{
 						$template = '<input type="email" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'tel')
+					else if ($extendForm->column_type == 'tel')
 					{
 						$extentionReplace = array('tel_0' => $extendForm->value[0],
 							'tel_1' => $extendForm->value[1],
 							'tel_2' => $extendForm->value[2]);
 						$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:35px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:35px" title="Third Number" />';
 					}
-					else if($extendForm->column_type == 'textarea')
+					else if ($extendForm->column_type == 'textarea')
 					{
 						$template = '<textarea name="%column_name%" id="%column_name%" rows="4" cols="42">%value%</textarea>';
 					}
-					else if($extendForm->column_type == 'checkbox')
+					else if ($extendForm->column_type == 'checkbox')
 					{
 						$template = '';
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
 							$template = '<div style="padding-top:5px">%s</div>';
 							$__i = 0;
 							$optionTag = array();
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
 								$checked = '';
-								if(is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
+								if (is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
 								$optionTag[] = '<label for="%column_name%'.$__i.'"><input type="checkbox" id="%column_name%'.$__i.'" name="%column_name%[]" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 								$__i++;
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
 					}
-					else if($extendForm->column_type == 'radio')
+					else if ($extendForm->column_type == 'radio')
 					{
 						$template = '';
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
 							$template = '<div style="padding-top:5px">%s</div>';
 							$optionTag = array();
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
-								if($extendForm->value == $v)$checked = 'checked="checked"';
+								if ($extendForm->value == $v)$checked = 'checked="checked"';
 								else $checked = '';
 								$optionTag[] = '<label><input type="radio" name="%column_name%" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
 					}
-					else if($extendForm->column_type == 'select')
+					else if ($extendForm->column_type == 'select')
 					{
 						$template = '<select name="'.$formInfo->name.'" id="'.$formInfo->name.'">%s</select>';
 						$optionTag = array();
 						$optionTag[] = sprintf('<option value="">%s</option>', $lang->cmd_select);
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
-								if($v == $extendForm->value) $selected = 'selected="selected"';
+								if ($v == $extendForm->value) $selected = 'selected="selected"';
 								else $selected = '';
 								$optionTag[] = sprintf('<option value="%s" %s >%s</option>', $v, $selected, $v);
 							}
 						}
 						$template = sprintf($template, implode('', $optionTag));
 					}
-					else if($extendForm->column_type == 'kr_zip')
+					else if ($extendForm->column_type == 'kr_zip')
 					{
 						$krzipModel = getModel('krzip');
-						if($krzipModel && method_exists($krzipModel , 'getKrzipCodeSearchHtml' ))
+						if ($krzipModel && method_exists($krzipModel, 'getKrzipCodeSearchHtml'))
 						{
 							$template = $krzipModel->getKrzipCodeSearchHtml($extendForm->column_name, $extendForm->value);
 						}
 					}
-					else if($extendForm->column_type == 'jp_zip')
+					else if ($extendForm->column_type == 'jp_zip')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'date')
+					else if ($extendForm->column_type == 'date')
 					{
 						$extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'), 'cmd_delete' => $lang->cmd_delete);
 						$template = '<input type="hidden" name="%column_name%" id="date_%column_name%" value="%value%" /><input type="text" placeholder="YYYY-MM-DD" class="inputDate" value="%date%" readonly="readonly" /> <input type="button" value="%cmd_delete%" class="btn dateRemover" />';
@@ -643,7 +643,7 @@ 
 					$replace = array_merge($extentionReplace, $replace);
 					$inputTag = preg_replace_callback('@%(\w+)%@', function($n) use($replace) { return $replace[$n[1]]; }, $template);
 
-					if($extendForm->description)
+					if ($extendForm->description)
 						$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
 				}
 				$formTag->inputTag = $inputTag;
@@ -674,12 +674,12 @@ 
 	function dispMemberAdminInsertJoinForm() {
 		// Get the value of join_form
 		$member_join_form_srl = Context::get('member_join_form_srl');
-		if($member_join_form_srl)
+		if ($member_join_form_srl)
 		{
 			$oMemberModel = getModel('member');
 			$join_form = $oMemberModel->getJoinForm($member_join_form_srl);
 
-			if(!$join_form) Context::set('member_join_form_srl','',true);
+			if (!$join_form) Context::set('member_join_form_srl', '', true);
 			else
 			{
 				Context::set('join_form', $join_form);

Braces +62 added lines, -57 removed lines

@@ -49,8 +49,7 @@ 
 			if(!$this->memberInfo)
 			{
 				Context::set('member_srl','');
-			}
-			else
+			} else
 			{
 				Context::set('member_info',$this->memberInfo);
 			}
@@ -101,7 +100,9 @@ 
 		{
 			foreach($config->signupForm as $signupItem)
 			{
-				if(!count($memberIdentifiers)) break;
+				if(!count($memberIdentifiers)) {
+					break;
+				}
 				if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
 				{
 					unset($memberIdentifiers[$signupItem->name]);
@@ -316,7 +317,9 @@ 
 		$extendForm = $oMemberModel->getCombineJoinForm($this->memberInfo);
 		Context::set('extend_form_list', $extendForm);
 		$memberInfo = get_object_vars(Context::get('member_info'));
-		if (!is_array($memberInfo['group_list'])) $memberInfo['group_list'] = array();
+		if (!is_array($memberInfo['group_list'])) {
+			$memberInfo['group_list'] = array();
+		}
 		Context::set('memberInfo', $memberInfo);
 
 		$disableColumns = array('password', 'find_account_question', 'find_account_answer');
@@ -418,7 +421,9 @@ 
 
 		foreach($member_config->signupForm as $no=>$formInfo)
 		{
-			if(!$formInfo->isUse)continue;
+			if(!$formInfo->isUse) {
+				continue;
+			}
 
 			// 회원 본인이 아닌 경우 입력 폼 제거
 			if($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
@@ -427,18 +432,23 @@ 
 				continue;
 			}
 
-			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
+			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') {
+				continue;
+			}
 
 			$formTag = new stdClass();
 			$inputTag = '';
 			$formTag->title = ($formInfo->isDefaultForm) ? $lang->{$formInfo->name} : $formInfo->title;
 			if($isAdmin)
 			{
-				if($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
-			}
-			else
+				if($formInfo->mustRequired) {
+					$formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				}
+			} else
 			{
-				if ($formInfo->required && $formInfo->name != 'password') $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				if ($formInfo->required && $formInfo->name != 'password') {
+					$formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				}
 			}
 			$formTag->name = $formInfo->name;
 
@@ -451,13 +461,11 @@ 
 					{
 						$target = $memberInfo['profile_image'];
 						$functionName = 'doDeleteProfileImage';
-					}
-					else if($formInfo->name == 'image_name')
+					} else if($formInfo->name == 'image_name')
 					{
 						$target = $memberInfo['image_name'];
 						$functionName = 'doDeleteImageName';
-					}
-					else if($formInfo->name == 'image_mark')
+					} else if($formInfo->name == 'image_mark')
 					{
 						$target = $memberInfo['image_mark'];
 						$functionName = 'doDeleteImageMark';
@@ -473,8 +481,7 @@ 
 							$functionName,
 							$memberInfo['member_srl'],
 							$lang->cmd_delete);
-					}
-					else
+					} else
 					{
 						$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="false" />', $formInfo->name);
 					}
@@ -493,8 +500,7 @@ 
 							$memberInfo['birthday'],
 							zdate($memberInfo['birthday'], 'Y-m-d', false),
 							$lang->cmd_delete);
-					}
-					else if($formInfo->name == 'find_account_question')
+					} else if($formInfo->name == 'find_account_question')
 					{
 						$disabled = (!!$memberInfo['member_srl']) ? 'disabled="disabled"' : '';
 
@@ -503,8 +509,11 @@ 
 						$optionTag = array();
 						foreach($lang->find_account_question_items as $key=>$val)
 						{
-							if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
-							else $selected = '';
+							if($key == $memberInfo['find_account_question']) {
+								$selected = 'selected="selected"';
+							} else {
+								$selected = '';
+							}
 							$optionTag[] = sprintf('<option value="%s" %s >%s</option>',
 								$key,
 								$selected,
@@ -517,23 +526,19 @@ 
 							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> ' . Context::getLang('cmd_modify') . '</label>';
 							$inputTag .= '<script>(function($) {$(function() {$(\'[name=modify_find_account_answer]\').change(function() {var $this = $(this); if($this.prop(\'checked\')) {$(\'[name=find_account_question],[name=find_account_answer]\').attr(\'disabled\', false); } else {$(\'[name=find_account_question]\').attr(\'disabled\', true); $(\'[name=find_account_answer]\').attr(\'disabled\', true).val(\'\'); } }); }); })(jQuery);</script>';
 						}
-					}
-					else if($formInfo->name == 'email_address')
+					} else if($formInfo->name == 'email_address')
 					{
 						$formTag->type = 'email';
 						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" />';
-					}
-					else if($formInfo->name == 'homepage')
+					} else if($formInfo->name == 'homepage')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="homepage" id="homepage" value="'.$memberInfo['homepage'].'" />';
-					}
-					else if($formInfo->name == 'blog')
+					} else if($formInfo->name == 'blog')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="blog" id="blog" value="'.$memberInfo['blog'].'" />';
-					}
-					else
+					} else
 					{
 						$formTag->type = 'text';
 						$inputTag = sprintf('<input type="text" name="%s" id="%s" value="%s" />',
@@ -552,27 +557,22 @@ 
 					if($extendForm->column_type == 'text')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'homepage')
+					} else if($extendForm->column_type == 'homepage')
 					{
 						$template = '<input type="url" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'email_address')
+					} else if($extendForm->column_type == 'email_address')
 					{
 						$template = '<input type="email" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'tel')
+					} else if($extendForm->column_type == 'tel')
 					{
 						$extentionReplace = array('tel_0' => $extendForm->value[0],
 							'tel_1' => $extendForm->value[1],
 							'tel_2' => $extendForm->value[2]);
 						$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:35px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:35px" title="Third Number" />';
-					}
-					else if($extendForm->column_type == 'textarea')
+					} else if($extendForm->column_type == 'textarea')
 					{
 						$template = '<textarea name="%column_name%" id="%column_name%" rows="4" cols="42">%value%</textarea>';
-					}
-					else if($extendForm->column_type == 'checkbox')
+					} else if($extendForm->column_type == 'checkbox')
 					{
 						$template = '';
 						if($extendForm->default_value)
@@ -583,14 +583,15 @@ 
 							foreach($extendForm->default_value as $v)
 							{
 								$checked = '';
-								if(is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
+								if(is_array($extendForm->value) && in_array($v, $extendForm->value)) {
+									$checked = 'checked="checked"';
+								}
 								$optionTag[] = '<label for="%column_name%'.$__i.'"><input type="checkbox" id="%column_name%'.$__i.'" name="%column_name%[]" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 								$__i++;
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
-					}
-					else if($extendForm->column_type == 'radio')
+					} else if($extendForm->column_type == 'radio')
 					{
 						$template = '';
 						if($extendForm->default_value)
@@ -599,14 +600,16 @@ 
 							$optionTag = array();
 							foreach($extendForm->default_value as $v)
 							{
-								if($extendForm->value == $v)$checked = 'checked="checked"';
-								else $checked = '';
+								if($extendForm->value == $v) {
+									$checked = 'checked="checked"';
+								} else {
+									$checked = '';
+								}
 								$optionTag[] = '<label><input type="radio" name="%column_name%" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
-					}
-					else if($extendForm->column_type == 'select')
+					} else if($extendForm->column_type == 'select')
 					{
 						$template = '<select name="'.$formInfo->name.'" id="'.$formInfo->name.'">%s</select>';
 						$optionTag = array();
@@ -615,26 +618,26 @@ 
 						{
 							foreach($extendForm->default_value as $v)
 							{
-								if($v == $extendForm->value) $selected = 'selected="selected"';
-								else $selected = '';
+								if($v == $extendForm->value) {
+									$selected = 'selected="selected"';
+								} else {
+									$selected = '';
+								}
 								$optionTag[] = sprintf('<option value="%s" %s >%s</option>', $v, $selected, $v);
 							}
 						}
 						$template = sprintf($template, implode('', $optionTag));
-					}
-					else if($extendForm->column_type == 'kr_zip')
+					} else if($extendForm->column_type == 'kr_zip')
 					{
 						$krzipModel = getModel('krzip');
 						if($krzipModel && method_exists($krzipModel , 'getKrzipCodeSearchHtml' ))
 						{
 							$template = $krzipModel->getKrzipCodeSearchHtml($extendForm->column_name, $extendForm->value);
 						}
-					}
-					else if($extendForm->column_type == 'jp_zip')
+					} else if($extendForm->column_type == 'jp_zip')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'date')
+					} else if($extendForm->column_type == 'date')
 					{
 						$extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'), 'cmd_delete' => $lang->cmd_delete);
 						$template = '<input type="hidden" name="%column_name%" id="date_%column_name%" value="%value%" /><input type="text" placeholder="YYYY-MM-DD" class="inputDate" value="%date%" readonly="readonly" /> <input type="button" value="%cmd_delete%" class="btn dateRemover" />';
@@ -643,8 +646,9 @@ 
 					$replace = array_merge($extentionReplace, $replace);
 					$inputTag = preg_replace_callback('@%(\w+)%@', function($n) use($replace) { return $replace[$n[1]]; }, $template);
 
-					if($extendForm->description)
-						$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
+					if($extendForm->description) {
+											$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
+					}
 				}
 				$formTag->inputTag = $inputTag;
 				$formTags[] = $formTag;
@@ -679,8 +683,9 @@ 
 			$oMemberModel = getModel('member');
 			$join_form = $oMemberModel->getJoinForm($member_join_form_srl);
 
-			if(!$join_form) Context::set('member_join_form_srl','',true);
-			else
+			if(!$join_form) {
+				Context::set('member_join_form_srl','',true);
+			} else
 			{
 				Context::set('join_form', $join_form);
 				$security = new Security();

modules/member/member.admin.controller.php

Spacing +175 added lines, -175 removed lines

@@ -24,31 +24,31 @@ 
 		// if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
 		// Extract the necessary information in advance
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' || !checkCSRF())
+		if ($logged_info->is_admin != 'Y' || !checkCSRF())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
-		$oMemberModel = &getModel ('member');
-		$config = $oMemberModel->getMemberConfig ();
+		$args = Context::gets('member_srl', 'email_address', 'find_account_answer', 'allow_mailing', 'allow_message', 'denied', 'is_admin', 'description', 'group_srl_list', 'limit_date');
+		$oMemberModel = &getModel('member');
+		$config = $oMemberModel->getMemberConfig();
 		$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;
 				}
 			}
 		}
-		foreach($getVars as $val)
+		foreach ($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
 		}
 		$args->member_srl = Context::get('member_srl');
-		if(Context::get('reset_password'))
+		if (Context::get('reset_password'))
 			$args->password = Context::get('reset_password');
 		else unset($args->password);
 
@@ -60,7 +60,7 @@ 
 		unset($all_args->error_return_url);
 		unset($all_args->success_return_url);
 		unset($all_args->ruleset);
-		if(!isset($args->limit_date)) $args->limit_date = "";
+		if (!isset($args->limit_date)) $args->limit_date = "";
 		unset($all_args->password);
 		unset($all_args->password2);
 		unset($all_args->reset_password);
@@ -68,7 +68,7 @@ 
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
 		// Check if an original member exists having the member_srl
-		if($args->member_srl)
+		if ($args->member_srl)
 		{
 			// Create a member model object
 			$oMemberModel = getModel('member');
@@ -76,14 +76,14 @@ 
 			$columnList = array('member_srl');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
 			// If no original member exists, make a new one
-			if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
+			if ($member_info->member_srl != $args->member_srl) unset($args->member_srl);
 		}
 
 		// 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});
 			}
@@ -91,7 +91,7 @@ 
 
 		$oMemberController = getController('member');
 		// Execute insert or update depending on the value of member_srl
-		if(!$args->member_srl)
+		if (!$args->member_srl)
 		{
 			$args->password = Context::get('password');
 			$output = $oMemberController->insertMember($args);
@@ -103,7 +103,7 @@ 
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Save Signature
 		$signature = Context::get('signature');
 		$oMemberController->putSignature($args->member_srl, $signature);
@@ -112,13 +112,13 @@ 
 		$this->setMessage($msg_code);
 
 		$profile_image = $_FILES['profile_image'];
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$oMemberController->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']))
 		{
 			$oMemberController->insertImageMark($args->member_srl, $image_mark['tmp_name']);
 		}
@@ -144,9 +144,9 @@ 
 
 		$oMemberController = getController('member');
 		$output = $oMemberController->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('page',Context::get('page'));
+		$this->add('page', Context::get('page'));
 		$this->setMessage("success_deleted");
 	}
 
@@ -165,26 +165,26 @@ 
 		);
 		
 		$oPassword = new Password();
-		if(!array_key_exists($args->password_hashing_algorithm, $oPassword->getSupportedAlgorithms()))
+		if (!array_key_exists($args->password_hashing_algorithm, $oPassword->getSupportedAlgorithms()))
 		{
 			$args->password_hashing_algorithm = 'md5';
 		}
 		
 		$args->password_hashing_work_factor = intval($args->password_hashing_work_factor, 10);
-		if($args->password_hashing_work_factor < 4)
+		if ($args->password_hashing_work_factor < 4)
 		{
 			$args->password_hashing_work_factor = 4;
 		}
-		if($args->password_hashing_work_factor > 16)
+		if ($args->password_hashing_work_factor > 16)
 		{
 			$args->password_hashing_work_factor = 16;
 		}
-		if($args->password_hashing_auto_upgrade != 'Y')
+		if ($args->password_hashing_auto_upgrade != 'Y')
 		{
 			$args->password_hashing_auto_upgrade = 'N';
 		}
 
-		if((!$args->webmaster_name || !$args->webmaster_email) && $args->enable_confirm == 'Y')
+		if ((!$args->webmaster_name || !$args->webmaster_email) && $args->enable_confirm == 'Y')
 		{
 			return new Object(-1, 'msg_mail_authorization');
 		}
@@ -219,20 +219,20 @@ 
 		$usable_list = Context::get('usable_list');
 		$all_args = Context::getRequestVars();
 
-		$args->limit_day = (int)$args->limit_day;
-		if(!trim(strip_tags($args->agreement)))
+		$args->limit_day = (int) $args->limit_day;
+		if (!trim(strip_tags($args->agreement)))
 		{
-			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
 			FileHandler::removeFile($agreement_file);
 			$args->agreement = NULL;
 		}
 
-		if($args->redirect_url)
+		if ($args->redirect_url)
 		{
 			$oModuleModel = getModel('module');
 			$redirectModuleInfo = $oModuleModel->getModuleInfoByModuleSrl($args->redirect_url, array('mid'));
 
-			if(!$redirectModuleInfo)
+			if (!$redirectModuleInfo)
 			{
 				return new Object('-1', 'msg_exist_selected_module');
 			}
@@ -256,28 +256,28 @@ 
 		$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark', 'profile_image_max_width', 'profile_image_max_height', 'image_name_max_width', 'image_name_max_height', 'image_mark_max_width', 'image_mark_max_height');
 		$mustRequireds = array('email_address', 'nick_name', 'password', 'find_account_question');
 		$extendItems = $oMemberModel->getJoinFormList();
-		foreach($list_order as $key)
+		foreach ($list_order as $key)
 		{
 			$signupItem = new stdClass();
 			$signupItem->isIdentifier = ($key == $all_args->identifier);
 			$signupItem->isDefaultForm = in_array($key, $items);
 
 			$signupItem->name = $key;
-			if(!in_array($key, $items)) $signupItem->title = $key;
+			if (!in_array($key, $items)) $signupItem->title = $key;
 			else $signupItem->title = $lang->{$key};
 			$signupItem->mustRequired = in_array($key, $mustRequireds);
 			$signupItem->imageType = (strpos($key, 'image') !== false);
 			$signupItem->required = ($all_args->{$key} == 'required') || $signupItem->mustRequired || $signupItem->isIdentifier;
 			$signupItem->isUse = in_array($key, $usable_list) || $signupItem->required;
 			$signupItem->isPublic = ($all_args->{'is_'.$key.'_public'} == 'Y' && $signupItem->isUse) ? 'Y' : 'N';
-			if($signupItem->imageType)
+			if ($signupItem->imageType)
 			{
 				$signupItem->max_width = $all_args->{$key.'_max_width'};
 				$signupItem->max_height = $all_args->{$key.'_max_height'};
 			}
 
 			// set extends form
-			if(!$signupItem->isDefaultForm)
+			if (!$signupItem->isDefaultForm)
 			{
 				$extendItem = $extendItems[$all_args->{$key.'_member_join_form_srl'}];
 				$signupItem->type = $extendItem->column_type;
@@ -286,13 +286,13 @@ 
 				$signupItem->description = $extendItem->description;
 
 				// check usable value change, required/option
-				if($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y'))
+				if ($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y'))
 				{
 					unset($update_args);
 					$update_args = new stdClass;
 					$update_args->member_join_form_srl = $extendItem->member_join_form_srl;
-					$update_args->is_active = $signupItem->isUse?'Y':'N';
-					$update_args->required = $signupItem->required?'Y':'N';
+					$update_args->is_active = $signupItem->isUse ? 'Y' : 'N';
+					$update_args->required = $signupItem->required ? 'Y' : 'N';
 
 					$update_output = executeQuery('member.updateJoinForm', $update_args);
 				}
@@ -309,9 +309,9 @@ 
 		$this->_createFindAccountByQuestion($args->identifier);
 
 		// check agreement value exist
-		if($args->agreement)
+		if ($args->agreement)
 		{
-			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
 			$output = FileHandler::writeFile($agreement_file, $args->agreement);
 
 			unset($args->agreement);
@@ -339,16 +339,16 @@ 
 			'after_logout_url'
 		);
 
-		if(!$args->change_password_date)
+		if (!$args->change_password_date)
 		{
 			$args->change_password_date = 0;
 		}
 
-		if(!trim(strip_tags($args->after_login_url)))
+		if (!trim(strip_tags($args->after_login_url)))
 		{
 			$args->after_login_url = NULL;
 		}
-		if(!trim(strip_tags($args->after_logout_url)))
+		if (!trim(strip_tags($args->after_logout_url)))
 		{
 			$args->after_logout_url = NULL;
 		}
@@ -375,17 +375,17 @@ 
 		);
 
 		$args->layout_srl = $args->layout_srl ? $args->layout_srl : NULL;
-		if(!$args->skin)
+		if (!$args->skin)
 		{
 			$args->skin = 'default';
 		}
-		if(!$args->colorset)
+		if (!$args->colorset)
 		{
 			$args->colorset = 'white';
 		}
 
 		$args->mlayout_srl = $args->mlayout_srl ? $args->mlayout_srl : NULL;
-		if(!$args->mskin)
+		if (!$args->mskin)
 		{
 			$args->mskin = 'default';
 		}
@@ -408,12 +408,12 @@ 
 		$extendItems = $oMemberModel->getJoinFormList();
 
 		$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
-		$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
+		$mustRequireds = array('email_address', 'nick_name', 'password', 'find_account_question');
 		$orgRequireds = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name');
 		$orgUse = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name', 'homepage', 'blog', 'birthday');
 		$list_order = array();
 
-		foreach($items as $key)
+		foreach ($items as $key)
 		{
 			unset($signupItem);
 			$signupItem = new stdClass;
@@ -425,23 +425,23 @@ 
 			$signupItem->required = in_array($key, $orgRequireds);
 			$signupItem->isUse = ($config->{$key} == 'Y') || in_array($key, $orgUse);
 			$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
-			if($key == 'find_account_question' || $key == 'password')
+			if ($key == 'find_account_question' || $key == 'password')
 			{
 				$signupItem->isPublic = 'N';
 			}
 			$signupItem->isIdentifier = ($key == $identifier);
-			if ($signupItem->imageType){
+			if ($signupItem->imageType) {
 				$signupItem->max_width = $config->{$key.'_max_width'};
 				$signupItem->max_height = $config->{$key.'_max_height'};
 			}
-			if($signupItem->isIdentifier)
+			if ($signupItem->isIdentifier)
 				array_unshift($list_order, $signupItem);
 			else
 				$list_order[] = $signupItem;
 		}
-		if(is_array($extendItems))
+		if (is_array($extendItems))
 		{
-			foreach($extendItems as $form_srl=>$item_info)
+			foreach ($extendItems as $form_srl=>$item_info)
 			{
 				unset($signupItem);
 				$signupItem = new stdClass;
@@ -454,7 +454,7 @@ 
 				$signupItem->isUse = ($item_info->is_active == 'Y');
 				$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
 				$signupItem->description = $item_info->description;
-				if($signupItem->imageType)
+				if ($signupItem->imageType)
 				{
 					$signupItem->max_width = $config->{$key.'_max_width'};
 					$signupItem->max_height = $config->{$key.'_max_height'};
@@ -472,13 +472,13 @@ 
 	 * @param string $agreement
 	 * @return void
 	 */
-	function _createSignupRuleset($signupForm, $agreement = null){
+	function _createSignupRuleset($signupForm, $agreement = null) {
 		$xml_file = './files/ruleset/insertMember.xml';
-		$buff = '<?xml version="1.0" encoding="utf-8"?>' . PHP_EOL.
-			'<ruleset version="1.5.0">' . PHP_EOL.
-			'<customrules>' . PHP_EOL.
-			'</customrules>' . PHP_EOL.
-			'<fields>' . PHP_EOL . '%s' . PHP_EOL . '</fields>' . PHP_EOL.
+		$buff = '<?xml version="1.0" encoding="utf-8"?>'.PHP_EOL.
+			'<ruleset version="1.5.0">'.PHP_EOL.
+			'<customrules>'.PHP_EOL.
+			'</customrules>'.PHP_EOL.
+			'<fields>'.PHP_EOL.'%s'.PHP_EOL.'</fields>'.PHP_EOL.
 			'</ruleset>';
 
 		$fields = array();
@@ -487,41 +487,41 @@ 
 		{
 			$fields[] = '<field name="accept_agreement"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /></field>';
 		}
-		foreach($signupForm as $formInfo)
+		foreach ($signupForm as $formInfo)
 		{
-			if($formInfo->required || $formInfo->mustRequired)
+			if ($formInfo->required || $formInfo->mustRequired)
 			{
-				if($formInfo->type == 'tel' || $formInfo->type == 'kr_zip')
+				if ($formInfo->type == 'tel' || $formInfo->type == 'kr_zip')
 				{
 					$fields[] = sprintf('<field name="%s[]" required="true" />', $formInfo->name);
 				}
-				else if($formInfo->name == 'password')
+				else if ($formInfo->name == 'password')
 				{
 					$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="4:60" /></field>';
 					$fields[] = '<field name="password2"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="equalto" value="password" /></field>';
 				}
-				else if($formInfo->name == 'find_account_question')
+				else if ($formInfo->name == 'find_account_question')
 				{
 					$fields[] = '<field name="find_account_question"><if test="$modify_find_account_answer" attr="required" value="true" /></field>';
 					$fields[] = '<field name="find_account_answer" length=":250"><if test="$modify_find_account_answer" attr="required" value="true" /></field>';
 				}
-				else if($formInfo->name == 'email_address')
+				else if ($formInfo->name == 'email_address')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" rule="email"/>', $formInfo->name);
 				}
-				else if($formInfo->name == 'user_id')
+				else if ($formInfo->name == 'user_id')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" rule="userid" length="3:20" />', $formInfo->name);
 				}
-				else if($formInfo->name == 'nick_name')
+				else if ($formInfo->name == 'nick_name')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" length="2:20" />', $formInfo->name);
 				}
-				else if(strpos($formInfo->name, 'image') !== false)
+				else if (strpos($formInfo->name, 'image') !== false)
 				{
 					$fields[] = sprintf('<field name="%s"><if test="$act != \'procMemberAdminInsert\' &amp;&amp; $__%s_exist != \'true\'" attr="required" value="true" /></field>', $formInfo->name, $formInfo->name);
 				}
-				else if($formInfo->name == 'signature')
+				else if ($formInfo->name == 'signature')
 				{
 					$fields[] = '<field name="signature"><if test="$member_srl" attr="required" value="true" /></field>';
 				}
@@ -536,7 +536,7 @@ 
 		FileHandler::writeFile($xml_file, $xml_buff);
 		unset($xml_buff);
 
-		$validator   = new Validator($xml_file);
+		$validator = new Validator($xml_file);
 		$validator->setCacheDir('files/cache');
 		$validator->getJsPath();
 	}
@@ -564,7 +564,7 @@ 
 		$xml_buff = sprintf($buff, implode('', $fields));
 		Filehandler::writeFile($xml_file, $xml_buff);
 
-		$validator   = new Validator($xml_file);
+		$validator = new Validator($xml_file);
 		$validator->setCacheDir('files/cache');
 		$validator->getJsPath();
 	}
@@ -585,7 +585,7 @@ 
 			'</ruleset>';
 
 		$fields = array();
-		if($identifier == 'user_id')
+		if ($identifier == 'user_id')
 			$fields[] = '<field name="user_id" required="true" rule="userid" />';
 
 		$fields[] = '<field name="email_address" required="true" rule="email" />';
@@ -595,7 +595,7 @@ 
 		$xml_buff = sprintf($buff, implode('', $fields));
 		Filehandler::writeFile($xml_file, $xml_buff);
 
-		$validator   = new Validator($xml_file);
+		$validator = new Validator($xml_file);
 		$validator->setCacheDir('files/cache');
 		$validator->getJsPath();
 	}
@@ -606,12 +606,12 @@ 
 	 */
 	function procMemberAdminInsertGroup()
 	{
-		$args = Context::gets('title','description','is_default','image_mark');
+		$args = Context::gets('title', 'description', 'is_default', 'image_mark');
 		$output = $this->insertGroup($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('group_srl','');
-		$this->add('page',Context::get('page'));
+		$this->add('group_srl', '');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_registed');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
@@ -626,13 +626,13 @@ 
 	{
 		$group_srl = Context::get('group_srl');
 
-		$args = Context::gets('group_srl','title','description','is_default','image_mark');
+		$args = Context::gets('group_srl', 'title', 'description', 'is_default', 'image_mark');
 		$args->site_srl = 0;
 		$output = $this->updateGroup($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('group_srl','');
-		$this->add('page',Context::get('page'));
+		$this->add('group_srl', '');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_updated');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
@@ -648,10 +648,10 @@ 
 		$group_srl = Context::get('group_srl');
 
 		$output = $this->deleteGroup($group_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('group_srl','');
-		$this->add('page',Context::get('page'));
+		$this->add('group_srl', '');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_deleted');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
@@ -673,10 +673,10 @@ 
 		$args->default_value = explode("\n", str_replace("\r", '', Context::get('default_value')));
 		$args->required = Context::get('required');
 		$args->is_active = (isset($args->required));
-		if(!in_array(strtoupper($args->required), array('Y','N')))$args->required = 'N';
+		if (!in_array(strtoupper($args->required), array('Y', 'N')))$args->required = 'N';
 		$args->description = Context::get('description') ? Context::get('description') : '';
 		// Default values
-		if(in_array($args->column_type, array('checkbox','select','radio')) && count($args->default_value))
+		if (in_array($args->column_type, array('checkbox', 'select', 'radio')) && count($args->default_value))
 		{
 			$args->default_value = serialize($args->default_value);
 		}
@@ -688,17 +688,17 @@ 
 		// Check ID duplicated
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		foreach($config->signupForm as $item)
+		foreach ($config->signupForm as $item)
 		{
-			if($item->name == $args->column_name)
+			if ($item->name == $args->column_name)
 			{
-				if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
-				return new Object(-1,'msg_exists_user_id');
+				if ($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
+				return new Object(-1, 'msg_exists_user_id');
 			}
 		}
 		// Fix if member_join_form_srl exists. Add if not exists.
 		$isInsert;
-		if(!$args->member_join_form_srl)
+		if (!$args->member_join_form_srl)
 		{
 			$isInsert = true;
 			$args->list_order = $args->member_join_form_srl = getNextSequence();
@@ -709,7 +709,7 @@ 
 			$output = executeQuery('member.updateJoinForm', $args);
 		}
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// memberConfig update
 		$signupItem = new stdClass();
@@ -726,15 +726,15 @@ 
 		$config = $oMemberModel->getMemberConfig();
 		unset($config->agreement);
 
-		if($isInsert)
+		if ($isInsert)
 		{
 			$config->signupForm[] = $signupItem;
 		}
 		else
 		{
-			foreach($config->signupForm as $key=>$val)
+			foreach ($config->signupForm as $key=>$val)
 			{
-				if($val->member_join_form_srl == $signupItem->member_join_form_srl)
+				if ($val->member_join_form_srl == $signupItem->member_join_form_srl)
 				{
 					$config->signupForm[$key] = $signupItem;
 				}
@@ -762,9 +762,9 @@ 
 		$config = $oMemberModel->getMemberConfig();
 		unset($config->agreement);
 
-		foreach($config->signupForm as $key=>$val)
+		foreach ($config->signupForm as $key=>$val)
 		{
-			if($val->member_join_form_srl == $member_join_form_srl)
+			if ($val->member_join_form_srl == $member_join_form_srl)
 			{
 				unset($config->signupForm[$key]);
 				break;
@@ -784,7 +784,7 @@ 
 		$member_join_form_srl = Context::get('member_join_form_srl');
 		$mode = Context::get('mode');
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'up' :
 				$output = $this->moveJoinFormUp($member_join_form_srl);
@@ -801,7 +801,7 @@ 
 			case 'update' :
 				break;
 		}
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage($msg_code);
 	}
@@ -820,40 +820,40 @@ 
 		$oDB->begin();
 
 		$oMemberController = getController('member');
-		foreach($members as $key=>$member_srl)
+		foreach ($members as $key=>$member_srl)
 		{
 			$args = new stdClass();
 			$args->member_srl = $member_srl;
-			switch($var->type)
+			switch ($var->type)
 			{
 				case 'modify':
 					{
-						if(count($groups) > 0)
+						if (count($groups) > 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
-							foreach($groups as $group_srl)
+							foreach ($groups as $group_srl)
 							{
-								$output = $oMemberController->addMemberToGroup($args->member_srl,$group_srl);
-								if(!$output->toBool())
+								$output = $oMemberController->addMemberToGroup($args->member_srl, $group_srl);
+								if (!$output->toBool())
 								{
 									$oDB->rollback();
 									return $output;
 								}
 							}
 						}
-						if($var->denied)
+						if ($var->denied)
 						{
 							$args->denied = $var->denied;
 							$output = executeQuery('member.updateMemberDeniedInfo', $args);
-							if(!$output->toBool())
+							if (!$output->toBool())
 							{
 								$oDB->rollback();
 								return $output;
@@ -866,7 +866,7 @@ 
 					{
 						$oMemberController->memberInfo = null;
 						$output = $oMemberController->deleteMember($member_srl);
-						if(!$output->toBool())
+						if (!$output->toBool())
 						{
 							$oDB->rollback();
 							return $output;
@@ -879,15 +879,15 @@ 
 
 		$message = $var->message;
 		// Send a message
-		if($message)
+		if ($message)
 		{
 			$oCommunicationController = getController('communication');
 
 			$logged_info = Context::get('logged_info');
-			$title = cut_str($message,10,'...');
+			$title = cut_str($message, 10, '...');
 			$sender_member_srl = $logged_info->member_srl;
 
-			foreach($members as $member_srl)
+			foreach ($members as $member_srl)
 			{
 				$oCommunicationController->sendMessage($sender_member_srl, $member_srl, $title, $message, false);
 			}
@@ -904,14 +904,14 @@ 
 	function procMemberAdminDeleteMembers()
 	{
 		$target_member_srls = Context::get('target_member_srls');
-		if(!$target_member_srls) return new Object(-1, 'msg_invalid_request');
+		if (!$target_member_srls) return new Object(-1, 'msg_invalid_request');
 		$member_srls = explode(',', $target_member_srls);
 		$oMemberController = getController('member');
 
-		foreach($member_srls as $member)
+		foreach ($member_srls as $member)
 		{
 			$output = $oMemberController->deleteMember($member);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$this->setMessage('failed_deleted');
 				return $output;
@@ -928,11 +928,11 @@ 
 	function procMemberAdminUpdateMembersGroup()
 	{
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return new Object(-1,'msg_invalid_request');
-		$member_srls = explode(',',$member_srl);
+		if (!$member_srl) return new Object(-1, 'msg_invalid_request');
+		$member_srls = explode(',', $member_srl);
 
 		$group_srl = Context::get('group_srls');
-		if(!is_array($group_srl)) $group_srls = explode('|@|', $group_srl);
+		if (!is_array($group_srl)) $group_srls = explode('|@|', $group_srl);
 		else $group_srls = $group_srl;
 
 		$oDB = &DB::getInstance();
@@ -941,7 +941,7 @@ 
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -949,21 +949,21 @@ 
 		// Add to a selected group
 		$group_count = count($group_srls);
 		$member_count = count($member_srls);
-		for($j=0;$j<$group_count;$j++)
+		for ($j = 0; $j < $group_count; $j++)
 		{
-			$group_srl = (int)trim($group_srls[$j]);
-			if(!$group_srl) continue;
-			for($i=0;$i<$member_count;$i++)
+			$group_srl = (int) trim($group_srls[$j]);
+			if (!$group_srl) continue;
+			for ($i = 0; $i < $member_count; $i++)
 			{
-				$member_srl = (int)trim($member_srls[$i]);
-				if(!$member_srl) continue;
+				$member_srl = (int) trim($member_srls[$i]);
+				if (!$member_srl) continue;
 
 				$args = new stdClass;
 				$args->member_srl = $member_srl;
 				$args->group_srl = $group_srl;
 
 				$output = executeQuery('member.addMemberToGroup', $args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -976,7 +976,7 @@ 
 
 		$this->setMessage('success_updated');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			global $lang;
 			htmlHeader();
@@ -997,19 +997,19 @@ 
 	{
 		$user_ids = Context::get('user_id');
 
-		$user_ids = explode(',',$user_ids);
+		$user_ids = explode(',', $user_ids);
 		$success_ids = array();
 
-		foreach($user_ids as $val)
+		foreach ($user_ids as $val)
 		{
 			$val = trim($val);
-			if(!$val) continue;
+			if (!$val) continue;
 
 			$output = $this->insertDeniedID($val, '');
-			if($output->toBool()) $success_ids[] = $val;
+			if ($output->toBool()) $success_ids[] = $val;
 		}
 
-		$this->add('user_ids', implode(',',$success_ids));
+		$this->add('user_ids', implode(',', $success_ids));
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList');
 		$this->setRedirectUrl($returnUrl);
@@ -1026,10 +1026,10 @@ 
 		$mode = Context::get('mode');
 		$mode = $mode ? $mode : 'insert';
 
-		if($mode == 'delete')
+		if ($mode == 'delete')
 		{
 			$output = $this->deleteDeniedNickName($nick_name);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -1038,19 +1038,19 @@ 
 		}
 		else
 		{
-			$nick_names = explode(',',$nick_name);
+			$nick_names = explode(',', $nick_name);
 			$success_nick_names = array();
 
-			foreach($nick_names as $val)
+			foreach ($nick_names as $val)
 			{
 				$val = trim($val);
-				if(!$val) continue;
+				if (!$val) continue;
 
 				$output = $this->insertDeniedNickName($val, '');
-				if($output->toBool()) $success_nick_names[] = $val;
+				if ($output->toBool()) $success_nick_names[] = $val;
 			}
 
-			$this->add('nick_names', implode(',',$success_nick_names));
+			$this->add('nick_names', implode(',', $success_nick_names));
 		}
 	}
 
@@ -1063,16 +1063,16 @@ 
 		$user_id = Context::get('user_id');
 		$mode = Context::get('mode');
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'delete' :
 				$output = $this->deleteDeniedID($user_id);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 				$msg_code = 'success_deleted';
 				break;
 		}
 
-		$this->add('page',Context::get('page'));
+		$this->add('page', Context::get('page'));
 		$this->setMessage($msg_code);
 	}
 
@@ -1119,24 +1119,24 @@ 
 	 */
 	function insertGroup($args)
 	{
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 		// Check the value of is_default.
-		if($args->is_default != 'Y')
+		if ($args->is_default != 'Y')
 		{
 			$args->is_default = 'N';
 		}
 		else
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
-		if(!isset($args->list_order) || $args->list_order=='')
+		if (!isset($args->list_order) || $args->list_order == '')
 		{
 			$args->list_order = $args->group_srl;
 		}
 
-		if(!$args->group_srl) $args->group_srl = getNextSequence();
+		if (!$args->group_srl) $args->group_srl = getNextSequence();
 		$args->list_order = $args->group_srl;
 		$output = executeQuery('member.insertGroup', $args);
 		$this->_deleteMemberGroupCache($args->site_srl);
@@ -1151,17 +1151,17 @@ 
 	 */
 	function updateGroup($args)
 	{
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 		// Check the value of is_default.
-		if(!$args->group_srl) return new Object(-1, 'lang->msg_not_founded');
-		if($args->is_default!='Y')
+		if (!$args->group_srl) return new Object(-1, 'lang->msg_not_founded');
+		if ($args->is_default != 'Y')
 		{
 			$args->is_default = 'N';
 		}
 		else
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$output = executeQuery('member.updateGroup', $args);
@@ -1184,8 +1184,8 @@ 
 		$columnList = array('group_srl', 'is_default');
 		$group_info = $oMemberModel->getGroup($group_srl, $columnList);
 
-		if(!$group_info) return new Object(-1, 'lang->msg_not_founded');
-		if($group_info->is_default == 'Y') return new Object(-1, 'msg_not_delete_default');
+		if (!$group_info) return new Object(-1, 'lang->msg_not_founded');
+		if ($group_info->is_default == 'Y') return new Object(-1, 'msg_not_delete_default');
 
 		// Get groups where is_default == 'Y'
 		$columnList = array('site_srl', 'group_srl');
@@ -1222,7 +1222,7 @@ 
 		$defaultGroup = $oMemberModel->getDefaultGroup(0);
 		$defaultGroupSrl = $defaultGroup->group_srl;
 		$group_srls = $vars->group_srls;
-		foreach($group_srls as $order=>$group_srl)
+		foreach ($group_srls as $order=>$group_srl)
 		{
 			$isInsert = false;
 			$update_args = new stdClass();
@@ -1231,9 +1231,9 @@ 
 			$update_args->image_mark = $vars->image_marks[$order];
 			$update_args->list_order = $order + 1;
 
-			if(!$update_args->title) continue;
+			if (!$update_args->title) continue;
 
-			if(is_numeric($group_srl)) {
+			if (is_numeric($group_srl)) {
 				$update_args->group_srl = $group_srl;
 				$output = $this->updateGroup($update_args);
 			}
@@ -1242,7 +1242,7 @@ 
 				$output = $this->insertGroup($update_args);
 			}
 
-			if($vars->defaultGroup == $group_srl) {
+			if ($vars->defaultGroup == $group_srl) {
 				$defaultGroupSrl = $update_args->group_srl;
 			}
 		}
@@ -1268,7 +1268,7 @@ 
 	{
 		$vars = Context::getRequestVars();
 
-		foreach($vars->group_srls as $key => $val)
+		foreach ($vars->group_srls as $key => $val)
 		{
 			$args = new stdClass;
 			$args->group_srl = $val;
@@ -1289,7 +1289,7 @@ 
 	{
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('member');
 		}
@@ -1306,7 +1306,7 @@ 
 		$args = new stdClass();
 		$args->user_id = $user_id;
 		$args->description = $description;
-		$args->list_order = -1*getNextSequence();
+		$args->list_order = -1 * getNextSequence();
 
 		return executeQuery('member.insertDeniedID', $args);
 	}
@@ -1327,7 +1327,7 @@ 
 	 */
 	function deleteDeniedID($user_id)
 	{
-		if(!$user_id) unset($user_id);
+		if (!$user_id) unset($user_id);
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
@@ -1341,7 +1341,7 @@ 
 	 */
 	function deleteDeniedNickName($nick_name)
 	{
-		if(!$nick_name) unset($nick_name);
+		if (!$nick_name) unset($nick_name);
 
 		$args = new stdClass;
 		$args->nick_name = $nick_name;
@@ -1380,16 +1380,16 @@ 
 		// Get a list of all join forms
 		$join_form_list = $oMemberModel->getJoinFormList();
 		$join_form_srl_list = array_keys($join_form_list);
-		if(count($join_form_srl_list)<2) return new Object();
+		if (count($join_form_srl_list) < 2) return new Object();
 
 		$prev_member_join_form = NULL;
-		foreach($join_form_list as $key => $val)
+		foreach ($join_form_list as $key => $val)
 		{
-			if($val->member_join_form_srl == $member_join_form_srl) break;
+			if ($val->member_join_form_srl == $member_join_form_srl) break;
 			$prev_member_join_form = $val;
 		}
 		// Return if no previous join form exists
-		if(!$prev_member_join_form) return new Object();
+		if (!$prev_member_join_form) return new Object();
 		// Information of the join form
 		$cur_args = new stdClass;
 		$cur_args->member_join_form_srl = $member_join_form_srl;
@@ -1400,10 +1400,10 @@ 
 		$prev_args->list_order = $list_order;
 		// Execute Query
 		$output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		executeQuery('member.updateMemberJoinFormListorder', $prev_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new Object();
 	}
@@ -1427,16 +1427,16 @@ 
 		// Get information of all join forms
 		$join_form_list = $oMemberModel->getJoinFormList();
 		$join_form_srl_list = array_keys($join_form_list);
-		if(count($join_form_srl_list)<2) return new Object();
+		if (count($join_form_srl_list) < 2) return new Object();
 
-		for($i=0;$i<count($join_form_srl_list);$i++)
+		for ($i = 0; $i < count($join_form_srl_list); $i++)
 		{
-			if($join_form_srl_list[$i]==$member_join_form_srl) break;
+			if ($join_form_srl_list[$i] == $member_join_form_srl) break;
 		}
 
-		$next_member_join_form_srl = $join_form_srl_list[$i+1];
+		$next_member_join_form_srl = $join_form_srl_list[$i + 1];
 		// Return if no previous join form exists
-		if(!$next_member_join_form_srl) return new Object();
+		if (!$next_member_join_form_srl) return new Object();
 		$next_member_join_form = $join_form_list[$next_member_join_form_srl];
 		// Information of the join form
 		$cur_args = new stdClass;
@@ -1448,10 +1448,10 @@ 
 		$next_args->list_order = $list_order;
 		// Execute Query
 		$output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('member.updateMemberJoinFormListorder', $next_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new Object();
 	}

Braces +162 added lines, -86 removed lines

@@ -48,9 +48,11 @@ 
 			$args->{$val} = Context::get($val);
 		}
 		$args->member_srl = Context::get('member_srl');
-		if(Context::get('reset_password'))
-			$args->password = Context::get('reset_password');
-		else unset($args->password);
+		if(Context::get('reset_password')) {
+					$args->password = Context::get('reset_password');
+		} else {
+			unset($args->password);
+		}
 
 		// Remove some unnecessary variables from all the vars
 		$all_args = Context::getRequestVars();
@@ -60,7 +62,9 @@ 
 		unset($all_args->error_return_url);
 		unset($all_args->success_return_url);
 		unset($all_args->ruleset);
-		if(!isset($args->limit_date)) $args->limit_date = "";
+		if(!isset($args->limit_date)) {
+			$args->limit_date = "";
+		}
 		unset($all_args->password);
 		unset($all_args->password2);
 		unset($all_args->reset_password);
@@ -76,7 +80,9 @@ 
 			$columnList = array('member_srl');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
 			// If no original member exists, make a new one
-			if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
+			if($member_info->member_srl != $args->member_srl) {
+				unset($args->member_srl);
+			}
 		}
 
 		// remove whitespace
@@ -96,14 +102,15 @@ 
 			$args->password = Context::get('password');
 			$output = $oMemberController->insertMember($args);
 			$msg_code = 'success_registed';
-		}
-		else
+		} else
 		{
 			$output = $oMemberController->updateMember($args);
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Save Signature
 		$signature = Context::get('signature');
 		$oMemberController->putSignature($args->member_srl, $signature);
@@ -144,7 +151,9 @@ 
 
 		$oMemberController = getController('member');
 		$output = $oMemberController->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('page',Context::get('page'));
 		$this->setMessage("success_deleted");
@@ -263,8 +272,11 @@ 
 			$signupItem->isDefaultForm = in_array($key, $items);
 
 			$signupItem->name = $key;
-			if(!in_array($key, $items)) $signupItem->title = $key;
-			else $signupItem->title = $lang->{$key};
+			if(!in_array($key, $items)) {
+				$signupItem->title = $key;
+			} else {
+				$signupItem->title = $lang->{$key};
+			}
 			$signupItem->mustRequired = in_array($key, $mustRequireds);
 			$signupItem->imageType = (strpos($key, 'image') !== false);
 			$signupItem->required = ($all_args->{$key} == 'required') || $signupItem->mustRequired || $signupItem->isIdentifier;
@@ -434,10 +446,11 @@ 
 				$signupItem->max_width = $config->{$key.'_max_width'};
 				$signupItem->max_height = $config->{$key.'_max_height'};
 			}
-			if($signupItem->isIdentifier)
-				array_unshift($list_order, $signupItem);
-			else
-				$list_order[] = $signupItem;
+			if($signupItem->isIdentifier) {
+							array_unshift($list_order, $signupItem);
+			} else {
+							$list_order[] = $signupItem;
+			}
 		}
 		if(is_array($extendItems))
 		{
@@ -494,38 +507,30 @@ 
 				if($formInfo->type == 'tel' || $formInfo->type == 'kr_zip')
 				{
 					$fields[] = sprintf('<field name="%s[]" required="true" />', $formInfo->name);
-				}
-				else if($formInfo->name == 'password')
+				} else if($formInfo->name == 'password')
 				{
 					$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="4:60" /></field>';
 					$fields[] = '<field name="password2"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="equalto" value="password" /></field>';
-				}
-				else if($formInfo->name == 'find_account_question')
+				} else if($formInfo->name == 'find_account_question')
 				{
 					$fields[] = '<field name="find_account_question"><if test="$modify_find_account_answer" attr="required" value="true" /></field>';
 					$fields[] = '<field name="find_account_answer" length=":250"><if test="$modify_find_account_answer" attr="required" value="true" /></field>';
-				}
-				else if($formInfo->name == 'email_address')
+				} else if($formInfo->name == 'email_address')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" rule="email"/>', $formInfo->name);
-				}
-				else if($formInfo->name == 'user_id')
+				} else if($formInfo->name == 'user_id')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" rule="userid" length="3:20" />', $formInfo->name);
-				}
-				else if($formInfo->name == 'nick_name')
+				} else if($formInfo->name == 'nick_name')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" length="2:20" />', $formInfo->name);
-				}
-				else if(strpos($formInfo->name, 'image') !== false)
+				} else if(strpos($formInfo->name, 'image') !== false)
 				{
 					$fields[] = sprintf('<field name="%s"><if test="$act != \'procMemberAdminInsert\' &amp;&amp; $__%s_exist != \'true\'" attr="required" value="true" /></field>', $formInfo->name, $formInfo->name);
-				}
-				else if($formInfo->name == 'signature')
+				} else if($formInfo->name == 'signature')
 				{
 					$fields[] = '<field name="signature"><if test="$member_srl" attr="required" value="true" /></field>';
-				}
-				else
+				} else
 				{
 					$fields[] = sprintf('<field name="%s" required="true" />', $formInfo->name);
 				}
@@ -585,8 +590,9 @@ 
 			'</ruleset>';
 
 		$fields = array();
-		if($identifier == 'user_id')
-			$fields[] = '<field name="user_id" required="true" rule="userid" />';
+		if($identifier == 'user_id') {
+					$fields[] = '<field name="user_id" required="true" rule="userid" />';
+		}
 
 		$fields[] = '<field name="email_address" required="true" rule="email" />';
 		$fields[] = '<field name="find_account_question" required="true" />';
@@ -608,7 +614,9 @@ 
 	{
 		$args = Context::gets('title','description','is_default','image_mark');
 		$output = $this->insertGroup($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('group_srl','');
 		$this->add('page',Context::get('page'));
@@ -629,7 +637,9 @@ 
 		$args = Context::gets('group_srl','title','description','is_default','image_mark');
 		$args->site_srl = 0;
 		$output = $this->updateGroup($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('group_srl','');
 		$this->add('page',Context::get('page'));
@@ -648,7 +658,9 @@ 
 		$group_srl = Context::get('group_srl');
 
 		$output = $this->deleteGroup($group_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('group_srl','');
 		$this->add('page',Context::get('page'));
@@ -673,14 +685,15 @@ 
 		$args->default_value = explode("\n", str_replace("\r", '', Context::get('default_value')));
 		$args->required = Context::get('required');
 		$args->is_active = (isset($args->required));
-		if(!in_array(strtoupper($args->required), array('Y','N')))$args->required = 'N';
+		if(!in_array(strtoupper($args->required), array('Y','N'))) {
+			$args->required = 'N';
+		}
 		$args->description = Context::get('description') ? Context::get('description') : '';
 		// Default values
 		if(in_array($args->column_type, array('checkbox','select','radio')) && count($args->default_value))
 		{
 			$args->default_value = serialize($args->default_value);
-		}
-		else
+		} else
 		{
 			$args->default_value = '';
 		}
@@ -692,7 +705,9 @@ 
 		{
 			if($item->name == $args->column_name)
 			{
-				if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
+				if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) {
+					continue;
+				}
 				return new Object(-1,'msg_exists_user_id');
 			}
 		}
@@ -703,13 +718,14 @@ 
 			$isInsert = true;
 			$args->list_order = $args->member_join_form_srl = getNextSequence();
 			$output = executeQuery('member.insertJoinForm', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('member.updateJoinForm', $args);
 		}
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// memberConfig update
 		$signupItem = new stdClass();
@@ -729,8 +745,7 @@ 
 		if($isInsert)
 		{
 			$config->signupForm[] = $signupItem;
-		}
-		else
+		} else
 		{
 			foreach($config->signupForm as $key=>$val)
 			{
@@ -801,7 +816,9 @@ 
 			case 'update' :
 				break;
 		}
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage($msg_code);
 	}
@@ -904,7 +921,9 @@ 
 	function procMemberAdminDeleteMembers()
 	{
 		$target_member_srls = Context::get('target_member_srls');
-		if(!$target_member_srls) return new Object(-1, 'msg_invalid_request');
+		if(!$target_member_srls) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		$member_srls = explode(',', $target_member_srls);
 		$oMemberController = getController('member');
 
@@ -928,12 +947,17 @@ 
 	function procMemberAdminUpdateMembersGroup()
 	{
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return new Object(-1,'msg_invalid_request');
+		if(!$member_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		$member_srls = explode(',',$member_srl);
 
 		$group_srl = Context::get('group_srls');
-		if(!is_array($group_srl)) $group_srls = explode('|@|', $group_srl);
-		else $group_srls = $group_srl;
+		if(!is_array($group_srl)) {
+			$group_srls = explode('|@|', $group_srl);
+		} else {
+			$group_srls = $group_srl;
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -952,11 +976,15 @@ 
 		for($j=0;$j<$group_count;$j++)
 		{
 			$group_srl = (int)trim($group_srls[$j]);
-			if(!$group_srl) continue;
+			if(!$group_srl) {
+				continue;
+			}
 			for($i=0;$i<$member_count;$i++)
 			{
 				$member_srl = (int)trim($member_srls[$i]);
-				if(!$member_srl) continue;
+				if(!$member_srl) {
+					continue;
+				}
 
 				$args = new stdClass;
 				$args->member_srl = $member_srl;
@@ -1003,10 +1031,14 @@ 
 		foreach($user_ids as $val)
 		{
 			$val = trim($val);
-			if(!$val) continue;
+			if(!$val) {
+				continue;
+			}
 
 			$output = $this->insertDeniedID($val, '');
-			if($output->toBool()) $success_ids[] = $val;
+			if($output->toBool()) {
+				$success_ids[] = $val;
+			}
 		}
 
 		$this->add('user_ids', implode(',',$success_ids));
@@ -1035,8 +1067,7 @@ 
 			}
 			$msg_code = 'success_deleted';
 			$this->setMessage($msg_code);
-		}
-		else
+		} else
 		{
 			$nick_names = explode(',',$nick_name);
 			$success_nick_names = array();
@@ -1044,10 +1075,14 @@ 
 			foreach($nick_names as $val)
 			{
 				$val = trim($val);
-				if(!$val) continue;
+				if(!$val) {
+					continue;
+				}
 
 				$output = $this->insertDeniedNickName($val, '');
-				if($output->toBool()) $success_nick_names[] = $val;
+				if($output->toBool()) {
+					$success_nick_names[] = $val;
+				}
 			}
 
 			$this->add('nick_names', implode(',',$success_nick_names));
@@ -1067,7 +1102,9 @@ 
 		{
 			case 'delete' :
 				$output = $this->deleteDeniedID($user_id);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 				$msg_code = 'success_deleted';
 				break;
 		}
@@ -1119,16 +1156,19 @@ 
 	 */
 	function insertGroup($args)
 	{
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 		// Check the value of is_default.
 		if($args->is_default != 'Y')
 		{
 			$args->is_default = 'N';
-		}
-		else
+		} else
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		if(!isset($args->list_order) || $args->list_order=='')
@@ -1136,7 +1176,9 @@ 
 			$args->list_order = $args->group_srl;
 		}
 
-		if(!$args->group_srl) $args->group_srl = getNextSequence();
+		if(!$args->group_srl) {
+			$args->group_srl = getNextSequence();
+		}
 		$args->list_order = $args->group_srl;
 		$output = executeQuery('member.insertGroup', $args);
 		$this->_deleteMemberGroupCache($args->site_srl);
@@ -1151,17 +1193,22 @@ 
 	 */
 	function updateGroup($args)
 	{
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 		// Check the value of is_default.
-		if(!$args->group_srl) return new Object(-1, 'lang->msg_not_founded');
+		if(!$args->group_srl) {
+			return new Object(-1, 'lang->msg_not_founded');
+		}
 		if($args->is_default!='Y')
 		{
 			$args->is_default = 'N';
-		}
-		else
+		} else
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$output = executeQuery('member.updateGroup', $args);
@@ -1184,8 +1231,12 @@ 
 		$columnList = array('group_srl', 'is_default');
 		$group_info = $oMemberModel->getGroup($group_srl, $columnList);
 
-		if(!$group_info) return new Object(-1, 'lang->msg_not_founded');
-		if($group_info->is_default == 'Y') return new Object(-1, 'msg_not_delete_default');
+		if(!$group_info) {
+			return new Object(-1, 'lang->msg_not_founded');
+		}
+		if($group_info->is_default == 'Y') {
+			return new Object(-1, 'msg_not_delete_default');
+		}
 
 		// Get groups where is_default == 'Y'
 		$columnList = array('site_srl', 'group_srl');
@@ -1231,13 +1282,14 @@ 
 			$update_args->image_mark = $vars->image_marks[$order];
 			$update_args->list_order = $order + 1;
 
-			if(!$update_args->title) continue;
+			if(!$update_args->title) {
+				continue;
+			}
 
 			if(is_numeric($group_srl)) {
 				$update_args->group_srl = $group_srl;
 				$output = $this->updateGroup($update_args);
-			}
-			else {
+			} else {
 				$update_args->group_srl = getNextSequence();
 				$output = $this->insertGroup($update_args);
 			}
@@ -1327,7 +1379,9 @@ 
 	 */
 	function deleteDeniedID($user_id)
 	{
-		if(!$user_id) unset($user_id);
+		if(!$user_id) {
+			unset($user_id);
+		}
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
@@ -1341,7 +1395,9 @@ 
 	 */
 	function deleteDeniedNickName($nick_name)
 	{
-		if(!$nick_name) unset($nick_name);
+		if(!$nick_name) {
+			unset($nick_name);
+		}
 
 		$args = new stdClass;
 		$args->nick_name = $nick_name;
@@ -1380,16 +1436,22 @@ 
 		// Get a list of all join forms
 		$join_form_list = $oMemberModel->getJoinFormList();
 		$join_form_srl_list = array_keys($join_form_list);
-		if(count($join_form_srl_list)<2) return new Object();
+		if(count($join_form_srl_list)<2) {
+			return new Object();
+		}
 
 		$prev_member_join_form = NULL;
 		foreach($join_form_list as $key => $val)
 		{
-			if($val->member_join_form_srl == $member_join_form_srl) break;
+			if($val->member_join_form_srl == $member_join_form_srl) {
+				break;
+			}
 			$prev_member_join_form = $val;
 		}
 		// Return if no previous join form exists
-		if(!$prev_member_join_form) return new Object();
+		if(!$prev_member_join_form) {
+			return new Object();
+		}
 		// Information of the join form
 		$cur_args = new stdClass;
 		$cur_args->member_join_form_srl = $member_join_form_srl;
@@ -1400,10 +1462,14 @@ 
 		$prev_args->list_order = $list_order;
 		// Execute Query
 		$output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		executeQuery('member.updateMemberJoinFormListorder', $prev_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new Object();
 	}
@@ -1427,16 +1493,22 @@ 
 		// Get information of all join forms
 		$join_form_list = $oMemberModel->getJoinFormList();
 		$join_form_srl_list = array_keys($join_form_list);
-		if(count($join_form_srl_list)<2) return new Object();
+		if(count($join_form_srl_list)<2) {
+			return new Object();
+		}
 
 		for($i=0;$i<count($join_form_srl_list);$i++)
 		{
-			if($join_form_srl_list[$i]==$member_join_form_srl) break;
+			if($join_form_srl_list[$i]==$member_join_form_srl) {
+				break;
+			}
 		}
 
 		$next_member_join_form_srl = $join_form_srl_list[$i+1];
 		// Return if no previous join form exists
-		if(!$next_member_join_form_srl) return new Object();
+		if(!$next_member_join_form_srl) {
+			return new Object();
+		}
 		$next_member_join_form = $join_form_list[$next_member_join_form_srl];
 		// Information of the join form
 		$cur_args = new stdClass;
@@ -1448,10 +1520,14 @@ 
 		$next_args->list_order = $list_order;
 		// Execute Query
 		$output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('member.updateMemberJoinFormListorder', $next_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new Object();
 	}