xpressengine / xe-core

modules/member/member.controller.php

Braces +587 added lines, -246 removed lines

@@ -41,19 +41,31 @@ 
 		}
 
 		// Variables
-		if(!$user_id) $user_id = Context::get('user_id');
+		if(!$user_id) {
+			$user_id = Context::get('user_id');
+		}
 		$user_id = trim($user_id);
 
-		if(!$password) $password = Context::get('password');
+		if(!$password) {
+			$password = Context::get('password');
+		}
 		$password = trim($password);
 
-		if(!$keep_signed) $keep_signed = Context::get('keep_signed');
+		if(!$keep_signed) {
+			$keep_signed = Context::get('keep_signed');
+		}
 		// Return an error when id and password doesn't exist
-		if(!$user_id) return new Object(-1,'null_user_id');
-		if(!$password) return new Object(-1,'null_password');
+		if(!$user_id) {
+			return new Object(-1,'null_user_id');
+		}
+		if(!$password) {
+			return new Object(-1,'null_password');
+		}
 
 		$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
-		if (!$output->toBool()) return $output;
+		if (!$output->toBool()) {
+			return $output;
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
@@ -80,8 +92,7 @@ 
 		if(!$config->after_login_url)
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
-		}
-		else
+		} else
 		{
 			$returnUrl = $config->after_login_url;
 		}
@@ -98,19 +109,24 @@ 
 		// Call a trigger before log-out (before)
 		$logged_info = Context::get('logged_info');
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'before', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// Destroy session information
 		$this->destroySessionInfo();
 		// Call a trigger after log-out (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$output = new Object();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($config->after_logout_url)
-			$output->redirect_url = $config->after_logout_url;
+		if($config->after_logout_url) {
+					$output->redirect_url = $config->after_logout_url;
+		}
 
 		$this->_clearMemberCache($logged_info->member_srl);
 
@@ -125,12 +141,18 @@ 
 	function procMemberScrapDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) $document_srl = (int)Context::get('target_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			$document_srl = (int)Context::get('target_srl');
+		}
+		if(!$document_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Get document
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
@@ -145,10 +167,14 @@ 
 		$args->title = $oDocument->get('title');
 		// Check if already scrapped
 		$output = executeQuery('member.getScrapDocument', $args);
-		if($output->data->count) return new Object(-1, 'msg_alreay_scrapped');
+		if($output->data->count) {
+			return new Object(-1, 'msg_alreay_scrapped');
+		}
 		// Insert
 		$output = executeQuery('member.addScrapDocument', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setError(-1);
 		$this->setMessage('success_registed');
@@ -162,11 +188,15 @@ 
 	function procMemberDeleteScrap()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Variables
 		$args = new stdClass;
 		$args->member_srl = $logged_info->member_srl;
@@ -192,11 +222,15 @@ 
 	function procMemberDeleteSavedDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_logged');
+		}
 		$logged_info = Context::get('logged_info');
 
 		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Variables
 		$oDocumentController = getController('document');
 		$oDocumentController->deleteDocument($document_srl, true);
@@ -211,7 +245,9 @@ 
 	{
 		$name = Context::get('name');
 		$value = Context::get('value');
-		if(!$value) return;
+		if(!$value) {
+			return;
+		}
 
 		$oMemberModel = getModel('member');
 		// Check if logged-in
@@ -222,10 +258,14 @@ 
 		{
 			case 'user_id' :
 				// Check denied ID
-				if($oMemberModel->isDeniedID($value)) return new Object(0,'denied_user_id');
+				if($oMemberModel->isDeniedID($value)) {
+					return new Object(0,'denied_user_id');
+				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new Object(0,'msg_exists_user_id');
+				}
 				break;
 			case 'nick_name' :
 				// Check denied ID
@@ -235,13 +275,17 @@ 
 				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new Object(0,'msg_exists_nick_name');
+				}
 
 				break;
 			case 'email_address' :
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_email_address');
+				if($member_srl && $logged_info->member_srl != $member_srl ) {
+					return new Object(0,'msg_exists_email_address');
+				}
 				break;
 		}
 	}
@@ -253,17 +297,25 @@ 
 	 */
 	function procMemberInsert()
 	{
-		if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request");
+		if (Context::getRequestMethod () == "GET") {
+			return new Object (-1, "msg_invalid_request");
+		}
 		$oMemberModel = &getModel ('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// call a trigger (before)
 		$trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
-		if(!$trigger_output->toBool ()) return $trigger_output;
+		if(!$trigger_output->toBool ()) {
+			return $trigger_output;
+		}
 		// Check if an administrator allows a membership
-		if($config->enable_join != 'Y') return $this->stop ('msg_signup_disabled');
+		if($config->enable_join != 'Y') {
+			return $this->stop ('msg_signup_disabled');
+		}
 		// Check if the user accept the license terms (only if terms exist)
-		if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
+		if($config->agreement && Context::get('accept_agreement')!='Y') {
+			return $this->stop('msg_accept_agreement');
+		}
 
 		// Extract the necessary information in advance
 		$getVars = array();
@@ -282,16 +334,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))
@@ -320,7 +378,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);
@@ -335,7 +395,9 @@ 
 			}
 		}
 		$output = $this->insertMember($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// insert ProfileImage, ImageName, ImageMark
 		$profile_image = $_FILES['profile_image'];
@@ -374,43 +436,46 @@ 
 			if($config->identifier == 'email_address')
 			{
 				$output = $this->doLogin($args->email_address);
-			}
-			else
+			} else
 			{
 				$output = $this->doLogin($args->user_id);
 			}
 			if(!$output->toBool()) {
-				if($output->error == -9)
-					$output->error = -11;
+				if($output->error == -9) {
+									$output->error = -11;
+				}
 				return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), $output);
 			}
 		}
 
 		// Results
 		$this->add('member_srl', $args->member_srl);
-		if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
+		if($config->redirect_url) {
+			$this->add('redirect_url', $config->redirect_url);
+		}
 		if($config->enable_confirm == 'Y')
 		{
 			$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
 			$this->setMessage($msg);
 			return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new Object(-12, $msg));
+		} else {
+			$this->setMessage('success_registed');
 		}
-		else $this->setMessage('success_registed');
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		if($config->redirect_url)
 		{
 			$returnUrl = $config->redirect_url;
-		}
-		else
+		} else
 		{
 			if(Context::get('success_return_url'))
 			{
 				$returnUrl = Context::get('success_return_url');
-			}
-			else if($_COOKIE['XE_REDIRECT_URL'])
+			} else if($_COOKIE['XE_REDIRECT_URL'])
 			{
 				$returnUrl = $_COOKIE['XE_REDIRECT_URL'];
 				setcookie("XE_REDIRECT_URL", '', 1);
@@ -464,8 +529,7 @@ 
 		if(Context::get('success_return_url'))
 		{
 			$redirectUrl = Context::get('success_return_url');
-		}
-		else
+		} else
 		{
 			$redirectUrl = getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
 		}
@@ -509,13 +573,17 @@ 
 		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');
+			}
 		}
 		// Login Information
 		$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();
 		unset($all_args->module);
