xpressengine / xe-core

modules/member/member.controller.php

Doc Comments +22 added lines, -11 removed lines

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

Spacing +470 added lines, -470 removed lines

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

Braces +571 added lines, -251 removed lines

@@ -41,19 +41,31 @@ 
 		}
 
 		// Variables
-		if(!$user_id) $user_id = Context::get('user_id');
+		if(!$user_id) {
+			$user_id = Context::get('user_id');
+		}
 		$user_id = trim($user_id);
 
-		if(!$password) $password = Context::get('password');
+		if(!$password) {
+			$password = Context::get('password');
+		}
 		$password = trim($password);
 
-		if(!$keep_signed) $keep_signed = Context::get('keep_signed');
+		if(!$keep_signed) {
+			$keep_signed = Context::get('keep_signed');
+		}
 		// Return an error when id and password doesn't exist
-		if(!$user_id) return new BaseObject(-1,'null_user_id');
-		if(!$password) return new BaseObject(-1,'null_password');
+		if(!$user_id) {
+			return new BaseObject(-1,'null_user_id');
+		}
+		if(!$password) {
+			return new BaseObject(-1,'null_password');
+		}
 
 		$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
-		if (!$output->toBool()) return $output;
+		if (!$output->toBool()) {
+			return $output;
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
@@ -80,8 +92,7 @@ 
 		if(!$config->after_login_url)
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
-		}
-		else
+		} else
 		{
 			$returnUrl = $config->after_login_url;
 		}
@@ -98,19 +109,24 @@ 
 		// Call a trigger before log-out (before)
 		$logged_info = Context::get('logged_info');
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'before', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// Destroy session information
 		$this->destroySessionInfo();
 		// Call a trigger after log-out (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$output = new BaseObject();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($config->after_logout_url)
-			$output->redirect_url = $config->after_logout_url;
+		if($config->after_logout_url) {
+					$output->redirect_url = $config->after_logout_url;
+		}
 
 		$this->_clearMemberCache($logged_info->member_srl);
 
@@ -127,12 +143,18 @@ 
 		$oModuleModel = &getModel('module');
 
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) $document_srl = (int)Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			$document_srl = (int)Context::get('target_srl');
+		}
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		// Get document
 		$oDocumentModel = getModel('document');
@@ -180,11 +202,15 @@ 
 
 		// Check if already scrapped
 		$output = executeQuery('member.getScrapDocument', $args);
-		if($output->data->count) return new BaseObject(-1, 'msg_alreay_scrapped');
+		if($output->data->count) {
+			return new BaseObject(-1, 'msg_alreay_scrapped');
+		}
 
 		// Insert
 		$output = executeQuery('member.addScrapDocument', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setError(-1);
 		$this->setMessage('success_registed');
@@ -198,11 +224,15 @@ 
 	function procMemberDeleteScrap()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// Variables
 		$args = new stdClass;
 		$args->member_srl = $logged_info->member_srl;
@@ -228,11 +258,15 @@ 
 	function procMemberDeleteSavedDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
@@ -260,7 +294,9 @@ 
 	{
 		$name = Context::get('name');
 		$value = Context::get('value');
-		if(!$value) return;
+		if(!$value) {
+			return;
+		}
 
 		$oMemberModel = getModel('member');
 		// Check if logged-in
@@ -271,10 +307,14 @@ 
 		{
 			case 'user_id' :
 				// Check denied ID
-				if($oMemberModel->isDeniedID($value)) return new BaseObject(0,'denied_user_id');
+				if($oMemberModel->isDeniedID($value)) {
+					return new BaseObject(0,'denied_user_id');
+				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_user_id');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new BaseObject(0,'msg_exists_user_id');
+				}
 				break;
 			case 'nick_name' :
 				// Check denied ID
@@ -284,13 +324,17 @@ 
 				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_nick_name');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new BaseObject(0,'msg_exists_nick_name');
+				}
 
 				break;
 			case 'email_address' :
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_email_address');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new BaseObject(0,'msg_exists_email_address');
+				}
 				break;
 		}
 	}
@@ -302,17 +346,25 @@ 
 	 */
 	function procMemberInsert()
 	{
-		if (Context::getRequestMethod () == "GET") return new BaseObject(-1, "msg_invalid_request");
+		if (Context::getRequestMethod () == "GET") {
+			return new BaseObject(-1, "msg_invalid_request");
+		}
 		$oMemberModel = &getModel ('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// call a trigger (before)
 		$trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
-		if(!$trigger_output->toBool ()) return $trigger_output;
+		if(!$trigger_output->toBool ()) {
+			return $trigger_output;
+		}
 		// Check if an administrator allows a membership
-		if($config->enable_join != 'Y') return $this->stop ('msg_signup_disabled');
+		if($config->enable_join != 'Y') {
+			return $this->stop ('msg_signup_disabled');
+		}
 		// Check if the user accept the license terms (only if terms exist)
-		if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
+		if($config->agreement && Context::get('accept_agreement')!='Y') {
+			return $this->stop('msg_accept_agreement');
+		}
 
 		// Extract the necessary information in advance
 		$getVars = array();
@@ -331,16 +383,22 @@ 
 		foreach($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if($val == 'birthday') {
+				$args->birthday_ui = Context::get('birthday_ui');
+			}
 		}
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if(!$args->birthday && $args->birthday_ui) {
+			$args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		}
 
 		$args->find_account_answer = Context::get('find_account_answer');
 		$args->allow_mailing = Context::get('allow_mailing');
 		$args->allow_message = Context::get('allow_message');
 
-		if($args->password1) $args->password = $args->password1;
+		if($args->password1) {
+			$args->password = $args->password1;
+		}
 
 		// check password strength
 		if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
@@ -369,7 +427,9 @@ 
 		unset($all_args->secret_text);
 
 		// Set the user state as "denied" when using mail authentication
-		if($config->enable_confirm == 'Y') $args->denied = 'Y';
+		if($config->enable_confirm == 'Y') {
+			$args->denied = 'Y';
+		}
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
@@ -384,7 +444,9 @@ 
 			}
 		}
 		$output = $this->insertMember($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// insert ProfileImage, ImageName, ImageMark
 		$profile_image = Context::get('profile_image');
@@ -423,43 +485,46 @@ 
 			if($config->identifier == 'email_address')
 			{
 				$output = $this->doLogin($args->email_address);
-			}
-			else
+			} else
 			{
 				$output = $this->doLogin($args->user_id);
 			}
 			if(!$output->toBool()) {
-				if($output->error == -9)
-					$output->error = -11;
+				if($output->error == -9) {
+									$output->error = -11;
+				}
 				return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), $output);
 			}
 		}
 
 		// Results
 		$this->add('member_srl', $args->member_srl);
-		if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
+		if($config->redirect_url) {
+			$this->add('redirect_url', $config->redirect_url);
+		}
 		if($config->enable_confirm == 'Y')
 		{
 			$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
 			$this->setMessage($msg);
 			return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new BaseObject(-12, $msg));
+		} else {
+			$this->setMessage('success_registed');
 		}
-		else $this->setMessage('success_registed');
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		if($config->redirect_url)
 		{
 			$returnUrl = $config->redirect_url;
-		}
-		else
+		} else
 		{
 			if(Context::get('success_return_url'))
 			{
 				$returnUrl = Context::get('success_return_url');
-			}
-			else if($_COOKIE['XE_REDIRECT_URL'])
+			} else if($_COOKIE['XE_REDIRECT_URL'])
 			{
 				$returnUrl = $_COOKIE['XE_REDIRECT_URL'];
 				setcookie("XE_REDIRECT_URL", '', 1);
@@ -513,8 +578,7 @@ 
 		if(Context::get('success_return_url'))
 		{
 			$redirectUrl = Context::get('success_return_url');
-		}
-		else
+		} else
 		{
 			$redirectUrl = getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		}
@@ -558,7 +622,9 @@ 
 		foreach($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if($val == 'birthday') {
+				$args->birthday_ui = Context::get('birthday_ui');
+			}
 			if($val == 'find_account_answer' && !Context::get($val)) {
 				unset($args->{$val});
 			}
@@ -568,7 +634,9 @@ 
 		$logged_info = Context::get('logged_info');
 		$args->member_srl = $logged_info->member_srl;
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if(!$args->birthday && $args->birthday_ui) {
+			$args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		}
 
 		// Remove some unnecessary variables from all the vars
 		$all_args = Context::getRequestVars();
@@ -603,7 +671,9 @@ 
 
 		// Execute insert or update depending on the value of member_srl
 		$output = $this->updateMember($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$profile_image = Context::get('profile_image');
 		if(is_uploaded_file($profile_image['tmp_name']))
@@ -633,7 +703,9 @@ 
 
 		// Call a trigger after successfully log-in (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberModifyInfo', 'after', $this->memberInfo);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$this->setSessionInfo();
 		// Return result
@@ -654,7 +726,9 @@ 
 	 */
 	function procMemberModifyPassword()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return $this->stop('msg_not_logged');
+		}
 		// Extract the necessary information in advance
 		$current_password = trim(Context::get('current_password'));
 		$password = trim(Context::get('password1'));
@@ -668,17 +742,23 @@ 
 
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new BaseObject(-1, 'invalid_password');
+		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) {
+			return new BaseObject(-1, 'invalid_password');
+		}
 
 		// Check if a new password is as same as the previous password
-		if($current_password == $password) return new BaseObject(-1, 'invalid_new_password');
+		if($current_password == $password) {
+			return new BaseObject(-1, 'invalid_new_password');
+		}
 
 		// Execute insert or update depending on the value of member_srl
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$args->password = $password;
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('member_srl', $args->member_srl);
 		$this->setMessage('success_updated');
@@ -694,7 +774,9 @@ 
 	 */
 	function procMemberLeave()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return $this->stop('msg_not_logged');
+		}
 		// Extract the necessary information in advance
 		$password = trim(Context::get('password'));
 		// Get information of logged-in user
@@ -710,10 +792,14 @@ 
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new BaseObject(-1, 'invalid_password');
+		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) {
+			return new BaseObject(-1, 'invalid_password');
+		}
 
 		$output = $this->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Destroy all session information
 		$this->destroySessionInfo();
 		// Return success message
@@ -732,20 +818,30 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = Context::get('profile_image');
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
+		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 
 		$output = $this->insertProfileImage($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		$this->setRedirectUrl($returnUrl);
@@ -768,8 +864,9 @@ 
 		$max_filesize = $config->profile_image_max_filesize;
 		foreach($config->signupForm as $val)
 		{
-			if($val->name == "profile_image")
-				$allow_transparent = $val->allow_transparent_thumbnail == 'Y';
+			if($val->name == "profile_image") {
+							$allow_transparent = $val->allow_transparent_thumbnail == 'Y';
+			}
 		}
 
 		Context::loadLang(_XE_PATH_ . 'modules/file/lang');
@@ -777,10 +874,13 @@ 
 		// Get file information
 		FileHandler::clearStatCache($target_file);
 		list($width, $height, $type) = @getimagesize($target_file);
-		if(IMAGETYPE_PNG == $type) $ext = 'png';
-		elseif(IMAGETYPE_JPEG == $type) $ext = 'jpg';
-		elseif(IMAGETYPE_GIF == $type) $ext = 'gif';
-		else
+		if(IMAGETYPE_PNG == $type) {
+			$ext = 'png';
+		} elseif(IMAGETYPE_JPEG == $type) {
+			$ext = 'jpg';
+		} elseif(IMAGETYPE_GIF == $type) {
+			$ext = 'gif';
+		} else
 		{
 			return $this->stop('msg_not_uploaded_profile_image');
 		}
@@ -811,8 +911,7 @@ 
 			FileHandler::removeFilesInDir($target_path);
 			FileHandler::moveFile($temp_filename, $target_filename);
 			FileHandler::clearStatCache($target_filename);
-		}
-		else
+		} else
 		{
 			// 파일 용량 제한
 			$filesize = filesize($target_file);
@@ -841,20 +940,30 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = Context::get('image_name');
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
+		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 
 		$output = $this->insertImageName($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Page refresh
 		//$this->setRefreshPage();
@@ -909,8 +1018,7 @@ 
 			FileHandler::removeFilesInDir($target_path);
 			FileHandler::moveFile($temp_filename, $target_filename);
 			FileHandler::clearStatCache($target_filename);
-		}
-		else
+		} else
 		{
 			// 파일 용량 제한
 			$filesize = filesize($target_file);
@@ -987,20 +1095,30 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = Context::get('image_mark');
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 		// Membership in the images mark the module using the ban was set by an administrator or return;
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
+		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 
 		$this->insertImageMark($member_srl, $file['tmp_name']);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		$this->setRedirectUrl($returnUrl);
@@ -1051,8 +1169,7 @@ 
 			FileHandler::removeFilesInDir($target_path);
 			FileHandler::moveFile($temp_filename, $target_filename);
 			FileHandler::clearStatCache($target_filename);
-		}
-		else
+		} else
 		{
 			$filesize = filesize($target_file);
 			if($max_filesize && $filesize > ($max_filesize * 1024))
@@ -1104,14 +1221,18 @@ 
 	function procMemberFindAccount()
 	{
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$email_address) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$oModuleModel = getModel('module');
 
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new BaseObject(-1, 'msg_email_not_exists');
+		if(!$member_srl) {
+			return new BaseObject(-1, 'msg_email_not_exists');
+		}
 
 		// Get information of the member
 		$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
@@ -1123,7 +1244,9 @@ 
 			$chk_args = new stdClass;
 			$chk_args->member_srl = $member_info->member_srl;
 			$output = executeQuery('member.chkAuthMail', $chk_args);
-			if($output->toBool() && $output->data->count != '0') return new BaseObject(-1, 'msg_user_not_confirmed');
+			if($output->toBool() && $output->data->count != '0') {
+				return new BaseObject(-1, 'msg_user_not_confirmed');
+			}
 		}
 
 		// Insert data into the authentication DB
@@ -1136,7 +1259,9 @@ 
 		$args->is_register = 'N';
 
 		$output = executeQuery('member.insertAuthMail', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Get content of the email to send a member
 		Context::set('auth_args', $args);
 
@@ -1153,8 +1278,7 @@ 
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
 			}
