xpressengine / xe-core

modules/integration_search/integration_search.admin.controller.php

Braces +9 added lines, -3 removed lines

@@ -31,7 +31,9 @@ 
 		$args->skin = Context::get('skin');
 		$args->target = Context::get('target');
 		$args->target_module_srl = Context::get('target_module_srl');
-		if(!$args->target_module_srl) $args->target_module_srl = '';
+		if(!$args->target_module_srl) {
+			$args->target_module_srl = '';
+		}
 		$args->skin_vars = $config->skin_vars;
 
 		$oModuleController = getController('module');
@@ -67,7 +69,9 @@ 
 		{
 			foreach($skin_info->extra_vars as $vars)
 			{
-				if($vars->type!='image') continue;
+				if($vars->type!='image') {
+					continue;
+				}
 
 				$image_obj = $obj->{$vars->name};
 				// Get a variable on a request to delete
@@ -99,7 +103,9 @@ 
 				// Upload the file to a path
 				$path = sprintf("./files/attach/images/%s/", $module_srl);
 				// Create a directory
-				if(!FileHandler::makeDir($path)) return false;
+				if(!FileHandler::makeDir($path)) {
+					return false;
+				}
 
 				$filename = $path.$image_obj['name'];
 				// Move the file

Spacing +12 added lines, -12 removed lines

@@ -31,11 +31,11 @@ 
 		$args->skin = Context::get('skin');
 		$args->target = Context::get('target');
 		$args->target_module_srl = Context::get('target_module_srl');
-		if(!$args->target_module_srl) $args->target_module_srl = '';
+		if (!$args->target_module_srl) $args->target_module_srl = '';
 		$args->skin_vars = $config->skin_vars;
 
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('integration_search',$args);
+		$output = $oModuleController->insertModuleConfig('integration_search', $args);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent');
 		return $this->setRedirectUrl($returnUrl, $output);
@@ -63,35 +63,35 @@ 
 		unset($obj->module_srl);
 		unset($obj->page);
 		// Separately handle if the extra_vars is an image type in the original skin_info
-		if($skin_info->extra_vars)
+		if ($skin_info->extra_vars)
 		{
-			foreach($skin_info->extra_vars as $vars)
+			foreach ($skin_info->extra_vars as $vars)
 			{
-				if($vars->type!='image') continue;
+				if ($vars->type != 'image') continue;
 
 				$image_obj = $obj->{$vars->name};
 				// Get a variable on a request to delete
 				$del_var = $obj->{"del_".$vars->name};
 				unset($obj->{"del_".$vars->name});
-				if($del_var == 'Y')
+				if ($del_var == 'Y')
 				{
 					FileHandler::removeFile($module_info->{$vars->name});
 					continue;
 				}
 				// Use the previous data if not uploaded
-				if(!$image_obj['tmp_name'])
+				if (!$image_obj['tmp_name'])
 				{
 					$obj->{$vars->name} = $module_info->{$vars->name};
 					continue;
 				}
 				// Ignore if the file is not successfully uploaded, and check uploaded file
-				if(!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
+				if (!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
 				{
 					unset($obj->{$vars->name});
 					continue;
 				}
 				// Ignore if the file is not an image
-				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
+				if (!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
 				{
 					unset($obj->{$vars->name});
 					continue;
@@ -99,11 +99,11 @@ 
 				// Upload the file to a path
 				$path = sprintf("./files/attach/images/%s/", $module_srl);
 				// Create a directory
-				if(!FileHandler::makeDir($path)) return false;
+				if (!FileHandler::makeDir($path)) return false;
 
 				$filename = $path.$image_obj['name'];
 				// Move the file
-				if(!move_uploaded_file($image_obj['tmp_name'], $filename))
+				if (!move_uploaded_file($image_obj['tmp_name'], $filename))
 				{
 					unset($obj->{$vars->name});
 					continue;
@@ -117,7 +117,7 @@ 
 		$args->skin_vars = serialize($obj);
 
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('integration_search',$args);
+		$output = $oModuleController->insertModuleConfig('integration_search', $args);
 
 		$this->setMessage('success_updated', 'info');
 

modules/integration_search/integration_search.admin.view.php

Braces +3 added lines, -1 removed lines

@@ -86,7 +86,9 @@
 				$name = $val->name;
 				$type = $val->type;
 				$value = $skin_vars->{$name};
-				if($type=="checkbox"&&!$value) $value = array();
+				if($type=="checkbox"&&!$value) {
+					$value = array();
+				}
 				$skin_info->extra_vars[$key]->value= $value;
 			}
 		}

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
 		// Get configurations (using module model object)
 		$oModuleModel = getModel('module');
 		$this->config = $oModuleModel->getModuleConfig('integration_search');
-		Context::set('config',$this->config);
+		Context::set('config', $this->config);
 
 		$this->setTemplatePath($this->module_path."/tpl/");
 	}
@@ -39,7 +39,7 @@ 
 		// Get a list of skins(themes)
 		$oModuleModel = getModel('module');
 		$skin_list = $oModuleModel->getSkins($this->module_path);
-		Context::set('skin_list',$skin_list);
+		Context::set('skin_list', $skin_list);
 		// Get a list of module categories
 		$module_categories = $oModuleModel->getModuleCategories();
 		// Generated mid Wanted list
@@ -63,7 +63,7 @@ 
 		$security->encodeHTML('skin_list..title');
 
 		// Sample Code
-		Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword"  value="{$is_keyword}" /><input class="btn" type="submit" value="{$lang->cmd_search}" /></form>', ENT_COMPAT | ENT_HTML401, 'UTF-8', false) );
+		Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword"  value="{$is_keyword}" /><input class="btn" type="submit" value="{$lang->cmd_search}" /></form>', ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 
 		$this->setTemplateFile("index");
 	}
@@ -79,15 +79,15 @@ 
 		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $this->config->skin);
 		$skin_vars = unserialize($this->config->skin_vars);
 		// value for skin_info extra_vars
-		if(count($skin_info->extra_vars))
+		if (count($skin_info->extra_vars))
 		{
-			foreach($skin_info->extra_vars as $key => $val)
+			foreach ($skin_info->extra_vars as $key => $val)
 			{
 				$name = $val->name;
 				$type = $val->type;
 				$value = $skin_vars->{$name};
-				if($type=="checkbox"&&!$value) $value = array();
-				$skin_info->extra_vars[$key]->value= $value;
+				if ($type == "checkbox" && !$value) $value = array();
+				$skin_info->extra_vars[$key]->value = $value;
 			}
 		}
 		Context::set('skin_info', $skin_info);

modules/member/member.admin.controller.php

Indentation +1 added lines, -1 removed lines

@@ -1284,7 +1284,7 @@
 	/**
 	 * Delete cached group data
 	 * @return void
-	*/
+	 */
 	function _deleteMemberGroupCache($site_srl = 0)
 	{
 		//remove from cache

Doc Comments +5 added lines, -2 removed lines

@@ -777,7 +777,7 @@ 
 	/**
 	 * Move up/down the member join form and modify it
 	 * @deprecated
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procMemberAdminUpdateJoinForm()
 	{
@@ -1114,7 +1114,7 @@ 
 
 	/**
 	 * Insert a group
-	 * @param object $args
+	 * @param null|stdClass $args
 	 * @return BaseObject
 	 */
 	function insertGroup($args)
@@ -1311,6 +1311,9 @@ 
 		return executeQuery('member.insertDeniedID', $args);
 	}
 
+	/**
+	 * @param string $nick_name
+	 */
 	function insertDeniedNickName($nick_name, $description = '')
 	{
 		$args = new stdClass();

Braces +166 added lines, -87 removed lines

@@ -48,9 +48,11 @@ 
 			$args->{$val} = Context::get($val);
 		}
 		$args->member_srl = Context::get('member_srl');
-		if(Context::get('reset_password'))
-			$args->password = Context::get('reset_password');
-		else unset($args->password);
+		if(Context::get('reset_password')) {
+					$args->password = Context::get('reset_password');
+		} else {
+			unset($args->password);
+		}
 
 		// Remove some unnecessary variables from all the vars
 		$all_args = Context::getRequestVars();
@@ -60,7 +62,9 @@ 
 		unset($all_args->error_return_url);
 		unset($all_args->success_return_url);
 		unset($all_args->ruleset);
-		if(!isset($args->limit_date)) $args->limit_date = "";
+		if(!isset($args->limit_date)) {
+			$args->limit_date = "";
+		}
 		unset($all_args->password);
 		unset($all_args->password2);
 		unset($all_args->reset_password);
@@ -76,7 +80,9 @@ 
 			$columnList = array('member_srl');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
 			// If no original member exists, make a new one
-			if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
+			if($member_info->member_srl != $args->member_srl) {
+				unset($args->member_srl);
+			}
 		}
 
 		// remove whitespace
@@ -96,14 +102,15 @@ 
 			$args->password = Context::get('password');
 			$output = $oMemberController->insertMember($args);
 			$msg_code = 'success_registed';
-		}
-		else
+		} else
 		{
 			$output = $oMemberController->updateMember($args);
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Save Signature
 		$signature = Context::get('signature');
 		$oMemberController->putSignature($args->member_srl, $signature);
@@ -115,21 +122,27 @@ 
 		if(is_uploaded_file($profile_image['tmp_name']))
 		{
 			$output = $oMemberController->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$image_mark = $_FILES['image_mark'];
 		if(is_uploaded_file($image_mark['tmp_name']))
 		{
 			$output = $oMemberController->insertImageMark($args->member_srl, $image_mark['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$image_name = $_FILES['image_name'];
 		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$output = $oMemberController->insertImageName($args->member_srl, $image_name['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
@@ -147,7 +160,9 @@ 
 
 		$oMemberController = getController('member');
 		$output = $oMemberController->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('page',Context::get('page'));
 		$this->setMessage("success_deleted");
@@ -452,10 +467,11 @@ 
 				$signupItem->max_width = $config->{$key.'_max_width'};
 				$signupItem->max_height = $config->{$key.'_max_height'};
 			}
-			if($signupItem->isIdentifier)
-				array_unshift($list_order, $signupItem);
-			else
-				$list_order[] = $signupItem;
+			if($signupItem->isIdentifier) {
+							array_unshift($list_order, $signupItem);
+			} else {
+							$list_order[] = $signupItem;
+			}
 		}
 		if(is_array($extendItems))
 		{
@@ -512,38 +528,30 @@ 
 				if($formInfo->type == 'tel' || $formInfo->type == 'kr_zip')
 				{
 					$fields[] = sprintf('<field name="%s[]" required="true" />', $formInfo->name);
-				}
-				else if($formInfo->name == 'password')
+				} else if($formInfo->name == 'password')
 				{
 					$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="4:60" /></field>';
 					$fields[] = '<field name="password2"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="equalto" value="password" /></field>';
-				}
-				else if($formInfo->name == 'find_account_question')
+				} else if($formInfo->name == 'find_account_question')
 				{
 					$fields[] = '<field name="find_account_question"><if test="$modify_find_account_answer" attr="required" value="true" /></field>';
 					$fields[] = '<field name="find_account_answer" length=":250"><if test="$modify_find_account_answer" attr="required" value="true" /></field>';
-				}
-				else if($formInfo->name == 'email_address')
+				} else if($formInfo->name == 'email_address')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" rule="email"/>', $formInfo->name);
-				}
-				else if($formInfo->name == 'user_id')
+				} else if($formInfo->name == 'user_id')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" rule="userid" length="3:20" />', $formInfo->name);
-				}
-				else if($formInfo->name == 'nick_name')
+				} else if($formInfo->name == 'nick_name')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" length="2:20" />', $formInfo->name);
-				}
-				else if(strpos($formInfo->name, 'image') !== false)
+				} else if(strpos($formInfo->name, 'image') !== false)
 				{
 					$fields[] = sprintf('<field name="%s"><if test="$act != \'procMemberAdminInsert\' &amp;&amp; $__%s_exist != \'true\'" attr="required" value="true" /></field>', $formInfo->name, $formInfo->name);
-				}
-				else if($formInfo->name == 'signature')
+				} else if($formInfo->name == 'signature')
 				{
 					$fields[] = '<field name="signature"><if test="$member_srl" attr="required" value="true" /></field>';
-				}
-				else
+				} else
 				{
 					$fields[] = sprintf('<field name="%s" required="true" />', $formInfo->name);
 				}
@@ -603,8 +611,9 @@ 
 			'</ruleset>';
 
 		$fields = array();