@@ -549,7 +617,9 @@ 
 
 		// Execute insert or update depending on the value of member_srl
 		$output = $this->updateMember($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$profile_image = $_FILES['profile_image'];
 		if(is_uploaded_file($profile_image['tmp_name']))
@@ -579,7 +649,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
@@ -600,7 +672,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'));
@@ -614,17 +688,23 @@ 
 
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new Object(-1, 'invalid_password');
+		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) {
+			return new Object(-1, 'invalid_password');
+		}
 
 		// Check if a new password is as same as the previous password
-		if($current_password == $password) return new Object(-1, 'invalid_new_password');
+		if($current_password == $password) {
+			return new Object(-1, 'invalid_new_password');
+		}
 
 		// Execute insert or update depending on the value of member_srl
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$args->password = $password;
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('member_srl', $args->member_srl);
 		$this->setMessage('success_updated');
@@ -640,7 +720,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
@@ -656,10 +738,14 @@ 
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
+		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) {
+			return new Object(-1, 'invalid_password');
+		}
 
 		$output = $this->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Destroy all session information
 		$this->destroySessionInfo();
 		// Return success message
@@ -678,17 +764,25 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['profile_image'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
+		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') {
+			return $this->stop('msg_not_uploaded_profile_image');
+		}
 
 		$this->insertProfileImage($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -710,26 +804,35 @@ 
 	{
 
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if(!checkUploadedFile($target_file)) {
+			return;
+		}
 
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// Get an image size
 		$max_width = $config->profile_image_max_width;
-		if(!$max_width) $max_width = "90";
+		if(!$max_width) {
+			$max_width = "90";
+		}
 		$max_height = $config->profile_image_max_height;
-		if(!$max_height) $max_height = "90";
+		if(!$max_height) {
+			$max_height = "90";
+		}
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
-		if(IMAGETYPE_PNG == $type) $ext = 'png';
-		elseif(IMAGETYPE_JPEG == $type) $ext = 'jpg';
-		elseif(IMAGETYPE_GIF == $type) $ext = 'gif';
-		else
+		if(IMAGETYPE_PNG == $type) {
+			$ext = 'png';
+		} elseif(IMAGETYPE_JPEG == $type) {
+			$ext = 'jpg';
+		} elseif(IMAGETYPE_GIF == $type) {
+			$ext = 'gif';
+		} else
 		{
 			return;
 		}
@@ -741,8 +844,7 @@ 
 		if(($width > $max_width || $height > $max_height ) && $type != 1)
 		{
 			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
-		}
-		else
+		} else
 		{
 			@copy($target_file, $target_filename);
 		}
@@ -757,17 +859,25 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_name'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
+		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') {
+			return $this->stop('msg_not_uploaded_image_name');
+		}
 
 		$this->insertImageName($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -788,15 +898,21 @@ 
 	function insertImageName($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if(!checkUploadedFile($target_file)) {
+			return;
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_name_max_width;
-		if(!$max_width) $max_width = "90";
+		if(!$max_width) {
+			$max_width = "90";
+		}
 		$max_height = $config->image_name_max_height;
-		if(!$max_height) $max_height = "20";
+		if(!$max_height) {
+			$max_height = "20";
+		}
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -805,8 +921,11 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 		// Convert if the image size is larger than a given size or if the format is not a gif
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
-		else @copy($target_file, $target_filename);
+		if($width > $max_width || $height > $max_height || $type!=1) {
+			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		} else {
+			@copy($target_file, $target_filename);
+		}
 	}
 
 	/**
@@ -866,17 +985,25 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_mark'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
+		if(!is_uploaded_file($file['tmp_name'])) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if(!$member_srl) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 		// Membership in the images mark the module using the ban was set by an administrator or return;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
+		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') {
+			return $this->stop('msg_not_uploaded_image_mark');
+		}
 
 		$this->insertImageMark($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -897,15 +1024,21 @@ 
 	function insertImageMark($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if(!checkUploadedFile($target_file)) {
+			return;
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_mark_max_width;
-		if(!$max_width) $max_width = "20";
+		if(!$max_width) {
+			$max_width = "20";
+		}
 		$max_height = $config->image_mark_max_height;
-		if(!$max_height) $max_height = "20";
+		if(!$max_height) {
+			$max_height = "20";
+		}
 
 		$target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -914,8 +1047,11 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
-		else @copy($target_file, $target_filename);
+		if($width > $max_width || $height > $max_height || $type!=1) {
+			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		} else {
+			@copy($target_file, $target_filename);
+		}
 	}
 
 	/**
@@ -950,14 +1086,18 @@ 
 	function procMemberFindAccount()
 	{
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if(!$email_address) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$oModuleModel = getModel('module');
 
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
+		if(!$member_srl) {
+			return new Object(-1, 'msg_email_not_exists');
+		}
 
 		// Get information of the member
 		$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
@@ -969,7 +1109,9 @@ 
 			$chk_args = new stdClass;
 			$chk_args->member_srl = $member_info->member_srl;
 			$output = executeQuery('member.chkAuthMail', $chk_args);
-			if($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
+			if($output->toBool() && $output->data->count != '0') {
+				return new Object(-1, 'msg_user_not_confirmed');
+			}
 		}
 
 		// Insert data into the authentication DB
@@ -982,7 +1124,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);
 
@@ -999,8 +1143,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;
@@ -1009,13 +1152,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);
@@ -1057,20 +1206,28 @@ 
 		$find_account_question = trim(Context::get('find_account_question'));
 		$find_account_answer = trim(Context::get('find_account_answer'));
 
-		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-1, 'msg_invalid_request');
+		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
+		if(!$member_srl) {
+			return new Object(-1, 'msg_email_not_exists');
+		}
 		// Get information of the member
 		$columnList = array('member_srl', 'find_account_question', 'find_account_answer');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Display a message if no answer is entered
-		if(!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
+		if(!$member_info->find_account_question || !$member_info->find_account_answer) {
+			return new Object(-1, 'msg_question_not_exists');
+		}
 
-		if(trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) return new Object(-1, 'msg_answer_not_matches');
+		if(trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) {
+			return new Object(-1, 'msg_answer_not_matches');
+		}
 
 		if($config->identifier == 'email_address')
 		{
@@ -1086,7 +1243,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;
 
@@ -1143,8 +1302,7 @@ 
 		if($output->data->is_register == 'Y')
 		{
 			$args->denied = 'N';
-		}
-		else
+		} else
 		{
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
@@ -1178,33 +1336,45 @@ 
 	{
 		// Get an email_address
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if(!$email_address) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		// Log test by using email_address
 		$oMemberModel = getModel('member');
 
 		$args = new stdClass;
 		$args->email_address = $email_address;
 		$memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$memberSrl) return new Object(-1, 'msg_not_exists_member');
+		if(!$memberSrl) {
+			return new Object(-1, 'msg_not_exists_member');
+		}
 
 		$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if(!$member_config->skin) {
+			$member_config->skin = "default";
+		}
+		if(!$member_config->colorset) {
+			$member_config->colorset = "white";
+		}
 
 		// Check if a authentication mail has been sent previously
 		$chk_args = new stdClass;
 		$chk_args->member_srl = $member_info->member_srl;
 		$output = executeQuery('member.chkAuthMail', $chk_args);
-		if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
+		if($output->toBool() && $output->data->count == '0') {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$auth_args = new stdClass;
 		$auth_args->member_srl = $member_info->member_srl;
 		$output = executeQueryArray('member.getAuthMailInfo', $auth_args);
-		if(!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
+		if(!$output->data || !$output->data[0]->auth_key) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		$auth_info = $output->data[0];
 
 		// Update the regdate of authmail entry
@@ -1225,8 +1395,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;
@@ -1239,7 +1408,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);
@@ -1317,7 +1488,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;
 
@@ -1351,8 +1524,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;
@@ -1361,13 +1533,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);
@@ -1392,7 +1570,9 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$columnList = array('site_srl', 'group_srl', 'title');
@@ -1411,13 +1591,17 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$args = new stdClass;
 		$args->site_srl= $site_module_info->site_srl;
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		$this->setMessage('success_deleted');
 		$this->_clearMemberCache($args->member_srl, $site_module_info->site_srl);
 	}
@@ -1431,17 +1615,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);
@@ -1449,7 +1653,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);
@@ -1475,7 +1681,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);
@@ -1509,7 +1717,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);
@@ -1535,15 +1745,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);
@@ -1553,7 +1769,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);
 		}
@@ -1615,8 +1833,7 @@ 
 				if($config->identifier == 'user_id')
 				{
 					$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
-				}
-				else
+				} else
 				{
 					$member_info = $oMemberModel->getMemberInfoByEmailAddress($user_id, $columnList);
 				}
@@ -1625,8 +1842,7 @@ 
 					$do_auto_login = true;
 				}
 
-			}
-			else
+			} else
 			{
 				$do_auto_login = true;
 			}
@@ -1635,8 +1851,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, '/');
@@ -1655,13 +1870,17 @@ 
 	function doLogin($user_id, $password = '', $keep_signed = false)
 	{
 		$user_id = strtolower($user_id);
-		if(!$user_id) return new Object(-1, 'null_user_id');
+		if(!$user_id) {
+			return new Object(-1, 'null_user_id');
+		}
 		// Call a trigger before log-in (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->user_id = $user_id;
 		$trigger_obj->password = $password;
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 		// Create a member model object
 		$oMemberModel = getModel('member');
 
@@ -1676,15 +1895,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);
@@ -1696,14 +1918,18 @@ 
 			if($term < $config->max_error_count_time)
 			{
 				$term = $config->max_error_count_time - $term;
-				if($term < 60) $term = intval($term).Context::getLang('unit_sec');
-				elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
-				elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
-				else $term = intval($term/86400).Context::getLang('unit_day');
+				if($term < 60) {
+					$term = intval($term).Context::getLang('unit_sec');
+				} elseif(60 <= $term && $term < 3600) {
+					$term = intval($term/60).Context::getLang('unit_min');
+				} elseif(3600 <= $term && $term < 86400) {
+					$term = intval($term/3600).Context::getLang('unit_hour');
+				} else {
+					$term = intval($term/86400).Context::getLang('unit_day');
+				}
 
 				return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
-			}
-			else
+			} else
 			{
 				$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 				$output = executeQuery('member.deleteLoginCountByIp', $args);
@@ -1730,7 +1956,9 @@ 
 			return new Object(-1,'msg_user_denied');
 		}
 		// Notify if denied_date is less than the current time
-		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new Object(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) {
+			return new Object(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		}
 		// Update the latest login time
 		$args->member_srl = $this->memberInfo->member_srl;
 		$output = executeQuery('member.updateLastLogin', $args);
@@ -1779,7 +2007,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)
 		{
@@ -1793,7 +2023,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')
 		{
@@ -1882,7 +2114,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;
@@ -1901,35 +2135,52 @@ 
 	{
 		// 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_mailing!='Y') {
+			$args->allow_mailing = 'N';
+		}
+		if($args->denied!='Y') {
+			$args->denied = 'N';
+		}
 		$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);
 		}
@@ -1942,8 +2193,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');
@@ -1957,8 +2212,7 @@ 
 				return new Object(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		elseif(!$args->password)
+		} elseif(!$args->password)
 		{
 			unset($args->password);
 		}
@@ -1999,8 +2253,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();
@@ -2012,8 +2270,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)
 		{
@@ -2030,8 +2291,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++)
 			{
@@ -2092,27 +2352,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');
@@ -2120,13 +2392,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();
@@ -2143,8 +2421,7 @@ 
 				return new Object(-1,'msg_exists_email_address');
 			}
 			$args->email_address = $orgMemberInfo->email_address;
-		}
-		else
+		} else
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
 			if($member_srl && $args->member_srl != $member_srl)
@@ -2201,17 +2478,26 @@ 
 				return new Object(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		else
+		} else
 		{
 			$args->password = $orgMemberInfo->password;
 		}
 
-		if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
-		if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
-		if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
-		if(!$args->description) $args->description = $orgMemberInfo->description;
-		if(!$args->birthday) $args->birthday = '';
+		if(!$args->user_name) {
+			$args->user_name = $orgMemberInfo->user_name;
+		}
+		if(!$args->user_id) {
+			$args->user_id = $orgMemberInfo->user_id;
+		}
+		if(!$args->nick_name) {
+			$args->nick_name = $orgMemberInfo->nick_name;
+		}
+		if(!$args->description) {
+			$args->description = $orgMemberInfo->description;
+		}
+		if(!$args->birthday) {
+			$args->birthday = '';
+		}
 
 		$output = executeQuery('member.updateMember', $args);
 
@@ -2223,8 +2509,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)
 			{
@@ -2267,7 +2556,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);
@@ -2293,8 +2584,7 @@ 
 			}
 
 			$args->password = $oMemberModel->hashPassword($args->password);
-		}
-		else if($args->hashed_password)
+		} else if($args->hashed_password)
 		{
 			$args->password = $args->hashed_password;
 		}
@@ -2319,7 +2609,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
@@ -2328,9 +2620,13 @@ 
 			$columnList = array('member_srl', 'is_admin');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		}
-		if(!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
+		if(!$this->memberInfo) {
+			return new Object(-1, 'msg_not_exists_member');
+		}
 		// If managers can not be deleted
-		if($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
+		if($this->memberInfo->is_admin == 'Y') {
+			return new Object(-1, 'msg_cannot_delete_admin');
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2394,7 +2690,9 @@ 
 	 */
 	function destroySessionInfo()
 	{
-		if(!$_SESSION || !is_array($_SESSION)) return;
+		if(!$_SESSION || !is_array($_SESSION)) {
+			return;
+		}
 
 		$memberInfo = Context::get('logged_info');
 		$memberSrl = $memberInfo->member_srl;
@@ -2433,8 +2731,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)
 		{
@@ -2451,16 +2750,22 @@ 
 
 	function procMemberModifyEmailAddress()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return $this->stop('msg_not_logged');
+		}
 
 		$member_info = Context::get('logged_info');
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail) return $this->stop('msg_invalid_request');
+		if(!$newEmail) {
+			return $this->stop('msg_invalid_request');
+		}
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl) return new Object(-1,'msg_exists_email_address');
+		if($member_srl) {
+			return new Object(-1,'msg_exists_email_address');
+		}
 
 		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