-		}
-		else
+		} else
 		{
 			$memberInfo[$lang->user_id] = $args->user_id;
 			$memberInfo[$lang->user_name] = $args->user_name;
@@ -1163,13 +1287,19 @@ 
 		}
 		Context::set('memberInfo', $memberInfo);
 
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if(!$member_config->skin) {
+			$member_config->skin = "default";
+		}
+		if(!$member_config->colorset) {
+			$member_config->colorset = "white";
+		}
 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if(!is_dir($tpl_path)) {
+			$tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		}
 
 		$find_url = getFullUrl ('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $args->auth_key);
 		Context::set('find_url', $find_url);
@@ -1212,19 +1342,25 @@ 
 		$find_account_question = trim(Context::get('find_account_question'));
 		$find_account_answer = trim(Context::get('find_account_answer'));
 
-		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new BaseObject(-1, 'msg_invalid_request');
+		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new BaseObject(-1, 'msg_email_not_exists');
+		if(!$member_srl) {
+			return new BaseObject(-1, 'msg_email_not_exists');
+		}
 
 		// Get information of the member
 		$columnList = array('member_srl', 'find_account_question', 'find_account_answer');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Display a message if no answer is entered
-		if(!$member_info->find_account_question || !$member_info->find_account_answer) return new BaseObject(-1, 'msg_question_not_exists');
+		if(!$member_info->find_account_question || !$member_info->find_account_answer) {
+			return new BaseObject(-1, 'msg_question_not_exists');
+		}
 
 		// 답변 확인
 		$hashed = $oPassword->checkAlgorithm($member_info->find_account_answer);
@@ -1233,12 +1369,10 @@ 
 		if($member_info->find_account_question != $find_account_question)
 		{
 			$authed = false;
-		}
-		else if($hashed && !$oPassword->checkPassword($find_account_answer, $member_info->find_account_answer))
+		} else if($hashed && !$oPassword->checkPassword($find_account_answer, $member_info->find_account_answer))
 		{
 			$authed = false;
-		}
-		else if(!$hashed && $find_account_answer != $member_info->find_account_answer)
+		} else if(!$hashed && $find_account_answer != $member_info->find_account_answer)
 		{
 			$authed = false;
 		}
@@ -1267,7 +1401,9 @@ 
 		$args->password = $temp_password;
 		$args->change_password_date = '1';
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$_SESSION['xe_temp_password_' . $user_id] = $temp_password;
 
@@ -1327,7 +1463,9 @@ 
 			$auth_args->is_register = 'Y';
 
 			$output = executeQuery('member.insertAuthMail', $auth_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// resend auth mail.
 			$this->_sendAuthMail($auth_args, $memberInfo);
@@ -1344,8 +1482,7 @@ 
 		if($output->data->is_register == 'Y')
 		{
 			$args->denied = 'N';
-		}
-		else
+		} else
 		{
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
@@ -1379,33 +1516,45 @@ 
 	{
 		// Get an email_address
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$email_address) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		// Log test by using email_address
 		$oMemberModel = getModel('member');
 
 		$args = new stdClass;
 		$args->email_address = $email_address;
 		$memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$memberSrl) return new BaseObject(-1, 'msg_not_exists_member');
+		if(!$memberSrl) {
+			return new BaseObject(-1, 'msg_not_exists_member');
+		}
 
 		$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if(!$member_config->skin) {
+			$member_config->skin = "default";
+		}
+		if(!$member_config->colorset) {
+			$member_config->colorset = "white";
+		}
 
 		// Check if a authentication mail has been sent previously
 		$chk_args = new stdClass;
 		$chk_args->member_srl = $member_info->member_srl;
 		$output = executeQuery('member.chkAuthMail', $chk_args);
-		if($output->toBool() && $output->data->count == '0') return new BaseObject(-1, 'msg_invalid_request');
+		if($output->toBool() && $output->data->count == '0') {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$auth_args = new stdClass;
 		$auth_args->member_srl = $member_info->member_srl;
 		$output = executeQueryArray('member.getAuthMailInfo', $auth_args);
-		if(!$output->data || !$output->data[0]->auth_key)  return new BaseObject(-1, 'msg_invalid_request');
+		if(!$output->data || !$output->data[0]->auth_key) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		$auth_info = $output->data[0];
 
 		// Update the regdate of authmail entry
@@ -1426,8 +1575,7 @@ 
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
 			}
-		}
-		else
+		} else
 		{
 			$memberInfo[$lang->user_id] = $member_info->user_id;
 			$memberInfo[$lang->user_name] = $member_info->user_name;
@@ -1440,7 +1588,9 @@ 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if(!is_dir($tpl_path)) {
+			$tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		}
 
 		$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_info->auth_key);
 		Context::set('auth_url', $auth_url);
@@ -1518,7 +1668,9 @@ 
 		$auth_args->is_register = 'Y';
 
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$memberInfo->email_address = $newEmail;
 
@@ -1552,8 +1704,7 @@ 
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
 			}
-		}
-		else
+		} else
 		{
 			$memberInfo[$lang->user_id] = $member_info->user_id;
 			$memberInfo[$lang->user_name] = $member_info->user_name;
@@ -1562,13 +1713,19 @@ 
 		}
 		Context::set('memberInfo', $memberInfo);
 
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if(!$member_config->skin) {
+			$member_config->skin = "default";
+		}
+		if(!$member_config->colorset) {
+			$member_config->colorset = "white";
+		}
 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if(!is_dir($tpl_path)) {
+			$tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		}
 
 		$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
 		Context::set('auth_url', $auth_url);
@@ -1593,7 +1750,9 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new BaseObject(-1,'msg_invalid_request');
+		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$columnList = array('site_srl', 'group_srl', 'title');
@@ -1612,13 +1771,17 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new BaseObject(-1,'msg_invalid_request');
+		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$args = new stdClass;
 		$args->site_srl= $site_module_info->site_srl;
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		$this->setMessage('success_deleted');
 		$this->_clearMemberCache($args->member_srl, $site_module_info->site_srl);
 	}
@@ -1632,17 +1795,37 @@ 
 	 */
 	function setMemberConfig($args)
 	{
-		if(!$args->skin) $args->skin = "default";
-		if(!$args->colorset) $args->colorset = "white";
-		if(!$args->editor_skin) $args->editor_skin= "ckeditor";
-		if(!$args->editor_colorset) $args->editor_colorset = "moono";
-		if($args->enable_join!='Y') $args->enable_join = 'N';
+		if(!$args->skin) {
+			$args->skin = "default";
+		}
+		if(!$args->colorset) {
+			$args->colorset = "white";
+		}
+		if(!$args->editor_skin) {
+			$args->editor_skin= "ckeditor";
+		}
+		if(!$args->editor_colorset) {
+			$args->editor_colorset = "moono";
+		}
+		if($args->enable_join!='Y') {
+			$args->enable_join = 'N';
+		}
 		$args->enable_openid= 'N';
-		if($args->profile_image !='Y') $args->profile_image = 'N';
-		if($args->image_name!='Y') $args->image_name = 'N';
-		if($args->image_mark!='Y') $args->image_mark = 'N';
-		if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
-		if(!trim(strip_tags($args->agreement))) $args->agreement = null;
+		if($args->profile_image !='Y') {
+			$args->profile_image = 'N';
+		}
+		if($args->image_name!='Y') {
+			$args->image_name = 'N';
+		}
+		if($args->image_mark!='Y') {
+			$args->image_mark = 'N';
+		}
+		if($args->group_image_mark!='Y') {
+			$args->group_image_mark = 'N';
+		}
+		if(!trim(strip_tags($args->agreement))) {
+			$args->agreement = null;
+		}
 		$args->limit_day = (int)$args->limit_day;
 
 		$agreement = trim($args->agreement);
@@ -1650,7 +1833,9 @@ 
 
 		$oModuleController = getController('module');
 		$output = $oModuleController->insertModuleConfig('member',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
 		FileHandler::writeFile($agreement_file, $agreement);
@@ -1675,7 +1860,9 @@ 
 		$path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($member_srl));
 		$filename = sprintf('%s%d.signature.php', $path, $member_srl);
 
-		if(!$check_signature) return FileHandler::removeFile($filename);
+		if(!$check_signature) {
+			return FileHandler::removeFile($filename);
+		}
 
 		$buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);
 		FileHandler::makeDir($path);
@@ -1709,7 +1896,9 @@ 
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$args->group_srl = $group_srl;
-		if($site_srl) $args->site_srl = $site_srl;
+		if($site_srl) {
+			$args->site_srl = $site_srl;
+		}
 
 		// Add
 		$output = executeQuery('member.addMemberToGroup',$args);
@@ -1735,15 +1924,21 @@ 
 		$obj->member_srl = implode(',',$args->member_srl);
 
 		$output = executeQueryArray('member.getMembersGroup', $obj);
-		if($output->data) foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
+		if($output->data) {
+			foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
+		}
 
 		$output = executeQuery('member.deleteMembersGroup', $obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$inserted_members = array();
 		foreach($args->member_srl as $key => $val)
 		{
-			if($inserted_members[$val]) continue;
+			if($inserted_members[$val]) {
+				continue;
+			}
 			$inserted_members[$val] = true;
 
 			unset($obj);
@@ -1753,7 +1948,9 @@ 
 			$obj->site_srl = $args->site_srl;
 			$obj->regdate = $date[$obj->member_srl];
 			$output = executeQuery('member.addMemberToGroup', $obj);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$this->_clearMemberCache($obj->member_srl, $args->site_srl);
 		}
@@ -1815,8 +2012,7 @@ 
 				if($config->identifier == 'user_id')
 				{
 					$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
-				}
-				else
+				} else
 				{
 					$member_info = $oMemberModel->getMemberInfoByEmailAddress($user_id, $columnList);
 				}
@@ -1825,8 +2021,7 @@ 
 					$do_auto_login = true;
 				}
 
-			}
-			else
+			} else
 			{
 				$do_auto_login = true;
 			}
@@ -1835,8 +2030,7 @@ 
 		if($do_auto_login)
 		{
 			$output = $this->doLogin($user_id);
-		}
-		else
+		} else
 		{
 			executeQuery('member.deleteAutologin', $args);
 			setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365);
@@ -1855,13 +2049,17 @@ 
 	function doLogin($user_id, $password = '', $keep_signed = false)
 	{
 		$user_id = strtolower($user_id);
-		if(!$user_id) return new BaseObject(-1, 'null_user_id');
+		if(!$user_id) {
+			return new BaseObject(-1, 'null_user_id');
+		}
 		// Call a trigger before log-in (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->user_id = $user_id;
 		$trigger_obj->password = $password;
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// Create a member model object
 		$oMemberModel = getModel('member');
 
@@ -1876,15 +2074,18 @@ 
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_email_address');
+			if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) {
+				return $this->recordLoginError(-1, 'invalid_email_address');
+			}
 
-		}
-		else
+		} else
 		{
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_user_id');
+			if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) {
+				return $this->recordLoginError(-1, 'invalid_user_id');
+			}
 		}
 
 		$output = executeQuery('member.getLoginCountByIp', $args);
@@ -1896,14 +2097,18 @@ 
 			if($term < $config->max_error_count_time)
 			{
 				$term = $config->max_error_count_time - $term;
-				if($term < 60) $term = intval($term).Context::getLang('unit_sec');
-				elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
-				elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
-				else $term = intval($term/86400).Context::getLang('unit_day');
+				if($term < 60) {
+					$term = intval($term).Context::getLang('unit_sec');
+				} elseif(60 <= $term && $term < 3600) {
+					$term = intval($term/60).Context::getLang('unit_min');
+				} elseif(3600 <= $term && $term < 86400) {
+					$term = intval($term/3600).Context::getLang('unit_hour');
+				} else {
+					$term = intval($term/86400).Context::getLang('unit_day');
+				}
 
 				return new BaseObject(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
-			}
-			else
+			} else
 			{
 				$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 				$output = executeQuery('member.deleteLoginCountByIp', $args);
@@ -1930,7 +2135,9 @@ 
 			return new BaseObject(-1,'msg_user_denied');
 		}
 		// Notify if denied_date is less than the current time
-		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new BaseObject(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) {
+			return new BaseObject(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		}
 		// Update the latest login time
 		$args->member_srl = $this->memberInfo->member_srl;
 		$output = executeQuery('member.updateLastLogin', $args);
@@ -1979,7 +2186,9 @@ 
 		}
 		// Call a trigger after successfully log-in (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $this->memberInfo);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// When user checked to use auto-login
 		if($keep_signed)
 		{
@@ -1993,7 +2202,9 @@ 
 			$autologin_args->member_srl = $this->memberInfo->member_srl;
 			executeQuery('member.deleteAutologin', $autologin_args);
 			$autologin_output = executeQuery('member.insertAutologin', $autologin_args);
-			if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, $_SERVER['REQUEST_TIME']+31536000);
+			if($autologin_output->toBool()) {
+				setCookie('xeak',$autologin_args->autologin_key, $_SERVER['REQUEST_TIME']+31536000);
+			}
 		}
 		if($this->memberInfo->is_admin == 'Y')
 		{
@@ -2082,7 +2293,9 @@ 
 	function addMemberPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$member_popup_menu_list = Context::get('member_popup_menu_list');
-		if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
+		if(!is_array($member_popup_menu_list)) {
+			$member_popup_menu_list = array();
+		}
 
 		$obj = new stdClass;
 		$obj->url = $url;
@@ -2101,35 +2314,54 @@ 
 	{
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('member.insertMember', 'before', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Terms and Conditions portion of the information set up by members reaffirmed
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
 		$logged_info = Context::get('logged_info');
 		// If the date of the temporary restrictions limit further information on the date of
-		if($config->limit_day) $args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME']+$config->limit_day*60*60*24);
+		if($config->limit_day) {
+			$args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME']+$config->limit_day*60*60*24);
+		}
 
 		$args->member_srl = getNextSequence();
 		$args->list_order = -1 * $args->member_srl;
 
 		// Execute insert or update depending on the value of member_srl
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
+		if(!$args->user_id) {
+			$args->user_id = 't'.$args->member_srl;
+		}
 		// Enter the user's identity changed to lowercase
-		else $args->user_id = strtolower($args->user_id);
-		if(!$args->user_name) $args->user_name = $args->member_srl;
-		if(!$args->nick_name) $args->nick_name = $args->member_srl;
+		else {
+			$args->user_id = strtolower($args->user_id);
+		}
+		if(!$args->user_name) {
+			$args->user_name = $args->member_srl;
+		}
+		if(!$args->nick_name) {
+			$args->nick_name = $args->member_srl;
+		}
 
 		// Control of essential parameters
-		if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-		if($args->denied!='Y') $args->denied = 'N';
-		if(!$args->allow_message || ($args->allow_message && !in_array($args->allow_message, array('Y','N','F')))) $args->allow_message = 'Y';
+		if($args->allow_mailing!='Y') {
+			$args->allow_mailing = 'N';
+		}
+		if($args->denied!='Y') {
+			$args->denied = 'N';
+		}
+		if(!$args->allow_message || ($args->allow_message && !in_array($args->allow_message, array('Y','N','F')))) {
+			$args->allow_message = 'Y';
+		}
 
 		if($logged_info->is_admin == 'Y')
 		{
-			if($args->is_admin!='Y') $args->is_admin = 'N';
-		}
-		else
+			if($args->is_admin!='Y') {
+				$args->is_admin = 'N';
+			}
+		} else
 		{
 			unset($args->is_admin);
 		}
@@ -2142,8 +2374,12 @@ 
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) {
+			$args->homepage = 'http://'.$args->homepage;
+		}
+		if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) {
+			$args->blog = 'http://'.$args->blog;
+		}
 
 		// Create a model object
 		$oMemberModel = getModel('member');
@@ -2157,8 +2393,7 @@ 
 				return new BaseObject(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		elseif(!$args->password)
+		} elseif(!$args->password)
 		{
 			unset($args->password);
 		}