-		if($identifier == 'user_id')
-			$fields[] = '<field name="user_id" required="true" rule="userid" />';
+		if($identifier == 'user_id') {
+					$fields[] = '<field name="user_id" required="true" rule="userid" />';
+		}
 
 		$fields[] = '<field name="email_address" required="true" rule="email" />';
 		$fields[] = '<field name="find_account_question" required="true" />';
@@ -626,7 +635,9 @@ 
 	{
 		$args = Context::gets('title','description','is_default','image_mark');
 		$output = $this->insertGroup($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('group_srl','');
 		$this->add('page',Context::get('page'));
@@ -647,7 +658,9 @@ 
 		$args = Context::gets('group_srl','title','description','is_default','image_mark');
 		$args->site_srl = 0;
 		$output = $this->updateGroup($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('group_srl','');
 		$this->add('page',Context::get('page'));
@@ -666,7 +679,9 @@ 
 		$group_srl = Context::get('group_srl');
 
 		$output = $this->deleteGroup($group_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('group_srl','');
 		$this->add('page',Context::get('page'));
@@ -691,14 +706,15 @@ 
 		$args->default_value = explode("\n", str_replace("\r", '', Context::get('default_value')));
 		$args->required = Context::get('required');
 		$args->is_active = (isset($args->required));
-		if(!in_array(strtoupper($args->required), array('Y','N')))$args->required = 'N';
+		if(!in_array(strtoupper($args->required), array('Y','N'))) {
+			$args->required = 'N';
+		}
 		$args->description = Context::get('description') ? Context::get('description') : '';
 		// Default values
 		if(in_array($args->column_type, array('checkbox','select','radio')) && count($args->default_value))
 		{
 			$args->default_value = serialize($args->default_value);
-		}
-		else
+		} else
 		{
 			$args->default_value = '';
 		}
@@ -710,7 +726,9 @@ 
 		{
 			if($item->name == $args->column_name)
 			{
-				if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
+				if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) {
+					continue;
+				}
 				return new BaseObject(-1,'msg_exists_user_id');
 			}
 		}
@@ -721,13 +739,14 @@ 
 			$isInsert = true;
 			$args->list_order = $args->member_join_form_srl = getNextSequence();
 			$output = executeQuery('member.insertJoinForm', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('member.updateJoinForm', $args);
 		}
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// memberConfig update
 		$signupItem = new stdClass();
@@ -747,8 +766,7 @@ 
 		if($isInsert)
 		{
 			$config->signupForm[] = $signupItem;
-		}
-		else
+		} else
 		{
 			foreach($config->signupForm as $key=>$val)
 			{
@@ -819,7 +837,9 @@ 
 			case 'update' :
 				break;
 		}
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage($msg_code);
 	}
@@ -922,7 +942,9 @@ 
 	function procMemberAdminDeleteMembers()
 	{
 		$target_member_srls = Context::get('target_member_srls');
-		if(!$target_member_srls) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$target_member_srls) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		$member_srls = explode(',', $target_member_srls);
 		$oMemberController = getController('member');
 
@@ -946,12 +968,17 @@ 
 	function procMemberAdminUpdateMembersGroup()
 	{
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$member_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		$member_srls = explode(',',$member_srl);
 
 		$group_srl = Context::get('group_srls');
-		if(!is_array($group_srl)) $group_srls = explode('|@|', $group_srl);
-		else $group_srls = $group_srl;
+		if(!is_array($group_srl)) {
+			$group_srls = explode('|@|', $group_srl);
+		} else {
+			$group_srls = $group_srl;
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -970,11 +997,15 @@ 
 		for($j=0;$j<$group_count;$j++)
 		{
 			$group_srl = (int)trim($group_srls[$j]);
-			if(!$group_srl) continue;
+			if(!$group_srl) {
+				continue;
+			}
 			for($i=0;$i<$member_count;$i++)
 			{
 				$member_srl = (int)trim($member_srls[$i]);
-				if(!$member_srl) continue;
+				if(!$member_srl) {
+					continue;
+				}
 
 				$args = new stdClass;
 				$args->member_srl = $member_srl;
@@ -1021,10 +1052,14 @@ 
 		foreach($user_ids as $val)
 		{
 			$val = trim($val);
-			if(!$val) continue;
+			if(!$val) {
+				continue;
+			}
 
 			$output = $this->insertDeniedID($val, '');
-			if($output->toBool()) $success_ids[] = $val;
+			if($output->toBool()) {
+				$success_ids[] = $val;
+			}
 		}
 
 		$this->add('user_ids', implode(',',$success_ids));
@@ -1053,8 +1088,7 @@ 
 			}
 			$msg_code = 'success_deleted';
 			$this->setMessage($msg_code);
-		}
-		else
+		} else
 		{
 			$nick_names = explode(',',$nick_name);
 			$success_nick_names = array();
@@ -1062,10 +1096,14 @@ 
 			foreach($nick_names as $val)
 			{
 				$val = trim($val);
-				if(!$val) continue;
+				if(!$val) {
+					continue;
+				}
 
 				$output = $this->insertDeniedNickName($val, '');
-				if($output->toBool()) $success_nick_names[] = $val;
+				if($output->toBool()) {
+					$success_nick_names[] = $val;
+				}
 			}
 
 			$this->add('nick_names', implode(',',$success_nick_names));
@@ -1085,7 +1123,9 @@ 
 		{
 			case 'delete' :
 				$output = $this->deleteDeniedID($user_id);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 				$msg_code = 'success_deleted';
 				break;
 		}
@@ -1137,16 +1177,19 @@ 
 	 */
 	function insertGroup($args)
 	{
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 		// Check the value of is_default.
 		if($args->is_default != 'Y')
 		{
 			$args->is_default = 'N';
-		}
-		else
+		} else
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		if(!isset($args->list_order) || $args->list_order=='')
@@ -1154,7 +1197,9 @@ 
 			$args->list_order = $args->group_srl;
 		}
 
-		if(!$args->group_srl) $args->group_srl = getNextSequence();
+		if(!$args->group_srl) {
+			$args->group_srl = getNextSequence();
+		}
 		$args->list_order = $args->group_srl;
 		$output = executeQuery('member.insertGroup', $args);
 		$this->_deleteMemberGroupCache($args->site_srl);
@@ -1169,17 +1214,22 @@ 
 	 */
 	function updateGroup($args)
 	{
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 		// Check the value of is_default.
-		if(!$args->group_srl) return new BaseObject(-1, 'lang->msg_not_founded');
+		if(!$args->group_srl) {
+			return new BaseObject(-1, 'lang->msg_not_founded');
+		}
 		if($args->is_default!='Y')
 		{
 			$args->is_default = 'N';
-		}
-		else
+		} else
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$output = executeQuery('member.updateGroup', $args);
@@ -1202,8 +1252,12 @@ 
 		$columnList = array('group_srl', 'is_default');
 		$group_info = $oMemberModel->getGroup($group_srl, $columnList);
 
-		if(!$group_info) return new BaseObject(-1, 'lang->msg_not_founded');
-		if($group_info->is_default == 'Y') return new BaseObject(-1, 'msg_not_delete_default');
+		if(!$group_info) {
+			return new BaseObject(-1, 'lang->msg_not_founded');
+		}
+		if($group_info->is_default == 'Y') {
+			return new BaseObject(-1, 'msg_not_delete_default');
+		}
 
 		// Get groups where is_default == 'Y'
 		$columnList = array('site_srl', 'group_srl');
@@ -1249,13 +1303,14 @@ 
 			$update_args->image_mark = $vars->image_marks[$order];
 			$update_args->list_order = $order + 1;
 
-			if(!$update_args->title) continue;
+			if(!$update_args->title) {
+				continue;
+			}
 
 			if(is_numeric($group_srl)) {
 				$update_args->group_srl = $group_srl;
 				$output = $this->updateGroup($update_args);
-			}
-			else {
+			} else {
 				$update_args->group_srl = getNextSequence();
 				$output = $this->insertGroup($update_args);
 			}
@@ -1345,7 +1400,9 @@ 
 	 */
 	function deleteDeniedID($user_id)
 	{
-		if(!$user_id) unset($user_id);
+		if(!$user_id) {
+			unset($user_id);
+		}
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
@@ -1359,7 +1416,9 @@ 
 	 */
 	function deleteDeniedNickName($nick_name)
 	{
-		if(!$nick_name) unset($nick_name);
+		if(!$nick_name) {
+			unset($nick_name);
+		}
 
 		$args = new stdClass;
 		$args->nick_name = $nick_name;
@@ -1398,16 +1457,22 @@ 
 		// Get a list of all join forms
 		$join_form_list = $oMemberModel->getJoinFormList();
 		$join_form_srl_list = array_keys($join_form_list);
-		if(count($join_form_srl_list)<2) return new BaseObject();
+		if(count($join_form_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		$prev_member_join_form = NULL;
 		foreach($join_form_list as $key => $val)
 		{
-			if($val->member_join_form_srl == $member_join_form_srl) break;
+			if($val->member_join_form_srl == $member_join_form_srl) {
+				break;
+			}
 			$prev_member_join_form = $val;
 		}
 		// Return if no previous join form exists
-		if(!$prev_member_join_form) return new BaseObject();
+		if(!$prev_member_join_form) {
+			return new BaseObject();
+		}
 		// Information of the join form
 		$cur_args = new stdClass;
 		$cur_args->member_join_form_srl = $member_join_form_srl;
@@ -1418,10 +1483,14 @@ 
 		$prev_args->list_order = $list_order;
 		// Execute Query
 		$output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		executeQuery('member.updateMemberJoinFormListorder', $prev_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject();
 	}
@@ -1445,16 +1514,22 @@ 
 		// Get information of all join forms
 		$join_form_list = $oMemberModel->getJoinFormList();
 		$join_form_srl_list = array_keys($join_form_list);
-		if(count($join_form_srl_list)<2) return new BaseObject();
+		if(count($join_form_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		for($i=0;$i<count($join_form_srl_list);$i++)
 		{
-			if($join_form_srl_list[$i]==$member_join_form_srl) break;
+			if($join_form_srl_list[$i]==$member_join_form_srl) {
+				break;
+			}
 		}
 
 		$next_member_join_form_srl = $join_form_srl_list[$i+1];
 		// Return if no previous join form exists
-		if(!$next_member_join_form_srl) return new BaseObject();
+		if(!$next_member_join_form_srl) {
+			return new BaseObject();
+		}
 		$next_member_join_form = $join_form_list[$next_member_join_form_srl];
 		// Information of the join form
 		$cur_args = new stdClass;
@@ -1466,10 +1541,14 @@ 
 		$next_args->list_order = $list_order;
 		// Execute Query
 		$output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('member.updateMemberJoinFormListorder', $next_args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject();
 	}

Spacing +177 added lines, -177 removed lines

@@ -24,31 +24,31 @@ 
 		// if(Context::getRequestMethod() == "GET") return new BaseObject(-1, "msg_invalid_request");
 		// Extract the necessary information in advance
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' || !checkCSRF())
+		if ($logged_info->is_admin != 'Y' || !checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
-		$oMemberModel = &getModel ('member');
-		$config = $oMemberModel->getMemberConfig ();
+		$args = Context::gets('member_srl', 'email_address', 'find_account_answer', 'allow_mailing', 'allow_message', 'denied', 'is_admin', 'description', 'group_srl_list', 'limit_date');
+		$oMemberModel = &getModel('member');
+		$config = $oMemberModel->getMemberConfig();
 		$getVars = array();
-		if($config->signupForm)
+		if ($config->signupForm)
 		{
-			foreach($config->signupForm as $formInfo)
+			foreach ($config->signupForm as $formInfo)
 			{
-				if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
+				if ($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
 				{
 					$getVars[] = $formInfo->name;
 				}
 			}
 		}
-		foreach($getVars as $val)
+		foreach ($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
 		}
 		$args->member_srl = Context::get('member_srl');
-		if(Context::get('reset_password'))
+		if (Context::get('reset_password'))
 			$args->password = Context::get('reset_password');
 		else unset($args->password);
 
@@ -60,7 +60,7 @@ 
 		unset($all_args->error_return_url);
 		unset($all_args->success_return_url);
 		unset($all_args->ruleset);
-		if(!isset($args->limit_date)) $args->limit_date = "";
+		if (!isset($args->limit_date)) $args->limit_date = "";
 		unset($all_args->password);
 		unset($all_args->password2);
 		unset($all_args->reset_password);
@@ -68,7 +68,7 @@ 
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
 		// Check if an original member exists having the member_srl
-		if($args->member_srl)
+		if ($args->member_srl)
 		{
 			// Create a member model object
 			$oMemberModel = getModel('member');
@@ -76,14 +76,14 @@ 
 			$columnList = array('member_srl');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
 			// If no original member exists, make a new one
-			if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
+			if ($member_info->member_srl != $args->member_srl) unset($args->member_srl);
 		}
 
 		// remove whitespace
 		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach ($checkInfos as $val)
 		{
-			if(isset($args->{$val}))
+			if (isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', html_entity_decode($args->{$val}));
 			}
@@ -91,7 +91,7 @@ 
 
 		$oMemberController = getController('member');
 		// Execute insert or update depending on the value of member_srl
-		if(!$args->member_srl)
+		if (!$args->member_srl)
 		{
 			$args->password = Context::get('password');
 			$output = $oMemberController->insertMember($args);
@@ -103,7 +103,7 @@ 
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Save Signature
 		$signature = Context::get('signature');
 		$oMemberController->putSignature($args->member_srl, $signature);
@@ -112,24 +112,24 @@ 
 		$this->setMessage($msg_code);
 
 		$profile_image = $_FILES['profile_image'];
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$output = $oMemberController->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$image_mark = $_FILES['image_mark'];
-		if(is_uploaded_file($image_mark['tmp_name']))
+		if (is_uploaded_file($image_mark['tmp_name']))
 		{
 			$output = $oMemberController->insertImageMark($args->member_srl, $image_mark['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$image_name = $_FILES['image_name'];
 		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$output = $oMemberController->insertImageName($args->member_srl, $image_name['tmp_name']);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
@@ -147,9 +147,9 @@ 
 
 		$oMemberController = getController('member');
 		$output = $oMemberController->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('page',Context::get('page'));
+		$this->add('page', Context::get('page'));
 		$this->setMessage("success_deleted");
 	}
 
@@ -168,26 +168,26 @@ 
 		);
 		
 		$oPassword = new Password();
-		if(!array_key_exists($args->password_hashing_algorithm, $oPassword->getSupportedAlgorithms()))
+		if (!array_key_exists($args->password_hashing_algorithm, $oPassword->getSupportedAlgorithms()))
 		{
 			$args->password_hashing_algorithm = 'md5';
 		}
 		
 		$args->password_hashing_work_factor = intval($args->password_hashing_work_factor, 10);
-		if($args->password_hashing_work_factor < 4)
+		if ($args->password_hashing_work_factor < 4)
 		{
 			$args->password_hashing_work_factor = 4;
 		}
-		if($args->password_hashing_work_factor > 16)
+		if ($args->password_hashing_work_factor > 16)
 		{
 			$args->password_hashing_work_factor = 16;
 		}
-		if($args->password_hashing_auto_upgrade != 'Y')
+		if ($args->password_hashing_auto_upgrade != 'Y')
 		{
 			$args->password_hashing_auto_upgrade = 'N';
 		}
 
-		if((!$args->webmaster_name || !$args->webmaster_email) && $args->enable_confirm == 'Y')
+		if ((!$args->webmaster_name || !$args->webmaster_email) && $args->enable_confirm == 'Y')
 		{
 			return new BaseObject(-1, 'msg_mail_authorization');
 		}
@@ -222,20 +222,20 @@ 
 		$usable_list = Context::get('usable_list');
 		$all_args = Context::getRequestVars();
 
-		$args->limit_day = (int)$args->limit_day;
-		if(!trim(strip_tags($args->agreement)))
+		$args->limit_day = (int) $args->limit_day;
+		if (!trim(strip_tags($args->agreement)))
 		{
-			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
 			FileHandler::removeFile($agreement_file);
 			$args->agreement = NULL;
 		}
 
-		if($args->redirect_url)
+		if ($args->redirect_url)
 		{
 			$oModuleModel = getModel('module');
 			$redirectModuleInfo = $oModuleModel->getModuleInfoByModuleSrl($args->redirect_url, array('mid'));
 
-			if(!$redirectModuleInfo)
+			if (!$redirectModuleInfo)
 			{
 				return new BaseObject('-1', 'msg_exist_selected_module');
 			}
@@ -274,7 +274,7 @@ 
 		$mustRequireds = array('email_address', 'nick_name', 'password', 'find_account_question');
 		$extendItems = $oMemberModel->getJoinFormList();
 
-		foreach($list_order as $key)
+		foreach ($list_order as $key)
 		{
 			$signupItem = new stdClass();
 			$signupItem->isIdentifier = ($key == $all_args->identifier);
@@ -287,7 +287,7 @@ 
 			$signupItem->isUse = in_array($key, $usable_list) || $signupItem->required;
 			$signupItem->isPublic = ($all_args->{'is_'.$key.'_public'} == 'Y' && $signupItem->isUse) ? 'Y' : 'N';
 
-			if($signupItem->imageType)
+			if ($signupItem->imageType)
 			{
 				$signupItem->max_width = $all_args->{$key.'_max_width'};
 				$signupItem->max_height = $all_args->{$key.'_max_height'};
@@ -296,7 +296,7 @@ 
 			}
 
 			// set extends form
-			if(!$signupItem->isDefaultForm)
+			if (!$signupItem->isDefaultForm)
 			{
 				$extendItem = $extendItems[$all_args->{$key.'_member_join_form_srl'}];
 				$signupItem->type = $extendItem->column_type;
@@ -305,13 +305,13 @@ 
 				$signupItem->description = $extendItem->description;
 
 				// check usable value change, required/option
-				if($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y'))
+				if ($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y'))
 				{
 					unset($update_args);
 					$update_args = new stdClass;
 					$update_args->member_join_form_srl = $extendItem->member_join_form_srl;
-					$update_args->is_active = $signupItem->isUse?'Y':'N';
-					$update_args->required = $signupItem->required?'Y':'N';
+					$update_args->is_active = $signupItem->isUse ? 'Y' : 'N';
+					$update_args->required = $signupItem->required ? 'Y' : 'N';
 
 					$update_output = executeQuery('member.updateJoinForm', $update_args);
 				}
@@ -328,9 +328,9 @@ 
 		$this->_createFindAccountByQuestion($args->identifier);
 
 		// check agreement value exist
-		if($args->agreement)
+		if ($args->agreement)
 		{
-			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
 			$output = FileHandler::writeFile($agreement_file, $args->agreement);
 
 			unset($args->agreement);
@@ -358,16 +358,16 @@ 
 			'after_logout_url'
 		);
 
-		if(!$args->change_password_date)
+		if (!$args->change_password_date)
 		{
 			$args->change_password_date = 0;
 		}
 
-		if(!trim(strip_tags($args->after_login_url)))
+		if (!trim(strip_tags($args->after_login_url)))
 		{
 			$args->after_login_url = NULL;
 		}
-		if(!trim(strip_tags($args->after_logout_url)))
+		if (!trim(strip_tags($args->after_logout_url)))
 		{
 			$args->after_logout_url = NULL;
 		}
@@ -394,17 +394,17 @@ 
 		);
 
 		$args->layout_srl = $args->layout_srl ? $args->layout_srl : NULL;
-		if(!$args->skin)
+		if (!$args->skin)
 		{
 			$args->skin = 'default';
 		}
-		if(!$args->colorset)
+		if (!$args->colorset)
 		{
 			$args->colorset = 'white';
 		}
 
 		$args->mlayout_srl = $args->mlayout_srl ? $args->mlayout_srl : NULL;
-		if(!$args->mskin)
+		if (!$args->mskin)
 		{
 			$args->mskin = 'default';
 		}
@@ -427,12 +427,12 @@ 
 		$extendItems = $oMemberModel->getJoinFormList();
 
 		$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
-		$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
+		$mustRequireds = array('email_address', 'nick_name', 'password', 'find_account_question');
 		$orgRequireds = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name');
 		$orgUse = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name', 'homepage', 'blog', 'birthday');
 		$list_order = array();
 
-		foreach($items as $key)
+		foreach ($items as $key)
 		{
 			unset($signupItem);
 			$signupItem = new stdClass;
@@ -444,23 +444,23 @@ 
 			$signupItem->required = in_array($key, $orgRequireds);
 			$signupItem->isUse = ($config->{$key} == 'Y') || in_array($key, $orgUse);
 			$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
-			if(in_array($key, array('find_account_question', 'password', 'email_address')))
+			if (in_array($key, array('find_account_question', 'password', 'email_address')))
 			{
 				$signupItem->isPublic = 'N';
 			}
 			$signupItem->isIdentifier = ($key == $identifier);
-			if ($signupItem->imageType){
+			if ($signupItem->imageType) {
 				$signupItem->max_width = $config->{$key.'_max_width'};
 				$signupItem->max_height = $config->{$key.'_max_height'};
 			}
-			if($signupItem->isIdentifier)
+			if ($signupItem->isIdentifier)
 				array_unshift($list_order, $signupItem);
 			else
 				$list_order[] = $signupItem;
 		}
-		if(is_array($extendItems))
+		if (is_array($extendItems))
 		{
-			foreach($extendItems as $form_srl=>$item_info)
+			foreach ($extendItems as $form_srl=>$item_info)
 			{
 				unset($signupItem);
 				$signupItem = new stdClass;
@@ -473,7 +473,7 @@ 
 				$signupItem->isUse = ($item_info->is_active == 'Y');
 				$signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N';
 				$signupItem->description = $item_info->description;
-				if($signupItem->imageType)
+				if ($signupItem->imageType)
 				{
 					$signupItem->max_width = $config->{$key.'_max_width'};
 					$signupItem->max_height = $config->{$key.'_max_height'};
@@ -491,13 +491,13 @@ 
 	 * @param string $agreement
 	 * @return void
 	 */
-	function _createSignupRuleset($signupForm, $agreement = null){
+	function _createSignupRuleset($signupForm, $agreement = null) {
 		$xml_file = './files/ruleset/insertMember.xml';
-		$buff = '<?xml version="1.0" encoding="utf-8"?>' . PHP_EOL.
-			'<ruleset version="1.5.0">' . PHP_EOL.
-			'<customrules>' . PHP_EOL.
-			'</customrules>' . PHP_EOL.
-			'<fields>' . PHP_EOL . '%s' . PHP_EOL . '</fields>' . PHP_EOL.
+		$buff = '<?xml version="1.0" encoding="utf-8"?>'.PHP_EOL.
+			'<ruleset version="1.5.0">'.PHP_EOL.
+			'<customrules>'.PHP_EOL.
+			'</customrules>'.PHP_EOL.
+			'<fields>'.PHP_EOL.'%s'.PHP_EOL.'</fields>'.PHP_EOL.
 			'</ruleset>';
 
 		$fields = array();
@@ -506,41 +506,41 @@ 
 		{
 			$fields[] = '<field name="accept_agreement"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /></field>';
 		}
-		foreach($signupForm as $formInfo)
+		foreach ($signupForm as $formInfo)
 		{
-			if($formInfo->required || $formInfo->mustRequired)
+			if ($formInfo->required || $formInfo->mustRequired)
 			{
-				if($formInfo->type == 'tel' || $formInfo->type == 'kr_zip')
+				if ($formInfo->type == 'tel' || $formInfo->type == 'kr_zip')
 				{
 					$fields[] = sprintf('<field name="%s[]" required="true" />', $formInfo->name);
 				}
-				else if($formInfo->name == 'password')
+				else if ($formInfo->name == 'password')
 				{
 					$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="4:60" /></field>';
 					$fields[] = '<field name="password2"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="equalto" value="password" /></field>';
 				}
-				else if($formInfo->name == 'find_account_question')
+				else if ($formInfo->name == 'find_account_question')
 				{
 					$fields[] = '<field name="find_account_question"><if test="$modify_find_account_answer" attr="required" value="true" /></field>';
 					$fields[] = '<field name="find_account_answer" length=":250"><if test="$modify_find_account_answer" attr="required" value="true" /></field>';
 				}
-				else if($formInfo->name == 'email_address')
+				else if ($formInfo->name == 'email_address')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" rule="email"/>', $formInfo->name);
 				}
-				else if($formInfo->name == 'user_id')
+				else if ($formInfo->name == 'user_id')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" rule="userid" length="3:20" />', $formInfo->name);
 				}
-				else if($formInfo->name == 'nick_name')
+				else if ($formInfo->name == 'nick_name')
 				{
 					$fields[] = sprintf('<field name="%s" required="true" length="2:20" />', $formInfo->name);
 				}
-				else if(strpos($formInfo->name, 'image') !== false)
+				else if (strpos($formInfo->name, 'image') !== false)
 				{
 					$fields[] = sprintf('<field name="%s"><if test="$act != \'procMemberAdminInsert\' &amp;&amp; $__%s_exist != \'true\'" attr="required" value="true" /></field>', $formInfo->name, $formInfo->name);
 				}
-				else if($formInfo->name == 'signature')
+				else if ($formInfo->name == 'signature')
 				{
 					$fields[] = '<field name="signature"><if test="$member_srl" attr="required" value="true" /></field>';
 				}
@@ -555,7 +555,7 @@ 
 		FileHandler::writeFile($xml_file, $xml_buff);
 		unset($xml_buff);
 
-		$validator   = new Validator($xml_file);
+		$validator = new Validator($xml_file);
 		$validator->setCacheDir('files/cache');
 		$validator->getJsPath();
 	}
@@ -583,7 +583,7 @@ 
 		$xml_buff = sprintf($buff, implode('', $fields));
 		Filehandler::writeFile($xml_file, $xml_buff);
 
-		$validator   = new Validator($xml_file);
+		$validator = new Validator($xml_file);
 		$validator->setCacheDir('files/cache');
 		$validator->getJsPath();
 	}
@@ -604,7 +604,7 @@ 
 			'</ruleset>';
 
 		$fields = array();
-		if($identifier == 'user_id')
+		if ($identifier == 'user_id')
 			$fields[] = '<field name="user_id" required="true" rule="userid" />';
 
 		$fields[] = '<field name="email_address" required="true" rule="email" />';
@@ -614,7 +614,7 @@ 
 		$xml_buff = sprintf($buff, implode('', $fields));
 		Filehandler::writeFile($xml_file, $xml_buff);
 
-		$validator   = new Validator($xml_file);
+		$validator = new Validator($xml_file);
 		$validator->setCacheDir('files/cache');
 		$validator->getJsPath();
 	}
@@ -625,12 +625,12 @@ 
 	 */
 	function procMemberAdminInsertGroup()
 	{
-		$args = Context::gets('title','description','is_default','image_mark');
+		$args = Context::gets('title', 'description', 'is_default', 'image_mark');
 		$output = $this->insertGroup($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('group_srl','');
-		$this->add('page',Context::get('page'));
+		$this->add('group_srl', '');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_registed');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
@@ -645,13 +645,13 @@ 
 	{
 		$group_srl = Context::get('group_srl');
 
-		$args = Context::gets('group_srl','title','description','is_default','image_mark');
+		$args = Context::gets('group_srl', 'title', 'description', 'is_default', 'image_mark');
 		$args->site_srl = 0;
 		$output = $this->updateGroup($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('group_srl','');
-		$this->add('page',Context::get('page'));
+		$this->add('group_srl', '');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_updated');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
@@ -667,10 +667,10 @@ 
 		$group_srl = Context::get('group_srl');
 
 		$output = $this->deleteGroup($group_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('group_srl','');
-		$this->add('page',Context::get('page'));
+		$this->add('group_srl', '');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_deleted');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
@@ -692,10 +692,10 @@ 
 		$args->default_value = explode("\n", str_replace("\r", '', Context::get('default_value')));
 		$args->required = Context::get('required');
 		$args->is_active = (isset($args->required));
-		if(!in_array(strtoupper($args->required), array('Y','N')))$args->required = 'N';
+		if (!in_array(strtoupper($args->required), array('Y', 'N')))$args->required = 'N';
 		$args->description = Context::get('description') ? Context::get('description') : '';
 		// Default values
-		if(in_array($args->column_type, array('checkbox','select','radio')) && count($args->default_value))
+		if (in_array($args->column_type, array('checkbox', 'select', 'radio')) && count($args->default_value))
 		{
 			$args->default_value = serialize($args->default_value);
 		}
@@ -707,17 +707,17 @@ 
 		// Check ID duplicated
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		foreach($config->signupForm as $item)
+		foreach ($config->signupForm as $item)
 		{
-			if($item->name == $args->column_name)
+			if ($item->name == $args->column_name)
 			{
-				if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
-				return new BaseObject(-1,'msg_exists_user_id');
+				if ($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
+				return new BaseObject(-1, 'msg_exists_user_id');
 			}
 		}
 		// Fix if member_join_form_srl exists. Add if not exists.
 		$isInsert;
-		if(!$args->member_join_form_srl)
+		if (!$args->member_join_form_srl)
 		{
 			$isInsert = true;
 			$args->list_order = $args->member_join_form_srl = getNextSequence();
@@ -728,7 +728,7 @@ 
 			$output = executeQuery('member.updateJoinForm', $args);
 		}
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// memberConfig update
 		$signupItem = new stdClass();
@@ -745,15 +745,15 @@ 
 		$config = $oMemberModel->getMemberConfig();
 		unset($config->agreement);
 
-		if($isInsert)
+		if ($isInsert)
 		{
 			$config->signupForm[] = $signupItem;
 		}
 		else
 		{
-			foreach($config->signupForm as $key=>$val)
+			foreach ($config->signupForm as $key=>$val)
 			{
-				if($val->member_join_form_srl == $signupItem->member_join_form_srl)
+				if ($val->member_join_form_srl == $signupItem->member_join_form_srl)
 				{
 					$config->signupForm[$key] = $signupItem;
 				}
@@ -781,9 +781,9 @@ 
 		$config = $oMemberModel->getMemberConfig();
 		unset($config->agreement);
 
-		foreach($config->signupForm as $key=>$val)
+		foreach ($config->signupForm as $key=>$val)
 		{
-			if($val->member_join_form_srl == $member_join_form_srl)
+			if ($val->member_join_form_srl == $member_join_form_srl)
 			{
 				unset($config->signupForm[$key]);
 				break;
@@ -803,7 +803,7 @@ 
 		$member_join_form_srl = Context::get('member_join_form_srl');
 		$mode = Context::get('mode');
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'up' :
 				$output = $this->moveJoinFormUp($member_join_form_srl);
@@ -820,7 +820,7 @@ 
 			case 'update' :
 				break;
 		}
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage($msg_code);
 	}
@@ -839,40 +839,40 @@ 
 		$oDB->begin();
 
 		$oMemberController = getController('member');
-		foreach($members as $key=>$member_srl)
+		foreach ($members as $key=>$member_srl)
 		{
 			$args = new stdClass();
 			$args->member_srl = $member_srl;
-			switch($var->type)
+			switch ($var->type)
 			{
 				case 'modify':
 					{
-						if(count($groups) > 0)
+						if (count($groups) > 0)
 						{
 							$args->site_srl = 0;
 							// One of its members to delete all the group
 							$output = executeQuery('member.deleteMemberGroupMember', $args);
-							if(!$output->toBool())
+							if (!$output->toBool())
 							{
 								$oDB->rollback();
 								return $output;
 							}
 							// Enter one of the loop a
-							foreach($groups as $group_srl)
+							foreach ($groups as $group_srl)
 							{
-								$output = $oMemberController->addMemberToGroup($args->member_srl,$group_srl);
-								if(!$output->toBool())
+								$output = $oMemberController->addMemberToGroup($args->member_srl, $group_srl);
+								if (!$output->toBool())
 								{
 									$oDB->rollback();
 									return $output;
 								}
 							}
 						}
-						if($var->denied)
+						if ($var->denied)
 						{
 							$args->denied = $var->denied;
 							$output = executeQuery('member.updateMemberDeniedInfo', $args);
-							if(!$output->toBool())
+							if (!$output->toBool())
 							{
 								$oDB->rollback();
 								return $output;
@@ -885,7 +885,7 @@ 
 					{
 						$oMemberController->memberInfo = null;
 						$output = $oMemberController->deleteMember($member_srl);
-						if(!$output->toBool())
+						if (!$output->toBool())
 						{
 							$oDB->rollback();
 							return $output;
@@ -898,15 +898,15 @@ 
 
 		$message = $var->message;
 		// Send a message
-		if($message)
+		if ($message)
 		{
 			$oCommunicationController = getController('communication');
 
 			$logged_info = Context::get('logged_info');
-			$title = cut_str($message,10,'...');
+			$title = cut_str($message, 10, '...');
 			$sender_member_srl = $logged_info->member_srl;
 
-			foreach($members as $member_srl)
+			foreach ($members as $member_srl)
 			{
 				$oCommunicationController->sendMessage($sender_member_srl, $member_srl, $title, $message, false);
 			}
@@ -923,14 +923,14 @@ 
 	function procMemberAdminDeleteMembers()
 	{
 		$target_member_srls = Context::get('target_member_srls');
-		if(!$target_member_srls) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$target_member_srls) return new BaseObject(-1, 'msg_invalid_request');
 		$member_srls = explode(',', $target_member_srls);
 		$oMemberController = getController('member');
 
-		foreach($member_srls as $member)
+		foreach ($member_srls as $member)
 		{
 			$output = $oMemberController->deleteMember($member);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$this->setMessage('failed_deleted');
 				return $output;
@@ -947,11 +947,11 @@ 
 	function procMemberAdminUpdateMembersGroup()
 	{
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return new BaseObject(-1,'msg_invalid_request');
-		$member_srls = explode(',',$member_srl);
+		if (!$member_srl) return new BaseObject(-1, 'msg_invalid_request');
+		$member_srls = explode(',', $member_srl);
 
 		$group_srl = Context::get('group_srls');
-		if(!is_array($group_srl)) $group_srls = explode('|@|', $group_srl);
+		if (!is_array($group_srl)) $group_srls = explode('|@|', $group_srl);
 		else $group_srls = $group_srl;
 
 		$oDB = &DB::getInstance();
@@ -960,7 +960,7 @@ 
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -968,21 +968,21 @@ 
 		// Add to a selected group
 		$group_count = count($group_srls);
 		$member_count = count($member_srls);
-		for($j=0;$j<$group_count;$j++)
+		for ($j = 0; $j < $group_count; $j++)
 		{
-			$group_srl = (int)trim($group_srls[$j]);
-			if(!$group_srl) continue;
-			for($i=0;$i<$member_count;$i++)
+			$group_srl = (int) trim($group_srls[$j]);
+			if (!$group_srl) continue;
+			for ($i = 0; $i < $member_count; $i++)
 			{
-				$member_srl = (int)trim($member_srls[$i]);
-				if(!$member_srl) continue;
+				$member_srl = (int) trim($member_srls[$i]);
+				if (!$member_srl) continue;
 
 				$args = new stdClass;
 				$args->member_srl = $member_srl;
 				$args->group_srl = $group_srl;
 
 				$output = executeQuery('member.addMemberToGroup', $args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -995,7 +995,7 @@ 
 
 		$this->setMessage('success_updated');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			global $lang;
 			htmlHeader();
@@ -1016,19 +1016,19 @@ 
 	{
 		$user_ids = Context::get('user_id');
 
-		$user_ids = explode(',',$user_ids);
+		$user_ids = explode(',', $user_ids);
 		$success_ids = array();
 
-		foreach($user_ids as $val)
+		foreach ($user_ids as $val)
 		{
 			$val = trim($val);
-			if(!$val) continue;
+			if (!$val) continue;
 
 			$output = $this->insertDeniedID($val, '');
-			if($output->toBool()) $success_ids[] = $val;
+			if ($output->toBool()) $success_ids[] = $val;
 		}
 
-		$this->add('user_ids', implode(',',$success_ids));
+		$this->add('user_ids', implode(',', $success_ids));
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList');
 		$this->setRedirectUrl($returnUrl);
@@ -1045,10 +1045,10 @@ 
 		$mode = Context::get('mode');
 		$mode = $mode ? $mode : 'insert';
 
-		if($mode == 'delete')
+		if ($mode == 'delete')
 		{
 			$output = $this->deleteDeniedNickName($nick_name);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -1057,19 +1057,19 @@ 
 		}
 		else
 		{
-			$nick_names = explode(',',$nick_name);
+			$nick_names = explode(',', $nick_name);
 			$success_nick_names = array();
 
-			foreach($nick_names as $val)
+			foreach ($nick_names as $val)
 			{
 				$val = trim($val);
-				if(!$val) continue;
+				if (!$val) continue;
 
 				$output = $this->insertDeniedNickName($val, '');
-				if($output->toBool()) $success_nick_names[] = $val;
+				if ($output->toBool()) $success_nick_names[] = $val;
 			}
 
-			$this->add('nick_names', implode(',',$success_nick_names));
+			$this->add('nick_names', implode(',', $success_nick_names));
 		}
 	}
 
@@ -1082,16 +1082,16 @@ 
 		$user_id = Context::get('user_id');
 		$mode = Context::get('mode');
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'delete' :
 				$output = $this->deleteDeniedID($user_id);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 				$msg_code = 'success_deleted';
 				break;
 		}
 
-		$this->add('page',Context::get('page'));
+		$this->add('page', Context::get('page'));
 		$this->setMessage($msg_code);
 	}
 
@@ -1138,24 +1138,24 @@ 
 	 */
 	function insertGroup($args)
 	{
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 		// Check the value of is_default.
-		if($args->is_default != 'Y')
+		if ($args->is_default != 'Y')
 		{
 			$args->is_default = 'N';
 		}
 		else
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
-		if(!isset($args->list_order) || $args->list_order=='')
+		if (!isset($args->list_order) || $args->list_order == '')
 		{
 			$args->list_order = $args->group_srl;
 		}
 
-		if(!$args->group_srl) $args->group_srl = getNextSequence();
+		if (!$args->group_srl) $args->group_srl = getNextSequence();
 		$args->list_order = $args->group_srl;
 		$output = executeQuery('member.insertGroup', $args);
 		$this->_deleteMemberGroupCache($args->site_srl);
@@ -1170,17 +1170,17 @@ 
 	 */
 	function updateGroup($args)
 	{
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 		// Check the value of is_default.
-		if(!$args->group_srl) return new BaseObject(-1, 'lang->msg_not_founded');
-		if($args->is_default!='Y')
+		if (!$args->group_srl) return new BaseObject(-1, 'lang->msg_not_founded');
+		if ($args->is_default != 'Y')
 		{
 			$args->is_default = 'N';
 		}
 		else
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$output = executeQuery('member.updateGroup', $args);
@@ -1203,8 +1203,8 @@ 
 		$columnList = array('group_srl', 'is_default');
 		$group_info = $oMemberModel->getGroup($group_srl, $columnList);
 
-		if(!$group_info) return new BaseObject(-1, 'lang->msg_not_founded');
-		if($group_info->is_default == 'Y') return new BaseObject(-1, 'msg_not_delete_default');
+		if (!$group_info) return new BaseObject(-1, 'lang->msg_not_founded');
+		if ($group_info->is_default == 'Y') return new BaseObject(-1, 'msg_not_delete_default');
 
 		// Get groups where is_default == 'Y'
 		$columnList = array('site_srl', 'group_srl');
@@ -1241,7 +1241,7 @@ 
 		$defaultGroup = $oMemberModel->getDefaultGroup(0);
 		$defaultGroupSrl = $defaultGroup->group_srl;
 		$group_srls = $vars->group_srls;
-		foreach($group_srls as $order=>$group_srl)
+		foreach ($group_srls as $order=>$group_srl)
 		{
 			$isInsert = false;
 			$update_args = new stdClass();
@@ -1250,9 +1250,9 @@ 
 			$update_args->image_mark = $vars->image_marks[$order];
 			$update_args->list_order = $order + 1;
 
-			if(!$update_args->title) continue;
+			if (!$update_args->title) continue;
 
-			if(is_numeric($group_srl)) {
+			if (is_numeric($group_srl)) {
 				$update_args->group_srl = $group_srl;
 				$output = $this->updateGroup($update_args);
 			}
@@ -1261,7 +1261,7 @@ 
 				$output = $this->insertGroup($update_args);
 			}
 
-			if($vars->defaultGroup == $group_srl) {
+			if ($vars->defaultGroup == $group_srl) {
 				$defaultGroupSrl = $update_args->group_srl;
 			}
 		}
@@ -1287,7 +1287,7 @@ 
 	{
 		$vars = Context::getRequestVars();
 
-		foreach($vars->group_srls as $key => $val)
+		foreach ($vars->group_srls as $key => $val)
 		{
 			$args = new stdClass;
 			$args->group_srl = $val;
@@ -1308,7 +1308,7 @@ 
 	{
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('member');
 		}
@@ -1325,7 +1325,7 @@ 
 		$args = new stdClass();
 		$args->user_id = $user_id;
 		$args->description = $description;
-		$args->list_order = -1*getNextSequence();
+		$args->list_order = -1 * getNextSequence();
 
 		return executeQuery('member.insertDeniedID', $args);
 	}
@@ -1346,7 +1346,7 @@ 
 	 */
 	function deleteDeniedID($user_id)
 	{
-		if(!$user_id) unset($user_id);
+		if (!$user_id) unset($user_id);
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
@@ -1360,7 +1360,7 @@ 
 	 */
 	function deleteDeniedNickName($nick_name)
 	{
-		if(!$nick_name) unset($nick_name);
+		if (!$nick_name) unset($nick_name);
 
 		$args = new stdClass;
 		$args->nick_name = $nick_name;
@@ -1399,16 +1399,16 @@ 
 		// Get a list of all join forms
 		$join_form_list = $oMemberModel->getJoinFormList();
 		$join_form_srl_list = array_keys($join_form_list);
-		if(count($join_form_srl_list)<2) return new BaseObject();
+		if (count($join_form_srl_list) < 2) return new BaseObject();
 
 		$prev_member_join_form = NULL;
-		foreach($join_form_list as $key => $val)
+		foreach ($join_form_list as $key => $val)
 		{
-			if($val->member_join_form_srl == $member_join_form_srl) break;
+			if ($val->member_join_form_srl == $member_join_form_srl) break;
 			$prev_member_join_form = $val;
 		}
 		// Return if no previous join form exists
-		if(!$prev_member_join_form) return new BaseObject();
+		if (!$prev_member_join_form) return new BaseObject();
 		// Information of the join form
 		$cur_args = new stdClass;
 		$cur_args->member_join_form_srl = $member_join_form_srl;
@@ -1419,10 +1419,10 @@ 
 		$prev_args->list_order = $list_order;
 		// Execute Query
 		$output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		executeQuery('member.updateMemberJoinFormListorder', $prev_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new BaseObject();
 	}
@@ -1446,16 +1446,16 @@ 
 		// Get information of all join forms
 		$join_form_list = $oMemberModel->getJoinFormList();
 		$join_form_srl_list = array_keys($join_form_list);
-		if(count($join_form_srl_list)<2) return new BaseObject();
+		if (count($join_form_srl_list) < 2) return new BaseObject();
 
-		for($i=0;$i<count($join_form_srl_list);$i++)
+		for ($i = 0; $i < count($join_form_srl_list); $i++)
 		{
-			if($join_form_srl_list[$i]==$member_join_form_srl) break;
+			if ($join_form_srl_list[$i] == $member_join_form_srl) break;
 		}
 
-		$next_member_join_form_srl = $join_form_srl_list[$i+1];
+		$next_member_join_form_srl = $join_form_srl_list[$i + 1];
 		// Return if no previous join form exists
-		if(!$next_member_join_form_srl) return new BaseObject();
+		if (!$next_member_join_form_srl) return new BaseObject();
 		$next_member_join_form = $join_form_list[$next_member_join_form_srl];
 		// Information of the join form
 		$cur_args = new stdClass;
@@ -1467,10 +1467,10 @@ 
 		$next_args->list_order = $list_order;
 		// Execute Query
 		$output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('member.updateMemberJoinFormListorder', $next_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new BaseObject();
 	}

modules/member/member.admin.model.php

Braces +45 added lines, -18 removed lines

@@ -63,20 +63,28 @@ 
 			switch($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_nick_name = $search_keyword;
 					$args->html_nick_name = htmlspecialchars($search_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
@@ -129,8 +137,7 @@ 
 		{
 			$query_id = 'member.getMemberListWithinGroup';
 			$args->sort_index = "member.".$sort_index;
-		}
-		else
+		} else
 		{
 			$query_id = 'member.getMemberList';
 			$args->sort_index = $sort_index; 
@@ -174,7 +181,9 @@ 
 	function getSiteAdminMemberSrls()
 	{
 		$output = executeQueryArray('member.getSiteAdminMemberSrls');
-		if(!$output->toBool() || !$output->data) return array();
+		if(!$output->toBool() || !$output->data) {
+			return array();
+		}
 
 		$member_srls = array();
 		foreach($output->data as $member_info)
@@ -193,8 +202,9 @@ 
 	function getMemberAdminColorset()
 	{
 		$skin = Context::get('skin');
-		if(!$skin) $tpl = "";
-		else
+		if(!$skin) {
+			$tpl = "";
+		} else
 		{
 			$oModuleModel = getModel('module');
 			$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
@@ -202,7 +212,9 @@ 
 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
-			if(!$config->colorset) $config->colorset = "white";
+			if(!$config->colorset) {
+				$config->colorset = "white";
+			}
 			Context::set('config', $config);
 
 			$oTemplate = &TemplateHandler::getInstance();
@@ -223,10 +235,14 @@ 
 	public function getMemberCountByDate($date = '')
 	{
 		$args = new stdClass();
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if($date) {
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('member.getMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool()) {
+			return 0;
+		}
 
 		return $output->data->count;
 	}
@@ -240,10 +256,14 @@ 
 	 */
 	function getMemberGroupMemberCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if($date) {
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('member.getMemberGroupMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool()) {
+			return 0;
+		}
 
 		return count($output->data);
 	}
@@ -298,10 +318,17 @@ 
 	{
 		$db_info = Context::getDBInfo();
 		$admin_ip_list = $db_info->admin_ip_list;
-		if(!$admin_ip_list) return true;
-		if(!is_array($admin_ip_list)) $admin_ip_list = explode(',',$admin_ip_list);
-		if(!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) return true;
-		else return false;
+		if(!$admin_ip_list) {
+			return true;
+		}
+		if(!is_array($admin_ip_list)) {
+			$admin_ip_list = explode(',',$admin_ip_list);
+		}
+		if(!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 }
 /* End of file member.admin.model.php */

Spacing +41 added lines, -41 removed lines

@@ -42,64 +42,64 @@ 
 	{
 		// Search option
 		$args = new stdClass();
-		$args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
-		$args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
+		$args->is_admin = Context::get('is_admin') == 'Y' ? 'Y' : '';
+		$args->is_denied = Context::get('is_denied') == 'Y' ? 'Y' : '';
 		$args->selected_group_srl = Context::get('selected_group_srl');
 
 		$filter = Context::get('filter_type');
-		switch($filter)
+		switch ($filter)
 		{
-			case 'super_admin' : $args->is_admin = 'Y';break;
-			case 'site_admin' : $args->member_srls = $this->getSiteAdminMemberSrls();break;
-			case 'enable' : $args->is_denied = 'N';break;
-			case 'disable' : $args->is_denied = 'Y';break;
+			case 'super_admin' : $args->is_admin = 'Y'; break;
+			case 'site_admin' : $args->member_srls = $this->getSiteAdminMemberSrls(); break;
+			case 'enable' : $args->is_denied = 'N'; break;
+			case 'disable' : $args->is_denied = 'Y'; break;
 		}
 
 		$search_target = trim(Context::get('search_target'));
 		$search_keyword = trim(Context::get('search_keyword'));
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_nick_name = $search_keyword;
 					$args->html_nick_name = htmlspecialchars($search_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
-					$args->s_regdate = preg_replace("/[^0-9]/","",$search_keyword);
+					$args->s_regdate = preg_replace("/[^0-9]/", "", $search_keyword);
 					break;
 				case 'regdate_more' :
-					$args->s_regdate_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+					$args->s_regdate_more = substr(preg_replace("/[^0-9]/", "", $search_keyword).'00000000000000', 0, 14);
 					break;
 				case 'regdate_less' :
-					$args->s_regdate_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+					$args->s_regdate_less = substr(preg_replace("/[^0-9]/", "", $search_keyword).'00000000000000', 0, 14);
 					break;
 				case 'last_login' :
-					$args->s_last_login = preg_replace("/[^0-9]/","",$search_keyword);
+					$args->s_last_login = preg_replace("/[^0-9]/", "", $search_keyword);
 					//$args->s_last_login = $search_keyword;
 					break;
 				case 'last_login_more' :
-					$args->s_last_login_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+					$args->s_last_login_more = substr(preg_replace("/[^0-9]/", "", $search_keyword).'00000000000000', 0, 14);
 					break;
 				case 'last_login_less' :
-					$args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+					$args->s_last_login_less = substr(preg_replace("/[^0-9]/", "", $search_keyword).'00000000000000', 0, 14);
 					break;
 				case 'birthday' :
-					$args->s_birthday = preg_replace("/[^0-9]/","",$search_keyword);
+					$args->s_birthday = preg_replace("/[^0-9]/", "", $search_keyword);
 					break;
 				case 'extra_vars' :
 					$args->s_extra_vars = $search_keyword;
@@ -110,22 +110,22 @@ 
 		// Change the query id if selected_group_srl exists (for table join)
 		$sort_order = Context::get('sort_order');
 		$sort_index = Context::get('sort_index');
-		if(!$sort_index)
+		if (!$sort_index)
 		{
 			$sort_index = "list_order";
 		}
 
-		if(!$sort_order)
+		if (!$sort_order)
 		{
 			$sort_order = 'asc';
 		}
 
-		if($sort_order != 'asc')
+		if ($sort_order != 'asc')
 		{
 			$sort_order = 'desc';
 		}
 
-		if($args->selected_group_srl)
+		if ($args->selected_group_srl)
 		{
 			$query_id = 'member.getMemberListWithinGroup';
 			$args->sort_index = "member.".$sort_index;
@@ -174,10 +174,10 @@ 
 	function getSiteAdminMemberSrls()
 	{
 		$output = executeQueryArray('member.getSiteAdminMemberSrls');
-		if(!$output->toBool() || !$output->data) return array();
+		if (!$output->toBool() || !$output->data) return array();
 
 		$member_srls = array();
-		foreach($output->data as $member_info)
+		foreach ($output->data as $member_info)
 		{
 			$member_srls[] = $member_info->member_srl;
 		}
@@ -193,7 +193,7 @@ 
 	function getMemberAdminColorset()
 	{
 		$skin = Context::get('skin');
-		if(!$skin) $tpl = "";
+		if (!$skin) $tpl = "";
 		else
 		{
 			$oModuleModel = getModel('module');
@@ -202,7 +202,7 @@ 
 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
-			if(!$config->colorset) $config->colorset = "white";
+			if (!$config->colorset) $config->colorset = "white";
 			Context::set('config', $config);
 
 			$oTemplate = &TemplateHandler::getInstance();
@@ -223,10 +223,10 @@ 
 	public function getMemberCountByDate($date = '')
 	{
 		$args = new stdClass();
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if ($date) $args->regDate = date('Ymd', strtotime($date));
 
 		$output = executeQuery('member.getMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if (!$output->toBool()) return 0;
 
 		return $output->data->count;
 	}
@@ -240,10 +240,10 @@ 
 	 */
 	function getMemberGroupMemberCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if ($date) $args->regDate = date('Ymd', strtotime($date));
 
 		$output = executeQuery('member.getMemberGroupMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if (!$output->toBool()) return 0;
 
 		return count($output->data);
 	}
@@ -261,11 +261,11 @@ 
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 
-		if($output->toBool() && $output->data)
+		if ($output->toBool() && $output->data)
 		{
 			$formInfo = $output->data;
 			$default_value = $formInfo->default_value;
-			if($default_value)
+			if ($default_value)
 			{
 				$default_value = unserialize($default_value);
 				Context::set('default_value', $default_value);
@@ -275,18 +275,18 @@ 
 
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
-		foreach($config->signupForm as $item) 
+		foreach ($config->signupForm as $item) 
 		{
 			$list[] = $item->name;
 		}
 
-		$id_list = implode(',',$list);
-		Context::set('id_list',$id_list);
+		$id_list = implode(',', $list);
+		Context::set('id_list', $id_list);
 
 		$oTemplate = &TemplateHandler::getInstance();
 		$tpl = $oTemplate->compile($this->module_path.'tpl', 'insert_join_form');
 
-		$this->add('tpl', str_replace("\n"," ",$tpl));
+		$this->add('tpl', str_replace("\n", " ", $tpl));
 	}
 
 	/**
@@ -298,9 +298,9 @@ 
 	{
 		$db_info = Context::getDBInfo();
 		$admin_ip_list = $db_info->admin_ip_list;
-		if(!$admin_ip_list) return true;
-		if(!is_array($admin_ip_list)) $admin_ip_list = explode(',',$admin_ip_list);
-		if(!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) return true;
+		if (!$admin_ip_list) return true;
+		if (!is_array($admin_ip_list)) $admin_ip_list = explode(',', $admin_ip_list);
+		if (!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) return true;
 		else return false;
 	}
 }

modules/member/member.mobile.php

Braces +2 added lines, -4 removed lines

@@ -25,8 +25,7 @@ 
 		{
 			$mskin = 'default';
 			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
-		}
-		else
+		} else
 		{
 			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
 		}
@@ -40,8 +39,7 @@ 
 			if(!$this->memberInfo)
 			{
 				Context::set('member_srl','');
-			}
-			else
+			} else
 			{
 				Context::set('member_info',$this->memberInfo);
 			}

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 
 		$mskin = $this->member_config->mskin;
 		// Set the template path
-		if(!$mskin)
+		if (!$mskin)
 		{
 			$mskin = 'default';
 			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
@@ -33,17 +33,17 @@ 
 
 		// if member_srl exists, set memberInfo
 		$member_srl = Context::get('member_srl');
-		if($member_srl)
+		if ($member_srl)
 		{
 			$oMemberModel = getModel('member');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-			if(!$this->memberInfo)
+			if (!$this->memberInfo)
 			{
-				Context::set('member_srl','');
+				Context::set('member_srl', '');
 			}
 			else
 			{
-				Context::set('member_info',$this->memberInfo);
+				Context::set('member_info', $this->memberInfo);
 			}
 		}
 
@@ -51,7 +51,7 @@ 
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($this->member_config->mlayout_srl);
-		if($layout_info)
+		if ($layout_info)
 		{
 			$this->module_info->mlayout_srl = $this->member_config->mlayout_srl;
 			$this->setLayoutPath($layout_info->path);
@@ -62,7 +62,7 @@ 
 	{
 		parent::dispMemberModifyInfo();
 
-		if($this->member_info)
+		if ($this->member_info)
 		{
 			Context::set('oMemberInfo', get_object_vars($this->member_info));
 		}

modules/menu/menu.admin.model.php

Braces +72 added lines, -45 removed lines

@@ -41,7 +41,9 @@ 
 		// document.getDocumentList query execution
 		$output = executeQuery('menu.getMenuList', $args);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -63,7 +65,9 @@ 
 		$args->site_srl = $site_srl ;
 		$args->menu_srl = $menu_srl;
 		$output = executeQueryArray('menu.getMenus', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 		$menus = $output->data;
 		return $menus;
 	}
@@ -80,7 +84,9 @@ 
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		$menu_info = $output->data;
 		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
@@ -105,10 +111,15 @@ 
 		$args->title = $title;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('menu.getMenuByTitle', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
-		if(is_array($output->data)) $menu_info = $output->data[0];
-		else $menu_info = $output->data;
+		if(is_array($output->data)) {
+			$menu_info = $output->data[0];
+		} else {
+			$menu_info = $output->data;
+		}
 
 		if($menu_info->menu_srl)
 		{
@@ -152,15 +163,20 @@ 
 		$output = executeQuery('menu.getMenuItem', $args);
 		$node = $output->data;
 		settype($node,'object');
-		if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
-		else $node->group_srls = array();
+		if($node->group_srls) {
+			$node->group_srls = explode(',',$node->group_srls);
+		} else {
+			$node->group_srls = array();
+		}
 
 		$tmp_name = unserialize($node->name);
 		if($tmp_name && count($tmp_name))
 		{
 			$selected_lang = array();
 			$rand_name = $tmp_name[Context::getLangType()];
-			if(!$rand_name) $rand_name = array_shift($tmp_name);
+			if(!$rand_name) {
+				$rand_name = array_shift($tmp_name);
+			}
 			$node->name = $rand_name;
 		}
 		return $node;
@@ -178,13 +194,13 @@ 
 		if(!$menuItem->url)
 		{
 			$menuItem->moduleType = null;
-		}
-		else if(strncasecmp('http', $menuItem->url, 4) !== 0)
+		} else if(strncasecmp('http', $menuItem->url, 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
-			if(!$moduleInfo) $menuItem->moduleType = 'url';
-			else
+			if(!$moduleInfo) {
+				$menuItem->moduleType = 'url';
+			} else
 			{
 				if($moduleInfo->mid == $menuItem->url)
 				{
@@ -193,8 +209,9 @@ 
 					$menuItem->layoutSrl = $moduleInfo->layout_srl;
 				}
 			}
+		} else {
+			$menuItem->moduleType = 'url';
 		}
-		else $menuItem->moduleType = 'url';
 
 		// grant setting
 		if(is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
@@ -202,12 +219,10 @@ 
 			if($menuItem->group_srls[0] == -1)
 			{
 				$menuItem->grant = 'member';
-			}
-			else if($menuItem->group_srls[0] == -3)
+			} else if($menuItem->group_srls[0] == -3)
 			{
 				$menuItem->grant = 'manager';
-			}
-			else
+			} else
 			{
 				$menuItem->grant = 'group';
 			}
@@ -228,11 +243,15 @@ 
 				{
 					$tmp = $oModuleAdminModel->getLangCode(0, $value->title);
 					$groupList[$value->group_srl]->title = $tmp[Context::getLangType()];
+				} else {
+					$groupList[$value->group_srl]->title = $value->title;
 				}
-				else $groupList[$value->group_srl]->title = $value->title;
 
-				if(in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
-				else $groupList[$value->group_srl]->isChecked = false;
+				if(in_array($key, $menuItem->group_srls)) {
+					$groupList[$value->group_srl]->isChecked = true;
+				} else {
+					$groupList[$value->group_srl]->isChecked = false;
+				}
 			}
 		}
 		$menuItem->groupList = $groupList;
@@ -305,11 +324,12 @@ 
 			$item_info->parent_srl = $parent_srl;
 			$item_info->parent_menu_name = $parent_info->name;
 			// In case of modifying the existing menu or addting a new menu to the root
-		}
-		else
+		} else
 		{
 			// Get information of the menu if menu_item_srl exists
-			if($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
+			if($menu_item_srl) {
+				$item_info = $this->getMenuItemInfo($menu_item_srl);
+			}
 			// Get only menu_item_srl if no values found, considering it as adding a new menu
 			if(!$item_info->menu_item_srl)
 			{
@@ -349,7 +369,9 @@ 
 		foreach($_allModules as $module_name)
 		{
 			$module = $oModuleModel->getModuleInfoXml($module_name);
-			if(!isset($module)) continue;
+			if(!isset($module)) {
+				continue;
+			}
 			$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
 			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
 			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);
@@ -379,8 +401,7 @@ 
 				$oModuleInfo->title = $pageTypeName['OUTSIDE'];
 				$oModuleInfo->no_skin = 'Y';
 				$allModules['OUTSIDE'] = $oModuleInfo;
-			}
-			else
+			} else
 			{
 				$allModules[$module_name] = $module;
 			}
@@ -414,7 +435,9 @@ 
 
 		// after trigger
 		$output = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$localModuleList = array_unique($moduleList);
 
@@ -425,7 +448,9 @@ 
 		$remoteModuleList = array();
 		foreach($remotePackageList as $package)
 		{
-			if(strpos($package->path, './modules/') !== 0) continue;
+			if(strpos($package->path, './modules/') !== 0) {
+				continue;
+			}
 
 			$pathInfo = explode('/', $package->path);
 			$remoteModuleList[] = $pathInfo[2];
@@ -464,8 +489,7 @@ 
 					$oModuleInfo->title = $pageTypeName['OUTSIDE'];
 					$oModuleInfo->no_skin = 'Y';
 					$moduleInfoList['OUTSIDE'] = $oModuleInfo;
-				}
-				else
+				} else
 				{
 					$moduleInfoList[$value] = $moduleInfo;
 				}
@@ -497,8 +521,11 @@ 
 			$isMenuFixed = false;
 			$output = $this->getMenu($menuSrl);
 			$php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$output->menu_srl);
-			if(file_exists($php_file)) include($php_file);
-			else $oMenuAdminController->makeXmlFile($menuSrl);
+			if(file_exists($php_file)) {
+				include($php_file);
+			} else {
+				$oMenuAdminController->makeXmlFile($menuSrl);
+			}
 
 			if(count($menu->list)>0)
 			{
@@ -518,8 +545,7 @@ 
 			$menuItems->title = $output->title;
 			$menuItems->menuItems = $menu;
 			$menuList[] = $menuItems;
-		}
-		else
+		} else
 		{
 			$menuListFromDB = $this->getMenus($siteSrl);
 			if(is_array($menuListFromDB))
@@ -527,8 +553,9 @@ 
 				$oAdmin = getClass('admin');
 				foreach($menuListFromDB AS $key=>$value)
 				{
-					if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
-					else
+					if($value->title == $oAdmin->getAdminMenuName()) {
+						unset($output[$key]);
+					} else
 					{
 						unset($menu);
 						unset($menuItems);
@@ -564,8 +591,7 @@ 
 						if($value->menu_srl == $this->menuSrlWithinHome)
 						{
 							$menuList[-1] = $menuItems;
-						}
-						else
+						} else
 						{
 							$menuList[] = $menuItems;
 						}
@@ -639,8 +665,11 @@ 
 			$args = new stdClass;
 			$args->menu_item_srl = $menu['node_srl'];
 			$args->is_shortcut = 'Y';
-			if($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
-			else $args->name = $menu['menu_name'];
+			if($menu['menu_name_key']) {
+				$args->name = $menu['menu_name_key'];
+			} else {
+				$args->name = $menu['menu_name'];
+			}
 			$output = executeQuery('menu.updateMenuItem', $args);
 
 			$isMenuFixed = true;
@@ -661,8 +690,7 @@ 
 				if($midInfo->page_type)
 				{
 					$menu['module_type'] = $midInfo->page_type;
-				}
-				else
+				} else
 				{
 					$menu['module_type'] = $midInfo->module;
 				}
@@ -671,8 +699,7 @@ 
 			if($moduleInfo->setup_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->setup_index_act;
-			}
-			else if($moduleInfo->default_index_act)
+			} else if($moduleInfo->default_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->default_index_act;
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
 
 	/**
 	 * Get module's detail setup contents
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	public function getMenuAdminDetailSetup()
 	{

Spacing +90 added lines, -90 removed lines

@@ -27,21 +27,21 @@ 
 	 */
 	function getMenuList($obj)
 	{
-		if(!$obj->site_srl)
+		if (!$obj->site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$obj->site_srl = (int)$site_module_info->site_srl;
+			$obj->site_srl = (int) $site_module_info->site_srl;
 		}
 		$args = new stdClass;
 		$args->site_srl = $obj->site_srl;
 		$args->sort_index = $obj->sort_index;
-		$args->page = $obj->page?$obj->page:1;
-		$args->list_count = $obj->list_count?$obj->list_count:20;
-		$args->page_count = $obj->page_count?$obj->page_count:10;
+		$args->page = $obj->page ? $obj->page : 1;
+		$args->list_count = $obj->list_count ? $obj->list_count : 20;
+		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		// document.getDocumentList query execution
 		$output = executeQuery('menu.getMenuList', $args);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 
 		return $output;
 	}
@@ -53,17 +53,17 @@ 
 	 */
 	function getMenus($site_srl = null)
 	{
-		if(!isset($site_srl))
+		if (!isset($site_srl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		// Get information from the DB
 		$args = new stdClass();
-		$args->site_srl = $site_srl ;
+		$args->site_srl = $site_srl;
 		$args->menu_srl = $menu_srl;
 		$output = executeQueryArray('menu.getMenus', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 		$menus = $output->data;
 		return $menus;
 	}
@@ -80,11 +80,11 @@ 
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$menu_info = $output->data;
-		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
-		$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_srl);
+		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php', $menu_srl);
+		$menu_info->php_file = sprintf('./files/cache/menu/%s.php', $menu_srl);
 		return $menu_info;
 	}
 
@@ -97,7 +97,7 @@ 
 	function getMenuByTitle($title, $site_srl = 0)
 	{
 		// Get information from the DB
-		if(!is_array($title))
+		if (!is_array($title))
 		{
 			$title = array($title);
 		}
@@ -105,15 +105,15 @@ 
 		$args->title = $title;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('menu.getMenuByTitle', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
-		if(is_array($output->data)) $menu_info = $output->data[0];
+		if (is_array($output->data)) $menu_info = $output->data[0];
 		else $menu_info = $output->data;
 
-		if($menu_info->menu_srl)
+		if ($menu_info->menu_srl)
 		{
-			$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_info->menu_srl);
-			$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_info->menu_srl);
+			$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php', $menu_info->menu_srl);
+			$menu_info->php_file = sprintf('./files/cache/menu/%s.php', $menu_info->menu_srl);
 		}
 		return $menu_info;
 	}
@@ -130,7 +130,7 @@ 
 		$args = new stdClass();
 		$args->title = $title;
 		$output = executeQueryArray('menu.getMenuByTitle', $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}
@@ -151,16 +151,16 @@ 
 		$args->menu_item_srl = $menu_item_srl;
 		$output = executeQuery('menu.getMenuItem', $args);
 		$node = $output->data;
-		settype($node,'object');
-		if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
+		settype($node, 'object');
+		if ($node->group_srls) $node->group_srls = explode(',', $node->group_srls);
 		else $node->group_srls = array();
 
 		$tmp_name = unserialize($node->name);
-		if($tmp_name && count($tmp_name))
+		if ($tmp_name && count($tmp_name))
 		{
 			$selected_lang = array();
 			$rand_name = $tmp_name[Context::getLangType()];
-			if(!$rand_name) $rand_name = array_shift($tmp_name);
+			if (!$rand_name) $rand_name = array_shift($tmp_name);
 			$node->name = $rand_name;
 		}
 		return $node;
@@ -175,18 +175,18 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$menuItem = $this->getMenuItemInfo($menuItemSrl);
 
-		if(!$menuItem->url)
+		if (!$menuItem->url)
 		{
 			$menuItem->moduleType = null;
 		}
-		else if(strncasecmp('http', $menuItem->url, 4) !== 0)
+		else if (strncasecmp('http', $menuItem->url, 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
-			if(!$moduleInfo) $menuItem->moduleType = 'url';
+			if (!$moduleInfo) $menuItem->moduleType = 'url';
 			else
 			{
-				if($moduleInfo->mid == $menuItem->url)
+				if ($moduleInfo->mid == $menuItem->url)
 				{
 					$menuItem->moduleType = $moduleInfo->module;
 					$menuItem->pageType = $moduleInfo->page_type;
@@ -197,13 +197,13 @@ 
 		else $menuItem->moduleType = 'url';
 
 		// grant setting
-		if(is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
+		if (is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
 		{
-			if($menuItem->group_srls[0] == -1)
+			if ($menuItem->group_srls[0] == -1)
 			{
 				$menuItem->grant = 'member';
 			}
-			else if($menuItem->group_srls[0] == -3)
+			else if ($menuItem->group_srls[0] == -3)
 			{
 				$menuItem->grant = 'manager';
 			}
@@ -217,21 +217,21 @@ 
 		$oMemberModel = getModel('member');
 		$oModuleAdminModel = getAdminModel('module');
 		$output = $oMemberModel->getGroups();
-		if(is_array($output))
+		if (is_array($output))
 		{
 			$groupList = array();
-			foreach($output AS $key=>$value)
+			foreach ($output AS $key=>$value)
 			{
 				$groupList[$value->group_srl] = new stdClass();
 				$groupList[$value->group_srl]->group_srl = $value->group_srl;
-				if(substr($value->title,0,12)=='$user_lang->')
+				if (substr($value->title, 0, 12) == '$user_lang->')
 				{
 					$tmp = $oModuleAdminModel->getLangCode(0, $value->title);
 					$groupList[$value->group_srl]->title = $tmp[Context::getLangType()];
 				}
 				else $groupList[$value->group_srl]->title = $value->title;
 
-				if(in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
+				if (in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
 				else $groupList[$value->group_srl]->isChecked = false;
 			}
 		}
@@ -269,10 +269,10 @@ 
 	 */
 	function getMenuItemNames($source_name, $site_srl = null)
 	{
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		// Get language code
 		$oModuleAdminModel = getAdminModel('module');
@@ -296,7 +296,7 @@ 
 
 		// Add a sub-menu if there is parent_srl but not menu_item_srl
 		$item_info = new stdClass;
-		if(!$menu_item_srl && $parent_srl)
+		if (!$menu_item_srl && $parent_srl)
 		{
 			// Get information of the parent menu
 			$parent_info = $this->getMenuItemInfo($parent_srl);
@@ -309,9 +309,9 @@ 
 		else
 		{
 			// Get information of the menu if menu_item_srl exists
-			if($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
+			if ($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
 			// Get only menu_item_srl if no values found, considering it as adding a new menu
-			if(!$item_info->menu_item_srl)
+			if (!$item_info->menu_item_srl)
 			{
 				$item_info->menu_item_srl = getNextSequence();
 			}
@@ -327,7 +327,7 @@ 
 		$oTemplate = &TemplateHandler::getInstance();
 		$tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');
 
-		$this->add('tpl', str_replace("\n"," ",$tpl));
+		$this->add('tpl', str_replace("\n", " ", $tpl));
 	}
 
 	/**
@@ -346,10 +346,10 @@ 
 
 		Context::loadLang('modules/page/lang');
 
-		foreach($_allModules as $module_name)
+		foreach ($_allModules as $module_name)
 		{
 			$module = $oModuleModel->getModuleInfoXml($module_name);
-			if(!isset($module)) continue;
+			if (!isset($module)) continue;
 			$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
 			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
 			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);
@@ -361,10 +361,10 @@ 
 			$module->defaultMobileSkin->skin = $defaultMobileSkin;
 			$module->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin;
 
-			$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name);
-			$module->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $module->package_srl;
+			$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/'.$module_name);
+			$module->url = _XE_LOCATION_SITE_.'?mid=download&package_srl='.$module->package_srl;
 
-			if($module_name == 'page')
+			if ($module_name == 'page')
 			{
 				$pageTypeName = Context::getLang('page_type_name');
 				$module->title = $pageTypeName['ARTICLE'];
@@ -401,11 +401,11 @@ 
 		$moduleList = array('page');
 
 		$output = $oModuleModel->getModuleListByInstance($site_srl);
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
-				if($value->instanceCount > 1)
+				if ($value->instanceCount > 1)
 				{
 					$moduleList[] = $value->module;
 				}
@@ -414,7 +414,7 @@ 
 
 		// after trigger
 		$output = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$localModuleList = array_unique($moduleList);
 
@@ -423,9 +423,9 @@ 
 		// get have instance
 		$remotePackageList = $oAutoinstallModel->getHaveInstance(array('path'));
 		$remoteModuleList = array();
-		foreach($remotePackageList as $package)
+		foreach ($remotePackageList as $package)
 		{
-			if(strpos($package->path, './modules/') !== 0) continue;
+			if (strpos($package->path, './modules/') !== 0) continue;
 
 			$pathInfo = explode('/', $package->path);
 			$remoteModuleList[] = $pathInfo[2];
@@ -443,13 +443,13 @@ 
 
 		$moduleInfoList = array();
 		Context::loadLang('modules/page/lang');
-		if(is_array($moduleList))
+		if (is_array($moduleList))
 		{
-			foreach($moduleList as $value)
+			foreach ($moduleList as $value)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoXml($value);
 
-				if($value == 'page')
+				if ($value == 'page')
 				{
 					$pageTypeName = Context::getLang('page_type_name');
 					$moduleInfo->title = $pageTypeName['ARTICLE'];
@@ -480,10 +480,10 @@ 
 		$siteSrl = Context::get('site_srl');
 		$menuSrl = Context::get('menu_srl');
 
-		if(!isset($siteSrl))
+		if (!isset($siteSrl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			$siteSrl = (int)$site_module_info->site_srl;
+			$siteSrl = (int) $site_module_info->site_srl;
 		}
 
 		$oModuleModel = getModel('module');
@@ -492,24 +492,24 @@ 
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
 
 		$menuList = array();
-		if($menuSrl)
+		if ($menuSrl)
 		{
 			$isMenuFixed = false;
 			$output = $this->getMenu($menuSrl);
-			$php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$output->menu_srl);
-			if(file_exists($php_file)) include($php_file);
+			$php_file = sprintf(_XE_PATH_.'files/cache/menu/%s.php', $output->menu_srl);
+			if (file_exists($php_file)) include($php_file);
 			else $oMenuAdminController->makeXmlFile($menuSrl);
 
-			if(count($menu->list)>0)
+			if (count($menu->list) > 0)
 			{
-				foreach($menu->list AS $key=>$value)
+				foreach ($menu->list AS $key=>$value)
 				{
-					$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl,$siteSrl);
+					$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl, $siteSrl);
 				}
 			}
 
 			// menu recreate
-			if($isMenuFixed)
+			if ($isMenuFixed)
 			{
 				$oMenuAdminController->makeXmlFile($menuSrl);
 			}
@@ -522,18 +522,18 @@ 
 		else
 		{
 			$menuListFromDB = $this->getMenus($siteSrl);
-			if(is_array($menuListFromDB))
+			if (is_array($menuListFromDB))
 			{
 				$oAdmin = getClass('admin');
-				foreach($menuListFromDB AS $key=>$value)
+				foreach ($menuListFromDB AS $key=>$value)
 				{
-					if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
+					if ($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
 					else
 					{
 						unset($menu);
 						unset($menuItems);
-						$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl);
-						if(!file_exists($value->php_file))
+						$value->php_file = sprintf(_XE_PATH_.'files/cache/menu/%s.php', $value->menu_srl);
+						if (!file_exists($value->php_file))
 						{
 							$oMenuAdminController->makeXmlFile($value->menu_srl);
 						}
@@ -541,16 +541,16 @@ 
 						include($value->php_file);
 
 						$isMenuFixed = false;
-						if(count($menu->list) > 0)
+						if (count($menu->list) > 0)
 						{
-							foreach($menu->list AS $key2=>$value2)
+							foreach ($menu->list AS $key2=>$value2)
 							{
-								$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl,$siteSrl);
+								$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl, $siteSrl);
 							}
 						}
 
 						// menu recreate
-						if($isMenuFixed)
+						if ($isMenuFixed)
 						{
 							$oMenuAdminController->makeXmlFile($value->menu_srl);
 						}
@@ -561,7 +561,7 @@ 
 						$menuItems->menuItems = $menu;
 
 						// If include home menu, move first
-						if($value->menu_srl == $this->menuSrlWithinHome)
+						if ($value->menu_srl == $this->menuSrlWithinHome)
 						{
 							$menuList[-1] = $menuItems;
 						}
@@ -584,7 +584,7 @@ 
 	public function getMenuAdminDetailSetup()
 	{
 		$menuItemSrl = Context::get('menu_item_srl');
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -592,7 +592,7 @@ 
 		$menuItemInfo = $this->getMenuItemInfo($menuItemSrl);
 
 		// if menu is shortcut
-		if($menuItemInfo->is_shortcut == 'Y')
+		if ($menuItemInfo->is_shortcut == 'Y')
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -604,18 +604,18 @@ 
 		// get xml info
 		$moduleConfInfo = $oModuleModel->getModuleInfoXml($moduleInfo->module);
 
-		if($moduleConfInfo->setup_index_act)
+		if ($moduleConfInfo->setup_index_act)
 		{
 			$setupUrl = getNotEncodedUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl, 'isLayoutDrop', '1');
 		}
 
-		if($moduleConfInfo->simple_setup_index_act)
+		if ($moduleConfInfo->simple_setup_index_act)
 		{
 			$oTargetmoduleAdminModel = getAdminModel($moduleInfo->module);
 			$advancedSetupUrl = getUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl);
 			$simpleSetupHtml = $oTargetmoduleAdminModel->{$moduleConfInfo->simple_setup_index_act}($moduleInfo->module_srl, $advancedSetupUrl);
 
-			if($simpleSetupHtml)
+			if ($simpleSetupHtml)
 			{
 				$this->add('simpleSetupHtml', $simpleSetupHtml);
 			}
@@ -628,18 +628,18 @@ 
 	 * @param array $menu
 	 * @return void
 	 */
-	private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl,$siteSrl = 0)
+	private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl, $siteSrl = 0)
 	{
 		$oModuleModel = getModel('module');
 		// if url is empty and is_shortcut is 'N', change to is_shortcut 'Y'
-		if(!$menu['url'] && $menu['is_shortcut'] == 'N')
+		if (!$menu['url'] && $menu['is_shortcut'] == 'N')
 		{
 			$menu['is_shortcut'] = 'Y';
 
 			$args = new stdClass;
 			$args->menu_item_srl = $menu['node_srl'];
 			$args->is_shortcut = 'Y';
-			if($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
+			if ($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
 			else $args->name = $menu['menu_name'];
 			$output = executeQuery('menu.updateMenuItem', $args);
 
@@ -648,17 +648,17 @@ 
 
 		//if menu type is module menu
 		//if(!empty($menu['url']) && !preg_match('/^http/i', $menu['url']))
-		if($menu['is_shortcut'] != 'Y')
+		if ($menu['is_shortcut'] != 'Y')
 		{
 			unset($midInfo, $moduleInfo);
 			$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], $siteSrl);
 			$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
 
-			if($midInfo)
+			if ($midInfo)
 			{
 				$menu['module_srl'] = $midInfo->module_srl;
 				$menu['module'] = $midInfo->module;
-				if($midInfo->page_type)
+				if ($midInfo->page_type)
 				{
 					$menu['module_type'] = $midInfo->page_type;
 				}
@@ -668,16 +668,16 @@ 
 				}
 			}
 
-			if($moduleInfo->setup_index_act)
+			if ($moduleInfo->setup_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->setup_index_act;
 			}
-			else if($moduleInfo->default_index_act)
+			else if ($moduleInfo->default_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->default_index_act;
 			}
 
-			if($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
+			if ($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
 			{
 				$menu['is_start_module'] = true;
 				$this->menuSrlWithinHome = $menuSrl;
@@ -686,9 +686,9 @@ 
 			$menu['layout_srl'] = $midInfo->layout_srl;
 			$menu['browser_title'] = $midInfo->browser_title;
 		}
-		if(count($menu['list']) > 0)
+		if (count($menu['list']) > 0)
 		{
-			foreach($menu['list'] as $key=>$value)
+			foreach ($menu['list'] as $key=>$value)
 			{
 				$this->_menuInfoSetting($menu['list'][$key], $start_module, $isMenuFixed, $menuSrl, $siteSrl);
 			}

modules/menu/menu.admin.view.php

Braces +15 added lines, -8 removed lines

@@ -36,8 +36,11 @@ 
 
 		if(!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword) $site_srl = 0;
-			else $site_srl = (int)$site_module_info->site_srl;
+			if($logged_info->is_admin == 'Y' && !$site_keyword) {
+				$site_srl = 0;
+			} else {
+				$site_srl = (int)$site_module_info->site_srl;
+			}
 		}
 
 		// process for unlinked modules
@@ -51,7 +54,9 @@ 
 
 		$oMenuAdminModel = getAdminModel('menu');
 		$menuListFromDB = $oMenuAdminModel->getMenus();
-		if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
+		if(is_array($menuListFromDB)) {
+			$output = array_reverse($menuListFromDB);
+		}
 
 		$menuList = array();
 		if(is_array($output))
@@ -59,13 +64,16 @@ 
 			$menuItems = array();
 			foreach($output as $key=>$value)
 			{
-				if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
-				else
+				if($value->title == $oAdmin->getAdminMenuName()) {
+					unset($output[$key]);
+				} else
 				{
 					unset($menu, $menuItems);
 					//$value->xml_file = sprintf('./files/cache/menu/%s.xml.php',$value->menu_srl);
 					$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl);
-					if(file_exists($value->php_file)) include($value->php_file);
+					if(file_exists($value->php_file)) {
+						include($value->php_file);
+					}
 
 					if(count($menu->list)>0)
 					{
@@ -102,8 +110,7 @@ 
 		{
 			include($theme_file);
 			Context::set('current_layout', $theme_info->layout);
-		}
-		else
+		} else
 		{
 			$oModuleModel = getModel('module');
 			$default_mid = $oModuleModel->getDefaultMid();

Spacing +23 added lines, -23 removed lines

@@ -34,14 +34,14 @@ 
 		$site_srl = Context::get('site_srl');
 		$site_module_info = Context::get('site_module_info');
 
-		if(!$site_srl)
+		if (!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword) $site_srl = 0;
-			else $site_srl = (int)$site_module_info->site_srl;
+			if ($logged_info->is_admin == 'Y' && !$site_keyword) $site_srl = 0;
+			else $site_srl = (int) $site_module_info->site_srl;
 		}
 
 		// process for unlinked modules
-		if($site_srl == 0)
+		if ($site_srl == 0)
 		{
 			$oMenuController = getAdminController('menu');
 			$oMenuController->linkAllModuleInstancesToSitemap();
@@ -51,25 +51,25 @@ 
 
 		$oMenuAdminModel = getAdminModel('menu');
 		$menuListFromDB = $oMenuAdminModel->getMenus();
-		if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
+		if (is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
 
 		$menuList = array();
-		if(is_array($output))
+		if (is_array($output))
 		{
 			$menuItems = array();
-			foreach($output as $key=>$value)
+			foreach ($output as $key=>$value)
 			{
-				if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
+				if ($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
 				else
 				{
 					unset($menu, $menuItems);
 					//$value->xml_file = sprintf('./files/cache/menu/%s.xml.php',$value->menu_srl);
-					$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl);
-					if(file_exists($value->php_file)) include($value->php_file);
+					$value->php_file = sprintf(_XE_PATH_.'files/cache/menu/%s.php', $value->menu_srl);
+					if (file_exists($value->php_file)) include($value->php_file);
 
-					if(count($menu->list)>0)
+					if (count($menu->list) > 0)
 					{
-						foreach($menu->list as $key2=>$value2)
+						foreach ($menu->list as $key2=>$value2)
 						{
 							$this->_menuInfoSetting($menu->list[$key2]);
 						}
@@ -98,7 +98,7 @@ 
 
 		// choice theme file
 		$theme_file = _XE_PATH_.'files/theme/theme_info.php';
-		if(is_readable($theme_file))
+		if (is_readable($theme_file))
 		{
 			include($theme_file);
 			Context::set('current_layout', $theme_info->layout);
@@ -113,10 +113,10 @@ 
 		// get default group list
 		$oMemberModel = getModel('member');
 		$output = $oMemberModel->getGroups();
-		if(is_array($output))
+		if (is_array($output))
 		{
 			$groupList = array();
-			foreach($output as $value)
+			foreach ($output as $value)
 			{
 				$groupList[$value->group_srl] = new stdClass();
 				$groupList[$value->group_srl]->group_srl = $value->group_srl;
@@ -145,13 +145,13 @@ 
 	function _menuInfoSetting(&$menu)
 	{
 		$oModuleModel = getModel('module');
-		if($menu['url'] && strncasecmp('http', $menu['url'], 4) !== 0)
+		if ($menu['url'] && strncasecmp('http', $menu['url'], 4) !== 0)
 		{
 			unset($midInfo);
 			unset($moduleInfo);
 			$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], 0);
 			$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
-			if($moduleInfo->setup_index_act)
+			if ($moduleInfo->setup_index_act)
 			{
 				$menu['module_srl'] = $midInfo->module_srl;
 				$menu['setup_index_act'] = $moduleInfo->setup_index_act;
@@ -159,9 +159,9 @@ 
 			// setting layout srl for layout management
 			$menu['layout_srl'] = $midInfo->layout_srl;
 		}
-		if(count($menu['list']) > 0)
+		if (count($menu['list']) > 0)
 		{
-			foreach($menu['list'] as $key=>$value)
+			foreach ($menu['list'] as $key=>$value)
 			{
 				$this->_menuInfoSetting($menu['list'][$key]);
 			}
@@ -175,17 +175,17 @@ 
 	 */
 	function _arrangeMenuItem($menuItems)
 	{
-		if(is_array($menuItems))
+		if (is_array($menuItems))
 		{
 			$arrangedMenuItemList = array();
-			foreach($menuItems as $value)
+			foreach ($menuItems as $value)
 			{
-				if($value->parent_srl == 0)
+				if ($value->parent_srl == 0)
 				{
 					$arrangedMenuItemList[$value->menu_item_srl] = array('name'=>$value->name, 'subMenu'=>array());
 				}
 
-				if($value->parent_srl > 0 && isset($arrangedMenuItemList[$value->parent_srl]))
+				if ($value->parent_srl > 0 && isset($arrangedMenuItemList[$value->parent_srl]))
 				{
 					$arrangedMenuItemList[$value->parent_srl]['subMenu'][$value->menu_item_srl] = $value;
 				}

modules/message/message.admin.controller.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 		$args = Context::gets('skin', 'mskin', 'colorset', 'mcolorset');
 		// Create a module Controller object
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('message',$args);
-		if(!$output->toBool()) return $output;
+		$output = $oModuleController->insertModuleConfig('message', $args);
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_updated');
 

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 		// Create a module Controller object
 		$oModuleController = getController('module');
 		$output = $oModuleController->insertModuleConfig('message',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_updated');
 

modules/message/message.admin.model.php

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
 		if(!$skin)
 		{
 			$tpl = '';
-		}
-		else
+		} else
 		{
 			$oModuleModel = getModel('module'); /* @var $oModuleModel moduleModel */
 			$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin, $dir);

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
-class messageAdminModel extends message{
+class messageAdminModel extends message {
 	public function getMessageAdminColorset()
 	{
 		$skin = Context::get('skin');
@@ -8,7 +8,7 @@ 
 		Context::set('type', $type);
 		$dir = $type == 'P' ? 'skins' : 'm.skins';
 
-		if(!$skin)
+		if (!$skin)
 		{
 			$tpl = '';
 		}