@@ -2488,7 +2793,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;
 
@@ -2524,7 +2831,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;
@@ -2533,7 +2842,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');
 		}
 
@@ -2542,7 +2853,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);
@@ -2563,7 +2876,9 @@ 
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if(!Context::get('is_logged')) {
+			return new Object();
+		}
 
 		$logged_info = Context::get('logged_info');
 		$document_srl = Context::get('target_srl');
@@ -2574,8 +2889,12 @@ 
 		$member_srl = $oDocument->get('member_srl');
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$member_srl) return new Object();
-		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if(!$member_srl) {
+			return new Object();
+		}
+		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) {
+			return new Object();
+		}
 
 		$oDocumentController = getController('document');
 		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@@ -2593,7 +2912,9 @@ 
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if(!Context::get('is_logged')) {
+			return new Object();
+		}
 
 		$logged_info = Context::get('logged_info');
 		$comment_srl = Context::get('target_srl');
@@ -2604,8 +2925,12 @@ 
 		$module_srl = $oComment->get('module_srl');
 		$member_srl = $oComment->get('member_srl');
 
-		if(!$member_srl) return new Object();
-		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if(!$member_srl) {
+			return new Object();
+		}
+		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) {
+			return new Object();
+		}
 
 		$oCommentController = getController('comment');
 		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@@ -2621,7 +2946,9 @@ 
 	**/
 	function procMemberSpammerManage()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = Context::get('member_srl');