@@ -2166,8 +2401,7 @@ 
 		if($args->find_account_answer && !$password_is_hashed)
 		{
 			$args->find_account_answer = $oMemberModel->hashPassword($args->find_account_answer);
-		}
-		elseif(!$args->find_account_answer)
+		} elseif(!$args->find_account_answer)
 		{
 			unset($args->find_account_answer);
 		}
@@ -2208,8 +2442,12 @@ 
 		// Insert data into the DB
 		$args->list_order = -1 * $args->member_srl;
 
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
-		if(!$args->user_name) $args->user_name = $args->member_srl;
+		if(!$args->user_id) {
+			$args->user_id = 't'.$args->member_srl;
+		}
+		if(!$args->user_name) {
+			$args->user_name = $args->member_srl;
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2221,8 +2459,11 @@ 
 			return $output;
 		}
 
-		if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
-		else $group_srl_list = explode('|@|', $args->group_srl_list);
+		if(is_array($args->group_srl_list)) {
+			$group_srl_list = $args->group_srl_list;
+		} else {
+			$group_srl_list = explode('|@|', $args->group_srl_list);
+		}
 		// If no value is entered the default group, the value of group registration
 		if(!$args->group_srl_list)
 		{
@@ -2239,8 +2480,7 @@ 
 				}
 			}
 			// If the value is the value of the group entered the group registration
-		}
-		else
+		} else
 		{
 			for($i=0;$i<count($group_srl_list);$i++)
 			{
@@ -2301,27 +2541,39 @@ 
 	{
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Create a model object
 		$oMemberModel = getModel('member');
 
 		$logged_info = Context::get('logged_info');
 		// Get what you want to modify the original information
-		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		if(!$this->memberInfo) {
+			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		}
 		// Control of essential parameters
-		if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-		if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+		if($args->allow_mailing!='Y') {
+			$args->allow_mailing = 'N';
+		}
+		if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) {
+			$args->allow_message = 'Y';
+		}
 
 		if($logged_info->is_admin == 'Y')
 		{
-			if($args->denied!='Y') $args->denied = 'N';
-			if($args->is_admin!='Y' && $logged_info->member_srl != $args->member_srl) $args->is_admin = 'N';
-		}
-		else
+			if($args->denied!='Y') {
+				$args->denied = 'N';
+			}
+			if($args->is_admin!='Y' && $logged_info->member_srl != $args->member_srl) {
+				$args->is_admin = 'N';
+			}
+		} else
 		{
 			unset($args->is_admin);
-			if($is_admin == false)
-				unset($args->denied);
+			if($is_admin == false) {
+							unset($args->denied);
+			}
 			if($logged_info->member_srl != $args->member_srl && $is_admin == false)
 			{
 				return $this->stop('msg_invalid_request');
@@ -2329,13 +2581,19 @@ 
 		}
 
 		// Sanitize user ID, username, nickname, homepage, blog
-		if($args->user_id) $args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		if($args->user_id) {
+			$args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		}
 		$args->user_name = htmlspecialchars($args->user_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) {
+			$args->homepage = 'http://'.$args->homepage;
+		}
+		if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) {
+			$args->blog = 'http://'.$args->blog;
+		}
 
 		// check member identifier form
 		$config = $oMemberModel->getMemberConfig();
@@ -2352,8 +2610,7 @@ 
 				return new BaseObject(-1,'msg_exists_email_address');
 			}
 			$args->email_address = $orgMemberInfo->email_address;
-		}
-		else
+		} else
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
 			if($member_srl && $args->member_srl != $member_srl)
@@ -2410,16 +2667,14 @@ 
 				return new BaseObject(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		else
+		} else
 		{
 			$args->password = $orgMemberInfo->password;
 		}
 
 		if($args->find_account_answer) {
 			$args->find_account_answer = $oMemberModel->hashPassword($args->find_account_answer);
-		}
-		else
+		} else
 		{
 			$oPassword =  new Password();
 			$hashed = $oPassword->checkAlgorithm($orgMemberInfo->find_account_answer);
@@ -2431,11 +2686,21 @@ 
 			}
 		}
 
-		if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
-		if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
-		if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
-		if(!isset($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(!isset($args->description)) {
+			$args->description = $orgMemberInfo->description;
+		}
+		if(!$args->birthday) {
+			$args->birthday = '';
+		}
 
 		$output = executeQuery('member.updateMember', $args);
 
@@ -2447,8 +2712,11 @@ 
 
 		if($args->group_srl_list)
 		{
-			if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
-			else $group_srl_list = explode('|@|', $args->group_srl_list);
+			if(is_array($args->group_srl_list)) {
+				$group_srl_list = $args->group_srl_list;
+			} else {
+				$group_srl_list = explode('|@|', $args->group_srl_list);
+			}
 			// If the group information, group information changes
 			if(count($group_srl_list) > 0)
 			{
@@ -2491,7 +2759,9 @@ 
 		$this->_clearMemberCache($args->member_srl, $args->site_srl);
 
 		// Save Session
-		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		if(!$this->memberInfo) {
+			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		}
 		$logged_info = Context::get('logged_info');
 
 		$output->add('member_srl', $args->member_srl);
@@ -2517,8 +2787,7 @@ 
 			}
 
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		else if($args->hashed_password)
+		} else if($args->hashed_password)
 		{
 			$args->password = $args->hashed_password;
 		}
@@ -2553,7 +2822,9 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->member_srl = $member_srl;
 		$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Create a model object
 		$oMemberModel = getModel('member');
 		// Bringing the user's information
@@ -2562,9 +2833,13 @@ 
 			$columnList = array('member_srl', 'is_admin');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		}
-		if(!$this->memberInfo) return new BaseObject(-1, 'msg_not_exists_member');
+		if(!$this->memberInfo) {
+			return new BaseObject(-1, 'msg_not_exists_member');
+		}
 		// If managers can not be deleted
-		if($this->memberInfo->is_admin == 'Y') return new BaseObject(-1, 'msg_cannot_delete_admin');
+		if($this->memberInfo->is_admin == 'Y') {
+			return new BaseObject(-1, 'msg_cannot_delete_admin');
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2628,7 +2903,9 @@ 
 	 */
 	function destroySessionInfo()
 	{
-		if(!$_SESSION || !is_array($_SESSION)) return;
+		if(!$_SESSION || !is_array($_SESSION)) {
+			return;
+		}
 
 		$memberInfo = Context::get('logged_info');
 		$memberSrl = $memberInfo->member_srl;
@@ -2667,8 +2944,9 @@ 
 		}
 		$maxLevel = 0;
 		$resultGroup = array_intersect($levelGroup, $groupSrlList);
-		if(count($resultGroup) > 0)
-			$maxLevel = max(array_flip($resultGroup));
+		if(count($resultGroup) > 0) {
+					$maxLevel = max(array_flip($resultGroup));
+		}
 
 		if($maxLevel > 0)
 		{
@@ -2685,16 +2963,22 @@ 
 
 	function procMemberModifyEmailAddress()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return $this->stop('msg_not_logged');
+		}
 
 		$member_info = Context::get('logged_info');
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail) return $this->stop('msg_invalid_request');
+		if(!$newEmail) {
+			return $this->stop('msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl) return new BaseObject(-1,'msg_exists_email_address');
+		if($member_srl) {
+			return new BaseObject(-1,'msg_exists_email_address');
+		}
 
 		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
@@ -2722,7 +3006,9 @@ 
 		$member_config = $oModuleModel->getModuleConfig('member');
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if(!is_dir($tpl_path)) {
+			$tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		}
 
 		global $lang;
 
@@ -2758,7 +3044,9 @@ 
 	{
 		$member_srl = Context::get('member_srl');
 		$auth_key = Context::get('auth_key');
-		if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
+		if(!$member_srl || !$auth_key) {
+			return $this->stop('msg_invalid_request');
+		}
 
 		// Test logs for finding password by user_id and authkey
 		$args = new stdClass;
@@ -2767,7 +3055,9 @@ 
 		$output = executeQuery('member.getAuthMail', $args);
 		if(!$output->toBool() || $output->data->auth_key != $auth_key)
 		{
-			if(strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthChangeEmailAddress', $args);
+			if(strlen($output->data->auth_key) !== strlen($auth_key)) {
+				executeQuery('member.deleteAuthChangeEmailAddress', $args);
+			}
 			return $this->stop('msg_invalid_modify_email_auth_key');
 		}
 
@@ -2776,7 +3066,9 @@ 
 		list($args->email_id, $args->email_host) = explode('@', $newEmail);
 
 		$output = executeQuery('member.updateMemberEmailAddress', $args);
-		if(!$output->toBool()) return $this->stop($output->getMessage());
+		if(!$output->toBool()) {
+			return $this->stop($output->getMessage());
+		}
 
 		// Remove all values having the member_srl and new_password equal to 'XE_change_emaill_address' from authentication table
 		executeQuery('member.deleteAuthChangeEmailAddress',$args);
@@ -2797,7 +3089,9 @@ 
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new BaseObject();
+		if(!Context::get('is_logged')) {
+			return new BaseObject();
+		}
 
 		$logged_info = Context::get('logged_info');
 		$document_srl = Context::get('target_srl');
@@ -2808,8 +3102,12 @@ 
 		$member_srl = $oDocument->get('member_srl');
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$member_srl) return new BaseObject();
-		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new BaseObject();
+		if(!$member_srl) {
+			return new BaseObject();
+		}
+		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) {
+			return new BaseObject();
+		}
 
 		$oDocumentController = getController('document');
 		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@@ -2827,7 +3125,9 @@ 
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new BaseObject();
+		if(!Context::get('is_logged')) {
+			return new BaseObject();
+		}
 
 		$logged_info = Context::get('logged_info');
 		$comment_srl = Context::get('target_srl');
@@ -2838,8 +3138,12 @@ 
 		$module_srl = $oComment->get('module_srl');
 		$member_srl = $oComment->get('member_srl');
 
-		if(!$member_srl) return new BaseObject();
-		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new BaseObject();
+		if(!$member_srl) {
+			return new BaseObject();
+		}
+		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) {
+			return new BaseObject();
+		}
 
 		$oCommentController = getController('comment');
 		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@@ -2855,7 +3159,9 @@ 
 	**/
 	function procMemberSpammerManage()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = Context::get('member_srl');
@@ -2863,8 +3169,9 @@ 
 		$cnt_loop = Context::get('cnt_loop');
 		$proc_type = Context::get('proc_type');
 		$isMoveToTrash = true;
-		if($proc_type == "delete")
-			$isMoveToTrash = false;
+		if($proc_type == "delete") {
+					$isMoveToTrash = false;
+		}
 
 		// check grant
 		$oModuleModel = getModel('module');
@@ -2872,7 +3179,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$proc_msg = "";
 
@@ -2881,11 +3190,13 @@ 
 
 		// delete or trash destination
 		// proc member
-		if($cnt_loop == 1)
-			$this->_spammerMember($member_srl);
+		if($cnt_loop == 1) {
+					$this->_spammerMember($member_srl);
+		}
 		// proc document and comment
-		elseif($cnt_loop>1)
-			$this->_spammerDocuments($member_srl, $isMoveToTrash);
+		elseif($cnt_loop>1) {
+					$this->_spammerDocuments($member_srl, $isMoveToTrash);
+		}
 
 		// get destination count
 		$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl);
@@ -2893,13 +3204,16 @@ 
 
 		$total_count = Context::get('total_count');
 		$remain_count = $cnt_document + $cnt_comment;
-		if($cnt_loop == 1) $total_count = $remain_count;
+		if($cnt_loop == 1) {
+			$total_count = $remain_count;
+		}
 
 		// get progress percent
-		if($total_count > 0)
-			$progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 );
-		else
-			$progress = 100;
+		if($total_count > 0) {
+					$progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 );
+		} else {
+					$progress = 100;
+		}
 
 		$this->add('total_count', $total_count);
 		$this->add('remain_count', $remain_count);
@@ -2941,7 +3255,10 @@ 
 		$args->nick_name = $member_info->nick_name;
 		$args->denied = "Y";
 		$args->description = trim( $member_info->description );
-		if( $args->description != "" ) $args->description .= "\n";	// add new line
+		if( $args->description != "" ) {
+			$args->description .= "\n";
+		}
+		// add new line
 
 		$args->description .= Context::getLang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . " docuemnts count:" . $total_count . "]";
 
@@ -2986,8 +3303,11 @@ 
 			$documentList = $oDocumentModel->getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
 			if($documentList) {
 				foreach($documentList as $v) {
-					if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v);
-					else $oDocumentController->deleteDocument($v->document_srl);
+					if($isMoveToTrash) {
+						$oDocumentController->moveDocumentToTrash($v);
+					} else {
+						$oDocumentController->deleteDocument($v->document_srl);
+					}
 				}
 			}
 		}

modules/board/board.class.php

Spacing +14 added lines, -14 removed lines