@@ -2629,8 +2956,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');
@@ -2638,7 +2966,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$proc_msg = "";
 
@@ -2647,11 +2977,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);
@@ -2659,13 +2991,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);
@@ -2707,7 +3042,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 . "]";
 
@@ -2752,8 +3090,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);
+					}
 				}
 			}
 		}

Spacing +441 added lines, -441 removed lines

@@ -34,25 +34,25 @@ 
 	 */
 	function procMemberLogin($user_id = null, $password = null, $keep_signed = null)
 	{
-		if(!$user_id && !$password && Context::getRequestMethod() == 'GET')
+		if (!$user_id && !$password && Context::getRequestMethod() == 'GET')
 		{
 			$this->setRedirectUrl(getNotEncodedUrl(''));
 			return new Object(-1, 'null_user_id');
 		}
 
 		// Variables
-		if(!$user_id) $user_id = Context::get('user_id');
+		if (!$user_id) $user_id = Context::get('user_id');
 		$user_id = trim($user_id);
 
-		if(!$password) $password = Context::get('password');
+		if (!$password) $password = Context::get('password');
 		$password = trim($password);
 
-		if(!$keep_signed) $keep_signed = Context::get('keep_signed');
+		if (!$keep_signed) $keep_signed = Context::get('keep_signed');
 		// Return an error when id and password doesn't exist
-		if(!$user_id) return new Object(-1,'null_user_id');
-		if(!$password) return new Object(-1,'null_password');
+		if (!$user_id) return new Object(-1, 'null_user_id');
+		if (!$password) return new Object(-1, 'null_password');
 
-		$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
+		$output = $this->doLogin($user_id, $password, $keep_signed == 'Y' ? true : false);
 		if (!$output->toBool()) return $output;
 
 		$oModuleModel = getModel('module');
@@ -62,13 +62,13 @@ 
 		$limit_date = $config->change_password_date;
 
 		// Check if change_password_date is set
-		if($limit_date > 0)
+		if ($limit_date > 0)
 		{
 			$oMemberModel = getModel('member');
-			if($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day')))
+			if ($this->memberInfo->change_password_date < date('YmdHis', strtotime('-'.$limit_date.' day')))
 			{
 				$msg = sprintf(Context::getLang('msg_change_password_date'), $limit_date);
-				return $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'), new Object(-1, $msg));
+				return $this->setRedirectUrl(getNotEncodedUrl('', 'vid', Context::get('vid'), 'mid', Context::get('mid'), 'act', 'dispMemberModifyPassword'), new Object(-1, $msg));
 			}
 		}
 
@@ -77,7 +77,7 @@ 
 		$args->member_srl = $this->memberInfo->member_srl;
 		executeQuery('member.deleteAuthMail', $args);
 
-		if(!$config->after_login_url)
+		if (!$config->after_login_url)
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
 		}
@@ -98,18 +98,18 @@ 
 		// Call a trigger before log-out (before)
 		$logged_info = Context::get('logged_info');
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'before', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Destroy session information
 		$this->destroySessionInfo();
 		// Call a trigger after log-out (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		$output = new Object();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($config->after_logout_url)
+		if ($config->after_logout_url)
 			$output->redirect_url = $config->after_logout_url;
 
 		$this->_clearMemberCache($logged_info->member_srl);
@@ -125,12 +125,12 @@ 
 	function procMemberScrapDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) $document_srl = (int)Context::get('target_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) $document_srl = (int) Context::get('target_srl');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 		// Get document
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
@@ -145,10 +145,10 @@ 
 		$args->title = $oDocument->get('title');
 		// Check if already scrapped
 		$output = executeQuery('member.getScrapDocument', $args);
-		if($output->data->count) return new Object(-1, 'msg_alreay_scrapped');
+		if ($output->data->count) return new Object(-1, 'msg_alreay_scrapped');
 		// Insert
 		$output = executeQuery('member.addScrapDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setError(-1);
 		$this->setMessage('success_registed');
@@ -162,11 +162,11 @@ 
 	function procMemberDeleteScrap()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 		// Variables
 		$args = new stdClass;
 		$args->member_srl = $logged_info->member_srl;
@@ -192,11 +192,11 @@ 
 	function procMemberDeleteSavedDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 		// Variables
 		$oDocumentController = getController('document');
 		$oDocumentController->deleteDocument($document_srl, true);
@@ -211,37 +211,37 @@ 
 	{
 		$name = Context::get('name');
 		$value = Context::get('value');
-		if(!$value) return;
+		if (!$value) return;
 
 		$oMemberModel = getModel('member');
 		// Check if logged-in
 		$logged_info = Context::get('logged_info');
 
 
-		switch($name)
+		switch ($name)
 		{
 			case 'user_id' :
 				// Check denied ID
-				if($oMemberModel->isDeniedID($value)) return new Object(0,'denied_user_id');
+				if ($oMemberModel->isDeniedID($value)) return new Object(0, 'denied_user_id');
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(0, 'msg_exists_user_id');
 				break;
 			case 'nick_name' :
 				// Check denied ID
-				if($oMemberModel->isDeniedNickName($value))
+				if ($oMemberModel->isDeniedNickName($value))
 				{
-					return new Object(0,'denied_nick_name');
+					return new Object(0, 'denied_nick_name');
 				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(0, 'msg_exists_nick_name');
 
 				break;
 			case 'email_address' :
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_email_address');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(0, 'msg_exists_email_address');
 				break;
 		}
 	}
@@ -253,25 +253,25 @@ 
 	 */
 	function procMemberInsert()
 	{
-		if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request");
-		$oMemberModel = &getModel ('member');
+		if (Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
+		$oMemberModel = &getModel('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// call a trigger (before)
-		$trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
-		if(!$trigger_output->toBool ()) return $trigger_output;
+		$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'before', $config);
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Check if an administrator allows a membership
-		if($config->enable_join != 'Y') return $this->stop ('msg_signup_disabled');
+		if ($config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
 		// Check if the user accept the license terms (only if terms exist)
-		if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
+		if ($config->agreement && Context::get('accept_agreement') != 'Y') return $this->stop('msg_accept_agreement');
 
 		// Extract the necessary information in advance
 		$getVars = array();
-		if($config->signupForm)
+		if ($config->signupForm)
 		{
-			foreach($config->signupForm as $formInfo)
+			foreach ($config->signupForm as $formInfo)
 			{
-				if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
+				if ($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
 				{
 					$getVars[] = $formInfo->name;
 				}
@@ -279,22 +279,22 @@ 
 		}
 
 		$args = new stdClass;
-		foreach($getVars as $val)
+		foreach ($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if ($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
 		}
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if (!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
 
 		$args->find_account_answer = Context::get('find_account_answer');
 		$args->allow_mailing = Context::get('allow_mailing');
 		$args->allow_message = Context::get('allow_message');
 
-		if($args->password1) $args->password = $args->password1;
+		if ($args->password1) $args->password = $args->password1;
 
 		// check password strength
-		if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+		if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 		{
 			$message = Context::getLang('about_password_strength');
 			return new Object(-1, $message[$config->password_strength]);
@@ -320,58 +320,58 @@ 
 		unset($all_args->secret_text);
 
 		// Set the user state as "denied" when using mail authentication
-		if($config->enable_confirm == 'Y') $args->denied = 'Y';
+		if ($config->enable_confirm == 'Y') $args->denied = 'Y';
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
 
 		// remove whitespace
 		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach ($checkInfos as $val)
 		{
-			if(isset($args->{$val}))
+			if (isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
 		}
 		$output = $this->insertMember($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// insert ProfileImage, ImageName, ImageMark
 		$profile_image = $_FILES['profile_image'];
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$this->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
 		}
 
 		$image_mark = $_FILES['image_mark'];
-		if(is_uploaded_file($image_mark['tmp_name']))
+		if (is_uploaded_file($image_mark['tmp_name']))
 		{
 			$this->insertImageMark($args->member_srl, $image_mark['tmp_name']);
 		}
 
 		$image_name = $_FILES['image_name'];
-		if(is_uploaded_file($image_name['tmp_name']))
+		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$this->insertImageName($args->member_srl, $image_name['tmp_name']);
 		}
 
 		// If a virtual site, join the site
 		$site_module_info = Context::get('site_module_info');
-		if($site_module_info->site_srl > 0)
+		if ($site_module_info->site_srl > 0)
 		{
 			$columnList = array('site_srl', 'group_srl');
 			$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList);
-			if($default_group->group_srl)
+			if ($default_group->group_srl)
 			{
 				$this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl);
 			}
 
 		}
 		// Log-in
-		if($config->enable_confirm != 'Y')
+		if ($config->enable_confirm != 'Y')
 		{
-			if($config->identifier == 'email_address')
+			if ($config->identifier == 'email_address')
 			{
 				$output = $this->doLogin($args->email_address);
 			}
@@ -379,8 +379,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);
 			}
@@ -388,8 +388,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);
@@ -398,19 +398,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);
@@ -424,26 +424,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');
@@ -454,14 +454,14 @@ 
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the current password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password))
+		if (!$oMemberModel->isValidPassword($this->memberInfo->password, $password))
 		{
 			return new Object(-1, 'invalid_password');
 		}
 
 		$_SESSION['rechecked_password_step'] = 'VALIDATE_PASSWORD';
 
-		if(Context::get('success_return_url'))
+		if (Context::get('success_return_url'))
 		{
 			$redirectUrl = Context::get('success_return_url');
 		}
@@ -479,12 +479,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');
 		}
@@ -492,13 +492,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;
 				}
@@ -506,16 +506,16 @@ 
 		}
 
 		$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');
 		}
 		// Login Information
 		$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();
 		unset($all_args->module);