@@ -9,7 +9,7 @@ 
 
 class board extends ModuleObject
 {
-	var $search_option = array('title_content','title','content','comment','user_name','nick_name','user_id','tag'); ///< 검색 옵션
+	var $search_option = array('title_content', 'title', 'content', 'comment', 'user_name', 'nick_name', 'user_id', 'tag'); ///< 검색 옵션
 
 	var $order_target = array('list_order', 'update_order', 'regdate', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title', 'nick_name', 'user_name', 'user_id'); // 정렬 옵션
 
@@ -25,14 +25,14 @@ 
 	 */
 	function __construct()
 	{
-		if(!Context::isInstalled()) return;
+		if (!Context::isInstalled()) return;
 
-		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
 			$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDelete', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
 			Context::addSSLActions($ssl_actions);
 		}
-		if(!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
 		{
 			Context::addSSLAction('dispTempSavedList');
 		}
@@ -54,7 +54,7 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = executeQuery('module.getSite', $args);
-		if(!$output->data->index_module_srl)
+		if (!$output->data->index_module_srl)
 		{
 			$args->mid = 'board';
 			$args->module = 'board';
@@ -63,7 +63,7 @@ 
 			$args->site_srl = 0;
 			$output = $oModuleController->insertModule($args);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$module_srl = $output->get('module_srl');
 
@@ -87,13 +87,13 @@ 
 		$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 get the member menu trigger
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+			if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+			if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -109,16 +109,16 @@ 
 		$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  check the member menu trigger, if it is not existed then insert
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
+			if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
 			{
 				$oModuleController->insertTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after');
 			}
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
+			if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
 			{
 				$oModuleController->insertTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after');
 			}
@@ -131,12 +131,12 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');
 
-		foreach($output->data as $board)
+		foreach ($output->data as $board)
 		{
 			$oModuleController->deleteModule($board->module_srl);
 		}

Braces +12 added lines, -4 removed lines

@@ -25,7 +25,9 @@ 
 	 */
 	function __construct()
 	{
-		if(!Context::isInstalled()) return;
+		if(!Context::isInstalled()) {
+			return;
+		}
 
 		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
@@ -90,10 +92,14 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 get the member menu trigger
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) {
+				return true;
+			}
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -131,7 +137,9 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');

modules/session/session.class.php

Spacing +17 added lines, -17 removed lines

@@ -15,7 +15,7 @@ 
 
 	function __construct()
 	{
-		if(Context::isInstalled()) $this->session_started= true;
+		if (Context::isInstalled()) $this->session_started = true;
 	}
 
 	/**
@@ -24,7 +24,7 @@ 
 	function moduleInstall()
 	{
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+		$oDB->addIndex("session", "idx_session_update_mid", array("member_srl", "last_update", "cur_mid"));
 
 		return new BaseObject();
 	}
@@ -38,11 +38,11 @@ 
 		$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))
 		{
-			if(!$oDB->isTableExists('session')) return true;
-			if(!$oDB->isColumnExists("session","cur_mid")) return true;
-			if(!$oDB->isIndexExists("session","idx_session_update_mid")) return true;
+			if (!$oDB->isTableExists('session')) return true;
+			if (!$oDB->isColumnExists("session", "cur_mid")) return true;
+			if (!$oDB->isIndexExists("session", "idx_session_update_mid")) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -59,19 +59,19 @@ 
 		$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))
 		{
-			if(!$oDB->isTableExists('session'))
+			if (!$oDB->isTableExists('session'))
 			{
 				$oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
 			}
-			if(!$oDB->isColumnExists("session","cur_mid"))
+			if (!$oDB->isColumnExists("session", "cur_mid"))
 			{
-				$oDB->addColumn('session',"cur_mid","varchar",128);
+				$oDB->addColumn('session', "cur_mid", "varchar", 128);
 			}
-			if(!$oDB->isIndexExists("session","idx_session_update_mid"))
+			if (!$oDB->isIndexExists("session", "idx_session_update_mid"))
 			{
-				$oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+				$oDB->addIndex("session", "idx_session_update_mid", array("member_srl", "last_update", "cur_mid"));
 			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
@@ -85,8 +85,8 @@ 
 	 */
 	function unSerializeSession($val)
 	{
-		$vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val,-1,PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-		for($i=0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
+		$vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+		for ($i = 0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
 		return $result;
 	}
 
@@ -95,11 +95,11 @@ 
 	 */
 	function serializeSession($data)
 	{
-		if(!count($data)) return;
+		if (!count($data)) return;
 
 		$str = '';
-		foreach($data as $key => $val) $str .= $key.'|'.serialize($val);
-		return substr($str, 0, strlen($str)-1).'}';
+		foreach ($data as $key => $val) $str .= $key.'|'.serialize($val);
+		return substr($str, 0, strlen($str) - 1).'}';
 	}
 
 	/**

Braces +21 added lines, -7 removed lines

@@ -15,7 +15,9 @@ 
 
 	function __construct()
 	{
-		if(Context::isInstalled()) $this->session_started= true;
+		if(Context::isInstalled()) {
+			$this->session_started= true;
+		}
 	}
 
 	/**
@@ -40,9 +42,15 @@ 
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
 		if($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isTableExists('session')) return true;
-			if(!$oDB->isColumnExists("session","cur_mid")) return true;
-			if(!$oDB->isIndexExists("session","idx_session_update_mid")) return true;
+			if(!$oDB->isTableExists('session')) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("session","cur_mid")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("session","idx_session_update_mid")) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -86,7 +94,9 @@ 
 	function unSerializeSession($val)
 	{
 		$vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val,-1,PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-		for($i=0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
+		for($i=0; $vars[$i]; $i++) {
+			$result[$vars[$i++]] = unserialize($vars[$i]);
+		}
 		return $result;
 	}
 
@@ -95,10 +105,14 @@ 
 	 */
 	function serializeSession($data)
 	{
-		if(!count($data)) return;
+		if(!count($data)) {
+			return;
+		}
 
 		$str = '';
-		foreach($data as $key => $val) $str .= $key.'|'.serialize($val);
+		foreach($data as $key => $val) {
+			$str .= $key.'|'.serialize($val);
+		}
 		return substr($str, 0, strlen($str)-1).'}';
 	}
 

modules/member/member.admin.controller.php

Spacing +177 added lines, -177 removed lines

@@ -24,31 +24,31 @@ 
 		// if(Context::getRequestMethod() == "GET") return new BaseObject(-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 BaseObject(-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');
+		$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);
 
@@ -64,14 +64,14 @@ 
 		unset($all_args->password2);
 		unset($all_args->reset_password);
 
-		if(!isset($args->limit_date)) $args->limit_date = "";
-		if(!isset($args->description)) $args->description = "";
+		if (!isset($args->limit_date)) $args->limit_date = "";
+		if (!isset($args->description)) $args->description = "";
 
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$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');
@@ -79,14 +79,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', '', html_entity_decode($args->{$val}));
 			}
@@ -94,7 +94,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);
@@ -106,7 +106,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);
@@ -115,24 +115,24 @@ 
 		$this->setMessage($msg_code);
 
 		$profile_image = Context::get('profile_image');
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$output = $oMemberController->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$image_mark = Context::get('image_mark');
-		if(is_uploaded_file($image_mark['tmp_name']))
+		if (is_uploaded_file($image_mark['tmp_name']))
 		{
 			$output = $oMemberController->insertImageMark($args->member_srl, $image_mark['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$image_name = Context::get('image_name');
 		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$output = $oMemberController->insertImageName($args->member_srl, $image_name['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
@@ -150,9 +150,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");
 	}
 
@@ -171,26 +171,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 BaseObject(-1, 'msg_mail_authorization');
 		}
@@ -225,20 +225,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 BaseObject('-1', 'msg_exist_selected_module');
 			}
@@ -277,7 +277,7 @@ 
 		$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);
@@ -290,7 +290,7 @@ 
 			$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'};
@@ -299,7 +299,7 @@ 
 			}
 
 			// set extends form
-			if(!$signupItem->isDefaultForm)
+			if (!$signupItem->isDefaultForm)
 			{
 				$extendItem = $extendItems[$all_args->{$key.'_member_join_form_srl'}];
 				$signupItem->type = $extendItem->column_type;
@@ -308,13 +308,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);
 				}
@@ -331,9 +331,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);
@@ -361,16 +361,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;
 		}
@@ -397,17 +397,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';
 		}
@@ -430,12 +430,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;
@@ -447,23 +447,23 @@ 
 			$signupItem->required = in_array($key, $orgRequireds);
 			$signupItem->isUse = ($config->{$key} == 'Y') || in_array($key, $orgUse);
 			$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
-			if(in_array($key, array('find_account_question', 'password', 'email_address')))
+			if (in_array($key, array('find_account_question', 'password', 'email_address')))
 			{
 				$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;
@@ -476,7 +476,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'};
@@ -494,13 +494,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();
@@ -509,41 +509,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>';
 				}
@@ -558,7 +558,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();
 	}
@@ -586,7 +586,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();
 	}
@@ -607,7 +607,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" />';
@@ -617,7 +617,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();
 	}
@@ -628,12 +628,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');
@@ -648,13 +648,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');
@@ -670,10 +670,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');
@@ -695,10 +695,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);
 		}
@@ -710,17 +710,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 BaseObject(-1,'msg_exists_user_id');
+				if ($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
+				return new BaseObject(-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();
@@ -731,7 +731,7 @@ 
 			$output = executeQuery('member.updateJoinForm', $args);
 		}
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// memberConfig update
 		$signupItem = new stdClass();
@@ -748,15 +748,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;
 				}
@@ -784,9 +784,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;
@@ -806,7 +806,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);
@@ -823,7 +823,7 @@ 
 			case 'update' :
 				break;
 		}
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage($msg_code);
 	}
@@ -842,40 +842,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;
@@ -888,7 +888,7 @@ 
 					{
 						$oMemberController->memberInfo = null;
 						$output = $oMemberController->deleteMember($member_srl);
-						if(!$output->toBool())
+						if (!$output->toBool())
 						{
 							$oDB->rollback();
 							return $output;
@@ -901,15 +901,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);
 			}
@@ -926,14 +926,14 @@ 
 	function procMemberAdminDeleteMembers()
 	{
 		$target_member_srls = Context::get('target_member_srls');
-		if(!$target_member_srls) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$target_member_srls) return new BaseObject(-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;
@@ -950,11 +950,11 @@ 
 	function procMemberAdminUpdateMembersGroup()
 	{
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return new BaseObject(-1,'msg_invalid_request');
-		$member_srls = explode(',',$member_srl);
+		if (!$member_srl) return new BaseObject(-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();
@@ -963,7 +963,7 @@ 
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -971,21 +971,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;
@@ -998,7 +998,7 @@ 
 
 		$this->setMessage('success_updated');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			global $lang;
 			htmlHeader();
@@ -1019,19 +1019,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);
@@ -1048,10 +1048,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;
 			}
@@ -1060,19 +1060,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));
 		}
 	}
 
@@ -1085,16 +1085,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);
 	}
 
@@ -1141,24 +1141,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);
@@ -1173,17 +1173,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 BaseObject(-1, 'lang->msg_not_founded');
-		if($args->is_default!='Y')
+		if (!$args->group_srl) return new BaseObject(-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);
@@ -1206,8 +1206,8 @@ 
 		$columnList = array('group_srl', 'is_default');
 		$group_info = $oMemberModel->getGroup($group_srl, $columnList);
 
-		if(!$group_info) return new BaseObject(-1, 'lang->msg_not_founded');
-		if($group_info->is_default == 'Y') return new BaseObject(-1, 'msg_not_delete_default');
+		if (!$group_info) return new BaseObject(-1, 'lang->msg_not_founded');
+		if ($group_info->is_default == 'Y') return new BaseObject(-1, 'msg_not_delete_default');
 
 		// Get groups where is_default == 'Y'
 		$columnList = array('site_srl', 'group_srl');
@@ -1244,7 +1244,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();
@@ -1253,9 +1253,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);
 			}
@@ -1264,7 +1264,7 @@ 
 				$output = $this->insertGroup($update_args);
 			}
 
-			if($vars->defaultGroup == $group_srl) {
+			if ($vars->defaultGroup == $group_srl) {
 				$defaultGroupSrl = $update_args->group_srl;
 			}
 		}
@@ -1290,7 +1290,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;
@@ -1311,7 +1311,7 @@ 
 	{
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('member');
 		}
@@ -1328,7 +1328,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);
 	}
@@ -1349,7 +1349,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;
@@ -1363,7 +1363,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;
@@ -1402,16 +1402,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 BaseObject();
+		if (count($join_form_srl_list) < 2) return new BaseObject();
 
 		$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 BaseObject();
+		if (!$prev_member_join_form) return new BaseObject();
 		// Information of the join form
 		$cur_args = new stdClass;
 		$cur_args->member_join_form_srl = $member_join_form_srl;
@@ -1422,10 +1422,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 BaseObject();
 	}
@@ -1449,16 +1449,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 BaseObject();
+		if (count($join_form_srl_list) < 2) return new BaseObject();
 
-		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 BaseObject();
+		if (!$next_member_join_form_srl) return new BaseObject();
 		$next_member_join_form = $join_form_list[$next_member_join_form_srl];
 		// Information of the join form
 		$cur_args = new stdClass;
@@ -1470,10 +1470,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 BaseObject();
 	}

Braces +169 added lines, -88 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();
@@ -64,8 +66,12 @@ 
 		unset($all_args->password2);
 		unset($all_args->reset_password);
 
-		if(!isset($args->limit_date)) $args->limit_date = "";
-		if(!isset($args->description)) $args->description = "";
+		if(!isset($args->limit_date)) {
+			$args->limit_date = "";
+		}
+		if(!isset($args->description)) {
+			$args->description = "";
+		}
 
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$extra_vars = delObjectVars($all_args, $args);
@@ -79,7 +85,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
@@ -99,14 +107,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);
@@ -118,21 +127,27 @@ 
 		if(is_uploaded_file($profile_image['tmp_name']))
 		{
 			$output = $oMemberController->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$image_mark = Context::get('image_mark');
 		if(is_uploaded_file($image_mark['tmp_name']))
 		{
 			$output = $oMemberController->insertImageMark($args->member_srl, $image_mark['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$image_name = Context::get('image_name');
 		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$output = $oMemberController->insertImageName($args->member_srl, $image_name['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
@@ -150,7 +165,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");
@@ -456,10 +473,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))
 		{
@@ -516,38 +534,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);
 				}
@@ -607,8 +617,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" />';
@@ -630,7 +641,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'));
@@ -651,7 +664,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'));
@@ -670,7 +685,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'));
@@ -695,14 +712,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 = '';
 		}
@@ -714,7 +732,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 BaseObject(-1,'msg_exists_user_id');
 			}
 		}
@@ -725,13 +745,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();
@@ -751,8 +772,7 @@ 
 		if($isInsert)
 		{
 			$config->signupForm[] = $signupItem;
-		}
-		else
+		} else
 		{
 			foreach($config->signupForm as $key=>$val)
 			{
@@ -823,7 +843,9 @@ 
 			case 'update' :
 				break;
 		}
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage($msg_code);
 	}
@@ -926,7 +948,9 @@ 
 	function procMemberAdminDeleteMembers()
 	{
 		$target_member_srls = Context::get('target_member_srls');
-		if(!$target_member_srls) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$target_member_srls) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		$member_srls = explode(',', $target_member_srls);
 		$oMemberController = getController('member');
 
@@ -950,12 +974,17 @@ 
 	function procMemberAdminUpdateMembersGroup()
 	{
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$member_srl) {
+			return new BaseObject(-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();
@@ -974,11 +1003,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;
@@ -1025,10 +1058,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));
@@ -1057,8 +1094,7 @@ 
 			}
 			$msg_code = 'success_deleted';
 			$this->setMessage($msg_code);
-		}
-		else
+		} else
 		{
 			$nick_names = explode(',',$nick_name);
 			$success_nick_names = array();
@@ -1066,10 +1102,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));
@@ -1089,7 +1129,9 @@ 
 		{
 			case 'delete' :
 				$output = $this->deleteDeniedID($user_id);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 				$msg_code = 'success_deleted';
 				break;
 		}
@@ -1141,16 +1183,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=='')
@@ -1158,7 +1203,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);
@@ -1173,17 +1220,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 BaseObject(-1, 'lang->msg_not_founded');
+		if(!$args->group_srl) {
+			return new BaseObject(-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);
@@ -1206,8 +1258,12 @@ 
 		$columnList = array('group_srl', 'is_default');
 		$group_info = $oMemberModel->getGroup($group_srl, $columnList);
 
-		if(!$group_info) return new BaseObject(-1, 'lang->msg_not_founded');
-		if($group_info->is_default == 'Y') return new BaseObject(-1, 'msg_not_delete_default');
+		if(!$group_info) {
+			return new BaseObject(-1, 'lang->msg_not_founded');
+		}
+		if($group_info->is_default == 'Y') {
+			return new BaseObject(-1, 'msg_not_delete_default');
+		}
 
 		// Get groups where is_default == 'Y'
 		$columnList = array('site_srl', 'group_srl');
@@ -1253,13 +1309,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);
 			}
@@ -1349,7 +1406,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;
@@ -1363,7 +1422,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;
@@ -1402,16 +1463,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 BaseObject();
+		if(count($join_form_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		$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 BaseObject();
+		if(!$prev_member_join_form) {
+			return new BaseObject();
+		}
 		// Information of the join form
 		$cur_args = new stdClass;
 		$cur_args->member_join_form_srl = $member_join_form_srl;
@@ -1422,10 +1489,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 BaseObject();
 	}
@@ -1449,16 +1520,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 BaseObject();
+		if(count($join_form_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		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 BaseObject();
+		if(!$next_member_join_form_srl) {
+			return new BaseObject();
+		}
 		$next_member_join_form = $join_form_list[$next_member_join_form_srl];
 		// Information of the join form
 		$cur_args = new stdClass;
@@ -1470,10 +1547,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 BaseObject();
 	}

modules/member/member.class.php

Spacing +103 added lines, -103 removed lines

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

Braces +138 added lines, -56 removed lines

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

classes/extravar/Extravar.class.php

Spacing +66 added lines, -66 removed lines

@@ -51,12 +51,12 @@ 
 	 */
 	function setExtraVarKeys($extra_keys)
 	{
-		if(!is_array($extra_keys) || count($extra_keys) < 1)
+		if (!is_array($extra_keys) || count($extra_keys) < 1)
 		{
 			return;
 		}
 
-		foreach($extra_keys as $val)
+		foreach ($extra_keys as $val)
 		{
 			$obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value, $val->eid);
 			$this->keys[$val->idx] = $obj;
@@ -159,7 +159,7 @@ 
 	 */
 	function __construct($module_srl, $idx, $name, $type = 'text', $default = null, $desc = '', $is_required = 'N', $search = 'N', $value = null, $eid = '')
 	{
-		if(!$idx)
+		if (!$idx)
 		{
 			return;
 		}
@@ -197,36 +197,36 @@ 
 	function _getTypeValue($type, $value)
 	{
 		$value = trim($value);
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'homepage' :
-				if($value && !preg_match('/^([a-z]+):\/\//i', $value))
+				if ($value && !preg_match('/^([a-z]+):\/\//i', $value))
 				{
-					$value = 'http://' . $value;
+					$value = 'http://'.$value;
 				}
 				return htmlspecialchars($value, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
 			case 'tel' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				elseif (strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
 				}
-				elseif(strpos($value, ',') !== FALSE)
+				elseif (strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
@@ -235,15 +235,15 @@ 
 			case 'checkbox' :
 			case 'radio' :
 			case 'select' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				elseif (strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
 				}
-				elseif(strpos($value, ',') !== FALSE)
+				elseif (strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
@@ -253,18 +253,18 @@ 
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
 				return $values;
 
 			case 'kr_zip' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== false)
+				elseif (strpos($value, '|@|') !== false)
 				{
 					$values = explode('|@|', $value);
 				}
@@ -274,7 +274,7 @@ 
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
@@ -308,10 +308,10 @@ 
 	{
 		$value = $this->_getTypeValue($this->type, $this->value);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'homepage' :
-				return ($value) ? (sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value) > 60 ? substr($value, 0, 40) . '...' . substr($value, -10) : $value)) : "";
+				return ($value) ? (sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value) > 60 ? substr($value, 0, 40).'...'.substr($value, -10) : $value)) : "";
 
 			case 'email_address' :
 				return ($value) ? sprintf('<a href="mailto:%s">%s</a>', $value, $value) : "";
@@ -328,14 +328,14 @@ 
 			case 'checkbox' :
 			case 'select' :
 			case 'radio' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					return implode(',', $value);
 				}
 				return $value;
 
 			case 'kr_zip' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					return implode(' ', $value);
 				}
@@ -360,77 +360,77 @@ 
 		$name = $this->name;
 		$value = $this->_getTypeValue($this->type, $this->value);
 		$default = $this->_getTypeValue($this->type, $this->default);
-		$column_name = 'extra_vars' . $this->idx;
-		$tmp_id = $column_name . '-' . $id_num++;
+		$column_name = 'extra_vars'.$this->idx;
+		$tmp_id = $column_name.'-'.$id_num++;
 
 		$buff = array();
-		switch($type)
+		switch ($type)
 		{
 			// Homepage
 			case 'homepage' :
-				$buff[] = '<input type="text" name="' . $column_name . '" value="' . $value . '" class="homepage" />';
+				$buff[] = '<input type="text" name="'.$column_name.'" value="'.$value.'" class="homepage" />';
 				break;
 			// Email Address
 			case 'email_address' :
-				$buff[] = '<input type="text" name="' . $column_name . '" value="' . $value . '" class="email_address" />';
+				$buff[] = '<input type="text" name="'.$column_name.'" value="'.$value.'" class="email_address" />';
 				break;
 			// Phone Number
 			case 'tel' :
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[0] . '" size="4" maxlength="4" class="tel" />';
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[1] . '" size="4" maxlength="4" class="tel" />';
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[2] . '" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[0].'" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[1].'" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[2].'" size="4" maxlength="4" class="tel" />';
 				break;
 			// textarea
 			case 'textarea' :
-				$buff[] = '<textarea name="' . $column_name . '" rows="8" cols="42">' . $value . '</textarea>';
+				$buff[] = '<textarea name="'.$column_name.'" rows="8" cols="42">'.$value.'</textarea>';
 				break;
 			// multiple choice
 			case 'checkbox' :
 				$buff[] = '<ul>';
-				foreach($default as $v)
+				foreach ($default as $v)
 				{
 					$checked = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$checked = ' checked="checked"';
 					}
 
 					// Temporary ID for labeling
-					$tmp_id = $column_name . '-' . $id_num++;
+					$tmp_id = $column_name.'-'.$id_num++;
 
-					$buff[] ='  <li><input type="checkbox" name="' . $column_name . '[]" id="' . $tmp_id . '" value="' . htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '" ' . $checked . ' /><label for="' . $tmp_id . '">' . $v . '</label></li>';
+					$buff[] = '  <li><input type="checkbox" name="'.$column_name.'[]" id="'.$tmp_id.'" value="'.htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'" '.$checked.' /><label for="'.$tmp_id.'">'.$v.'</label></li>';
 				}
 				$buff[] = '</ul>';
 				break;
 			// single choice
 			case 'select' :
-				$buff[] = '<select name="' . $column_name . '" class="select">';
-				foreach($default as $v)
+				$buff[] = '<select name="'.$column_name.'" class="select">';
+				foreach ($default as $v)
 				{
 					$selected = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$selected = ' selected="selected"';
 					}
-					$buff[] = '  <option value="' . $v . '" ' . $selected . '>' . $v . '</option>';
+					$buff[] = '  <option value="'.$v.'" '.$selected.'>'.$v.'</option>';
 				}
 				$buff[] = '</select>';
 				break;
 			// radio
 			case 'radio' :
 				$buff[] = '<ul>';
-				foreach($default as $v)
+				foreach ($default as $v)
 				{
 					$checked = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$checked = ' checked="checked"';
 					}
 
 					// Temporary ID for labeling
-					$tmp_id = $column_name . '-' . $id_num++;
+					$tmp_id = $column_name.'-'.$id_num++;
 
-					$buff[] = '<li><input type="radio" name="' . $column_name . '" id="' . $tmp_id . '" ' . $checked . ' value="' . $v . '"  class="radio" /><label for="' . $tmp_id . '">' . $v . '</label></li>';
+					$buff[] = '<li><input type="radio" name="'.$column_name.'" id="'.$tmp_id.'" '.$checked.' value="'.$v.'"  class="radio" /><label for="'.$tmp_id.'">'.$v.'</label></li>';
 				}
 				$buff[] = '</ul>';
 				break;
@@ -439,44 +439,44 @@ 
 				// datepicker javascript plugin load
 				Context::loadJavascriptPlugin('ui.datepicker');
 
-				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
-				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
-				$buff[] =	'<script type="text/javascript">';
+				$buff[] = '<input type="hidden" name="'.$column_name.'" value="'.$value.'" />'; 
+				$buff[] = '<input type="text" id="date_'.$column_name.'" value="'.zdate($value, 'Y-m-d').'" class="date" />';
+				$buff[] = '<input type="button" value="'.Context::getLang('cmd_delete').'" class="btn" id="dateRemover_'.$column_name.'" />';
+				$buff[] = '<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';
-				$buff[] =	'(function($){';
-				$buff[] =	'$(function(){';
-				$buff[] =	'  var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
-				$buff[] =	'    $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
-				$buff[] =	'  };';
-				$buff[] =	'  $.extend(option,$.datepicker.regional[\'' . Context::getLangType() . '\']);';
-				$buff[] =	'  $("#date_' . $column_name . '").datepicker(option);';
-				$buff[] =	'  $("#date_' . $column_name . '").datepicker("option", "dateFormat", "yy-mm-dd");';
-				$buff[] =	'  $("#dateRemover_' . $column_name . '").click(function(){';
-				$buff[] =	'    $(this).siblings("input").val("");';
-				$buff[] =	'    return false;';
-				$buff[] =	'  })';
-				$buff[] =	'});';
-				$buff[] =	'})(jQuery);';
+				$buff[] = '(function($){';
+				$buff[] = '$(function(){';
+				$buff[] = '  var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
+				$buff[] = '    $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
+				$buff[] = '  };';
+				$buff[] = '  $.extend(option,$.datepicker.regional[\''.Context::getLangType().'\']);';
+				$buff[] = '  $("#date_'.$column_name.'").datepicker(option);';
+				$buff[] = '  $("#date_'.$column_name.'").datepicker("option", "dateFormat", "yy-mm-dd");';
+				$buff[] = '  $("#dateRemover_'.$column_name.'").click(function(){';
+				$buff[] = '    $(this).siblings("input").val("");';
+				$buff[] = '    return false;';
+				$buff[] = '  })';
+				$buff[] = '});';
+				$buff[] = '})(jQuery);';
 				$buff[] = '//]]>';
 				$buff[] = '</script>';
 				break;
 			// address
 			case "kr_zip" :
-				if(($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel , 'getKrzipCodeSearchHtml' ))
+				if (($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel, 'getKrzipCodeSearchHtml'))
 				{
-					$buff[] =  $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
+					$buff[] = $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
 				}
 				break;
 			// General text
 			default :
-				$buff[] =' <input type="text" name="' . $column_name . '" value="' . ($value ? $value : $default) . '" class="text" />';
+				$buff[] = ' <input type="text" name="'.$column_name.'" value="'.($value ? $value : $default).'" class="text" />';
 		}
-		if($this->desc)
+		if ($this->desc)
 		{
 			$oModuleController = getController('module');
 			$oModuleController->replaceDefinedLangCode($this->desc);
-			$buff[] = '<p>' . htmlspecialchars($this->desc, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '</p>';
+			$buff[] = '<p>'.htmlspecialchars($this->desc, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'</p>';
 		}
 		
 		return join(PHP_EOL, $buff);

classes/db/DBMysqli_innodb.class.php

Spacing +62 added lines, -62 removed lines

@@ -23,7 +23,7 @@ 
 	function __construct($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	function __connect($connection)
 	{
 		// Attempt to connect
-		if($connection["db_port"])
+		if ($connection["db_port"])
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -60,7 +60,7 @@ 
 							, $connection["db_database"]);
 		}
 		$error = mysqli_connect_errno();
-		if($error)
+		if ($error)
 		{
 			$this->setError($error, mysqli_connect_error());
 			return;
@@ -89,13 +89,13 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
 			$this->_query("begin");
 		}
 		else
 		{
-			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
+			$this->_query("SAVEPOINT SP".$transactionLevel, $connection);
 		}
 		return true;
 	}
@@ -111,14 +111,14 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
-			$this->_query("ROLLBACK TO SP" . $point, $connection);
+			$this->_query("ROLLBACK TO SP".$point, $connection);
 		}
 		else
 		{
 			mysqli_rollback($connection);
-			$this->setQueryLog( array("query"=>"rollback") );
+			$this->setQueryLog(array("query"=>"rollback"));
 		}
 		return true;
 	}
@@ -132,7 +132,7 @@ 
 	{
 		$connection = $this->_getConnection('master');
 		mysqli_commit($connection);
-		$this->setQueryLog( array("query"=>"commit") );
+		$this->setQueryLog(array("query"=>"commit"));
 		return true;
 	}
 
@@ -145,11 +145,11 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
-		if(!is_numeric($string))
+		if (!is_numeric($string))
 		{
 			$connection = $this->_getConnection('master');
 			$string = mysqli_escape_string($connection, $string);
@@ -166,23 +166,23 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			// 1. Prepare query
 			$stmt = mysqli_prepare($connection, $query);
-			if($stmt)
+			if ($stmt)
 			{
 				$types = '';
 				$params = array();
 				$this->_prepareQueryParameters($types, $params);
 
-				if(!empty($params))
+				if (!empty($params))
 				{
 					$args[0] = $stmt;
 					$args[1] = $types;
 
 					$i = 2;
-					foreach($params as $key => $param)
+					foreach ($params as $key => $param)
 					{
 						$copy[$key] = $param;
 						$args[$i++] = &$copy[$key];
@@ -190,18 +190,18 @@ 
 
 					// 2. Bind parameters
 					$status = call_user_func_array('mysqli_stmt_bind_param', $args);
-					if(!$status)
+					if (!$status)
 					{
-						$this->setError(-1, "Invalid arguments: $query" . mysqli_error($connection));
+						$this->setError(-1, "Invalid arguments: $query".mysqli_error($connection));
 					}
 				}
 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
-					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection));
+					$this->setError(-1, "Prepared statement failed: $query".mysqli_error($connection));
 				}
 
 				// Return stmt for other processing - like retrieving resultset (_fetch)
@@ -213,7 +213,7 @@ 
 		$result = mysqli_query($connection, $query);
 		// Error Check
 		$error = mysqli_error($connection);
-		if($error)
+		if ($error)
 		{
 			$this->setError(mysqli_errno($connection), $error);
 		}