@@ -539,9 +539,9 @@ 
 
 		// remove whitespace
 		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach ($checkInfos as $val)
 		{
-			if(isset($args->{$val}))
+			if (isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
@@ -549,22 +549,22 @@ 
 
 		// Execute insert or update depending on the value of member_srl
 		$output = $this->updateMember($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$profile_image = $_FILES['profile_image'];
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$this->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
 		}
 
 		$image_mark = $_FILES['image_mark'];
-		if(is_uploaded_file($image_mark['tmp_name']))
+		if (is_uploaded_file($image_mark['tmp_name']))
 		{
 			$this->insertImageMark($args->member_srl, $image_mark['tmp_name']);
 		}
 
 		$image_name = $_FILES['image_name'];
-		if(is_uploaded_file($image_name['tmp_name']))
+		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$this->insertImageName($args->member_srl, $image_name['tmp_name']);
 		}
@@ -579,7 +579,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
@@ -600,7 +600,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'));
@@ -614,17 +614,17 @@ 
 
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new Object(-1, 'invalid_password');
+		if (!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new Object(-1, 'invalid_password');
 
 		// Check if a new password is as same as the previous password
-		if($current_password == $password) return new Object(-1, 'invalid_new_password');
+		if ($current_password == $password) return new Object(-1, 'invalid_new_password');
 
 		// Execute insert or update depending on the value of member_srl
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$args->password = $password;
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->add('member_srl', $args->member_srl);
 		$this->setMessage('success_updated');
@@ -640,7 +640,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
@@ -649,17 +649,17 @@ 
 		// Create a member model object
 		$oMemberModel = getModel('member');
 		// Get information of member_srl
-		if(!$this->memberInfo->password)
+		if (!$this->memberInfo->password)
 		{
 			$columnList = array('member_srl', 'password');
 			$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
+		if (!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
 
 		$output = $this->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Destroy all session information
 		$this->destroySessionInfo();
 		// Return success message
@@ -678,17 +678,17 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['profile_image'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
+		if ($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
 
 		$this->insertProfileImage($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -710,25 +710,25 @@ 
 	{
 
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// Get an image size
 		$max_width = $config->profile_image_max_width;
-		if(!$max_width) $max_width = "90";
+		if (!$max_width) $max_width = "90";
 		$max_height = $config->profile_image_max_height;
-		if(!$max_height) $max_height = "90";
+		if (!$max_height) $max_height = "90";
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
-		if(IMAGETYPE_PNG == $type) $ext = 'png';
-		elseif(IMAGETYPE_JPEG == $type) $ext = 'jpg';
-		elseif(IMAGETYPE_GIF == $type) $ext = 'gif';
+		if (IMAGETYPE_PNG == $type) $ext = 'png';
+		elseif (IMAGETYPE_JPEG == $type) $ext = 'jpg';
+		elseif (IMAGETYPE_GIF == $type) $ext = 'gif';
 		else
 		{
 			return;
@@ -738,7 +738,7 @@ 
 
 		$target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
 		// Convert if the image size is larger than a given size or if the format is not a gif
-		if(($width > $max_width || $height > $max_height ) && $type != 1)
+		if (($width > $max_width || $height > $max_height) && $type != 1)
 		{
 			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
 		}
@@ -757,17 +757,17 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_name'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_image_name');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
+		if ($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
 
 		$this->insertImageName($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -788,15 +788,15 @@ 
 	function insertImageName($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_name_max_width;
-		if(!$max_width) $max_width = "90";
+		if (!$max_width) $max_width = "90";
 		$max_height = $config->image_name_max_height;
-		if(!$max_height) $max_height = "20";
+		if (!$max_height) $max_height = "20";
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -805,7 +805,7 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 		// Convert if the image size is larger than a given size or if the format is not a gif
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		if ($width > $max_width || $height > $max_height || $type != 1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
 		else @copy($target_file, $target_filename);
 	}
 
@@ -817,20 +817,20 @@ 
 	function procMemberDeleteProfileImage($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$profile_image = $oMemberModel->getProfileImage($member_srl);
 			FileHandler::removeFile($profile_image->file);
 		}
-		return new Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -841,20 +841,20 @@ 
 	function procMemberDeleteImageName($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$image_name = $oMemberModel->getImageName($member_srl);
 			FileHandler::removeFile($image_name->file);
 		}
-		return new Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -866,17 +866,17 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_mark'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
 		// Membership in the images mark the module using the ban was set by an administrator or return;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
+		if ($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
 
 		$this->insertImageMark($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -897,15 +897,15 @@ 
 	function insertImageMark($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_mark_max_width;
-		if(!$max_width) $max_width = "20";
+		if (!$max_width) $max_width = "20";
 		$max_height = $config->image_mark_max_height;
-		if(!$max_height) $max_height = "20";
+		if (!$max_height) $max_height = "20";
 
 		$target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -914,7 +914,7 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		if ($width > $max_width || $height > $max_height || $type != 1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
 		else @copy($target_file, $target_filename);
 	}
 
@@ -926,20 +926,20 @@ 
 	function procMemberDeleteImageMark($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$image_mark = $oMemberModel->getImageMark($member_srl);
 			FileHandler::removeFile($image_mark->file);
 		}
-		return new Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -950,26 +950,26 @@ 
 	function procMemberFindAccount()
 	{
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if (!$email_address) return new Object(-1, 'msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$oModuleModel = getModel('module');
 
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
+		if (!$member_srl) return new Object(-1, 'msg_email_not_exists');
 
 		// Get information of the member
 		$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Check if possible to find member's ID and password
-		if($member_info->denied == 'Y')
+		if ($member_info->denied == 'Y')
 		{
 			$chk_args = new stdClass;
 			$chk_args->member_srl = $member_info->member_srl;
 			$output = executeQuery('member.chkAuthMail', $chk_args);
-			if($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
+			if ($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
 		}
 
 		// Insert data into the authentication DB
@@ -982,19 +982,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};
 				}
@@ -1009,15 +1009,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();
@@ -1027,19 +1027,19 @@ 
 		$member_config = $oModuleModel->getModuleConfig('member');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_find_account_title') );
+		$oMail->setTitle(Context::getLang('msg_find_account_title'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($member_info->user_name, $member_info->email_address);
 		$oMail->send();
 		// Return message
 		$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberFindAccount');
 			$this->setRedirectUrl($returnUrl);
 		}
-		return new Object(0,$msg);
+		return new Object(0, $msg);
 	}
 
 	/**
@@ -1057,28 +1057,28 @@ 
 		$find_account_question = trim(Context::get('find_account_question'));
 		$find_account_answer = trim(Context::get('find_account_answer'));
 
-		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-1, 'msg_invalid_request');
+		if (($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
+		if (!$member_srl) return new Object(-1, 'msg_email_not_exists');
 		// Get information of the member
 		$columnList = array('member_srl', 'find_account_question', 'find_account_answer');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Display a message if no answer is entered
-		if(!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
+		if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
 
-		if(trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) return new Object(-1, 'msg_answer_not_matches');
+		if (trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) return new Object(-1, 'msg_answer_not_matches');
 
-		if($config->identifier == 'email_address')
+		if ($config->identifier == 'email_address')
 		{
 			$user_id = $email_address;
 		}
 
 		// Update to a temporary password and set change_password_date to 1
-		$oPassword =  new Password();
+		$oPassword = new Password();
 		$temp_password = $oPassword->createTemporaryPassword(8);
 
 		$args = new stdClass();
@@ -1086,11 +1086,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);
@@ -1110,7 +1110,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');
 		}
@@ -1121,9 +1121,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);
 			}
@@ -1131,7 +1131,7 @@ 
 			return $this->stop('msg_invalid_auth_key');
 		}
 
-		if(ztime($output->data->regdate) < $_SERVER['REQUEST_TIME'] + zgap() - 86400)
+		if (ztime($output->data->regdate) < $_SERVER['REQUEST_TIME'] + zgap() - 86400)
 		{
 			executeQuery('member.deleteAuthMail', $args);
 			return $this->stop('msg_invalid_auth_key');
@@ -1140,7 +1140,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';
 		}
@@ -1153,13 +1153,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);
 
@@ -1178,33 +1178,33 @@ 
 	{
 		// Get an email_address
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if (!$email_address) return new Object(-1, 'msg_invalid_request');
 		// Log test by using email_address
 		$oMemberModel = getModel('member');
 
 		$args = new stdClass;
 		$args->email_address = $email_address;
 		$memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$memberSrl) return new Object(-1, 'msg_not_exists_member');
+		if (!$memberSrl) return new Object(-1, 'msg_not_exists_member');
 
 		$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if (!$member_config->skin) $member_config->skin = "default";
+		if (!$member_config->colorset) $member_config->colorset = "white";
 
 		// Check if a authentication mail has been sent previously
 		$chk_args = new stdClass;
 		$chk_args->member_srl = $member_info->member_srl;
 		$output = executeQuery('member.chkAuthMail', $chk_args);
-		if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
+		if ($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
 
 		$auth_args = new stdClass;
 		$auth_args->member_srl = $member_info->member_srl;
 		$output = executeQueryArray('member.getAuthMailInfo', $auth_args);
-		if(!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
+		if (!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
 		$auth_info = $output->data[0];
 
 		// Update the regdate of authmail entry
@@ -1215,12 +1215,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};
 				}
@@ -1239,19 +1239,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);
@@ -1266,23 +1266,23 @@ 
 		$memberInfo = $_SESSION['auth_member_info'];
 		unset($_SESSION['auth_member_info']);
 
-		if(!$memberInfo)
+		if (!$memberInfo)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail)
+		if (!$newEmail)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_email_address');
+			return new Object(-1, 'msg_exists_email_address');
 		}
 
 		// remove all key by member_srl
@@ -1290,7 +1290,7 @@ 
 		$args->member_srl = $memberInfo->member_srl;
 		$output = executeQuery('member.deleteAuthMail', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1300,7 +1300,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());
 		}
@@ -1317,7 +1317,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;
 
@@ -1341,12 +1341,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};
 				}
@@ -1361,25 +1361,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();
 	}
 
@@ -1392,7 +1392,7 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+		if (!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list)) return new Object(-1, 'msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$columnList = array('site_srl', 'group_srl', 'title');
@@ -1411,13 +1411,13 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+		if (!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list)) return new Object(-1, 'msg_invalid_request');
 
 		$args = new stdClass;
-		$args->site_srl= $site_module_info->site_srl;
+		$args->site_srl = $site_module_info->site_srl;
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		$this->setMessage('success_deleted');
 		$this->_clearMemberCache($args->member_srl, $site_module_info->site_srl);
 	}
@@ -1431,25 +1431,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);
@@ -1470,11 +1470,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);
@@ -1503,15 +1503,15 @@ 
 	 *
 	 * @return Object
 	 */
-	function addMemberToGroup($member_srl, $group_srl, $site_srl=0)
+	function addMemberToGroup($member_srl, $group_srl, $site_srl = 0)
 	{
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$args->group_srl = $group_srl;
-		if($site_srl) $args->site_srl = $site_srl;
+		if ($site_srl) $args->site_srl = $site_srl;
 
 		// Add
-		$output = executeQuery('member.addMemberToGroup',$args);
+		$output = executeQuery('member.addMemberToGroup', $args);
 		$output2 = ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args);
 
 		$this->_clearMemberCache($member_srl, $site_srl);
@@ -1531,18 +1531,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);
@@ -1552,7 +1552,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);
 		}
@@ -1574,9 +1574,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;
 		}
 
@@ -1586,9 +1586,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;
 		}
 
@@ -1598,7 +1598,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');
@@ -1606,12 +1606,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);
 				}
@@ -1620,7 +1620,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;
 				}
 
@@ -1631,14 +1631,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, '/');
 		}
 	}
 
@@ -1654,13 +1654,13 @@ 
 	function doLogin($user_id, $password = '', $keep_signed = false)
 	{
 		$user_id = strtolower($user_id);
-		if(!$user_id) return new Object(-1, 'null_user_id');
+		if (!$user_id) return new Object(-1, 'null_user_id');
 		// Call a trigger before log-in (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->user_id = $user_id;
 		$trigger_obj->password = $password;
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Create a member model object
 		$oMemberModel = getModel('member');
 
@@ -1670,12 +1670,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
@@ -1683,24 +1683,24 @@ 
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_user_id');
+			if (!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_user_id');
 		}
 
 		$output = executeQuery('member.getLoginCountByIp', $args);
 		$errorCount = $output->data->count;
-		if($errorCount >= $config->max_error_count)
+		if ($errorCount >= $config->max_error_count)
 		{
 			$last_update = strtotime($output->data->last_update);
-			$term = intval($_SERVER['REQUEST_TIME']-$last_update);
-			if($term < $config->max_error_count_time)
+			$term = intval($_SERVER['REQUEST_TIME'] - $last_update);
+			if ($term < $config->max_error_count_time)
 			{
 				$term = $config->max_error_count_time - $term;
-				if($term < 60) $term = intval($term).Context::getLang('unit_sec');
-				elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
-				elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
-				else $term = intval($term/86400).Context::getLang('unit_day');
+				if ($term < 60) $term = intval($term).Context::getLang('unit_sec');
+				elseif (60 <= $term && $term < 3600) $term = intval($term / 60).Context::getLang('unit_min');
+				elseif (3600 <= $term && $term < 86400) $term = intval($term / 3600).Context::getLang('unit_hour');
+				else $term = intval($term / 86400).Context::getLang('unit_day');
 
-				return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
+				return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'), $term));
 			}
 			else
 			{
@@ -1710,13 +1710,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);
@@ -1724,12 +1724,12 @@ 
 			{
 				$_SESSION['auth_member_srl'] = $this->memberInfo->member_srl;
 				$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
-				return $this->setRedirectUrl($redirectUrl, new Object(-1,'msg_user_not_confirmed'));
+				return $this->setRedirectUrl($redirectUrl, new Object(-1, 'msg_user_not_confirmed'));
 			}
-			return new Object(-1,'msg_user_denied');
+			return new Object(-1, 'msg_user_denied');
 		}
 		// Notify if denied_date is less than the current time
-		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new Object(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		if ($this->memberInfo->limit_date && substr($this->memberInfo->limit_date, 0, 8) >= date("Ymd")) return new Object(-9, sprintf(Context::getLang('msg_user_limited'), zdate($this->memberInfo->limit_date, "Y-m-d")));
 		// Update the latest login time
 		$args->member_srl = $this->memberInfo->member_srl;
 		$output = executeQuery('member.updateLastLogin', $args);
@@ -1739,36 +1739,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();
 					}
@@ -1778,9 +1778,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();
@@ -1792,12 +1792,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';
 			}
@@ -1815,18 +1815,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;
@@ -1856,10 +1856,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');
 	}
 
 	/**
@@ -1881,7 +1881,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;
@@ -1900,33 +1900,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';
-		$args->allow_message= 'Y';
+		if ($args->allow_mailing != 'Y') $args->allow_mailing = 'N';
+		if ($args->denied != 'Y') $args->denied = 'N';
+		$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
 		{
@@ -1941,88 +1941,88 @@ 
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if ($args->homepage && !preg_match("/^[a-z]+:\/\//i", $args->homepage)) $args->homepage = 'http://'.$args->homepage;
+		if ($args->blog && !preg_match("/^[a-z]+:\/\//i", $args->blog)) $args->blog = 'http://'.$args->blog;
 
 		// Create a model object
 		$oMemberModel = getModel('member');
 
 		// Check password strength
-		if($args->password && !$password_is_hashed)
+		if ($args->password && !$password_is_hashed)
 		{
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
-		elseif(!$args->password)
+		elseif (!$args->password)
 		{
 			unset($args->password);
 		}
 
 		// Check if ID is prohibited
-		if($oMemberModel->isDeniedID($args->user_id))
+		if ($oMemberModel->isDeniedID($args->user_id))
 		{
-			return new Object(-1,'denied_user_id');
+			return new Object(-1, 'denied_user_id');
 		}
 
 		// Check if ID is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_user_id');
+			return new Object(-1, 'msg_exists_user_id');
 		}
 
 		// Check if nickname is prohibited
-		if($oMemberModel->isDeniedNickName($args->nick_name))
+		if ($oMemberModel->isDeniedNickName($args->nick_name))
 		{
-			return new Object(-1,'denied_nick_name');
+			return new Object(-1, 'denied_nick_name');
 		}
 
 		// Check if nickname is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_nick_name');
+			return new Object(-1, 'msg_exists_nick_name');
 		}
 
 		// Check if email address is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_email_address');
+			return new Object(-1, 'msg_exists_email_address');
 		}
 
 		// Insert data into the DB
 		$args->list_order = -1 * $args->member_srl;
 
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
-		if(!$args->user_name) $args->user_name = $args->member_srl;
+		if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
+		if (!$args->user_name) $args->user_name = $args->member_srl;
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$output = executeQuery('member.insertMember', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
+		if (is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
 		else $group_srl_list = explode('|@|', $args->group_srl_list);
 		// If no value is entered the default group, the value of group registration
-		if(!$args->group_srl_list)
+		if (!$args->group_srl_list)
 		{
 			$columnList = array('site_srl', 'group_srl');
 			$default_group = $oMemberModel->getDefaultGroup(0, $columnList);
-			if($default_group)
+			if ($default_group)
 			{
 				// Add to the default group
-				$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
-				if(!$output->toBool())
+				$output = $this->addMemberToGroup($args->member_srl, $default_group->group_srl);
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -2032,11 +2032,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;
@@ -2046,7 +2046,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();
@@ -2058,7 +2058,7 @@ 
 			$auth_args->is_register = 'Y';
 
 			$output = executeQuery('member.insertAuthMail', $auth_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -2066,10 +2066,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;
@@ -2091,41 +2091,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();
@@ -2134,56 +2134,56 @@ 
 		$orgMemberInfo = $output->data;
 
 		// Check if email address or user ID is duplicate
-		if($config->identifier == 'email_address')
+		if ($config->identifier == 'email_address')
 		{
 			$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new Object(-1,'msg_exists_email_address');
+				return new Object(-1, 'msg_exists_email_address');
 			}
 			$args->email_address = $orgMemberInfo->email_address;
 		}
 		else
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new Object(-1,'msg_exists_user_id');
+				return new Object(-1, 'msg_exists_user_id');
 			}
 
 			$args->user_id = $orgMemberInfo->user_id;
 		}
 
-		if($logged_info->is_admin !== 'Y')
+		if ($logged_info->is_admin !== 'Y')
 		{
 			// Check if ID is prohibited
-			if($args->user_id && $oMemberModel->isDeniedID($args->user_id))
+			if ($args->user_id && $oMemberModel->isDeniedID($args->user_id))
 			{
-				return new Object(-1,'denied_user_id');
+				return new Object(-1, 'denied_user_id');
 			}
 
 			// Check if nickname is prohibited
-			if($args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
+			if ($args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
 			{
 				return new Object(-1, 'denied_nick_name');
 			}
 		}
 
 		// Check if ID is duplicate
-		if($args->user_id)
+		if ($args->user_id)
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new Object(-1,'msg_exists_user_id');
+				return new Object(-1, 'msg_exists_user_id');
 			}
 		}
 
 		// Check if nickname is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
- 		if($member_srl && $args->member_srl != $member_srl)
+ 		if ($member_srl && $args->member_srl != $member_srl)
  		{
- 			return new Object(-1,'msg_exists_nick_name');
+ 			return new Object(-1, 'msg_exists_nick_name');
  		}
 
 		list($args->email_id, $args->email_host) = explode('@', $args->email_address);
@@ -2192,9 +2192,9 @@ 
 		$oDB->begin();
 
 		// Check password strength
-		if($args->password)
+		if ($args->password)
 		{
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
@@ -2206,40 +2206,40 @@ 
 			$args->password = $orgMemberInfo->password;
 		}
 
-		if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
-		if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
-		if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
-		if(!$args->description) $args->description = $orgMemberInfo->description;
-		if(!$args->birthday) $args->birthday = '';
+		if (!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
+		if (!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
+		if (!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
+		if (!$args->description) $args->description = $orgMemberInfo->description;
+		if (!$args->birthday) $args->birthday = '';
 
 		$output = executeQuery('member.updateMember', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($args->group_srl_list)
+		if ($args->group_srl_list)
 		{
-			if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
+			if (is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
 			else $group_srl_list = explode('|@|', $args->group_srl_list);
 			// If the group information, group information changes
-			if(count($group_srl_list) > 0)
+			if (count($group_srl_list) > 0)
 			{
 				$args->site_srl = 0;
 				// One of its members to delete all the group
 				$output = executeQuery('member.deleteMemberGroupMember', $args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
 				}
 				// Enter one of the loop a
-				for($i=0;$i<count($group_srl_list);$i++)
+				for ($i = 0; $i < count($group_srl_list); $i++)
 				{
-					$output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
-					if(!$output->toBool())
+					$output = $this->addMemberToGroup($args->member_srl, $group_srl_list[$i]);
+					if (!$output->toBool())
 					{
 						$oDB->rollback();
 						return $output;
@@ -2251,9 +2251,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;
@@ -2266,7 +2266,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);
@@ -2278,14 +2278,14 @@ 
 	 */
 	function updateMemberPassword($args)
 	{
-		if($args->password)
+		if ($args->password)
 		{
 
 			// check password strength
 			$oMemberModel = getModel('member');
 			$config = $oMemberModel->getMemberConfig();
 
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
@@ -2293,13 +2293,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);
 		}
@@ -2318,18 +2318,18 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->member_srl = $member_srl;
 		$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Create a model object
 		$oMemberModel = getModel('member');
 		// Bringing the user's information
-		if(!$this->memberInfo || $this->memberInfo->member_srl != $member_srl || !isset($this->memberInfo->is_admin))
+		if (!$this->memberInfo || $this->memberInfo->member_srl != $member_srl || !isset($this->memberInfo->is_admin))
 		{
 			$columnList = array('member_srl', 'is_admin');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		}
-		if(!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
+		if (!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
 		// If managers can not be deleted
-		if($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
+		if ($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2338,7 +2338,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;
@@ -2353,23 +2353,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;
@@ -2393,23 +2393,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;
@@ -2425,22 +2425,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');
@@ -2450,18 +2450,18 @@ 
 
 	function procMemberModifyEmailAddress()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
 
 		$member_info = Context::get('logged_info');
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail) return $this->stop('msg_invalid_request');
+		if (!$newEmail) return $this->stop('msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl) return new Object(-1,'msg_exists_email_address');
+		if ($member_srl) return new Object(-1, 'msg_exists_email_address');
 
-		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
+		if ($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -2477,7 +2477,7 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -2487,7 +2487,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;
 
@@ -2499,17 +2499,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);
@@ -2523,16 +2523,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');
 		}
 
@@ -2541,10 +2541,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);
 
@@ -2562,7 +2562,7 @@ 
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if (!Context::get('is_logged')) return new Object();
 
 		$logged_info = Context::get('logged_info');
 		$document_srl = Context::get('target_srl');
@@ -2573,12 +2573,12 @@ 
 		$member_srl = $oDocument->get('member_srl');
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$member_srl) return new Object();
-		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if (!$member_srl) return new Object();
+		if ($oDocumentModel->grant->manager != 1 || $member_srl == $logged_info->member_srl) return new Object();
 
 		$oDocumentController = getController('document');
-		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
-		$oDocumentController->addDocumentPopupMenu($url,'cmd_spammer','','popup');
+		$url = getUrl('', 'module', 'member', 'act', 'dispMemberSpammer', 'member_srl', $member_srl, 'module_srl', $module_srl);
+		$oDocumentController->addDocumentPopupMenu($url, 'cmd_spammer', '', 'popup');
 
 		return new Object();
 	}
@@ -2592,7 +2592,7 @@ 
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if (!Context::get('is_logged')) return new Object();
 
 		$logged_info = Context::get('logged_info');
 		$comment_srl = Context::get('target_srl');
@@ -2603,12 +2603,12 @@ 
 		$module_srl = $oComment->get('module_srl');
 		$member_srl = $oComment->get('member_srl');
 
-		if(!$member_srl) return new Object();
-		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if (!$member_srl) return new Object();
+		if ($oCommentModel->grant->manager != 1 || $member_srl == $logged_info->member_srl) return new Object();
 
 		$oCommentController = getController('comment');
-		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
-		$oCommentController->addCommentPopupMenu($url,'cmd_spammer','','popup');
+		$url = getUrl('', 'module', 'member', 'act', 'dispMemberSpammer', 'member_srl', $member_srl, 'module_srl', $module_srl);
+		$oCommentController->addCommentPopupMenu($url, 'cmd_spammer', '', 'popup');
 
 		return new Object();
 	}
@@ -2620,7 +2620,7 @@ 
 	**/
 	function procMemberSpammerManage()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = Context::get('member_srl');
@@ -2628,7 +2628,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
@@ -2637,7 +2637,7 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if (!$grant->manager) return new Object(-1, 'msg_not_permitted');
 
 		$proc_msg = "";
 
@@ -2646,10 +2646,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
@@ -2658,11 +2658,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;
 
@@ -2686,7 +2686,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');
@@ -2705,10 +2705,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);
 
@@ -2737,21 +2737,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);
 				}
 			}
@@ -2763,24 +2763,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);
 		}