@@ -232,23 +232,23 @@ 
 	{
 		$types = '';
 		$params = array();
-		if(!$this->param)
+		if (!$this->param)
 		{
 			return;
 		}
 
-		foreach($this->param as $k => $o)
+		foreach ($this->param as $k => $o)
 		{
 			$value = $o->getUnescapedValue();
 			$type = $o->getType();
 
 			// Skip column names -> this should be concatenated to query string
-			if($o->isColumnName())
+			if ($o->isColumnName())
 			{
 				continue;
 			}
 
-			switch($type)
+			switch ($type)
 			{
 				case 'number' :
 					$type = 'i';
@@ -260,9 +260,9 @@ 
 					$type = 's';
 			}
 
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
 					$params[] = $v;
 					$types .= $type;
@@ -284,12 +284,12 @@ 
 	 */
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_fetch($result, $arrayIndexEndValue);
 		}
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
@@ -305,25 +305,25 @@ 
 		 * MYSQLI_TYPE for longtext is 252
 		 */
 		$longtext_exists = false;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if (isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
-				$field->name = 'repeat_' . $field->name;
+				$field->name = 'repeat_'.$field->name;
 			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
 			$resultArray[$field->name] = &$row[$field->name];
 
-			if($field->type == 252)
+			if ($field->type == 252)
 			{
 				$longtext_exists = true;
 			}
 		}
 		$resultArray = array_merge(array($stmt), $resultArray);
 
-		if($longtext_exists)
+		if ($longtext_exists)
 		{
 			mysqli_stmt_store_result($stmt);
 		}
@@ -331,17 +331,17 @@ 
 		call_user_func_array('mysqli_stmt_bind_result', $resultArray);
 
 		$rows = array();
-		while(mysqli_stmt_fetch($stmt))
+		while (mysqli_stmt_fetch($stmt))
 		{
 			$resultObject = new stdClass();
 
-			foreach($resultArray as $key => $value)
+			foreach ($resultArray as $key => $value)
 			{
-				if($key === 0)
+				if ($key === 0)
 				{
 					continue; // Skip stmt object
 				}
-				if(strpos($key, 'repeat_'))
+				if (strpos($key, 'repeat_'))
 				{
 					$key = substr($key, 6);
 				}
@@ -353,9 +353,9 @@ 
 
 		mysqli_stmt_close($stmt);
 
-		if($arrayIndexEndValue)
+		if ($arrayIndexEndValue)
 		{
-			foreach($rows as $row)
+			foreach ($rows as $row)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -365,9 +365,9 @@ 
 			$output = $rows;
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -388,7 +388,7 @@ 
 	 */
 	function _executeInsertAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeInsertAct($queryObject);
 		}
@@ -406,7 +406,7 @@ 
 	 */
 	function _executeUpdateAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeUpdateAct($queryObject);
 		}
@@ -424,7 +424,7 @@ 
 	 */
 	function _executeDeleteAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeDeleteAct($queryObject);
 		}
@@ -445,7 +445,7 @@ 
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeSelectAct($queryObject, $connection);
 		}
@@ -503,13 +503,13 @@ 
 		$xml_obj = $oXml->parse($xml_doc);
 		// Create a table schema
 		$table_name = $xml_obj->table->attrs->name;
-		if($this->isTableExists($table_name))
+		if ($this->isTableExists($table_name))
 		{
 			return;
 		}
-		$table_name = $this->prefix . $table_name;
+		$table_name = $this->prefix.$table_name;
 
-		if(!is_array($xml_obj->table->column))
+		if (!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
 		}
@@ -518,7 +518,7 @@ 
 			$columns = $xml_obj->table->column;
 		}
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -530,47 +530,47 @@ 
 			$default = $column->attrs->default;
 			$auto_increment = $column->attrs->auto_increment;
 
-			$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
+			$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '('.$size.')' : '', isset($default) ? "default '".$default."'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
 
-			if($primary_key)
+			if ($primary_key)
 			{
 				$primary_list[] = $name;
 			}
-			else if($unique)
+			else if ($unique)
 			{
 				$unique_list[$unique][] = $name;
 			}
-			else if($index)
+			else if ($index)
 			{
 				$index_list[$index][] = $name;
 			}
 		}
 
-		if(count($primary_list))
+		if (count($primary_list))
 		{
-			$column_schema[] = sprintf("primary key (%s)", '`' . implode($primary_list, '`,`') . '`');
+			$column_schema[] = sprintf("primary key (%s)", '`'.implode($primary_list, '`,`').'`');
 		}
 
-		if(count($unique_list))
+		if (count($unique_list))
 		{
-			foreach($unique_list as $key => $val)
+			foreach ($unique_list as $key => $val)
 			{
-				$column_schema[] = sprintf("unique %s (%s)", $key, '`' . implode($val, '`,`') . '`');
+				$column_schema[] = sprintf("unique %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
-		if(count($index_list))
+		if (count($index_list))
 		{
-			foreach($index_list as $key => $val)
+			foreach ($index_list as $key => $val)
 			{
-				$column_schema[] = sprintf("index %s (%s)", $key, '`' . implode($val, '`,`') . '`');
+				$column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
+		if (!$output)
 		{
 			return false;
 		}

Braces +15 added lines, -20 removed lines

@@ -23,7 +23,9 @@ 
 	function __construct($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -51,8 +53,7 @@ 
 							, $connection["db_password"]
 							, $connection["db_database"]
 							, $connection["db_port"]);
-		}
-		else
+		} else
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -92,8 +93,7 @@ 
 		if(!$transactionLevel)
 		{
 			$this->_query("begin");
-		}
-		else
+		} else
 		{
 			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
 		}
@@ -114,8 +114,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			mysqli_rollback($connection);
 			$this->setQueryLog( array("query"=>"rollback") );
@@ -267,8 +266,7 @@ 
 					$params[] = $v;
 					$types .= $type;
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $value;
 				$types .= $type;
@@ -307,10 +305,12 @@ 
 		$longtext_exists = false;
 		foreach($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if(isset($resultArray[$field->name])) {
+				// When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
 				$field->name = 'repeat_' . $field->name;
 			}
+			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
@@ -359,8 +359,7 @@ 
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
-		}
-		else
+		} else
 		{
 			$output = $rows;
 		}
@@ -370,8 +369,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -512,8 +510,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -535,12 +532,10 @@ 
 			if($primary_key)
 			{
 				$primary_list[] = $name;
-			}
-			else if($unique)
+			} else if($unique)
 			{
 				$unique_list[$unique][] = $name;
-			}
-			else if($index)
+			} else if($index)
 			{
 				$index_list[$index][] = $name;
 			}

classes/db/DBMysql.class.php

Spacing +90 added lines, -90 removed lines

@@ -46,7 +46,7 @@ 
 	function __construct($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -67,32 +67,32 @@ 
 	function __connect($connection)
 	{
 		// Ignore if no DB information exists
-		if(strpos($connection["db_hostname"], ':') === false && $connection["db_port"])
+		if (strpos($connection["db_hostname"], ':') === false && $connection["db_port"])
 		{
-			$connection["db_hostname"] .= ':' . $connection["db_port"];
+			$connection["db_hostname"] .= ':'.$connection["db_port"];
 		}
 
 		// Attempt to connect
 		$result = @mysql_connect($connection["db_hostname"], $connection["db_userid"], $connection["db_password"]);
-		if(!$result)
+		if (!$result)
 		{
 			exit('XE cannot connect to DB.');
 		}
 
-		if(mysql_error())
+		if (mysql_error())
 		{
 			$this->setError(mysql_errno(), mysql_error());
 			return;
 		}
 		// Error appears if the version is lower than 4.1
-		if(version_compare(mysql_get_server_info($result), '4.1', '<'))
+		if (version_compare(mysql_get_server_info($result), '4.1', '<'))
 		{
-			$this->setError(-1, 'XE cannot be installed under the version of mysql 4.1. Current mysql version is ' . mysql_get_server_info());
+			$this->setError(-1, 'XE cannot be installed under the version of mysql 4.1. Current mysql version is '.mysql_get_server_info());
 			return;
 		}
 		// select db
 		@mysql_select_db($connection["db_database"], $result);
-		if(mysql_error())
+		if (mysql_error())
 		{
 			$this->setError(mysql_errno(), mysql_error());
 			return;
@@ -131,11 +131,11 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
-		if(!is_numeric($string))
+		if (!is_numeric($string))
 		{
 			$string = @mysql_real_escape_string($string);
 		}
@@ -181,14 +181,14 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if(!$connection)
+		if (!$connection)
 		{
 			exit('XE cannot handle DB connection.');
 		}
 		// Run the query statement
 		$result = mysql_query($query, $connection);
 		// Error Check
-		if(mysql_error($connection))
+		if (mysql_error($connection))
 		{
 			$this->setError(mysql_errno($connection), mysql_error($connection));
 		}
@@ -205,13 +205,13 @@ 
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
-		while($tmp = $this->db_fetch_object($result))
+		while ($tmp = $this->db_fetch_object($result))
 		{
-			if($arrayIndexEndValue)
+			if ($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $tmp;
 			}
@@ -220,9 +220,9 @@ 
 				$output[] = $tmp;
 			}
 		}
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -245,7 +245,7 @@ 
 		$query = sprintf("insert into `%ssequence` (seq) values ('0')", $this->prefix);
 		$this->_query($query);
 		$sequence = $this->db_insert_id();
-		if($sequence % 10000 == 0)
+		if ($sequence % 10000 == 0)
 		{
 			$query = sprintf("delete from  `%ssequence` where seq < %d", $this->prefix, $sequence);
 			$this->_query($query);
@@ -265,7 +265,7 @@ 
 		$query = sprintf("select password('%s') as password, old_password('%s') as old_password", $this->addQuotes($password), $this->addQuotes($password));
 		$result = $this->_query($query);
 		$tmp = $this->_fetch($result);
-		if($tmp->password === $saved_password || $tmp->old_password === $saved_password)
+		if ($tmp->password === $saved_password || $tmp->old_password === $saved_password)
 		{
 			return true;
 		}
@@ -282,7 +282,7 @@ 
 		$query = sprintf("show tables like '%s%s'", $this->prefix, $this->addQuotes($target_name));
 		$result = $this->_query($query);
 		$tmp = $this->_fetch($result);
-		if(!$tmp)
+		if (!$tmp)
 		{
 			return false;
 		}
@@ -302,13 +302,13 @@ 
 	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false)
 	{
 		$type = $this->column_type[$type];
-		if(strtoupper($type) == 'INTEGER')
+		if (strtoupper($type) == 'INTEGER')
 		{
 			$size = '';
 		}
 
 		$query = sprintf("alter table `%s%s` add `%s` ", $this->prefix, $table_name, $column_name);
-		if($size)
+		if ($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
 		}
@@ -316,11 +316,11 @@ 
 		{
 			$query .= sprintf(" %s ", $type);
 		}
-		if(isset($default))
+		if (isset($default))
 		{
 			$query .= sprintf(" default '%s' ", $default);
 		}
-		if($notnull)
+		if ($notnull)
 		{
 			$query .= " not null ";
 		}
@@ -350,18 +350,18 @@ 
 	{
 		$query = sprintf("show fields from `%s%s`", $this->prefix, $table_name);
 		$result = $this->_query($query);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return;
 		}
 		$output = $this->_fetch($result);
-		if($output)
+		if ($output)
 		{
 			$column_name = strtolower($column_name);
-			foreach($output as $key => $val)
+			foreach ($output as $key => $val)
 			{
 				$name = strtolower($val->Field);
-				if($column_name == $name)
+				if ($column_name == $name)
 				{
 					return true;
 				}
@@ -382,7 +382,7 @@ 
 	 */
 	function addIndex($table_name, $index_name, $target_columns, $is_unique = false)
 	{
-		if(!is_array($target_columns))
+		if (!is_array($target_columns))
 		{
 			$target_columns = array($target_columns);
 		}
@@ -415,23 +415,23 @@ 
 		//$query = sprintf("show indexes from %s%s where key_name = '%s' ", $this->prefix, $table_name, $index_name);
 		$query = sprintf("show indexes from `%s%s`", $this->prefix, $table_name);
 		$result = $this->_query($query);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return;
 		}
 		$output = $this->_fetch($result);
-		if(!$output)
+		if (!$output)
 		{
 			return;
 		}
-		if(!is_array($output))
+		if (!is_array($output))
 		{
 			$output = array($output);
 		}
 
-		for($i = 0; $i < count($output); $i++)
+		for ($i = 0; $i < count($output); $i++)
 		{
-			if($output[$i]->Key_name == $index_name)
+			if ($output[$i]->Key_name == $index_name)
 			{
 				return true;
 			}
@@ -456,7 +456,7 @@ 
 	 */
 	function createTableByXmlFile($file_name)
 	{
-		if(!file_exists($file_name))
+		if (!file_exists($file_name))
 		{
 			return;
 		}
@@ -481,13 +481,13 @@ 
 		$xml_obj = $oXml->parse($xml_doc);
 		// Create a table schema
 		$table_name = $xml_obj->table->attrs->name;
-		if($this->isTableExists($table_name))
+		if ($this->isTableExists($table_name))
 		{
 			return;
 		}
-		$table_name = $this->prefix . $table_name;
+		$table_name = $this->prefix.$table_name;
 
-		if(!is_array($xml_obj->table->column))
+		if (!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
 		}
@@ -500,7 +500,7 @@ 
 		$unique_list = array();
 		$index_list = array();
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -512,47 +512,47 @@ 
 			$default = $column->attrs->default;
 			$auto_increment = $column->attrs->auto_increment;
 
-			$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
+			$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '('.$size.')' : '', isset($default) ? "default '".$default."'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
 
-			if($primary_key)
+			if ($primary_key)
 			{
 				$primary_list[] = $name;
 			}
-			else if($unique)
+			else if ($unique)
 			{
 				$unique_list[$unique][] = $name;
 			}
-			else if($index)
+			else if ($index)
 			{
 				$index_list[$index][] = $name;
 			}
 		}
 
-		if(count($primary_list))
+		if (count($primary_list))
 		{
-			$column_schema[] = sprintf("primary key (%s)", '`' . implode($primary_list, '`,`') . '`');
+			$column_schema[] = sprintf("primary key (%s)", '`'.implode($primary_list, '`,`').'`');
 		}
 
-		if(count($unique_list))
+		if (count($unique_list))
 		{
-			foreach($unique_list as $key => $val)
+			foreach ($unique_list as $key => $val)
 			{
-				$column_schema[] = sprintf("unique %s (%s)", $key, '`' . implode($val, '`,`') . '`');
+				$column_schema[] = sprintf("unique %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
-		if(count($index_list))
+		if (count($index_list))
 		{
-			foreach($index_list as $key => $val)
+			foreach ($index_list as $key => $val)
 			{
-				$column_schema[] = sprintf("index %s (%s)", $key, '`' . implode($val, '`,`') . '`');
+				$column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = MYISAM  CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
+		if (!$output)
 			return false;
 	}
 
@@ -565,8 +565,8 @@ 
 	function _executeInsertAct($queryObject, $with_values = true)
 	{
 		$query = $this->getInsertSql($queryObject, $with_values, true);
-		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
-		if(is_a($query, 'BaseObject'))
+		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
+		if (is_a($query, 'BaseObject'))
 		{
 			return;
 		}
@@ -582,13 +582,13 @@ 
 	function _executeUpdateAct($queryObject, $with_values = true)
 	{
 		$query = $this->getUpdateSql($queryObject, $with_values, true);
-		if(is_a($query, 'BaseObject'))
+		if (is_a($query, 'BaseObject'))
 		{
-			if(!$query->toBool()) return $query;
+			if (!$query->toBool()) return $query;
 			else return;
 		}
 
-		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
 
 
 		return $this->_query($query);
@@ -603,8 +603,8 @@ 
 	function _executeDeleteAct($queryObject, $with_values = true)
 	{
 		$query = $this->getDeleteSql($queryObject, $with_values, true);
-		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
-		if(is_a($query, 'BaseObject'))
+		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
+		if (is_a($query, 'BaseObject'))
 		{
 			return;
 		}
@@ -624,21 +624,21 @@ 
 	{
 		$limit = $queryObject->getLimit();
 		$result = NULL;
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
 			return $this->queryPageLimit($queryObject, $result, $connection, $with_values);
 		}
 		else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
-			if(is_a($query, 'BaseObject'))
+			if (is_a($query, 'BaseObject'))
 			{
 				return;
 			}
-			$query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' ' . $this->comment_syntax, $queryObject->queryID) : '';
+			$query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' '.$this->comment_syntax, $queryObject->queryID) : '';
 
 			$result = $this->_query($query, $connection);
-			if($this->isError())
+			if ($this->isError())
 			{
 				return $this->queryError($queryObject);
 			}
@@ -647,7 +647,7 @@ 
 			$buff = new BaseObject();
 			$buff->data = $data;
 
-			if($queryObject->usesClickCount())
+			if ($queryObject->usesClickCount())
 			{
 				$update_query = $this->getClickCountQuery($queryObject);
 				$this->_executeUpdateAct($update_query, $with_values);
@@ -708,7 +708,7 @@ 
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
 			$buff = new BaseObject();
 			$buff->total_count = 0;
@@ -737,48 +737,48 @@ 
 		$limit = $queryObject->getLimit();
 		// Total count
 		$temp_where = $queryObject->getWhereString($with_values, false);
-		$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString($with_values), ($temp_where === '' ? '' : ' WHERE ' . $temp_where));
+		$count_query = sprintf('select count(*) as "count" %s %s', 'FROM '.$queryObject->getFromString($with_values), ($temp_where === '' ? '' : ' WHERE '.$temp_where));
 
 		// Check for distinct query and if found update count query structure
 		$temp_select = $queryObject->getSelectString($with_values);
 		$uses_distinct = stripos($temp_select, "distinct") !== false;
 		$uses_groupby = $queryObject->getGroupByString() != '';
-		if($uses_distinct || $uses_groupby)
+		if ($uses_distinct || $uses_groupby)
 		{
 			$count_query = sprintf('select %s %s %s %s'
 					, $temp_select == '*' ? '1' : $temp_select
-					, 'FROM ' . $queryObject->getFromString($with_values)
-					, ($temp_where === '' ? '' : ' WHERE ' . $temp_where)
-					, ($uses_groupby ? ' GROUP BY ' . $queryObject->getGroupByString() : '')
+					, 'FROM '.$queryObject->getFromString($with_values)
+					, ($temp_where === '' ? '' : ' WHERE '.$temp_where)
+					, ($uses_groupby ? ' GROUP BY '.$queryObject->getGroupByString() : '')
 			);
 
 			// If query uses grouping or distinct, count from original select
 			$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
 		}
 
-		$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' ' . $this->comment_syntax, $queryObject->queryID) : '';
+		$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' '.$this->comment_syntax, $queryObject->queryID) : '';
 		$result_count = $this->_query($count_query, $connection);
 		$count_output = $this->_fetch($result_count);
 		$total_count = (int) (isset($count_output->count) ? $count_output->count : NULL);
 
 		$list_count = $limit->list_count->getValue();
-		if(!$list_count)
+		if (!$list_count)
 		{
 			$list_count = 20;
 		}
 		$page_count = $limit->page_count->getValue();
-		if(!$page_count)
+		if (!$page_count)
 		{
 			$page_count = 10;
 		}
 		$page = $limit->page->getValue();
-		if(!$page || $page < 1)
+		if (!$page || $page < 1)
 		{
 			$page = 1;
 		}
 
 		// total pages
-		if($total_count)
+		if ($total_count)
 		{
 			$total_page = (int) (($total_count - 1) / $list_count) + 1;
 		}
@@ -788,7 +788,7 @@ 
 		}
 
 		// check the page variables
-		if($page > $total_page)
+		if ($page > $total_page)
 		{
 			// If requested page is bigger than total number of pages, return empty list
 			$buff = new BaseObject();
@@ -803,9 +803,9 @@ 
 
 		$query = $this->getSelectPageSql($queryObject, $with_values, $start_count, $list_count);
 
-		$query .= (__DEBUG_QUERY__ & 1 && $queryObject->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$query .= (__DEBUG_QUERY__ & 1 && $queryObject->query_id) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
 		$result = $this->_query($query, $connection);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return $this->queryError($queryObject);
 		}
@@ -833,44 +833,44 @@ 
 	function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0)
 	{
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$select = 'SELECT ' . $select;
+		$select = 'SELECT '.$select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$from = ' FROM ' . $from;
+		$from = ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
-			$groupBy = ' GROUP BY ' . $groupBy;
+			$groupBy = ' GROUP BY '.$groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
-			$orderBy = ' ORDER BY ' . $orderBy;
+			$orderBy = ' ORDER BY '.$orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
 			$limit = sprintf(' LIMIT %d, %d', $start_count, $list_count);
 		}
 
-		return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+		return $select.' '.$from.' '.$where.' '.$groupBy.' '.$orderBy.' '.$limit;
 	}
 
 }

Braces +20 added lines, -23 removed lines

@@ -46,7 +46,9 @@ 
 	function __construct($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -214,8 +216,7 @@ 
 			if($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $tmp;
-			}
-			else
+			} else
 			{
 				$output[] = $tmp;
 			}
@@ -225,8 +226,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -311,8 +311,7 @@ 
 		if($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
-		}
-		else
+		} else
 		{
 			$query .= sprintf(" %s ", $type);
 		}
@@ -490,8 +489,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -517,12 +515,10 @@ 
 			if($primary_key)
 			{
 				$primary_list[] = $name;
-			}
-			else if($unique)
+			} else if($unique)
 			{
 				$unique_list[$unique][] = $name;
-			}
-			else if($index)
+			} else if($index)
 			{
 				$index_list[$index][] = $name;
 			}
@@ -552,8 +548,9 @@ 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = MYISAM  CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
-			return false;
+		if(!$output) {
+					return false;
+		}
 	}
 
 	/**
@@ -584,8 +581,11 @@ 
 		$query = $this->getUpdateSql($queryObject, $with_values, true);
 		if(is_a($query, 'BaseObject'))
 		{
-			if(!$query->toBool()) return $query;
-			else return;
+			if(!$query->toBool()) {
+				return $query;
+			} else {
+				return;
+			}
 		}
 
 		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
@@ -627,8 +627,7 @@ 
 		if($limit && $limit->isPageHandler())
 		{
 			return $this->queryPageLimit($queryObject, $result, $connection, $with_values);
-		}
-		else
+		} else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
 			if(is_a($query, 'BaseObject'))
@@ -717,8 +716,7 @@ 
 			$buff->data = array();
 			$buff->page_navigation = new PageHandler(/* $total_count */0, /* $total_page */1, /* $page */1, /* $page_count */10); //default page handler values
 			return $buff;
-		}
-		else
+		} else
 		{
 			return;
 		}
@@ -781,8 +779,7 @@ 
 		if($total_count)
 		{
 			$total_page = (int) (($total_count - 1) / $list_count) + 1;
-		}
-		else
+		} else
 		{
 			$total_page = 1;
 		}

classes/db/DBMssql.class.php

Spacing +112 added lines, -112 removed lines

@@ -45,7 +45,7 @@ 
 	function __construct($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -70,10 +70,10 @@ 
 		//sqlsrv_configure( 'LogSubsystems', SQLSRV_LOG_SYSTEM_ALL );
 		$result = @sqlsrv_connect($connection["db_hostname"], array('Database' => $connection["db_database"], 'UID' => $connection["db_userid"], 'PWD' => $connection["db_password"]));
 
-		if(!$result)
+		if (!$result)
 		{
 			$errors = print_r(sqlsrv_errors(), true);
-			$this->setError(-1, 'database connect fail' . PHP_EOL . $errors);
+			$this->setError(-1, 'database connect fail'.PHP_EOL.$errors);
 			return;
 		}
 		return $result;
@@ -99,7 +99,7 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
@@ -117,16 +117,16 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
-			if(sqlsrv_begin_transaction($connection) === false)
+			if (sqlsrv_begin_transaction($connection) === false)
 			{
 				return;
 			}
 		}
 		else
 		{
-			$this->_query("SAVE TRANS SP" . $transactionLevel, $connection);
+			$this->_query("SAVE TRANS SP".$transactionLevel, $connection);
 		}
 		return true;
 	}
@@ -142,9 +142,9 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
-			$this->_query("ROLLBACK TRANS SP" . $point, $connection);
+			$this->_query("ROLLBACK TRANS SP".$point, $connection);
 		}
 		else
 		{
@@ -176,18 +176,18 @@ 
 	{
 		$_param = array();
 
-		if(count($this->param))
+		if (count($this->param))
 		{
-			foreach($this->param as $k => $o)
+			foreach ($this->param as $k => $o)
 			{
-				if($o->isColumnName())
+				if ($o->isColumnName())
 				{
 					continue;
 				}
-				if($o->getType() == 'number')
+				if ($o->getType() == 'number')
 				{
 					$value = $o->getUnescapedValue();
-					if(is_array($value))
+					if (is_array($value))
 					{
 						$_param = array_merge($_param, $value);
 					}
@@ -199,9 +199,9 @@ 
 				else
 				{
 					$value = $o->getUnescapedValue();
-					if(is_array($value))
+					if (is_array($value))
 					{
-						foreach($value as $v)
+						foreach ($value as $v)
 						{
 							$_param[] = array($v, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
 						}
@@ -216,7 +216,7 @@ 
 
 		// Run the query statement
 		$result = false;
-		if(count($_param))
+		if (count($_param))
 		{
 			$args = $this->_getParametersByReference($_param);
 			$stmt = sqlsrv_prepare($connection, $query, $args);
@@ -226,7 +226,7 @@ 
 			$stmt = sqlsrv_prepare($connection, $query);
 		}
 
-		if(!$stmt)
+		if (!$stmt)
 		{
 			$result = false;
 		}
@@ -236,7 +236,7 @@ 
 		}
 
 		// Error Check
-		if(!$result)
+		if (!$result)
 		{
 			$this->setError(print_r(sqlsrv_errors(), true));
 		}
@@ -259,9 +259,9 @@ 
 		$copy = array();
 		$args = array();
 		$i = 0;
-		foreach($_param as $key => $value)
+		foreach ($_param as $key => $value)
 		{
-			if(is_array($value))
+			if (is_array($value))
 			{
 				$value_copy = $value;
 				$value_arg = array();
@@ -288,7 +288,7 @@ 
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
@@ -296,18 +296,18 @@ 
 		$c = sqlsrv_num_fields($result);
 		$m = null;
 
-		while(sqlsrv_fetch($result))
+		while (sqlsrv_fetch($result))
 		{
-			if(!$m)
+			if (!$m)
 			{
 				$m = sqlsrv_field_metadata($result);
 			}
 			unset($row);
-			for($i = 0; $i < $c; $i++)
+			for ($i = 0; $i < $c; $i++)
 			{
 				$row->{$m[$i]['Name']} = sqlsrv_get_field($result, $i, SQLSRV_PHPTYPE_STRING('utf-8'));
 			}
-			if($arrayIndexEndValue)
+			if ($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -317,9 +317,9 @@ 
 			}
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -360,7 +360,7 @@ 
 		$result = $this->_query($query);
 		$tmp = $this->_fetch($result);
 
-		if(!$tmp)
+		if (!$tmp)
 		{
 			return false;
 		}
@@ -379,18 +379,18 @@ 
 	 */
 	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false)
 	{
-		if($this->isColumnExists($table_name, $column_name))
+		if ($this->isColumnExists($table_name, $column_name))
 		{
 			return;
 		}
 		$type = $this->column_type[$type];
-		if(strtoupper($type) == 'INTEGER')
+		if (strtoupper($type) == 'INTEGER')
 		{
 			$size = '';
 		}
 
 		$query = sprintf("alter table %s%s add \"%s\" ", $this->prefix, $table_name, $column_name);
-		if($size)
+		if ($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
 		}
@@ -399,11 +399,11 @@ 
 			$query .= sprintf(" %s ", $type);
 		}
 
-		if(isset($default))
+		if (isset($default))
 		{
 			$query .= sprintf(" default '%s' ", $default);
 		}
-		if($notnull)
+		if ($notnull)
 		{
 			$query .= " not null ";
 		}
@@ -419,7 +419,7 @@ 
 	 */
 	function dropColumn($table_name, $column_name)
 	{
-		if(!$this->isColumnExists($table_name, $column_name))
+		if (!$this->isColumnExists($table_name, $column_name))
 		{
 			return;
 		}
@@ -437,12 +437,12 @@ 
 	{
 		$query = sprintf("select syscolumns.name as name from syscolumns, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = syscolumns.id and syscolumns.name = '%s'", $this->prefix, $table_name, $column_name);
 		$result = $this->_query($query);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return;
 		}
 		$tmp = $this->_fetch($result);
-		if(!$tmp->name)
+		if (!$tmp->name)
 		{
 			return false;
 		}
@@ -461,11 +461,11 @@ 
 	 */
 	function addIndex($table_name, $index_name, $target_columns, $is_unique = false)
 	{
-		if($this->isIndexExists($table_name, $index_name))
+		if ($this->isIndexExists($table_name, $index_name))
 		{
 			return;
 		}
-		if(!is_array($target_columns))
+		if (!is_array($target_columns))
 		{
 			$target_columns = array($target_columns);
 		}
@@ -483,7 +483,7 @@ 
 	 */
 	function dropIndex($table_name, $index_name, $is_unique = false)
 	{
-		if(!$this->isIndexExists($table_name, $index_name))
+		if (!$this->isIndexExists($table_name, $index_name))
 		{
 			return;
 		}
@@ -502,13 +502,13 @@ 
 		$query = sprintf("select sysindexes.name as name from sysindexes, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = sysindexes.id and sysindexes.name = '%s'", $this->prefix, $table_name, $index_name);
 
 		$result = $this->_query($query);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return;
 		}
 		$tmp = $this->_fetch($result);
 
-		if(!$tmp->name)
+		if (!$tmp->name)
 		{
 			return false;
 		}
@@ -532,7 +532,7 @@ 
 	 */
 	function createTableByXmlFile($file_name)
 	{
-		if(!file_exists($file_name))
+		if (!file_exists($file_name))
 		{
 			return;
 		}
@@ -557,22 +557,22 @@ 
 		$xml_obj = $oXml->parse($xml_doc);
 		// Create a table schema
 		$table_name = $xml_obj->table->attrs->name;
-		if($this->isTableExists($table_name))
+		if ($this->isTableExists($table_name))
 		{
 			return;
 		}
 
-		if($table_name == 'sequence')
+		if ($table_name == 'sequence')
 		{
-			$table_name = $this->prefix . $table_name;
+			$table_name = $this->prefix.$table_name;
 			$query = sprintf('create table %s ( sequence int identity(1,1), seq int )', $table_name);
 			return $this->_query($query);
 		}
 		else
 		{
-			$table_name = $this->prefix . $table_name;
+			$table_name = $this->prefix.$table_name;
 
-			if(!is_array($xml_obj->table->column))
+			if (!is_array($xml_obj->table->column))
 			{
 				$columns[] = $xml_obj->table->column;
 			}
@@ -586,7 +586,7 @@ 
 			$index_list = array();
 
 			$typeList = array('number' => 1, 'text' => 1);
-			foreach($columns as $column)
+			foreach ($columns as $column)
 			{
 				$name = $column->attrs->name;
 				$type = $column->attrs->type;
@@ -598,48 +598,48 @@ 
 				$default = $column->attrs->default;
 				$auto_increment = $column->attrs->auto_increment;
 
-				$column_schema[] = sprintf('[%s] %s%s %s %s %s', $name, $this->column_type[$type], !isset($typeList[$type]) && $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : 'null', $auto_increment ? 'identity(1,1)' : '');
+				$column_schema[] = sprintf('[%s] %s%s %s %s %s', $name, $this->column_type[$type], !isset($typeList[$type]) && $size ? '('.$size.')' : '', isset($default) ? "default '".$default."'" : '', $notnull ? 'not null' : 'null', $auto_increment ? 'identity(1,1)' : '');
 
-				if($primary_key)
+				if ($primary_key)
 				{
 					$primary_list[] = $name;
 				}
-				else if($unique)
+				else if ($unique)
 				{
 					$unique_list[$unique][] = $name;
 				}
-				else if($index)
+				else if ($index)
 				{
 					$index_list[$index][] = $name;
 				}
 			}
 
-			if(count($primary_list))
+			if (count($primary_list))
 			{
-				$column_schema[] = sprintf("primary key (%s)", '"' . implode($primary_list, '","') . '"');
+				$column_schema[] = sprintf("primary key (%s)", '"'.implode($primary_list, '","').'"');
 			}
 
 			$schema = sprintf('create table [%s] (%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"));
 			$output = $this->_query($schema);
-			if(!$output)
+			if (!$output)
 			{
 				return false;
 			}
 
-			if(count($unique_list))
+			if (count($unique_list))
 			{
-				foreach($unique_list as $key => $val)
+				foreach ($unique_list as $key => $val)
 				{
-					$query = sprintf("create unique index %s on %s (%s);", $key, $table_name, '[' . implode('],[', $val) . ']');
+					$query = sprintf("create unique index %s on %s (%s);", $key, $table_name, '['.implode('],[', $val).']');
 					$this->_query($query);
 				}
 			}
 
-			if(count($index_list))
+			if (count($index_list))
 			{
-				foreach($index_list as $key => $val)
+				foreach ($index_list as $key => $val)
 				{
-					$query = sprintf("create index %s on %s (%s);", $key, $table_name, '[' . implode('],[', $val) . ']');
+					$query = sprintf("create index %s on %s (%s);", $key, $table_name, '['.implode('],[', $val).']');
 					$this->_query($query);
 				}
 			}
@@ -682,34 +682,34 @@ 
 	function getUpdateSql($query, $with_values = true, $with_priority = false)
 	{
 		$columnsList = $query->getUpdateString($with_values);
-		if($columnsList == '')
+		if ($columnsList == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
 
 		$tables = $query->getTables();
 		$alias_list = '';
-		foreach($tables as $table)
+		foreach ($tables as $table)
 		{
 			$alias_list .= $table->getAlias();
 		}
 		implode(',', explode(' ', $alias_list));
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$priority = $with_priority ? $query->getPriority() : '';
 
-		return "UPDATE $priority $alias_list SET $columnsList FROM " . $from . $where;
+		return "UPDATE $priority $alias_list SET $columnsList FROM ".$from.$where;
 	}
 
 	/**
@@ -730,7 +730,7 @@ 
 	 * @param boolean $with_values
 	 * @return string
 	 */
-	function getSelectSql($query, $with_values = TRUE, $connection=NULL)
+	function getSelectSql($query, $with_values = TRUE, $connection = NULL)
 	{
 		$with_values = false;
 
@@ -740,75 +740,75 @@ 
 		$limit = '';
 		$limitCount = '';
 		$limitQueryPart = $query->getLimit();
-		if($limitQueryPart)
+		if ($limitQueryPart)
 		{
 			$limitCount = $limitQueryPart->getLimit();
 		}
-		if($limitCount != '')
+		if ($limitCount != '')
 		{
-			$limit = 'SELECT TOP ' . $limitCount;
+			$limit = 'SELECT TOP '.$limitCount;
 		}
 
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		if($limit != '')
+		if ($limit != '')
 		{
-			$select = $limit . ' ' . $select;
+			$select = $limit.' '.$select;
 		}
 		else
 		{
-			$select = 'SELECT ' . $select;
+			$select = 'SELECT '.$select;
 		}
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$from = ' FROM ' . $from;
+		$from = ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
-			$groupBy = ' GROUP BY ' . $groupBy;
+			$groupBy = ' GROUP BY '.$groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
-			$orderBy = ' ORDER BY ' . $orderBy;
+			$orderBy = ' ORDER BY '.$orderBy;
 		}
 
-		if($limitCount != '' && $query->limit->start > 0)
+		if ($limitCount != '' && $query->limit->start > 0)
 		{
 			$order = $query->getOrder();
 			$first_columns = array();
-			foreach($order as $val)
+			foreach ($order as $val)
 			{
 				$tmpColumnName = $val->getPureColumnName();
-				$first_columns[] = sprintf('%s(%s) as %s', $val->getPureSortOrder()=='asc'?'max':'min', $tmpColumnName, $tmpColumnName);
+				$first_columns[] = sprintf('%s(%s) as %s', $val->getPureSortOrder() == 'asc' ? 'max' : 'min', $tmpColumnName, $tmpColumnName);
 				$first_sub_columns[] = $tmpColumnName;
 			}
 
-			$first_query = sprintf("select %s from (select top %d %s %s %s %s %s) xet", implode(',',$first_columns),  $query->limit->start, implode(',',$first_sub_columns), $from, $where, $groupBy, $orderBy);
+			$first_query = sprintf("select %s from (select top %d %s %s %s %s %s) xet", implode(',', $first_columns), $query->limit->start, implode(',', $first_sub_columns), $from, $where, $groupBy, $orderBy);
 			$this->param = $query->getArguments();
 			$result = $this->__query($first_query, $connection);
 			$tmp = $this->_fetch($result);
 
 			$sub_cond = array();
-			foreach($order as $k => $v)
+			foreach ($order as $k => $v)
 			{
 				//for example... use Document
-				if(get_class($v->sort_order) == 'SortArgument')
+				if (get_class($v->sort_order) == 'SortArgument')
 				{
 					$sort_order = $v->sort_order->value;
 				}
@@ -818,19 +818,19 @@ 
 					$sort_order = $v->sort_order;
 				}
 
-				$sub_cond[] = sprintf("%s %s '%s'", $v->getPureColumnName(), $sort_order=='asc'?'>':'<', $tmp->{$v->getPureColumnName()});
+				$sub_cond[] = sprintf("%s %s '%s'", $v->getPureColumnName(), $sort_order == 'asc' ? '>' : '<', $tmp->{$v->getPureColumnName()});
 			}
 
-			if(!$where)
+			if (!$where)
 			{
-				$sub_condition = ' WHERE ( '.implode(' and ',$sub_cond).' )';
+				$sub_condition = ' WHERE ( '.implode(' and ', $sub_cond).' )';
 			}
 			else
 			{
-				$sub_condition = ' and ( '.implode(' and ',$sub_cond).' )';
+				$sub_condition = ' and ( '.implode(' and ', $sub_cond).' )';
 			}
 		}
-		return $select . ' ' . $from . ' ' . $where .$sub_condition. ' ' . $groupBy . ' ' . $orderBy;
+		return $select.' '.$from.' '.$where.$sub_condition.' '.$groupBy.' '.$orderBy;
 	}
 
 	/**
@@ -845,7 +845,7 @@ 
 	{
 		$query = $this->getSelectSql($queryObject, true, $connection);
 
-		if(strpos($query, "substr"))
+		if (strpos($query, "substr"))
 		{
 			$query = str_replace("substr", "substring", $query);
 		}
@@ -853,10 +853,10 @@ 
 		// TODO Decide if we continue to pass parameters like this
 		$this->param = $queryObject->getArguments();
 
-		$query .= (__DEBUG_QUERY__ & 1 && $output->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$query .= (__DEBUG_QUERY__ & 1 && $output->query_id) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
 		$result = $this->_query($query, $connection);
 
-		if($this->isError())
+		if ($this->isError())
 		{
 			return $this->queryError($queryObject);
 		}
@@ -884,7 +884,7 @@ 
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
 			$buff = new BaseObject();
 			$buff->total_count = 0;
@@ -910,52 +910,52 @@ 
 	function queryPageLimit($queryObject, $result, $connection)
 	{
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
 			// Total count
 			$temp_where = $queryObject->getWhereString(true, false);
-			$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE ' . $temp_where));
+			$count_query = sprintf('select count(*) as "count" %s %s', 'FROM '.$queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE '.$temp_where));
 
 			// Check for distinct query and if found update count query structure
 			$temp_select = $queryObject->getSelectString(true);
 			$uses_distinct = stripos($temp_select, "distinct") !== false;
 			$uses_groupby = $queryObject->getGroupByString() != '';
-			if($uses_distinct || $uses_groupby)
+			if ($uses_distinct || $uses_groupby)
 			{
 				$count_query = sprintf('select %s %s %s %s'
 						, $temp_select
-						, 'FROM ' . $queryObject->getFromString(true)
-						, ($temp_where === '' ? '' : ' WHERE ' . $temp_where)
-						, ($uses_groupby ? ' GROUP BY ' . $queryObject->getGroupByString() : '')
+						, 'FROM '.$queryObject->getFromString(true)
+						, ($temp_where === '' ? '' : ' WHERE '.$temp_where)
+						, ($uses_groupby ? ' GROUP BY '.$queryObject->getGroupByString() : '')
 				);
 
 				// If query uses grouping or distinct, count from original select
 				$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
 			}
 
-			$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+			$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
 			$this->param = $queryObject->getArguments();
 			$result_count = $this->_query($count_query, $connection);
 			$count_output = $this->_fetch($result_count);
 			$total_count = (int) $count_output->count;
 
 			$list_count = $limit->list_count->getValue();
-			if(!$list_count)
+			if (!$list_count)
 			{
 				$list_count = 20;
 			}
 			$page_count = $limit->page_count->getValue();
-			if(!$page_count)
+			if (!$page_count)
 			{
 				$page_count = 10;
 			}
 			$page = $limit->page->getValue();
-			if(!$page || $page < 1)
+			if (!$page || $page < 1)
 			{
 				$page = 1;
 			}
 			// Total pages
-			if($total_count)
+			if ($total_count)
 			{
 				$total_page = (int) (($total_count - 1) / $list_count) + 1;
 			}
@@ -965,7 +965,7 @@ 
 			}
 
 			// check the page variables
-			if($page > $total_page)
+			if ($page > $total_page)
 			{
 				// If requested page is bigger than total number of pages, return empty list
 
@@ -977,7 +977,7 @@ 
 				$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
 				return $buff;
 
-				if($queryObject->usesClickCount())
+				if ($queryObject->usesClickCount())
 				{
 					$update_query = $this->getClickCountQuery($queryObject);
 					$this->_executeUpdateAct($update_query);

Braces +24 added lines, -43 removed lines

@@ -45,7 +45,9 @@ 
 	function __construct($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -123,8 +125,7 @@ 
 			{
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_query("SAVE TRANS SP" . $transactionLevel, $connection);
 		}
@@ -145,8 +146,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TRANS SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			sqlsrv_rollback($connection);
 		}
@@ -190,13 +190,11 @@ 
 					if(is_array($value))
 					{
 						$_param = array_merge($_param, $value);
-					}
-					else
+					} else
 					{
 						$_param[] = $o->getUnescapedValue();
 					}
-				}
-				else
+				} else
 				{
 					$value = $o->getUnescapedValue();
 					if(is_array($value))
@@ -205,8 +203,7 @@ 
 						{
 							$_param[] = array($v, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
 						}
-					}
-					else
+					} else
 					{
 						$_param[] = array($value, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
 					}
@@ -220,8 +217,7 @@ 
 		{
 			$args = $this->_getParametersByReference($_param);
 			$stmt = sqlsrv_prepare($connection, $query, $args);
-		}
-		else
+		} else
 		{
 			$stmt = sqlsrv_prepare($connection, $query);
 		}
@@ -229,8 +225,7 @@ 
 		if(!$stmt)
 		{
 			$result = false;
-		}
-		else
+		} else
 		{
 			$result = sqlsrv_execute($stmt);
 		}
@@ -268,8 +263,7 @@ 
 				$value_arg[] = &$value_copy[0];
 				$value_arg[] = $value_copy[1];
 				$value_arg[] = $value_copy[2];
-			}
-			else
+			} else
 			{
 				$value_arg = $value;
 			}
@@ -310,8 +304,7 @@ 
 			if($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $row;
-			}
-			else
+			} else
 			{
 				$output[] = $row;
 			}
@@ -322,8 +315,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -393,8 +385,7 @@ 
 		if($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
-		}
-		else
+		} else
 		{
 			$query .= sprintf(" %s ", $type);
 		}
@@ -567,16 +558,14 @@ 
 			$table_name = $this->prefix . $table_name;
 			$query = sprintf('create table %s ( sequence int identity(1,1), seq int )', $table_name);
 			return $this->_query($query);
-		}
-		else
+		} else
 		{
 			$table_name = $this->prefix . $table_name;
 
 			if(!is_array($xml_obj->table->column))
 			{
 				$columns[] = $xml_obj->table->column;
-			}
-			else
+			} else
 			{
 				$columns = $xml_obj->table->column;
 			}
@@ -603,12 +592,10 @@ 
 				if($primary_key)
 				{
 					$primary_list[] = $name;
-				}
-				else if($unique)
+				} else if($unique)
 				{
 					$unique_list[$unique][] = $name;
-				}
-				else if($index)
+				} else if($index)
 				{
 					$index_list[$index][] = $name;
 				}
@@ -757,8 +744,7 @@ 
 		if($limit != '')
 		{
 			$select = $limit . ' ' . $select;
-		}
-		else
+		} else
 		{
 			$select = 'SELECT ' . $select;
 		}
@@ -824,8 +810,7 @@ 
 			if(!$where)
 			{
 				$sub_condition = ' WHERE ( '.implode(' and ',$sub_cond).' )';
-			}
-			else
+			} else
 			{
 				$sub_condition = ' and ( '.implode(' and ',$sub_cond).' )';
 			}
@@ -859,8 +844,7 @@ 
 		if($this->isError())
 		{
 			return $this->queryError($queryObject);
-		}
-		else
+		} else
 		{
 			return $this->queryPageLimit($queryObject, $result, $connection);
 		}
@@ -893,8 +877,7 @@ 
 			$buff->data = array();
 			$buff->page_navigation = new PageHandler(/* $total_count */0, /* $total_page */1, /* $page */1, /* $page_count */10); //default page handler values
 			return $buff;
-		}
-		else
+		} else
 		{
 			return;
 		}
@@ -958,8 +941,7 @@ 
 			if($total_count)
 			{
 				$total_page = (int) (($total_count - 1) / $list_count) + 1;
-			}
-			else
+			} else
 			{
 				$total_page = 1;
 			}
@@ -995,8 +977,7 @@ 
 			$buff->page = $page;
 			$buff->data = $data;
 			$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-		}
-		else
+		} else
 		{
 			$data = $this->_fetch($result);
 			$buff = new BaseObject();