xpressengine / xe-core

modules/document/document.model.php

Spacing +238 added lines, -238 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	function getDocumentExtraVarsFromDB($documentSrls)
 	{
-		if(!is_array($documentSrls) || count($documentSrls) == 0)
+		if (!is_array($documentSrls) || count($documentSrls) == 0)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -58,52 +58,52 @@ 
 		$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
 
 		// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
-		if(count($_document_list) <= 0) return;
+		if (count($_document_list) <= 0) return;
 
 		// Find all called the document object variable has been set extension
 		$document_srls = array();
-		foreach($_document_list as $key => $val)
+		foreach ($_document_list as $key => $val)
 		{
-			if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+			if (!$val->document_srl || $checked_documents[$val->document_srl]) continue;
 			$checked_documents[$val->document_srl] = true;
 			$document_srls[] = $val->document_srl;
 		}
 		// If the document number, return detected
-		if(!count($document_srls)) return;
+		if (!count($document_srls)) return;
 		// Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
 		//$obj->document_srl = implode(',',$document_srls);
 		$output = $this->getDocumentExtraVarsFromDB($document_srls);
-		if($output->toBool() && $output->data)
+		if ($output->toBool() && $output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if(!isset($val->value)) continue;
-				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				if (!isset($val->value)) continue;
+				if (!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
 				$extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
 			}
 		}
 
 		$user_lang_code = Context::getLangType();
-		for($i=0,$c=count($document_srls);$i<$c;$i++)
+		for ($i = 0, $c = count($document_srls); $i < $c; $i++)
 		{
 			$document_srl = $document_srls[$i];
 			unset($vars);
 
-			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
+			if (!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
 			$module_srl = $_document_list[$document_srl]->get('module_srl');
 			$extra_keys = $this->getExtraKeys($module_srl);
 			$vars = $extra_vars[$document_srl];
 			$document_lang_code = $_document_list[$document_srl]->get('lang_code');
 			// Expand the variable processing
-			if(count($extra_keys))
+			if (count($extra_keys))
 			{
-				foreach($extra_keys as $idx => $key)
+				foreach ($extra_keys as $idx => $key)
 				{
 					$extra_keys[$idx] = clone($key);
 					$val = $vars[$idx];
-					if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-					else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-					else if(isset($val[0])) $v = $val[0];
+					if (isset($val[$user_lang_code])) $v = $val[$user_lang_code];
+					else if (isset($val[$document_lang_code])) $v = $val[$document_lang_code];
+					else if (isset($val[0])) $v = $val[0];
 					else $v = null;
 					$extra_keys[$idx]->value = $v;
 				}
@@ -113,9 +113,9 @@ 
 			$evars = new ExtraVar($module_srl);
 			$evars->setExtraVarKeys($extra_keys);
 			// Title Processing
-			if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			if ($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title', $vars[-1][$user_lang_code]);
 			// Information processing
-			if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			if ($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content', $vars[-2][$user_lang_code]);
 			
 			// static 데이터를 갱신해주기 위해 들어간 코드같으나 어차피 언어 변경 자체는 페이지 전환이 일어나면서 발생하는게 대부분이라 효용이 없음. 또한 예기치않게 권한이 없는 다국어 문서 내용을 보여주는 부효과가 일어남		
 			/*		
@@ -137,21 +137,21 @@ 
 	 * @param array $columnList
 	 * @return documentItem
 	 */
-	function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array())
+	function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array())
 	{
-		if(!$document_srl) return new documentItem();
+		if (!$document_srl) return new documentItem();
 
-		if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+		if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 		{
 			$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				return $oDocument;
 			}
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+			if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 		}
-		if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
+		if ($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
 		return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 	}
@@ -164,12 +164,12 @@ 
 	 * @param array $columnList
 	 * @return array value type is documentItem
 	 */
-	function getDocuments($document_srls, $is_admin = false, $load_extra_vars=true, $columnList = array())
+	function getDocuments($document_srls, $is_admin = false, $load_extra_vars = true, $columnList = array())
 	{
-		if(is_array($document_srls))
+		if (is_array($document_srls))
 		{
 			$list_count = count($document_srls);
-			$document_srls = implode(',',$document_srls);
+			$document_srls = implode(',', $document_srls);
 		}
 		else
 		{
@@ -182,33 +182,33 @@ 
 
 		$output = executeQuery('document.getDocuments', $args, $columnList);
 		$document_list = $output->data;
-		if(!$document_list) return;
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if (!$document_list) return;
+		if (!is_array($document_list)) $document_list = array($document_list);
 
 		$document_count = count($document_list);
-		foreach($document_list as $key => $attribute)
+		foreach ($document_list as $key => $attribute)
 		{
 			$document_srl = $attribute->document_srl;
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if ($is_admin) $oDocument->setGrant();
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
 			$result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 
 		$output = null;
-		if(count($result))
+		if (count($result))
 		{
-			foreach($result as $document_srl => $val)
+			foreach ($result as $document_srl => $val)
 			{
 				$output[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 			}
@@ -225,7 +225,7 @@ 
 	 * @param array $columnList
 	 * @return BaseObject
 	 */
-	function getDocumentList($obj, $except_notice = false, $load_extra_vars=true, $columnList = array())
+	function getDocumentList($obj, $except_notice = false, $load_extra_vars = true, $columnList = array())
 	{
 		$sort_check = $this->_setSortIndex($obj, $load_extra_vars);
 		$obj->sort_index = $sort_check->sort_index;
@@ -235,7 +235,7 @@ 
 		// Call trigger (before)
 		// This trigger can be used to set an alternative output using a different search method
 		$output = ModuleHandler::triggerCall('document.getDocumentList', 'before', $obj);
-		if($output instanceof BaseObject && !$output->toBool())
+		if ($output instanceof BaseObject && !$output->toBool())
 		{
 			return $output;
 		}
@@ -252,10 +252,10 @@ 
 			$output = $obj->use_alternate_output;
 			unset($obj->use_alternate_output);
 		}
-		elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
+		elseif ($sort_check->isExtraVars && substr_count($obj->search_target, 'extra_vars'))
 		{
 			$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
-			$args->sort_index = str_replace('documents.','',$args->sort_index);
+			$args->sort_index = str_replace('documents.', '', $args->sort_index);
 			$output = executeQueryArray($query_id, $args);
 		}
 		elseif ($sort_check->isExtraVars)
@@ -267,16 +267,16 @@ 
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
 			$groupByQuery = array('document.getDocumentListWithinComment' => 1, 'document.getDocumentListWithinTag' => 1, 'document.getDocumentListWithinExtraVars' => 1);
-			if(isset($groupByQuery[$query_id]))
+			if (isset($groupByQuery[$query_id]))
 			{
 				$group_args = clone($args);
 				$group_args->sort_index = 'documents.'.$args->sort_index;
 				$output = executeQueryArray($query_id, $group_args);
-				if(!$output->toBool()||!count($output->data)) return $output;
+				if (!$output->toBool() || !count($output->data)) return $output;
 
-				foreach($output->data as $key => $val)
+				foreach ($output->data as $key => $val)
 				{
-					if($val->document_srl) $target_srls[] = $val->document_srl;
+					if ($val->document_srl) $target_srls[] = $val->document_srl;
 				}
 
 				$page_navigation = $output->page_navigation;
@@ -284,7 +284,7 @@ 
 				$virtual_number = $keys[0];
 
 				$target_args = new stdClass();
-				$target_args->document_srls = implode(',',$target_srls);
+				$target_args->document_srls = implode(',', $target_srls);
 				$target_args->list_order = $args->sort_index;
 				$target_args->order_type = $args->order_type;
 				$target_args->list_count = $args->list_count;
@@ -301,35 +301,35 @@ 
 			}
 		}
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 		$idx = 0;
 		$data = $output->data;
 		unset($output->data);
 
-		if(!isset($virtual_number))
+		if (!isset($virtual_number))
 		{
 			$keys = array_keys($data);
 			$virtual_number = $keys[0];
 		}
 
-		if($except_notice)
+		if ($except_notice)
 		{
-			foreach($data as $key => $attribute)
+			foreach ($data as $key => $attribute)
 			{
-				if($attribute->is_notice == 'Y') $virtual_number --;
+				if ($attribute->is_notice == 'Y') $virtual_number--;
 			}
 		}
 
-		foreach($data as $key => $attribute)
+		foreach ($data as $key => $attribute)
 		{
-			if($except_notice && $attribute->is_notice == 'Y') continue;
+			if ($except_notice && $attribute->is_notice == 'Y') continue;
 			$document_srl = $attribute->document_srl;
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if ($is_admin) $oDocument->setGrant();
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
@@ -337,11 +337,11 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 
-		if(count($output->data))
+		if (count($output->data))
 		{
-			foreach($output->data as $number => $document)
+			foreach ($output->data as $number => $document)
 			{
 				$output->data[$number] = $GLOBALS['XE_DOCUMENT_LIST'][$document->document_srl];
 			}
@@ -363,16 +363,16 @@ 
 	{
 		$args = new stdClass();
 		$args->module_srl = $obj->module_srl;
-		$args->category_srl= $obj->category_srl;
+		$args->category_srl = $obj->category_srl;
 		$output = executeQueryArray('document.getNoticeList', $args, $columnList);
-		if(!$output->toBool()||!$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$document_srl = $val->document_srl;
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
@@ -383,7 +383,7 @@ 
 		}
 		$this->setToAllDocumentExtraVars();
 
-		foreach($result->data as $document_srl => $val)
+		foreach ($result->data as $document_srl => $val)
 		{
 			$result->data[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
@@ -399,20 +399,20 @@ 
 	 */
 	function getExtraKeys($module_srl)
 	{
-		if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
+		if (!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
 		{
 			$keys = false;
 			$oCacheHandler = CacheHandler::getInstance('object', null, true);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
-				$object_key = 'module_document_extra_keys:' . $module_srl;
+				$object_key = 'module_document_extra_keys:'.$module_srl;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$keys = $oCacheHandler->get($cache_key);
 			}
 
 			$oExtraVar = ExtraVar::getInstance($module_srl);
 
-			if($keys === false)
+			if ($keys === false)
 			{
 				$obj = new stdClass();
 				$obj->module_srl = $module_srl;
@@ -422,13 +422,13 @@ 
 
 				// correcting index order
 				$isFixed = FALSE;
-				if(is_array($output->data))
+				if (is_array($output->data))
 				{
 					$prevIdx = 0;
-					foreach($output->data as $no => $value)
+					foreach ($output->data as $no => $value)
 					{
 						// case first
-						if($prevIdx == 0 && $value->idx != 1)
+						if ($prevIdx == 0 && $value->idx != 1)
 						{
 							$args = new stdClass();
 							$args->module_srl = $module_srl;
@@ -442,7 +442,7 @@ 
 						}
 
 						// case others
-						if($prevIdx > 0 && $prevIdx + 1 != $value->idx)
+						if ($prevIdx > 0 && $prevIdx + 1 != $value->idx)
 						{
 							$args = new stdClass();
 							$args->module_srl = $module_srl;
@@ -459,16 +459,16 @@ 
 					}
 				}
 
-				if($isFixed)
+				if ($isFixed)
 				{
 					$output = executeQueryArray('document.getDocumentExtraKeys', $obj);
 				}
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if (!$keys) $keys = array();
 
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $keys);
 				}
@@ -489,14 +489,14 @@ 
 	 */
 	function getExtraVars($module_srl, $document_srl)
 	{
-		if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
+		if (!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
 		{
 			// Extended to extract the values of variables set
 			$oDocument = $this->getDocument($document_srl, false);
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			$this->setToAllDocumentExtraVars();
 		}
-		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		if (is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
 		return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
 	}
 
@@ -519,71 +519,71 @@ 
 
 		$oDocumentController = getController('document');
 		// Members must be a possible feature
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 			$module_srl = $oDocument->get('module_srl');
 			$member_srl = $oDocument->get('member_srl');
-			if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+			if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 			$oModuleModel = getModel('module');
-			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-			if($document_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl)
+			$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+			if ($document_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add a Referral Button
 				$url = sprintf("doCallModuleAction('document','procDocumentVoteUp','%s')", $document_srl);
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_vote','','javascript');
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_vote', '', 'javascript');
 			}
 
-			if($document_config->use_vote_down!='N' && $member_srl!=$logged_info->member_srl)
+			if ($document_config->use_vote_down != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add button to negative
-				$url= sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_vote_down','','javascript');
+				$url = sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_vote_down', '', 'javascript');
 			}
 
 			// Adding Report
 			$url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_declare','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_declare', '', 'javascript');
 
 			// Add Bookmark button
 			$url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_scrap', '', 'javascript');
 		}
 		// Add print button
-		$url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
-		$oDocumentController->addDocumentPopupMenu($url,'cmd_print','','printDocument');
+		$url = getUrl('', 'module', 'document', 'act', 'dispDocumentPrint', 'document_srl', $document_srl);
+		$oDocumentController->addDocumentPopupMenu($url, 'cmd_print', '', 'printDocument');
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
-		if($this->grant->manager)
+		if ($this->grant->manager)
 		{
 			$str_confirm = Context::getLang('confirm_move');
 			$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['document_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('document', 'procDocumentAdminMoveToTrash', params)", $str_confirm, $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_trash','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_trash', '', 'javascript');
 		}
 
 		// If you are managing to find posts by ip
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$oDocumentModel = getModel('document');
-			$oDocument = $oDocumentModel->getDocument($document_srl);	//before setting document recycle
+			$oDocument = $oDocumentModel->getDocument($document_srl); //before setting document recycle
 
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				// Find a post equivalent to ip address
-				$url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->getIpAddress());
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+				$url = getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'ipaddress', 'search_keyword', $oDocument->getIpAddress());
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_search_by_ipaddress', $icon_path, 'TraceByIpaddress');
 
 				$url = sprintf("var params = new Array(); params['ipaddress_list']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument->getIpAddress());
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','','javascript');
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_add_ip_to_spamfilter', '', 'javascript');
 			}
 		}
 		// Changing the language of pop-up menu
 		$menus = Context::get('document_popup_menu_list');
 		$menus_count = count($menus);
-		for($i=0;$i<$menus_count;$i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -599,13 +599,13 @@ 
 	 */
 	function getDocumentCount($module_srl, $search_obj = NULL)
 	{
-		if(is_null($search_obj)) $search_obj = new stdClass();
+		if (is_null($search_obj)) $search_obj = new stdClass();
 		$search_obj->module_srl = $module_srl;
 
 		$output = executeQuery('document.getDocumentCount', $search_obj);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -616,7 +616,7 @@ 
 	function getDocumentCountByGroupStatus($search_obj = NULL)
 	{
 		$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 
 		return $output->data;
 	}
@@ -635,7 +635,7 @@ 
 		$output = executeQuery('document.getDocumentExtraVarsCount', $args);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -652,29 +652,29 @@ 
 
 		$this->_setSearchOption($opt, $args, $query_id, $use_division);
 
-		if($sort_check->isExtraVars)
+		if ($sort_check->isExtraVars)
 		{
 			return 1;
 		}
 		else
 		{
-			if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
+			if ($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
 			{
-				if($args->order_type === 'desc')
+				if ($args->order_type === 'desc')
 				{
-					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+					$args->{'rev_'.$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 				else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 			}
-			elseif($sort_check->sort_index === 'regdate')
+			elseif ($sort_check->sort_index === 'regdate')
 			{
 
-				if($args->order_type === 'asc')
+				if ($args->order_type === 'asc')
 				{
-					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+					$args->{'rev_'.$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 				else
 				{
@@ -689,9 +689,9 @@ 
 		}
 
 		// Guhanhu total number of the article search page
-		$output = executeQuery($query_id . 'Page', $args);
+		$output = executeQuery($query_id.'Page', $args);
 		$count = $output->data->count;
-		$page = (int)(($count-1)/$opt->list_count)+1;
+		$page = (int) (($count - 1) / $opt->list_count) + 1;
 		return $page;
 	}
 
@@ -703,16 +703,16 @@ 
 	 */
 	function getCategory($category_srl, $columnList = array())
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategory', $args, $columnList);
 
 		$node = $output->data;
-		if(!$node) return;
+		if (!$node) return;
 
-		if($node->group_srls)
+		if ($node->group_srls)
 		{
-			$group_srls = explode(',',$node->group_srls);
+			$group_srls = explode(',', $node->group_srls);
 			unset($node->group_srls);
 			$node->group_srls = $group_srls;
 		}
@@ -733,8 +733,8 @@ 
 	{
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
-		$output = executeQuery('document.getChildCategoryCount',$args);
-		if($output->data->count > 0) return true;
+		$output = executeQuery('document.getChildCategoryCount', $args);
+		if ($output->data->count > 0) return true;
 		return false;
 	}
 
@@ -750,10 +750,10 @@ 
 		// Category of the target module file swollen
 		$filename = sprintf("%sfiles/cache/document_category/%s.php", _XE_PATH_, $module_srl);
 		// If the target file to the cache file regeneration category
-		if(!file_exists($filename))
+		if (!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if (!$oDocumentController->makeCategoryFile($module_srl)) return array();
 		}
 
 		include($filename);
@@ -773,10 +773,10 @@ 
 	 */
 	function _arrangeCategory(&$document_category, $list, $depth)
 	{
-		if(!count($list)) return;
+		if (!count($list)) return;
 		$idx = 0;
 		$list_order = array();
-		foreach($list as $key => $val)
+		foreach ($list as $key => $val)
 		{
 			$obj = new stdClass;
 			$obj->mid = $val['mid'];
@@ -785,7 +785,7 @@ 
 			$obj->parent_srl = $val['parent_srl'];
 			$obj->title = $obj->text = $val['text'];
 			$obj->description = $val['description'];
-			$obj->expand = $val['expand']=='Y'?true:false;
+			$obj->expand = $val['expand'] == 'Y' ?true:false;
 			$obj->color = $val['color'];
 			$obj->document_count = $val['document_count'];
 			$obj->depth = $depth;
@@ -793,26 +793,26 @@ 
 			$obj->childs = array();
 			$obj->grant = $val['grant'];
 
-			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
+			if (Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
 			else $selected = false;
 
 			$obj->selected = $selected;
 
 			$list_order[$idx++] = $obj->category_srl;
 			// If you have a parent category of child nodes apply data
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_srl = $obj->parent_srl;
 				$document_count = $obj->document_count;
 				$expand = $obj->expand;
-				if($selected) $expand = true;
+				if ($selected) $expand = true;
 
-				while($parent_srl)
+				while ($parent_srl)
 				{
 					$document_category[$parent_srl]->document_count += $document_count;
 					$document_category[$parent_srl]->childs[] = $obj->category_srl;
 					$document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-					if($expand) $document_category[$parent_srl]->expand = $expand;
+					if ($expand) $document_category[$parent_srl]->expand = $expand;
 
 					$parent_srl = $document_category[$parent_srl]->parent_srl;
 				}
@@ -820,10 +820,10 @@ 
 
 			$document_category[$key] = $obj;
 
-			if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			if (count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth + 1);
 		}
 		$document_category[$list_order[0]]->first = true;
-		$document_category[$list_order[count($list_order)-1]]->last = true;
+		$document_category[$list_order[count($list_order) - 1]]->last = true;
 	}
 
 	/**
@@ -838,7 +838,7 @@ 
 		$args->module_srl = $module_srl;
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategoryDocumentCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -848,8 +848,8 @@ 
 	 */
 	function getCategoryXmlFile($module_srl)
 	{
-		$xml_file = sprintf('files/cache/document_category/%s.xml.php',$module_srl);
-		if(!file_exists($xml_file))
+		$xml_file = sprintf('files/cache/document_category/%s.xml.php', $module_srl);
+		if (!file_exists($xml_file))
 		{
 			$oDocumentController = getController('document');
 			$oDocumentController->makeCategoryFile($module_srl);
@@ -864,8 +864,8 @@ 
 	 */
 	function getCategoryPhpFile($module_srl)
 	{
-		$php_file = sprintf('files/cache/document_category/%s.php',$module_srl);
-		if(!file_exists($php_file))
+		$php_file = sprintf('files/cache/document_category/%s.php', $module_srl);
+		if (!file_exists($php_file))
 		{
 			$oDocumentController = getController('document');
 			$oDocumentController->makeCategoryFile($module_srl);
@@ -880,7 +880,7 @@ 
 	 */
 	function getMonthlyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -888,13 +888,13 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 
 		$output = executeQuery('document.getMonthlyArchivedList', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		return $output;
 	}
@@ -906,7 +906,7 @@ 
 	 */
 	function getDailyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -914,14 +914,14 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 		$args->regdate = $obj->regdate;
 
 		$output = executeQuery('document.getDailyArchivedList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		return $output;
 	}
@@ -932,17 +932,17 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		$module_srl = Context::get('module_srl');
-		$categories= $this->getCategoryList($module_srl);
+		$categories = $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
 		// No additional category
 		$output = "0,0,{$lang->none_category}\n";
-		if($categories)
+		if ($categories)
 		{
-			foreach($categories as $category_srl => $category)
+			foreach ($categories as $category_srl => $category)
 			{
-				$output .= sprintf("%d,%d,%s\n",$category_srl, $category->depth,$category->title);
+				$output .= sprintf("%d,%d,%s\n", $category_srl, $category->depth, $category->title);
 			}
 		}
 		$this->add('categories', $output);
@@ -954,7 +954,7 @@ 
 	 */
 	function getDocumentConfig()
 	{
-		if($this->documentConfig === NULL)
+		if ($this->documentConfig === NULL)
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('document');
@@ -1027,11 +1027,11 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
-		if(!$category_info)
+		if (!$category_info)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -1047,14 +1047,14 @@ 
 	 */
 	function getDocumentSrlByAlias($mid, $alias)
 	{
-		if(!$mid || !$alias) return null;
+		if (!$mid || !$alias) return null;
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass;
 		$args->mid = $mid;
 		$args->alias_title = $alias;
 		$args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('document.getDocumentSrlByAlias', $args);
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else return $output->data->document_srl;
 	}
 
@@ -1066,15 +1066,15 @@ 
 	 */
 	function getDocumentSrlByTitle($module_srl, $title)
 	{
-		if(!$module_srl || !$title) return null;
+		if (!$module_srl || !$title) return null;
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
 		$args->title = $title;
 		$output = executeQuery('document.getDocumentSrlByTitle', $args);
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else
 		{
-			if(is_array($output->data)) return $output->data[0]->document_srl;
+			if (is_array($output->data)) return $output->data[0]->document_srl;
 			return $output->data->document_srl;
 		}
 	}
@@ -1086,12 +1086,12 @@ 
 	 */
 	function getAlias($document_srl)
 	{
-		if(!$document_srl) return null;
+		if (!$document_srl) return null;
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('document.getAliases', $args);
 
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else return $output->data[0]->alias_title;
 	}
 
@@ -1134,32 +1134,32 @@ 
 	{
 		// Variable check
 		$args = new stdClass;
-		$args->category_srl = $obj->category_srl?$obj->category_srl:null;
+		$args->category_srl = $obj->category_srl ? $obj->category_srl : null;
 		$args->sort_index = $obj->sort_index;
-		$args->order_type = $obj->order_type?$obj->order_type:'desc';
-		$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->order_type = $obj->order_type ? $obj->order_type : 'desc';
+		$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;
 		// Search options
 		$search_target = $obj->search_target;
 		$search_keyword = $obj->search_keyword;
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					break;
 				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;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1167,13 +1167,13 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+					if ($search_keyword == 'N') $args->statusList = array($this->getConfigStatus('public'));
+					elseif ($search_keyword == 'Y') $args->statusList = array($this->getConfigStatus('secret'));
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1182,7 +1182,7 @@ 
 				case 'comment_count' :
 				case 'trackback_count' :
 				case 'uploaded_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1194,9 +1194,9 @@ 
 		}
 
 		$output = executeQueryArray('document.getTrashList', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $attribute)
+			foreach ($output->data as $key => $attribute)
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
@@ -1215,46 +1215,46 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$point = Context::get('point');
-		if($point != -1) $point = 1;
+		if ($point != -1) $point = 1;
 
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($point == -1)
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($point == -1)
 		{
-			if($document_config->use_vote_down!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_down != 'S') return new BaseObject(-1, 'msg_invalid_request');
 			$args->below_point = 0;
 		}
 		else
 		{
-			if($document_config->use_vote_up!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_up != 'S') return new BaseObject(-1, 'msg_invalid_request');
 			$args->more_point = 0;
 		}
 
 		$args->document_srl = $document_srl;
 
-		$output = executeQueryArray('document.getVotedMemberList',$args);
-		if(!$output->toBool()) return $output;
+		$output = executeQueryArray('document.getVotedMemberList', $args);
+		if (!$output->toBool()) return $output;
 
 		$oMemberModel = getModel('member');
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $d)
+			foreach ($output->data as $k => $d)
 			{
 				$profile_image = $oMemberModel->getProfileImage($d->member_srl);
 				$output->data[$k]->src = $profile_image->src;
 			}
 		}
 
-		$this->add('voted_member_list',$output->data);
+		$this->add('voted_member_list', $output->data);
 	}
 
 	/**
@@ -1264,7 +1264,7 @@ 
 	function getStatusNameList()
 	{
 		global $lang;
-		if(!isset($lang->status_name_list))
+		if (!isset($lang->status_name_list))
 			return array_flip($this->getStatusList());
 		else return $lang->status_name_list;
 	}
@@ -1279,7 +1279,7 @@ 
 	{
 		$sortIndex = $obj->sort_index;
 		$isExtraVars = false;
-		if(!in_array($sortIndex, array('list_order','regdate','last_update','update_order','readed_count','voted_count','blamed_count','comment_count','trackback_count','uploaded_count','title','category_srl')))
+		if (!in_array($sortIndex, array('list_order', 'regdate', 'last_update', 'update_order', 'readed_count', 'voted_count', 'blamed_count', 'comment_count', 'trackback_count', 'uploaded_count', 'title', 'category_srl')))
 		{
 			// get module_srl extra_vars list
 			if ($load_extra_vars)
@@ -1294,11 +1294,11 @@ 
 				else
 				{
 					$check_array = array();
-					foreach($extra_output->data as $val)
+					foreach ($extra_output->data as $val)
 					{
 						$check_array[] = $val->eid;
 					}
-					if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
+					if (!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
 					else $isExtraVars = true;
 				}
 			}
@@ -1326,13 +1326,13 @@ 
 	{
 		// Variable check
 		$args = new stdClass();
-		$args->category_srl = $searchOpt->category_srl?$searchOpt->category_srl:null;
+		$args->category_srl = $searchOpt->category_srl ? $searchOpt->category_srl : null;
 		$args->order_type = $searchOpt->order_type;
-		$args->page = $searchOpt->page?$searchOpt->page:1;
-		$args->list_count = $searchOpt->list_count?$searchOpt->list_count:20;
-		$args->page_count = $searchOpt->page_count?$searchOpt->page_count:10;
-		$args->start_date = $searchOpt->start_date?$searchOpt->start_date:null;
-		$args->end_date = $searchOpt->end_date?$searchOpt->end_date:null;
+		$args->page = $searchOpt->page ? $searchOpt->page : 1;
+		$args->list_count = $searchOpt->list_count ? $searchOpt->list_count : 20;
+		$args->page_count = $searchOpt->page_count ? $searchOpt->page_count : 10;
+		$args->start_date = $searchOpt->start_date ? $searchOpt->start_date : null;
+		$args->end_date = $searchOpt->end_date ? $searchOpt->end_date : null;
 		$args->member_srl = $searchOpt->member_srl;
 		$args->member_srls = $searchOpt->member_srls;
 
@@ -1342,10 +1342,10 @@ 
 
 		// Check the target and sequence alignment
 		$orderType = array('desc' => 1, 'asc' => 1);
-		if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
+		if (!isset($orderType[$args->order_type])) $args->order_type = 'asc';
 
 		// If that came across mid module_srl instead of a direct module_srl guhaejum
-		if($searchOpt->mid)
+		if ($searchOpt->mid)
 		{
 			$oModuleModel = getModel('module');
 			$args->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -1353,30 +1353,30 @@ 
 		}
 
 		// Module_srl passed the array may be a check whether the array
-		if(is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
+		if (is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
 		else $args->module_srl = $searchOpt->module_srl;
 
 		// Except for the test module_srl
-		if(is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
+		if (is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
 		else $args->exclude_module_srl = $searchOpt->exclude_module_srl;
 
 		// only admin document list, temp document showing
-		if($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
+		if ($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
 		else
 		{
-			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
+			if ($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
 				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
 			else
 				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
 		}
 
 		// Category is selected, further sub-categories until all conditions
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$category_list = $this->getCategoryList($args->module_srl);
 			$category_info = $category_list[$args->category_srl];
 			$category_info->childs[] = $args->category_srl;
-			$args->category_srl = implode(',',$category_info->childs);
+			$args->category_srl = implode(',', $category_info->childs);
 		}
 
 		// Used to specify the default query id (based on several search options to query id modified)
@@ -1389,24 +1389,24 @@ 
 		$search_target = $searchOpt->search_target;
 		$search_keyword = $searchOpt->search_keyword;
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					$use_division = true;
 					break;
 				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;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1414,18 +1414,18 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
-					if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-					elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
+					if ($search_keyword == 'N') $args->{"s_".$search_target} = 'N';
+					elseif ($search_keyword == 'Y') $args->{"s_".$search_target} = 'Y';
 					else $args->{"s_".$search_target} = '';
 					break;
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
-					elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+					if ($search_keyword == 'N') $args->statusList = array($this->getConfigStatus('public'));
+					elseif ($search_keyword == 'Y') $args->statusList = array($this->getConfigStatus('secret'));
+					elseif ($search_keyword == 'temp') $args->statusList = array($this->getConfigStatus('temp'));
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1433,17 +1433,17 @@ 
 				case 'comment_count' :
 				case 'trackback_count' :
 				case 'uploaded_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 				case 'member_srls' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 
-					if($logged_info->member_srl)
+					if ($logged_info->member_srl)
 					{
 						$srls = explode(',', $search_keyword);
-						foreach($srls as $srl)
+						foreach ($srls as $srl)
 						{
-							if(abs($srl) != $logged_info->member_srl)
+							if (abs($srl) != $logged_info->member_srl)
 							{
 								break; // foreach
 							}
@@ -1454,7 +1454,7 @@ 
 					}
 					break;
 				case 'blamed_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword * -1;
+					$args->{"s_".$search_target} = (int) $search_keyword * -1;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1467,7 +1467,7 @@ 
 					$use_division = true;
 					break;
 				case 'tag' :
-					$args->s_tags = str_replace(' ','%',$search_keyword);
+					$args->s_tags = str_replace(' ', '%', $search_keyword);
 					$query_id = 'document.getDocumentListWithinTag';
 					break;
 				case 'extra_vars':
@@ -1475,9 +1475,9 @@ 
 					$query_id = 'document.getDocumentListWithinExtraVars';
 					break;
 				default :
-					if(strpos($search_target,'extra_vars')!==false) {
+					if (strpos($search_target, 'extra_vars') !== false) {
 						$args->var_idx = substr($search_target, strlen('extra_vars'));
-						$args->var_value = str_replace(' ','%',$search_keyword);
+						$args->var_value = str_replace(' ', '%', $search_keyword);
 						$args->sort_index = 'documents.'.$args->sort_index;
 						$query_id = 'document.getDocumentListWithExtraVars';
 					}
@@ -1494,18 +1494,18 @@ 
 			/**
 			 * list_order asc sort of division that can be used only when
 			 */
-			if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+			if ($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
 
 			/**
 			 * If it is true, use_division changed to use the document division
 			 */
-			if($use_division)
+			if ($use_division)
 			{
 				// Division begins
-				$division = (int)Context::get('division');
+				$division = (int) Context::get('division');
 
 				// order by list_order and (module_srl===0 or module_srl may count), therefore case table full scan
-				if($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
+				if ($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
@@ -1517,7 +1517,7 @@ 
 				}
 
 				// If you do not value the best division top
-				if(!$division)
+				if (!$division)
 				{
 					$division_args = new stdClass();
 					$division_args->module_srl = $args->module_srl;
@@ -1528,7 +1528,7 @@ 
 					$division_args->statusList = $args->statusList;
 
 					$output = executeQuery($divisionSqlID, $division_args, array('list_order'));
-					if($output->data)
+					if ($output->data)
 					{
 						$item = array_pop($output->data);
 						$division = $item->list_order;
@@ -1537,10 +1537,10 @@ 
 				}
 
 				// The last division
-				$last_division = (int)Context::get('last_division');
+				$last_division = (int) Context::get('last_division');
 
 				// Division after division from the 5000 value of the specified Wanted
-				if(!$last_division)
+				if (!$last_division)
 				{
 					$last_division_args = new stdClass();
 					$last_division_args->module_srl = $args->module_srl;
@@ -1552,7 +1552,7 @@ 
 					$last_division_args->page = 5001;
 
 					$output = executeQuery($divisionSqlID, $last_division_args, array('list_order'));
-					if($output->data)
+					if ($output->data)
 					{
 						$item = array_pop($output->data);
 						$last_division = $item->list_order;
@@ -1560,14 +1560,14 @@ 
 				}
 
 				// Make sure that after last_division article
-				if($last_division)
+				if ($last_division)
 				{
 					$last_division_args = new stdClass();
 					$last_division_args->module_srl = $args->module_srl;
 					$last_division_args->exclude_module_srl = $args->exclude_module_srl;
 					$last_division_args->list_order = $last_division;
 					$output = executeQuery('document.getDocumentDivisionCount', $last_division_args);
-					if($output->data->count<1) $last_division = null;
+					if ($output->data->count < 1) $last_division = null;
 				}
 
 				$args->division = $division;
@@ -1600,7 +1600,7 @@ 
 	 * @param int $count
 	 * @return object
 	 */
-	function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0 )
+	function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0)
 	{
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
@@ -1608,8 +1608,8 @@ 
 		$output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList);
 		$document_list = $output->data;
 
-		if(!$document_list) return array();
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if (!$document_list) return array();
+		if (!is_array($document_list)) $document_list = array($document_list);
 
 		return $document_list;
 	}
@@ -1621,7 +1621,7 @@ 
 	function getDocumentExtraImagePath()
 	{
 		$documentConfig = getModel('document')->getDocumentConfig();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$iconSkin = $documentConfig->micons;
 		}
@@ -1629,7 +1629,7 @@ 
 		{
 			$iconSkin = $documentConfig->icons;
 		}
-		$path = sprintf('%s%s',getUrl(), "modules/document/tpl/icons/$iconSkin/");
+		$path = sprintf('%s%s', getUrl(), "modules/document/tpl/icons/$iconSkin/");
 
 		return $path;
 	}

Braces +300 added lines, -139 removed lines

@@ -58,18 +58,24 @@ 
 		$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
 
 		// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
-		if(count($_document_list) <= 0) return;
+		if(count($_document_list) <= 0) {
+			return;
+		}
 
 		// Find all called the document object variable has been set extension
 		$document_srls = array();
 		foreach($_document_list as $key => $val)
 		{
-			if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+			if(!$val->document_srl || $checked_documents[$val->document_srl]) {
+				continue;
+			}
 			$checked_documents[$val->document_srl] = true;
 			$document_srls[] = $val->document_srl;
 		}
 		// If the document number, return detected
-		if(!count($document_srls)) return;
+		if(!count($document_srls)) {
+			return;
+		}
 		// Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
 		//$obj->document_srl = implode(',',$document_srls);
 		$output = $this->getDocumentExtraVarsFromDB($document_srls);
@@ -77,8 +83,12 @@ 
 		{
 			foreach($output->data as $key => $val)
 			{
-				if(!isset($val->value)) continue;
-				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				if(!isset($val->value)) {
+					continue;
+				}
+				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) {
+					$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				}
 				$extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
 			}
 		}
@@ -89,7 +99,9 @@ 
 			$document_srl = $document_srls[$i];
 			unset($vars);
 
-			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
+			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) {
+				continue;
+			}
 			$module_srl = $_document_list[$document_srl]->get('module_srl');
 			$extra_keys = $this->getExtraKeys($module_srl);
 			$vars = $extra_vars[$document_srl];
@@ -101,10 +113,15 @@ 
 				{
 					$extra_keys[$idx] = clone($key);
 					$val = $vars[$idx];
-					if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-					else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-					else if(isset($val[0])) $v = $val[0];
-					else $v = null;
+					if(isset($val[$user_lang_code])) {
+						$v = $val[$user_lang_code];
+					} else if(isset($val[$document_lang_code])) {
+						$v = $val[$document_lang_code];
+					} else if(isset($val[0])) {
+						$v = $val[0];
+					} else {
+						$v = null;
+					}
 					$extra_keys[$idx]->value = $v;
 				}
 			}
@@ -113,9 +130,13 @@ 
 			$evars = new ExtraVar($module_srl);
 			$evars->setExtraVarKeys($extra_keys);
 			// Title Processing
-			if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			if($vars[-1][$user_lang_code]) {
+				$_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			}
 			// Information processing
-			if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			if($vars[-2][$user_lang_code]) {
+				$_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			}
 			
 			// static 데이터를 갱신해주기 위해 들어간 코드같으나 어차피 언어 변경 자체는 페이지 전환이 일어나면서 발생하는게 대부분이라 효용이 없음. 또한 예기치않게 권한이 없는 다국어 문서 내용을 보여주는 부효과가 일어남		
 			/*		
@@ -139,7 +160,9 @@ 
 	 */
 	function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array())
 	{
-		if(!$document_srl) return new documentItem();
+		if(!$document_srl) {
+			return new documentItem();
+		}
 
 		if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 		{
@@ -149,9 +172,13 @@ 
 				return $oDocument;
 			}
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+			if($load_extra_vars) {
+				$this->setToAllDocumentExtraVars();
+			}
+		}
+		if($is_admin) {
+			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 		}
-		if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
 		return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 	}
@@ -170,8 +197,7 @@ 
 		{
 			$list_count = count($document_srls);
 			$document_srls = implode(',',$document_srls);
-		}
-		else
+		} else
 		{
 			$list_count = 1;
 		}
@@ -182,28 +208,38 @@ 
 
 		$output = executeQuery('document.getDocuments', $args, $columnList);
 		$document_list = $output->data;
-		if(!$document_list) return;
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if(!$document_list) {
+			return;
+		}
+		if(!is_array($document_list)) {
+			$document_list = array($document_list);
+		}
 
 		$document_count = count($document_list);
 		foreach($document_list as $key => $attribute)
 		{
 			$document_srl = $attribute->document_srl;
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if($is_admin) {
+					$oDocument->setGrant();
+				}
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
 			$result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		$output = null;
 		if(count($result))
@@ -251,18 +287,15 @@ 
 		{
 			$output = $obj->use_alternate_output;
 			unset($obj->use_alternate_output);
-		}
-		elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
+		} elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
 		{
 			$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
 			$args->sort_index = str_replace('documents.','',$args->sort_index);
 			$output = executeQueryArray($query_id, $args);
-		}
-		elseif ($sort_check->isExtraVars)
+		} elseif ($sort_check->isExtraVars)
 		{
 			$output = executeQueryArray($query_id, $args);
-		}
-		else
+		} else
 		{
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
@@ -272,11 +305,15 @@ 
 				$group_args = clone($args);
 				$group_args->sort_index = 'documents.'.$args->sort_index;
 				$output = executeQueryArray($query_id, $group_args);
-				if(!$output->toBool()||!count($output->data)) return $output;
+				if(!$output->toBool()||!count($output->data)) {
+					return $output;
+				}
 
 				foreach($output->data as $key => $val)
 				{
-					if($val->document_srl) $target_srls[] = $val->document_srl;
+					if($val->document_srl) {
+						$target_srls[] = $val->document_srl;
+					}
 				}
 
 				$page_navigation = $output->page_navigation;
@@ -294,14 +331,15 @@ 
 				$output->total_count = $page_navigation->total_count;
 				$output->total_page = $page_navigation->total_page;
 				$output->page = $page_navigation->cur_page;
-			}
-			else
+			} else
 			{
 				$output = executeQueryArray($query_id, $args, $columnList);
 			}
 		}
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 		$idx = 0;
 		$data = $output->data;
 		unset($output->data);
@@ -316,20 +354,26 @@ 
 		{
 			foreach($data as $key => $attribute)
 			{
-				if($attribute->is_notice == 'Y') $virtual_number --;
+				if($attribute->is_notice == 'Y') {
+					$virtual_number --;
+				}
 			}
 		}
 
 		foreach($data as $key => $attribute)
 		{
-			if($except_notice && $attribute->is_notice == 'Y') continue;
+			if($except_notice && $attribute->is_notice == 'Y') {
+				continue;
+			}
 			$document_srl = $attribute->document_srl;
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if($is_admin) {
+					$oDocument->setGrant();
+				}
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
@@ -337,7 +381,9 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		if(count($output->data))
 		{
@@ -365,12 +411,16 @@ 
 		$args->module_srl = $obj->module_srl;
 		$args->category_srl= $obj->category_srl;
 		$output = executeQueryArray('document.getNoticeList', $args, $columnList);
-		if(!$output->toBool()||!$output->data) return;
+		if(!$output->toBool()||!$output->data) {
+			return;
+		}
 
 		foreach($output->data as $key => $val)
 		{
 			$document_srl = $val->document_srl;
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
@@ -466,7 +516,9 @@ 
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if(!$keys) {
+					$keys = array();
+				}
 
 				if($oCacheHandler->isSupport())
 				{
@@ -496,7 +548,9 @@ 
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			$this->setToAllDocumentExtraVars();
 		}
-		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) {
+			ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		}
 		return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
 	}
 
@@ -526,7 +580,9 @@ 
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 			$module_srl = $oDocument->get('module_srl');
 			$member_srl = $oDocument->get('member_srl');
-			if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 
 			$oModuleModel = getModel('module');
 			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
@@ -599,7 +655,9 @@ 
 	 */
 	function getDocumentCount($module_srl, $search_obj = NULL)
 	{
-		if(is_null($search_obj)) $search_obj = new stdClass();
+		if(is_null($search_obj)) {
+			$search_obj = new stdClass();
+		}
 		$search_obj->module_srl = $module_srl;
 
 		$output = executeQuery('document.getDocumentCount', $search_obj);
@@ -616,7 +674,9 @@ 
 	function getDocumentCountByGroupStatus($search_obj = NULL)
 	{
 		$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 
 		return $output->data;
 	}
@@ -655,34 +715,29 @@ 
 		if($sort_check->isExtraVars)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
 			{
 				if($args->order_type === 'desc')
 				{
 					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
-				}
-				else
+				} else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
-			}
-			elseif($sort_check->sort_index === 'regdate')
+			} elseif($sort_check->sort_index === 'regdate')
 			{
 
 				if($args->order_type === 'asc')
 				{
 					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
-				}
-				else
+				} else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 
-			}
-			else
+			} else
 			{
 				return 1;
 			}
@@ -708,15 +763,16 @@ 
 		$output = executeQuery('document.getCategory', $args, $columnList);
 
 		$node = $output->data;
-		if(!$node) return;
+		if(!$node) {
+			return;
+		}
 
 		if($node->group_srls)
 		{
 			$group_srls = explode(',',$node->group_srls);
 			unset($node->group_srls);
 			$node->group_srls = $group_srls;
-		}
-		else
+		} else
 		{
 			unset($node->group_srls);
 			$node->group_srls = array();
@@ -734,7 +790,9 @@ 
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getChildCategoryCount',$args);
-		if($output->data->count > 0) return true;
+		if($output->data->count > 0) {
+			return true;
+		}
 		return false;
 	}
 
@@ -753,7 +811,9 @@ 
 		if(!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if(!$oDocumentController->makeCategoryFile($module_srl)) {
+				return array();
+			}
 		}
 
 		include($filename);
@@ -773,7 +833,9 @@ 
 	 */
 	function _arrangeCategory(&$document_category, $list, $depth)
 	{
-		if(!count($list)) return;
+		if(!count($list)) {
+			return;
+		}
 		$idx = 0;
 		$list_order = array();
 		foreach($list as $key => $val)
@@ -793,8 +855,11 @@ 
 			$obj->childs = array();
 			$obj->grant = $val['grant'];
 
-			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
-			else $selected = false;
+			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) {
+				$selected = true;
+			} else {
+				$selected = false;
+			}
 
 			$obj->selected = $selected;
 
@@ -805,14 +870,18 @@ 
 				$parent_srl = $obj->parent_srl;
 				$document_count = $obj->document_count;
 				$expand = $obj->expand;
-				if($selected) $expand = true;
+				if($selected) {
+					$expand = true;
+				}
 
 				while($parent_srl)
 				{
 					$document_category[$parent_srl]->document_count += $document_count;
 					$document_category[$parent_srl]->childs[] = $obj->category_srl;
 					$document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-					if($expand) $document_category[$parent_srl]->expand = $expand;
+					if($expand) {
+						$document_category[$parent_srl]->expand = $expand;
+					}
 
 					$parent_srl = $document_category[$parent_srl]->parent_srl;
 				}
@@ -820,7 +889,9 @@ 
 
 			$document_category[$key] = $obj;
 
-			if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			if(count($val['list'])) {
+				$this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			}
 		}
 		$document_category[$list_order[0]]->first = true;
 		$document_category[$list_order[count($list_order)-1]]->last = true;
@@ -888,13 +959,20 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 
 		$output = executeQuery('document.getMonthlyArchivedList', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if(!$output->toBool()||!$output->data) {
+			return $output;
+		}
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		return $output;
 	}
@@ -914,14 +992,21 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 		$args->regdate = $obj->regdate;
 
 		$output = executeQuery('document.getDailyArchivedList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		return $output;
 	}
@@ -932,7 +1017,9 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		$module_srl = Context::get('module_srl');
 		$categories= $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
@@ -1027,7 +1114,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
@@ -1047,15 +1136,20 @@ 
 	 */
 	function getDocumentSrlByAlias($mid, $alias)
 	{
-		if(!$mid || !$alias) return null;
+		if(!$mid || !$alias) {
+			return null;
+		}
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass;
 		$args->mid = $mid;
 		$args->alias_title = $alias;
 		$args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('document.getDocumentSrlByAlias', $args);
-		if(!$output->data) return null;
-		else return $output->data->document_srl;
+		if(!$output->data) {
+			return null;
+		} else {
+			return $output->data->document_srl;
+		}
 	}
 
 	/**
@@ -1066,15 +1160,20 @@ 
 	 */
 	function getDocumentSrlByTitle($module_srl, $title)
 	{
-		if(!$module_srl || !$title) return null;
+		if(!$module_srl || !$title) {
+			return null;
+		}
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
 		$args->title = $title;
 		$output = executeQuery('document.getDocumentSrlByTitle', $args);
-		if(!$output->data) return null;
-		else
+		if(!$output->data) {
+			return null;
+		} else
 		{
-			if(is_array($output->data)) return $output->data[0]->document_srl;
+			if(is_array($output->data)) {
+				return $output->data[0]->document_srl;
+			}
 			return $output->data->document_srl;
 		}
 	}
@@ -1086,13 +1185,18 @@ 
 	 */
 	function getAlias($document_srl)
 	{
-		if(!$document_srl) return null;
+		if(!$document_srl) {
+			return null;
+		}
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('document.getAliases', $args);
 
-		if(!$output->data) return null;
-		else return $output->data[0]->alias_title;
+		if(!$output->data) {
+			return null;
+		} else {
+			return $output->data[0]->alias_title;
+		}
 	}
 
 	/**
@@ -1149,17 +1253,23 @@ 
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					break;
 				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;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1167,13 +1277,18 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+					if($search_keyword=='N') {
+						$args->statusList = array($this->getConfigStatus('public'));
+					} elseif($search_keyword=='Y') {
+						$args->statusList = array($this->getConfigStatus('secret'));
+					}
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1215,34 +1330,45 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$point = Context::get('point');
-		if($point != -1) $point = 1;
+		if($point != -1) {
+			$point = 1;
+		}
 
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
 		if($point == -1)
 		{
-			if($document_config->use_vote_down!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if($document_config->use_vote_down!='S') {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 			$args->below_point = 0;
-		}
-		else
+		} else
 		{
-			if($document_config->use_vote_up!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if($document_config->use_vote_up!='S') {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 			$args->more_point = 0;
 		}
 
 		$args->document_srl = $document_srl;
 
 		$output = executeQueryArray('document.getVotedMemberList',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oMemberModel = getModel('member');
 		if($output->data)
@@ -1264,9 +1390,11 @@ 
 	function getStatusNameList()
 	{
 		global $lang;
-		if(!isset($lang->status_name_list))
-			return array_flip($this->getStatusList());
-		else return $lang->status_name_list;
+		if(!isset($lang->status_name_list)) {
+					return array_flip($this->getStatusList());
+		} else {
+			return $lang->status_name_list;
+		}
 	}
 
 	/**
@@ -1290,20 +1418,22 @@ 
 				if (!$extra_output->data || !$extra_output->toBool())
 				{
 					$sortIndex = 'list_order';
-				}
-				else
+				} else
 				{
 					$check_array = array();
 					foreach($extra_output->data as $val)
 					{
 						$check_array[] = $val->eid;
 					}
-					if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
-					else $isExtraVars = true;
+					if(!in_array($sortIndex, $check_array)) {
+						$sortIndex = 'list_order';
+					} else {
+						$isExtraVars = true;
+					}
 				}
+			} else {
+							$sortIndex = 'list_order';
 			}
-			else
-				$sortIndex = 'list_order';
 		}
 		$returnObj = new stdClass();
 		$returnObj->sort_index = $sortIndex;
@@ -1342,7 +1472,9 @@ 
 
 		// Check the target and sequence alignment
 		$orderType = array('desc' => 1, 'asc' => 1);
-		if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
+		if(!isset($orderType[$args->order_type])) {
+			$args->order_type = 'asc';
+		}
 
 		// If that came across mid module_srl instead of a direct module_srl guhaejum
 		if($searchOpt->mid)
@@ -1353,21 +1485,29 @@ 
 		}
 
 		// Module_srl passed the array may be a check whether the array
-		if(is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
-		else $args->module_srl = $searchOpt->module_srl;
+		if(is_array($searchOpt->module_srl)) {
+			$args->module_srl = implode(',', $searchOpt->module_srl);
+		} else {
+			$args->module_srl = $searchOpt->module_srl;
+		}
 
 		// Except for the test module_srl
-		if(is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
-		else $args->exclude_module_srl = $searchOpt->exclude_module_srl;
+		if(is_array($searchOpt->exclude_module_srl)) {
+			$args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
+		} else {
+			$args->exclude_module_srl = $searchOpt->exclude_module_srl;
+		}
 
 		// only admin document list, temp document showing
-		if($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
-		else
+		if($searchOpt->statusList) {
+			$args->statusList = $searchOpt->statusList;
+		} else
 		{
-			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
-				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
-			else
-				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl) {
+							$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
+			} else {
+							$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+			}
 		}
 
 		// Category is selected, further sub-categories until all conditions
@@ -1395,18 +1535,24 @@ 
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					$use_division = true;
 					break;
 				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;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1414,18 +1560,28 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
-					if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-					elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
-					else $args->{"s_".$search_target} = '';
+					if($search_keyword=='N') {
+						$args->{"s_".$search_target} = 'N';
+					} elseif($search_keyword=='Y') {
+						$args->{"s_".$search_target} = 'Y';
+					} else {
+						$args->{"s_".$search_target} = '';
+					}
 					break;
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
-					elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+					if($search_keyword=='N') {
+						$args->statusList = array($this->getConfigStatus('public'));
+					} elseif($search_keyword=='Y') {
+						$args->statusList = array($this->getConfigStatus('secret'));
+					} elseif($search_keyword=='temp') {
+						$args->statusList = array($this->getConfigStatus('temp'));
+					}
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1488,13 +1644,14 @@ 
 		if ($searchOpt->isExtraVars)
 		{
 			$query_id = 'document.getDocumentListExtraSort';
-		}
-		else
+		} else
 		{
 			/**
 			 * list_order asc sort of division that can be used only when
 			 */
-			if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+			if($args->sort_index != 'list_order' || $args->order_type != 'asc') {
+				$use_division = false;
+			}
 
 			/**
 			 * If it is true, use_division changed to use the document division
@@ -1509,8 +1666,7 @@ 
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
-				}
-				else
+				} else
 				{
 					$listSqlID = 'document.getDocumentList';
 					$divisionSqlID = 'document.getDocumentDivision';
@@ -1567,7 +1723,9 @@ 
 					$last_division_args->exclude_module_srl = $args->exclude_module_srl;
 					$last_division_args->list_order = $last_division;
 					$output = executeQuery('document.getDocumentDivisionCount', $last_division_args);
-					if($output->data->count<1) $last_division = null;
+					if($output->data->count<1) {
+						$last_division = null;
+					}
 				}
 
 				$args->division = $division;
@@ -1608,8 +1766,12 @@ 
 		$output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList);
 		$document_list = $output->data;
 
-		if(!$document_list) return array();
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if(!$document_list) {
+			return array();
+		}
+		if(!is_array($document_list)) {
+			$document_list = array($document_list);
+		}
 
 		return $document_list;
 	}
@@ -1624,8 +1786,7 @@ 
 		if(Mobile::isFromMobilePhone())
 		{
 			$iconSkin = $documentConfig->micons;
-		}
-		else
+		} else
 		{
 			$iconSkin = $documentConfig->icons;
 		}

modules/document/document.controller.php

Spacing +367 added lines, -367 removed lines

@@ -24,19 +24,19 @@ 
 	 */
 	function procDocumentVoteUp()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_up=='N') return new BaseObject(-1, 'msg_invalid_request');
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($document_config->use_vote_up == 'N') return new BaseObject(-1, 'msg_invalid_request');
 
 		$point = 1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -69,19 +69,19 @@ 
 	 */
 	function procDocumentVoteDown()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_down=='N') return new BaseObject(-1, 'msg_invalid_request');
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($document_config->use_vote_down == 'N') return new BaseObject(-1, 'msg_invalid_request');
 
 		$point = -1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -95,10 +95,10 @@ 
 	 */
 	function procDocumentDeclare()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		return $this->declaredDocument($document_srl);
 	}
@@ -140,7 +140,7 @@ 
 		$args->history_srl = $history_srl;
 		$args->module_srl = $module_srl;
 		$args->document_srl = $document_srl;
-		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
+		if (!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
 		executeQuery("document.deleteHistory", $args);
 	}
 
@@ -152,15 +152,15 @@ 
 	function triggerDeleteModuleDocuments(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 		// Delete the document
 		$oDocumentAdminController = getAdminController('document');
 		$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Delete the category
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteModuleCategory($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Delete extra key and variable, because module deleted
 		$this->deleteDocumentExtraKeys($module_srl);
 
@@ -193,7 +193,7 @@ 
 	 */
 	function insertDocument($obj, $manual_inserted = false, $isRestore = false, $isLatest = true)
 	{
-		if(!$manual_inserted && !checkCSRF())
+		if (!$manual_inserted && !checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -202,32 +202,32 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
-		if($obj->homepage) 
+		if ($obj->comment_status) $obj->commentStatus = $obj->comment_status;
+		if (!$obj->commentStatus) $obj->commentStatus = 'DENY';
+		if ($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
+		if ($obj->allow_trackback != 'Y') $obj->allow_trackback = 'N';
+		if ($obj->homepage) 
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
-			if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+			if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 			{
 				$obj->homepage = 'http://'.$obj->homepage;
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
-		if(!$obj->email_address) $obj->email_address = '';
-		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		if ($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if (!$obj->email_address) $obj->email_address = '';
+		if (!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
 
                 // can modify regdate only manager
                 $grant = Context::get('grant');
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			unset($obj->regdate);
 		}
 		
 		// Serialize the $extra_vars, check the extra_vars type, because duplicate serialized avoid
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if (!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -235,34 +235,34 @@ 
 		unset($obj->_saved_doc_message);
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Register it if no given document_srl exists
-		if(!$obj->document_srl) $obj->document_srl = getNextSequence();
-		elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new BaseObject(-1, 'msg_not_permitted');
+		if (!$obj->document_srl) $obj->document_srl = getNextSequence();
+		elseif (!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new BaseObject(-1, 'msg_not_permitted');
 
 		$oDocumentModel = getModel('document');
 		// Set to 0 if the category_srl doesn't exist
-		if($obj->category_srl)
+		if ($obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
+			if (count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if (count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
 		// Set the read counts and update order.
-		if(!$obj->readed_count) $obj->readed_count = 0;
-		if($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
+		if (!$obj->readed_count) $obj->readed_count = 0;
+		if ($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
 		else $obj->update_order = $obj->list_order;
 		// Check the status of password hash for manually inserting. Apply hashing for otherwise.
-		if($obj->password && !$obj->password_is_hashed)
+		if ($obj->password && !$obj->password_is_hashed)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 		// Insert member's information only if the member is logged-in and not manually registered.
 		$logged_info = Context::get('logged_info');
-		if(Context::get('is_logged') && !$manual_inserted && !$isRestore)
+		if (Context::get('is_logged') && !$manual_inserted && !$isRestore)
 		{
 			$obj->member_srl = $logged_info->member_srl;
 
@@ -276,61 +276,61 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))), 20, '...');
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+		if ($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
 		// An error appears if both log-in info and user name don't exist.
-		if(!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-1,'msg_invalid_request');
+		if (!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-1, 'msg_invalid_request');
 
 		$obj->lang_code = Context::getLangType();
 		// Insert data into the DB
-		if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
+		if (!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
 		$output = executeQuery('document.insertDocument', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Insert extra variables if the document successfully inserted.
 		$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
-		if(count($extra_keys))
+		if (count($extra_keys))
 		{
-			foreach($extra_keys as $idx => $extra_item)
+			foreach ($extra_keys as $idx => $extra_item)
 			{
 				$value = NULL;
-				if(isset($obj->{'extra_vars'.$idx}))
+				if (isset($obj->{'extra_vars'.$idx}))
 				{
 					$tmp = $obj->{'extra_vars'.$idx};
-					if(is_array($tmp))
+					if (is_array($tmp))
 						$value = implode('|@|', $tmp);
 					else
 						$value = trim($tmp);
 				}
-				else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-				if($value == NULL) continue;
+				else if (isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
+				if ($value == NULL) continue;
 
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
 		// Update the category if the category_srl exists.
-		if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		if ($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.insertDocument', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -341,12 +341,12 @@ 
 		$oDB->commit();
 
 		// return
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			$this->addGrant($obj->document_srl);
 		}
-		$output->add('document_srl',$obj->document_srl);
-		$output->add('category_srl',$obj->category_srl);
+		$output->add('document_srl', $obj->document_srl);
+		$output->add('category_srl', $obj->category_srl);
 
 		return $output;
 	}
@@ -362,41 +362,41 @@ 
 	{
 		$logged_info = Context::get('logged_info');
 
-		if(!$manual_updated && !checkCSRF())
+		if (!$manual_updated && !checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1,'msg_invalied_request');
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
-		if(!$obj->status) $obj->status = 'PUBLIC';
+		if (!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1, 'msg_invalied_request');
+		if (!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
+		if (!$obj->status) $obj->status = 'PUBLIC';
 
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.updateDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$oModuleModel = getModel('module');
-		if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
+		if (!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
 		$module_srl = $obj->module_srl;
 		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
-		if(!$document_config)
+		if (!$document_config)
 		{
 			$document_config = new stdClass();
 		}
-		if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+		if (!isset($document_config->use_history)) $document_config->use_history = 'N';
 		$bUseHistory = $document_config->use_history == 'Y' || $document_config->use_history == 'Trace';
 
-		if($bUseHistory)
+		if ($bUseHistory)
 		{
 			$args = new stdClass;
 			$args->history_srl = getNextSequence();
 			$args->document_srl = $obj->document_srl;
 			$args->module_srl = $module_srl;
-			if($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
+			if ($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
 			$args->nick_name = $logged_info->nick_name;
 			$args->member_srl = $logged_info->member_srl;
 			$args->regdate = $source_obj->get('last_update');
@@ -408,30 +408,30 @@ 
 			$obj->ipaddress = $source_obj->get('ipaddress');
 		}
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
-		if($obj->homepage)
+		if ($obj->comment_status) $obj->commentStatus = $obj->comment_status;
+		if (!$obj->commentStatus) $obj->commentStatus = 'DENY';
+		if ($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
+		if ($obj->allow_trackback != 'Y') $obj->allow_trackback = 'N';
+		if ($obj->homepage)
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
-			if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+			if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 			{
 				$obj->homepage = 'http://'.$obj->homepage;
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if ($obj->notify_message != 'Y') $obj->notify_message = 'N';
 		
 		// can modify regdate only manager
                 $grant = Context::get('grant');
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			unset($obj->regdate);
 		}
 		
 		// Serialize the $extra_vars
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if (!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -440,23 +440,23 @@ 
 
 		$oDocumentModel = getModel('document');
 		// Set the category_srl to 0 if the changed category is not exsiting.
-		if($source_obj->get('category_srl')!=$obj->category_srl)
+		if ($source_obj->get('category_srl') != $obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if (!$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
 		// Change the update order
 		$obj->update_order = getNextSequence() * -1;
 		// Hash the password if it exists
-		if($obj->password)
+		if ($obj->password)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 
 		// If an author is identical to the modifier or history is used, use the logged-in user's information.
-		if(Context::get('is_logged') && !$manual_updated)
+		if (Context::get('is_logged') && !$manual_updated)
 		{
-			if($source_obj->get('member_srl')==$logged_info->member_srl)
+			if ($source_obj->get('member_srl') == $logged_info->member_srl)
 			{
 				$obj->member_srl = $logged_info->member_srl;
 				$obj->user_name = htmlspecialchars_decode($logged_info->user_name);
@@ -467,7 +467,7 @@ 
 		}
 
 		// For the document written by logged-in user however no nick_name exists
-		if($source_obj->get('member_srl')&& !$obj->nick_name)
+		if ($source_obj->get('member_srl') && !$obj->nick_name)
 		{
 			$obj->member_srl = $source_obj->get('member_srl');
 			$obj->user_name = $source_obj->get('user_name');
@@ -478,24 +478,24 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(strip_tags($obj->content), 20, '...');
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 			$obj->content = nl2br($obj->content);
 		}
 		// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.
-		if($source_obj->get('lang_code') != Context::getLangType())
+		if ($source_obj->get('lang_code') != Context::getLangType())
 		{
 			// Change not extra vars but language code of the original document if document's lang_code doesn't exist.
-			if(!$source_obj->get('lang_code'))
+			if (!$source_obj->get('lang_code'))
 			{
 				$lang_code_args->document_srl = $source_obj->get('document_srl');
 				$lang_code_args->lang_code = Context::getLangType();
@@ -515,59 +515,59 @@ 
 			}
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			$obj->content = removeHackTag($obj->content);
 		}
 		// if temporary document, regdate is now setting
-		if($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
+		if ($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
 
 		// Insert data into the DB
 		$output = executeQuery('document.updateDocument', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Remove all extra variables
-		if(Context::get('act')!='procFileDelete')
+		if (Context::get('act') != 'procFileDelete')
 		{
 			$this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
 			// Insert extra variables if the document successfully inserted.
 			$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
-			if(count($extra_keys))
+			if (count($extra_keys))
 			{
-				foreach($extra_keys as $idx => $extra_item)
+				foreach ($extra_keys as $idx => $extra_item)
 				{
 					$value = NULL;
-					if(isset($obj->{'extra_vars'.$idx}))
+					if (isset($obj->{'extra_vars'.$idx}))
 					{
 						$tmp = $obj->{'extra_vars'.$idx};
-						if(is_array($tmp))
+						if (is_array($tmp))
 							$value = implode('|@|', $tmp);
 						else
 							$value = trim($tmp);
 					}
-					else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-					if($value == NULL) continue;
+					else if (isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
+					if ($value == NULL) continue;
 					$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 				}
 			}
 			// Inert extra vars for multi-language support of title and contents.
-			if($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
-			if($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			if ($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
+			if ($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
 		}
 		// Update the category if the category_srl exists.
-		if($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
+		if ($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
 		{
-			if($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
-			if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			if ($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
+			if ($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.updateDocument', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -577,15 +577,15 @@ 
 		// commit
 		$oDB->commit();
 		// Remove the thumbnail file
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($obj->document_srl, 3)));
 
-		$output->add('document_srl',$obj->document_srl);
+		$output->add('document_srl', $obj->document_srl);
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($obj->document_srl) . $obj->document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($obj->document_srl).$obj->document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -606,33 +606,33 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->document_srl = $document_srl;
 		$output = ModuleHandler::triggerCall('document.deleteDocument', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
-		if(!$isEmptyTrash)
+		if (!$isEmptyTrash)
 		{
 			// get model object of the document
 			$oDocumentModel = getModel('document');
 			// Check if the documnet exists
 			$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
 		}
-		else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
+		else if ($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
 
-		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
+		if (!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
 		// Check if a permossion is granted
-		if(!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
+		if (!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
 
 		//if empty trash, document already deleted, therefore document not delete
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
-		if(!$isEmptyTrash)
+		if (!$isEmptyTrash)
 		{
 			// Delete the document
 			$output = executeQuery('document.deleteDocument', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -643,7 +643,7 @@ 
 
 		$this->deleteDocumentHistory(null, $document_srl, null);
 		// Update category information if the category_srl exists.
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if ($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'), $oDocument->get('category_srl'));
 		// Delete a declared list
 		executeQuery('document.deleteDeclared', $args);
 		// Delete extra variable
@@ -651,11 +651,11 @@ 
 
 		//this
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_obj = $oDocument->getObjectVars();
 			$trigger_output = ModuleHandler::triggerCall('document.deleteDocument', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -667,16 +667,16 @@ 
 		$this->_deleteDocumentVotedLog($args);
 
 		// Remove the thumbnail file
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($document_srl, 3)));
 
 		// commit
 		$oDB->commit();
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -723,7 +723,7 @@ 
 	{
 		$trash_args = new stdClass();
 		// Get trash_srl if a given trash_srl doesn't exist
-		if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
+		if (!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
 		else $trash_args->trash_srl = $obj->trash_srl;
 		// Get its module_srl which the document belongs to
 		$oDocumentModel = getModel('document');
@@ -732,12 +732,12 @@ 
 		$trash_args->module_srl = $oDocument->get('module_srl');
 		$obj->module_srl = $oDocument->get('module_srl');
 		// Cannot throw data from the trash to the trash
-		if($trash_args->module_srl == 0) return false;
+		if ($trash_args->module_srl == 0) return false;
 		// Data setting
 		$trash_args->document_srl = $obj->document_srl;
 		$trash_args->description = $obj->description;
 		// Insert member's information only if the member is logged-in and not manually registered.
-		if(Context::get('is_logged')&&!$manual_inserted)
+		if (Context::get('is_logged') && !$manual_inserted)
 		{
 			$logged_info = Context::get('logged_info');
 			$trash_args->member_srl = $logged_info->member_srl;
@@ -773,14 +773,14 @@ 
 
 		$oTrashAdminController = getAdminController('trash');
 		$output = $oTrashAdminController->insertTrash($oTrashVO);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = executeQuery('document.deleteDocument', $trash_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -793,12 +793,12 @@ 
 		  }*/
 
 		// update category
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if ($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'), $oDocument->get('category_srl'));
 
 		// remove thumbnails
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($obj->document_srl, 3)));
 		// Set the attachment to be invalid state
-		if($oDocument->hasUploadedFiles())
+		if ($oDocument->hasUploadedFiles())
 		{
 			$args = new stdClass();
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -806,10 +806,10 @@ 
 			executeQuery('file.updateFileValid', $args);
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.moveDocumentToTrash', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -821,9 +821,9 @@ 
 
 		// Clear cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'document_item:'. getNumberingPath($oDocument->document_srl) . $oDocument->document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($oDocument->document_srl).$oDocument->document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -838,7 +838,7 @@ 
 	function updateReadedCount(&$oDocument)
 	{
 		// Pass if Crawler access
-		if(isCrawler()) return false;
+		if (isCrawler()) return false;
 		
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
@@ -846,19 +846,19 @@ 
 
 		// Call a trigger when the read count is updated (before)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'before', $oDocument);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		// Pass if read count is increaded on the session information
-		if($_SESSION['readed_document'][$document_srl]) return false;
+		if ($_SESSION['readed_document'][$document_srl]) return false;
 
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 			return false;
 		}
 		// Pass ater registering sesscion if the author is a member and has same information as the currently logged-in user.
-		if($member_srl && $logged_info->member_srl == $member_srl)
+		if ($member_srl && $logged_info->member_srl == $member_srl)
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 			return false;
@@ -874,7 +874,7 @@ 
 
 		// Call a trigger when the read count is updated (after)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'after', $oDocument);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -883,15 +883,15 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
 		// Register session
-		if(!$_SESSION['banned_document'][$document_srl]) 
+		if (!$_SESSION['banned_document'][$document_srl]) 
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 		}
@@ -914,21 +914,21 @@ 
 	 */
 	function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid)
 	{
-		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-1, 'msg_invalid_request');
 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
 		$obj->var_idx = $var_idx;
 		$obj->var_name = $var_name;
 		$obj->var_type = $var_type;
-		$obj->var_is_required = $var_is_required=='Y'?'Y':'N';
-		$obj->var_search = $var_search=='Y'?'Y':'N';
+		$obj->var_is_required = $var_is_required == 'Y' ? 'Y' : 'N';
+		$obj->var_search = $var_search == 'Y' ? 'Y' : 'N';
 		$obj->var_default = $var_default;
 		$obj->var_desc = $var_desc;
 		$obj->eid = $eid;
 
 		$output = executeQuery('document.getDocumentExtraKeys', $obj);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			$output = executeQuery('document.insertDocumentExtraKey', $obj);
 		}
@@ -940,7 +940,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_document_extra_keys:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -958,42 +958,42 @@ 
 	 */
 	function deleteDocumentExtraKeys($module_srl, $var_idx = null)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if (!is_null($var_idx)) $obj->var_idx = $var_idx;
 
 		$oDB = DB::getInstance();
 		$oDB->begin();
 
 		$output = $oDB->executeQuery('document.deleteDocumentExtraKeys', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($var_idx != NULL)
+		if ($var_idx != NULL)
 		{
 			$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
 			}
 		}
 
-		$output =  executeQuery('document.deleteDocumentExtraVars', $obj);
-		if(!$output->toBool())
+		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($var_idx != NULL)
+		if ($var_idx != NULL)
 		{
 			$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1003,7 +1003,7 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_document_extra_keys:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1025,8 +1025,8 @@ 
 	 */
 	function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '')
 	{
-		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-1,'msg_invalid_request');
-		if(!$lang_code) $lang_code = Context::getLangType();
+		if (!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$lang_code) $lang_code = Context::getLangType();
 
 		$obj = new stdClass;
 		$obj->module_srl = $module_srl;
@@ -1052,10 +1052,10 @@ 
 	{
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($document_srl)) $obj->document_srl = $document_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
-		if(!is_null($lang_code)) $obj->lang_code = $lang_code;
-		if(!is_null($eid)) $obj->eid = $eid;
+		if (!is_null($document_srl)) $obj->document_srl = $document_srl;
+		if (!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if (!is_null($lang_code)) $obj->lang_code = $lang_code;
+		if (!is_null($eid)) $obj->eid = $eid;
 		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
 		return $output;
 	}
@@ -1069,10 +1069,10 @@ 
 	 */
 	function updateVotedCount($document_srl, $point = 1)
 	{
-		if($point > 0) $failed_voted = 'failed_voted';
+		if ($point > 0) $failed_voted = 'failed_voted';
 		else $failed_voted = 'failed_blamed';
 		// Return fail if session already has information about votes
-		if($_SESSION['voted_document'][$document_srl])
+		if ($_SESSION['voted_document'][$document_srl])
 		{
 			return new BaseObject(-1, $failed_voted);
 		}
@@ -1080,7 +1080,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['voted_document'][$document_srl] = true;
 			return new BaseObject(-1, $failed_voted);
@@ -1091,10 +1091,10 @@ 
 		$member_srl = $oMemberModel->getLoggedMemberSrl();
 
 		// Check if document's author is a member.
-		if($oDocument->get('member_srl'))
+		if ($oDocument->get('member_srl'))
 		{
 			// Pass after registering a session if author's information is same as the currently logged-in user's.
-			if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oDocument->get('member_srl')))
 			{
 				$_SESSION['voted_document'][$document_srl] = true;
 				return new BaseObject(-1, $failed_voted);
@@ -1103,7 +1103,7 @@ 
 
 		// Use member_srl for logged-in members and IP address for non-members.
 		$args = new stdClass;
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1114,7 +1114,7 @@ 
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDocumentVotedLogInfo', $args);
 		// Pass after registering a session if log information has vote-up logs
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			$_SESSION['voted_document'][$document_srl] = true;
 			return new BaseObject(-1, $failed_voted);
@@ -1125,7 +1125,7 @@ 
 		$oDB->begin();
 
 		// Update the voted count
-		if($point < 0)
+		if ($point < 0)
 		{
 			$args->blamed_count = $oDocument->get('blamed_count') + $point;
 			$output = executeQuery('document.updateBlamedCount', $args);
@@ -1135,11 +1135,11 @@ 
 			$args->voted_count = $oDocument->get('voted_count') + $point;
 			$output = executeQuery('document.updateVotedCount', $args);
 		}
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Leave logs
 		$args->point = $point;
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$obj = new stdClass;
 		$obj->member_srl = $oDocument->get('member_srl');
@@ -1150,7 +1150,7 @@ 
 		$obj->before_point = ($point < 0) ? $oDocument->get('blamed_count') : $oDocument->get('voted_count');
 		$obj->after_point = ($point < 0) ? $args->blamed_count : $args->voted_count;
 		$trigger_output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1159,10 +1159,10 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -1171,7 +1171,7 @@ 
 
 		// Return result
 		$output = new BaseObject();
-		if($point > 0)
+		if ($point > 0)
 		{
 			$output->setMessage('success_voted');
 			$output->add('voted_count', $obj->after_point);
@@ -1193,13 +1193,13 @@ 
 	function declaredDocument($document_srl)
 	{
 		// Fail if session information already has a reported document
-		if($_SESSION['declared_document'][$document_srl]) return new BaseObject(-1, 'failed_declared');
+		if ($_SESSION['declared_document'][$document_srl]) return new BaseObject(-1, 'failed_declared');
 
 		// Check if previously reported
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
 
@@ -1209,7 +1209,7 @@ 
 
 		// Call a trigger (before)
 		$trigger_output = ModuleHandler::triggerCall('document.declaredDocument', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -1219,19 +1219,19 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
 			$_SESSION['declared_document'][$document_srl] = true;
 			return new BaseObject(-1, 'failed_declared');
 		}
 
 		// Check if document's author is a member.
-		if($oDocument->get('member_srl'))
+		if ($oDocument->get('member_srl'))
 		{
 			// Create a member model object
 			$oMemberModel = getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
 			// Pass after registering a session if author's information is same as the currently logged-in user's.
-			if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oDocument->get('member_srl')))
 			{
 				$_SESSION['declared_document'][$document_srl] = true;
 				return new BaseObject(-1, 'failed_declared');
@@ -1240,7 +1240,7 @@ 
 
 		// Use member_srl for logged-in members and IP address for non-members.
 		$args = new stdClass;
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1253,7 +1253,7 @@ 
 		$output = executeQuery('document.getDocumentDeclaredLogInfo', $args);
 
 		// Pass after registering a sesson if reported/declared documents are in the logs.
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			$_SESSION['declared_document'][$document_srl] = true;
 			return new BaseObject(-1, 'failed_declared');
@@ -1264,23 +1264,23 @@ 
 		$oDB->begin();
 
 		// Add the declared document
-		if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
+		if ($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
 		else $output = executeQuery('document.insertDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Leave logs
 		$output = executeQuery('document.insertDocumentDeclaredLog', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		$this->add('declared_count', $declared_count+1);
+		$this->add('declared_count', $declared_count + 1);
 
 		// Call a trigger (after)
 		$trigger_obj->declared_count = $declared_count + 1;
 		$trigger_output = ModuleHandler::triggerCall('document.declaredDocument', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1310,16 +1310,16 @@ 
 		$args->document_srl = $document_srl;
 		$args->comment_count = $comment_count;
 
-		if($comment_inserted)
+		if ($comment_inserted)
 		{
-			$args->update_order = -1*getNextSequence();
+			$args->update_order = -1 * getNextSequence();
 			$args->last_updater = $last_updater;
 
 			$oCacheHandler = CacheHandler::getInstance('object');
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				//remove document item from cache
-				$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+				$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 				$oCacheHandler->delete($cache_key);
 			}
 		}
@@ -1340,10 +1340,10 @@ 
 		$args->trackback_count = $trackback_count;
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -1358,14 +1358,14 @@ 
 	function insertCategory($obj)
 	{
 		// Sort the order to display if a child category is added
-		if($obj->parent_srl)
+		if ($obj->parent_srl)
 		{
 			// Get its parent category
 			$oDocumentModel = getModel('document');
 			$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
 			$obj->list_order = $parent_category->list_order;
-			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1);
-			if(!$obj->category_srl) $obj->category_srl = getNextSequence();
+			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order + 1);
+			if (!$obj->category_srl) $obj->category_srl = getNextSequence();
 		}
 		else
 		{
@@ -1373,7 +1373,7 @@ 
 		}
 
 		$output = executeQuery('document.insertCategory', $obj);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output->add('category_srl', $obj->category_srl);
 			$this->makeCategoryFile($obj->module_srl);
@@ -1407,13 +1407,13 @@ 
 	{
 		// Create a document model object
 		$oDocumentModel = getModel('document');
-		if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		if (!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl, $category_srl);
 
 		$args = new stdClass;
 		$args->category_srl = $category_srl;
 		$args->document_count = $document_count;
 		$output = executeQuery('document.updateCategoryCount', $args);
-		if($output->toBool()) $this->makeCategoryFile($module_srl);
+		if ($output->toBool()) $this->makeCategoryFile($module_srl);
 
 		return $output;
 	}
@@ -1426,7 +1426,7 @@ 
 	function updateCategory($obj)
 	{
 		$output = executeQuery('document.updateCategory', $obj);
-		if($output->toBool()) $this->makeCategoryFile($obj->module_srl);
+		if ($output->toBool()) $this->makeCategoryFile($obj->module_srl);
 		return $output;
 	}
 
@@ -1443,32 +1443,32 @@ 
 		$category_info = $oDocumentModel->getCategory($category_srl);
 		// Display an error that the category cannot be deleted if it has a child
 		$output = executeQuery('document.getChildCategoryCount', $args);
-		if(!$output->toBool()) return $output;
-		if($output->data->count>0) return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		if (!$output->toBool()) return $output;
+		if ($output->data->count > 0) return new BaseObject(-1, 'msg_cannot_delete_for_child');
 		// Delete a category information
 		$output = executeQuery('document.deleteCategory', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->makeCategoryFile($category_info->module_srl);
 		// remvove cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$page = 0;
-			while(true) {
+			while (true) {
 				$args = new stdClass();
 				$args->category_srl = $category_srl;
 				$args->list_count = 100;
 				$args->page = ++$page;
 				$output = executeQuery('document.getDocumentList', $args, array('document_srl'));
 
-				if($output->data == array())
+				if ($output->data == array())
 					break;
 
-				foreach($output->data as $val)
+				foreach ($output->data as $val)
 				{
 					//remove document item from cache
-					$cache_key = 'document_item:'. getNumberingPath($val->document_srl) . $val->document_srl;
+					$cache_key = 'document_item:'.getNumberingPath($val->document_srl).$val->document_srl;
 					$oCacheHandler->delete($cache_key);
 				}
 			}
@@ -1515,18 +1515,18 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new BaseObject();
+		if (count($category_srl_list) < 2) return new BaseObject();
 
 		$prev_category = NULL;
-		foreach($category_list as $key => $val)
+		foreach ($category_list as $key => $val)
 		{
-			if($key==$category_srl) break;
+			if ($key == $category_srl) break;
 			$prev_category = $val;
 		}
 		// Return if the previous category doesn't exist
-		if(!$prev_category) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if (!$prev_category) return new BaseObject(-1, Context::getLang('msg_category_not_moved'));
 		// Return if the selected category is the top level
-		if($category_srl_list[0]==$category_srl) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if ($category_srl_list[0] == $category_srl) return new BaseObject(-1, Context::getLang('msg_category_not_moved'));
 		// Information of the selected category
 		$cur_args = new stdClass;
 		$cur_args->category_srl = $category_srl;
@@ -1562,15 +1562,15 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new BaseObject();
+		if (count($category_srl_list) < 2) return new BaseObject();
 
-		for($i=0;$i<count($category_srl_list);$i++)
+		for ($i = 0; $i < count($category_srl_list); $i++)
 		{
-			if($category_srl_list[$i]==$category_srl) break;
+			if ($category_srl_list[$i] == $category_srl) break;
 		}
 
-		$next_category_srl = $category_srl_list[$i+1];
-		if(!$category_list[$next_category_srl]) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		$next_category_srl = $category_srl_list[$i + 1];
+		if (!$category_list[$next_category_srl]) return new BaseObject(-1, Context::getLang('msg_category_not_moved'));
 		$next_category = $category_list[$next_category_srl];
 		// Information of the selected category
 		$cur_args = new stdClass;
@@ -1597,7 +1597,7 @@ 
 	{
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!count($extra_keys)) return;
+		if (!count($extra_keys)) return;
 
 		$js_code = array();
 		$js_code[] = '<script>//<![CDATA[';
@@ -1607,16 +1607,16 @@ 
 
 		$logged_info = Context::get('logged_info');
 
-		foreach($extra_keys as $idx => $val)
+		foreach ($extra_keys as $idx => $val)
 		{
 			$idx = $val->idx;
-			if($val->type == 'kr_zip')
+			if ($val->type == 'kr_zip')
 			{
 				$idx .= '[]';
 			}
 			$name = str_ireplace(array('<script', '</script'), array('<scr" + "ipt', '</scr" + "ipt'), $val->name);
 			$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $idx, $name);
-			if($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			if ($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
 		}
 
 		$js_code[] = '})(jQuery);';
@@ -1634,12 +1634,12 @@ 
 	function procDocumentInsertCategory($args = null)
 	{
 		// List variables
-		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		if (!$args) $args = Context::gets('module_srl', 'category_srl', 'parent_srl', 'category_title', 'category_description', 'expand', 'group_srls', 'category_color', 'mid');
 		$args->title = $args->category_title;
 		$args->description = $args->category_description;
 		$args->color = $args->category_color;
 
-		if(!$args->module_srl && $args->mid)
+		if (!$args->module_srl && $args->mid)
 		{
 			$mid = $args->mid;
 			unset($args->mid);
@@ -1650,28 +1650,28 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
-		if($args->expand !="Y") $args->expand = "N";
-		if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls);
+		if ($args->expand != "Y") $args->expand = "N";
+		if (!is_array($args->group_srls)) $args->group_srls = str_replace('|@|', ',', $args->group_srls);
 		else $args->group_srls = implode(',', $args->group_srls);
-		$args->parent_srl = (int)$args->parent_srl;
+		$args->parent_srl = (int) $args->parent_srl;
 
 		$oDocumentModel = getModel('document');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// Check if already exists
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$category_info = $oDocumentModel->getCategory($args->category_srl);
-			if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
+			if ($category_info->category_srl != $args->category_srl) $args->category_srl = null;
 		}
 		// Update if exists
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$output = $this->updateCategory($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1681,7 +1681,7 @@ 
 		else
 		{
 			$output = $this->insertCategory($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1720,11 +1720,11 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		// First child of the parent_category_srl
 		$source_args = new stdClass;
-		if($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0))
+		if ($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0))
 		{
 			$parent_category = $oDocumentModel->getCategory($parent_category_srl);
 
@@ -1733,30 +1733,30 @@ 
 			$args->parent_srl = $parent_category_srl;
 			$output = executeQuery('document.getChildCategoryMinListOrder', $args);
 
-			if(!$output->toBool()) return $output;
-			$args->list_order = (int)$output->data->list_order;
-			if(!$args->list_order) $args->list_order = 0;
+			if (!$output->toBool()) return $output;
+			$args->list_order = (int) $output->data->list_order;
+			if (!$args->list_order) $args->list_order = 0;
 			$args->list_order--;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $parent_category_srl;
 			$source_args->list_order = $args->list_order;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			// Sibling of the $target_category_srl
 		}
-		else if($target_category_srl > 0)
+		else if ($target_category_srl > 0)
 		{
 			$target_category = $oDocumentModel->getCategory($target_category_srl);
 			// Move all siblings of the $target_category down
-			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
-			if(!$output->toBool()) return $output;
+			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order + 1);
+			if (!$output->toBool()) return $output;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $target_category->parent_srl;
-			$source_args->list_order = $target_category->list_order+1;
+			$source_args->list_order = $target_category->list_order + 1;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Re-generate the xml file
 		$xml_file = $this->makeCategoryFile($source_category->module_srl);
@@ -1772,7 +1772,7 @@ 
 	function procDocumentDeleteCategory()
 	{
 		// List variables
-		$args = Context::gets('module_srl','category_srl');
+		$args = Context::gets('module_srl', 'category_srl');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -1781,17 +1781,17 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		$oDocumentModel = getModel('document');
 		// Get original information
 		$category_info = $oDocumentModel->getCategory($args->category_srl);
-		if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
+		if ($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
 		// Display an error that the category cannot be deleted if it has a child node
-		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		if ($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child');
 		// Remove from the DB
 		$output = $this->deleteCategory($args->category_srl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -1822,11 +1822,11 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		$xml_file = $this->makeCategoryFile($module_srl);
 		// Set return value
-		$this->add('xml_file',$xml_file);
+		$this->add('xml_file', $xml_file);
 	}
 
 	/**
@@ -1837,14 +1837,14 @@ 
 	function makeCategoryFile($module_srl)
 	{
 		// Return if there is no information you need for creating a cache file
-		if(!$module_srl) return false;
+		if (!$module_srl) return false;
 		// Get module information (to obtain mid)
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'mid', 'site_srl');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$mid = $module_info->mid;
 
-		if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
+		if (!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
 		// Cache file's name
 		$xml_file = sprintf("./files/cache/document_category/%s.xml.php", $module_srl);
 		$php_file = sprintf("./files/cache/document_category/%s.php", $module_srl);
@@ -1856,17 +1856,17 @@ 
 
 		$category_list = $output->data;
 
-		if(!is_array($category_list)) $category_list = array($category_list);
+		if (!is_array($category_list)) $category_list = array($category_list);
 
 		$category_count = count($category_list);
-		for($i=0;$i<$category_count;$i++)
+		for ($i = 0; $i < $category_count; $i++)
 		{
 			$category_srl = $category_list[$i]->category_srl;
-			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
+			if (!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
 			$list[$category_srl] = $category_list[$i];
 		}
 		// Create the xml file without node data if no data is obtained
-		if(!$list)
+		if (!$list)
 		{
 			$xml_buff = "<root />";
 			FileHandler::writeFile($xml_file, $xml_buff);
@@ -1874,12 +1874,12 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if (!is_array($list)) $list = array($list);
 		// Create a tree for loop
-		foreach($list as $category_srl => $node)
+		foreach ($list as $category_srl => $node)
 		{
 			$node->mid = $mid;
-			$parent_srl = (int)$node->parent_srl;
+			$parent_srl = (int) $node->parent_srl;
 			$tree[$parent_srl][$category_srl] = $node;
 		}
 		// A common header to set permissions and groups of the cache file
@@ -1953,13 +1953,13 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff)
 	{
-		if(!$source_node) return;
+		if (!$source_node) return;
 
-		foreach($source_node as $category_srl => $node)
+		foreach ($source_node as $category_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			if ($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
 			// List variables
 			$expand = ($node->expand) ? $node->expand : 'N';
 			$group_srls = ($node->group_srls) ? $node->group_srls : '';
@@ -1969,27 +1969,27 @@ 
 			$color = ($node->color) ? $node->color : '';
 			$description = ($node->description) ? $node->description : '';
 			// If node->group_srls value exists
-			if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
+			if ($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))', $group_srls);
 			else $group_check_code = "true";
 
 			$title = $node->title;
 			$oModuleAdminModel = getAdminModel('module');
 
 			$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
-			if(count($langs))
+			if (count($langs))
 			{
-				foreach($langs as $key => $val)
+				foreach ($langs as $key => $val)
 				{
-					$xml_header_buff .= sprintf('$_titles[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
+					$xml_header_buff .= sprintf('$_titles[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"', '\\"', htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
 				}
 			}
 
 			$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
-			if(count($langx))
+			if (count($langx))
 			{
-				foreach($langx as $key => $val)
+				foreach ($langx as $key => $val)
 				{
-					$xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
+					$xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"', '\\"', htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
 				}
 			}
 
@@ -2002,7 +2002,7 @@ 
 				$category_srl,
 				$group_check_code,
 				$category_srl,
-				var_export(getUrl('','mid',$node->mid,'category',$category_srl), true),
+				var_export(getUrl('', 'mid', $node->mid, 'category', $category_srl), true),
 				var_export($expand, true),
 				var_export($color, true),
 				$group_check_code,
@@ -2010,8 +2010,8 @@ 
 				$node->document_count
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if ($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			else $buff .= sprintf('<node %s />', $attribute);
 		}
 		return $buff;
 	}
@@ -2030,13 +2030,13 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff)
 	{
 		$output = array("buff"=>"", "category_srl_list"=>array());
-		if(!$source_node) return $output;
+		if (!$source_node) return $output;
 
 		// Set to an arraty for looping and then generate php script codes to be included
-		foreach($source_node as $category_srl => $node)
+		foreach ($source_node as $category_srl => $node)
 		{
 			// Get data from child nodes first if exist.
-			if($category_srl && $tree[$category_srl]){
+			if ($category_srl && $tree[$category_srl]) {
 				$child_output = $this->getPhpCacheCode($tree[$category_srl], $tree, $site_srl, $php_header_buff);
 			} else {
 				$child_output = array("buff"=>"", "category_srl_list"=>array());
@@ -2047,14 +2047,14 @@ 
 			$output['category_srl_list'] = array_merge($output['category_srl_list'], $child_output['category_srl_list']);
 
 			// If node->group_srls value exists
-			if($node->group_srls) {
-				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$node->group_srls);
+			if ($node->group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))', $node->group_srls);
 			} else {
 				$group_check_code = "true";
 			}
 
 			// List variables
-			$selected = '"' . implode('","', $child_output['category_srl_list']) . '"';
+			$selected = '"'.implode('","', $child_output['category_srl_list']).'"';
 			$child_buff = $child_output['buff'];
 			$expand = $node->expand;
 
@@ -2063,32 +2063,32 @@ 
 			$oModuleAdminModel = getAdminModel('module');
 			$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
 
-			if(count($langs))
+			if (count($langs))
 			{
-				foreach($langs as $key => $val)
+				foreach ($langs as $key => $val)
 				{
 					$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					$php_header_buff .= sprintf(
 						'$_titles[%d]["%s"] = %s; ',
 						$category_srl,
 						$key,
-						var_export(str_replace('"','\\"', $val), true)
+						var_export(str_replace('"', '\\"', $val), true)
 					);
 				}
 			}
 
 			$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
 
-			if(count($langx))
+			if (count($langx))
 			{
-				foreach($langx as $key => $val)
+				foreach ($langx as $key => $val)
 				{
 					$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					$php_header_buff .= sprintf(
 						'$_descriptions[%d]["%s"] = %s; ',
 						$category_srl,
 						$key,
-						var_export(str_replace('"','\\"', $val), true)
+						var_export(str_replace('"', '\\"', $val), true)
 					);
 				}
 			}
@@ -2112,7 +2112,7 @@ 
 			);
 
 			// Generate buff data
-			$output['buff'] .=  sprintf('%s=>array(%s),', $node->category_srl, $attribute);
+			$output['buff'] .= sprintf('%s=>array(%s),', $node->category_srl, $attribute);
 		}
 
 		return $output;
@@ -2129,7 +2129,7 @@ 
 	function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$document_popup_menu_list = Context::get('document_popup_menu_list');
-		if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
+		if (!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
 
 		$obj = new stdClass();
 		$obj->url = $url;
@@ -2147,68 +2147,68 @@ 
 	 */
 	function procDocumentAddCart()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
 		// Get document_srl
-		$srls = explode(',',Context::get('srls'));
-		for($i = 0; $i < count($srls); $i++)
+		$srls = explode(',', Context::get('srls'));
+		for ($i = 0; $i < count($srls); $i++)
 		{
 			$srl = trim($srls[$i]);
 
-			if(!$srl) continue;
+			if (!$srl) continue;
 
 			$document_srls[] = $srl;
 		}
-		if(!count($document_srls)) return;
+		if (!count($document_srls)) return;
 
 		// Get module_srl of the documents
 		$args = new stdClass;
 		$args->list_count = count($document_srls);
-		$args->document_srls = implode(',',$document_srls);
+		$args->document_srls = implode(',', $document_srls);
 		$args->order_type = 'asc';
 		$output = executeQueryArray('document.getDocuments', $args);
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 
 		unset($document_srls);
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$document_srls[$val->module_srl][] = $val->document_srl;
 		}
-		if(!$document_srls || !count($document_srls)) return new BaseObject();
+		if (!$document_srls || !count($document_srls)) return new BaseObject();
 
 		// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
 		$oModuleModel = getModel('module');
 		$module_srls = array_keys($document_srls);
-		for($i=0;$i<count($module_srls);$i++)
+		for ($i = 0; $i < count($module_srls); $i++)
 		{
 			$module_srl = $module_srls[$i];
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
-				if(!$module_info)
+				if (!$module_info)
 				{
 					unset($document_srls[$module_srl]);
 					continue;
 				}
 				$grant = $oModuleModel->getGrant($module_info, $logged_info);
-				if(!$grant->manager)
+				if (!$grant->manager)
 				{
 					unset($document_srls[$module_srl]);
 					continue;
 				}
 			}
 		}
-		if(!count($document_srls)) return new BaseObject();
+		if (!count($document_srls)) return new BaseObject();
 
-		foreach($document_srls as $module_srl => $documents)
+		foreach ($document_srls as $module_srl => $documents)
 		{
 			$cnt = count($documents);
-			for($i=0;$i<$cnt;$i++)
+			for ($i = 0; $i < $cnt; $i++)
 			{
-				$document_srl = (int)trim($documents[$i]);
-				if(!$document_srls) continue;
-				if($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
+				$document_srl = (int) trim($documents[$i]);
+				if (!$document_srls) continue;
+				if ($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
 				else $_SESSION['document_management'][$document_srl] = true;
 			}
 		}
@@ -2221,9 +2221,9 @@ 
 	function procDocumentManageCheckedDocument()
 	{
 		@set_time_limit(0);
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
-		if(!checkCSRF())
+		if (!checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -2231,44 +2231,44 @@ 
 		$type = Context::get('type');
 		$target_module = Context::get('target_module');
 		$module_srl = Context::get('module_srl');
-		if($target_module && !$module_srl) $module_srl = $target_module;
+		if ($target_module && !$module_srl) $module_srl = $target_module;
 		$category_srl = Context::get('target_category');
 		$message_content = Context::get('message_content');
-		if($message_content) $message_content = nl2br($message_content);
+		if ($message_content) $message_content = nl2br($message_content);
 
 		$cart = Context::get('cart');
-		if(!is_array($cart)) $document_srl_list = explode('|@|', $cart);
+		if (!is_array($cart)) $document_srl_list = explode('|@|', $cart);
 		else $document_srl_list = $cart;
 
 		$document_srl_count = count($document_srl_list);
 
 		$oDocumentModel = getModel('document');
 		$document_items = array();
-		foreach($document_srl_list as $document_srl)
+		foreach ($document_srl_list as $document_srl)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			$document_items[] = $oDocument;
-			if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+			if (!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
 		}
 
 		// Send a message
-		if($message_content)
+		if ($message_content)
 		{
 
 			$oCommunicationController = getController('communication');
 
 			$logged_info = Context::get('logged_info');
 
-			$title = cut_str($message_content,10,'...');
+			$title = cut_str($message_content, 10, '...');
 			$sender_member_srl = $logged_info->member_srl;
 
-			foreach($document_items as $oDocument)
+			foreach ($document_items as $oDocument)
 			{
-				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
+				if (!$oDocument->get('member_srl') || $oDocument->get('member_srl') == $sender_member_srl) continue;
 
-				if($type=='move') $purl = sprintf("<a href=\"%s\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
+				if ($type == 'move') $purl = sprintf("<a href=\"%s\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
 				else $purl = "";
-				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
+				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s", $message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
 
 				$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
 			}
@@ -2278,54 +2278,54 @@ 
 		$oSpamController->setAvoidLog();
 
 		$oDocumentAdminController = getAdminController('document');
-		if($type == 'move')
+		if ($type == 'move')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if (!$module_srl) return new BaseObject(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if (!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
 
 			$msg_code = 'success_moved';
 
 		}
-		else if($type == 'copy')
+		else if ($type == 'copy')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if (!$module_srl) return new BaseObject(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if (!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
 
 			$msg_code = 'success_copied';
 		}
-		else if($type =='delete')
+		else if ($type == 'delete')
 		{
 			$oDB = &DB::getInstance();
 			$oDB->begin();
-			for($i=0;$i<$document_srl_count;$i++)
+			for ($i = 0; $i < $document_srl_count; $i++)
 			{
 				$document_srl = $document_srl_list[$i];
 				$output = $this->deleteDocument($document_srl, true);
-				if(!$output->toBool()) return new BaseObject(-1, 'fail_to_delete');
+				if (!$output->toBool()) return new BaseObject(-1, 'fail_to_delete');
 			}
 			$oDB->commit();
 			$msg_code = 'success_deleted';
 		}
-		else if($type == 'trash')
+		else if ($type == 'trash')
 		{
 			$args = new stdClass();
 			$args->description = $message_content;
 
 			$oDB = &DB::getInstance();
 			$oDB->begin();
-			for($i=0;$i<$document_srl_count;$i++) {
+			for ($i = 0; $i < $document_srl_count; $i++) {
 				$args->document_srl = $document_srl_list[$i];
 				$output = $this->moveDocumentToTrash($args);
-				if(!$output || !$output->toBool()) return new BaseObject(-1, 'fail_to_trash');
+				if (!$output || !$output->toBool()) return new BaseObject(-1, 'fail_to_trash');
 			}
 			$oDB->commit();
 			$msg_code = 'success_trashed';
 		}
-		else if($type == 'cancelDeclare')
+		else if ($type == 'cancelDeclare')
 		{
 			$args->document_srl = $document_srl_list;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
@@ -2347,27 +2347,27 @@ 
 	function procDocumentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+		if (preg_match('/^([0-9,]+)$/', $module_srl)) $module_srl = explode(',', $module_srl);
 		else $module_srl = array($module_srl);
 
 		$document_config = new stdClass();
 		$document_config->use_history = Context::get('use_history');
-		if(!$document_config->use_history) $document_config->use_history = 'N';
+		if (!$document_config->use_history) $document_config->use_history = 'N';
 
 		$document_config->use_vote_up = Context::get('use_vote_up');
-		if(!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
+		if (!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
 
 		$document_config->use_vote_down = Context::get('use_vote_down');
-		if(!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
+		if (!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
 
 		$document_config->use_status = Context::get('use_status');
 
 		$oModuleController = getController('module');
-		for($i=0;$i<count($module_srl);$i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
-			$output = $oModuleController->insertModulePartConfig('document',$srl,$document_config);
+			if (!$srl) continue;
+			$output = $oModuleController->insertModulePartConfig('document', $srl, $document_config);
 		}
 		$this->setError(-1);
 		$this->setMessage('success_updated', 'info');
@@ -2383,7 +2383,7 @@ 
 	function procDocumentTempSave()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
 		$module_info = Context::get('module_info');
 		$logged_info = Context::get('logged_info');
 
@@ -2395,7 +2395,7 @@ 
 		unset($obj->is_notice);
 
 		// Extract from beginning part of contents in the guestbook
-		if(!$obj->title)
+		if (!$obj->title)
 		{
 			$obj->title = cut_str(strip_tags($obj->content), 20, '...');
 		}
@@ -2406,13 +2406,13 @@ 
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
 
 		// Update if already exists
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
-			if($oDocument->get('module_srl') != $obj->module_srl)
+			if ($oDocument->get('module_srl') != $obj->module_srl)
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
@@ -2430,7 +2430,7 @@ 
 			$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
 		}
 		// Set the attachment to be invalid state
-		if($oDocument->hasUploadedFiles())
+		if ($oDocument->hasUploadedFiles())
 		{
 			$args = new stdClass;
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -2448,11 +2448,11 @@ 
 	 */
 	function procDocumentGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		$documentSrls = Context::get('document_srls');
-		if($documentSrls) $documentSrlList = explode(',', $documentSrls);
+		if ($documentSrls) $documentSrlList = explode(',', $documentSrls);
 
-		if(count($documentSrlList) > 0)
+		if (count($documentSrlList) > 0)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'title', 'nick_name', 'status');
@@ -2476,10 +2476,10 @@ 
 	 */
 	function _checkCommentStatusForOldVersion(&$obj)
 	{
-		if(!isset($obj->allow_comment)) $obj->allow_comment = 'N';
-		if(!isset($obj->lock_comment)) $obj->lock_comment = 'N';
+		if (!isset($obj->allow_comment)) $obj->allow_comment = 'N';
+		if (!isset($obj->lock_comment)) $obj->lock_comment = 'N';
 
-		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
+		if ($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
 		else $obj->commentStatus = 'DENY';
 	}
 
@@ -2490,8 +2490,8 @@ 
 	 */
 	function _checkDocumentStatusForOldVersion(&$obj)
 	{
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
-		if(!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
+		if (!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
+		if (!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
 	}
 
 	public function updateUploaedCount($documentSrlList)
@@ -2499,10 +2499,10 @@ 
 		$oDocumentModel = getModel('document');
 		$oFileModel = getModel('file');
 
-		if(is_array($documentSrlList))
+		if (is_array($documentSrlList))
 		{
 			$documentSrlList = array_unique($documentSrlList);
-			foreach($documentSrlList AS $key => $documentSrl)
+			foreach ($documentSrlList AS $key => $documentSrl)
 			{
 				$fileCount = $oFileModel->getFilesCount($documentSrl);
 				$args = new stdClass();
@@ -2523,14 +2523,14 @@ 
 		$oDocumentModel = getModel('document');
 		$documentExtraKeys = $oDocumentModel->getExtraKeys($obj->originModuleSrl);
 
-		if(is_array($documentExtraKeys) && is_array($obj->moduleSrlList))
+		if (is_array($documentExtraKeys) && is_array($obj->moduleSrlList))
 		{
-			$oDocumentController=getController('document');
-			foreach($obj->moduleSrlList AS $key=>$value)
+			$oDocumentController = getController('document');
+			foreach ($obj->moduleSrlList AS $key=>$value)
 			{
-				foreach($documentExtraKeys AS $extraItem)
+				foreach ($documentExtraKeys AS $extraItem)
 				{
-					$oDocumentController->insertDocumentExtraKey($value, $extraItem->idx, $extraItem->name, $extraItem->type, $extraItem->is_required , $extraItem->search , $extraItem->default , $extraItem->desc, $extraItem->eid) ;
+					$oDocumentController->insertDocumentExtraKey($value, $extraItem->idx, $extraItem->name, $extraItem->type, $extraItem->is_required, $extraItem->search, $extraItem->default, $extraItem->desc, $extraItem->eid);
 				}
 			}
 		}
@@ -2542,9 +2542,9 @@ 
 		$documentConfig = $oModuleModel->getModulePartConfig('document', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('document', $moduleSrl, $documentConfig);
 			}

Braces +535 added lines, -216 removed lines

@@ -24,19 +24,27 @@ 
 	 */
 	function procDocumentVoteUp()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_up=='N') return new BaseObject(-1, 'msg_invalid_request');
+		if($document_config->use_vote_up=='N') {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$point = 1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -69,19 +77,27 @@ 
 	 */
 	function procDocumentVoteDown()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_down=='N') return new BaseObject(-1, 'msg_invalid_request');
+		if($document_config->use_vote_down=='N') {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$point = -1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -95,10 +111,14 @@ 
 	 */
 	function procDocumentDeclare()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		return $this->declaredDocument($document_srl);
 	}
@@ -140,7 +160,9 @@ 
 		$args->history_srl = $history_srl;
 		$args->module_srl = $module_srl;
 		$args->document_srl = $document_srl;
-		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
+		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) {
+			return;
+		}
 		executeQuery("document.deleteHistory", $args);
 	}
 
@@ -152,15 +174,21 @@ 
 	function triggerDeleteModuleDocuments(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 		// Delete the document
 		$oDocumentAdminController = getAdminController('document');
 		$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Delete the category
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteModuleCategory($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Delete extra key and variable, because module deleted
 		$this->deleteDocumentExtraKeys($module_srl);
 
@@ -202,10 +230,18 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
+		if($obj->comment_status) {
+			$obj->commentStatus = $obj->comment_status;
+		}
+		if(!$obj->commentStatus) {
+			$obj->commentStatus = 'DENY';
+		}
+		if($obj->commentStatus == 'DENY') {
+			$this->_checkCommentStatusForOldVersion($obj);
+		}
+		if($obj->allow_trackback!='Y') {
+			$obj->allow_trackback = 'N';
+		}
 		if($obj->homepage) 
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
@@ -215,9 +251,15 @@ 
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
-		if(!$obj->email_address) $obj->email_address = '';
-		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		if($obj->notify_message != 'Y') {
+			$obj->notify_message = 'N';
+		}
+		if(!$obj->email_address) {
+			$obj->email_address = '';
+		}
+		if(!$isRestore) {
+			$obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		}
 
                 // can modify regdate only manager
                 $grant = Context::get('grant');
@@ -227,7 +269,9 @@ 
 		}
 		
 		// Serialize the $extra_vars, check the extra_vars type, because duplicate serialized avoid
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if(!is_string($obj->extra_vars)) {
+			$obj->extra_vars = serialize($obj->extra_vars);
+		}
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -235,10 +279,15 @@ 
 		unset($obj->_saved_doc_message);
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Register it if no given document_srl exists
-		if(!$obj->document_srl) $obj->document_srl = getNextSequence();
-		elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new BaseObject(-1, 'msg_not_permitted');
+		if(!$obj->document_srl) {
+			$obj->document_srl = getNextSequence();
+		} elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$oDocumentModel = getModel('document');
 		// Set to 0 if the category_srl doesn't exist
@@ -249,12 +298,19 @@ 
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) {
+				$obj->category_srl = 0;
+			}
 		}
 		// Set the read counts and update order.
-		if(!$obj->readed_count) $obj->readed_count = 0;
-		if($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
-		else $obj->update_order = $obj->list_order;
+		if(!$obj->readed_count) {
+			$obj->readed_count = 0;
+		}
+		if($isLatest) {
+			$obj->update_order = $obj->list_order = $obj->document_srl * -1;
+		} else {
+			$obj->update_order = $obj->list_order;
+		}
 		// Check the status of password hash for manually inserting. Apply hashing for otherwise.
 		if($obj->password && !$obj->password_is_hashed)
 		{
@@ -276,9 +332,13 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		}
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
@@ -290,13 +350,19 @@ 
 			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+		if($logged_info->is_admin != 'Y') {
+			$obj->content = removeHackTag($obj->content);
+		}
 		// An error appears if both log-in info and user name don't exist.
-		if(!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-1,'msg_invalid_request');
+		if(!$logged_info->member_srl && !$obj->nick_name) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$obj->lang_code = Context::getLangType();
 		// Insert data into the DB
-		if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
+		if(!$obj->status) {
+			$this->_checkDocumentStatusForOldVersion($obj);
+		}
 		$output = executeQuery('document.insertDocument', $obj);
 		if(!$output->toBool())
 		{
@@ -313,19 +379,25 @@ 
 				if(isset($obj->{'extra_vars'.$idx}))
 				{
 					$tmp = $obj->{'extra_vars'.$idx};
-					if(is_array($tmp))
-						$value = implode('|@|', $tmp);
-					else
-						$value = trim($tmp);
+					if(is_array($tmp)) {
+											$value = implode('|@|', $tmp);
+					} else {
+											$value = trim($tmp);
+					}
+				} else if(isset($obj->{$extra_item->name})) {
+					$value = trim($obj->{$extra_item->name});
+				}
+				if($value == NULL) {
+					continue;
 				}
-				else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-				if($value == NULL) continue;
 
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
 		// Update the category if the category_srl exists.
-		if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		if($obj->category_srl) {
+			$this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		}
 		// Call a trigger (after)
 		if($output->toBool())
 		{
@@ -367,27 +439,39 @@ 
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1,'msg_invalied_request');
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
-		if(!$obj->status) $obj->status = 'PUBLIC';
+		if(!$source_obj->document_srl || !$obj->document_srl) {
+			return new BaseObject(-1,'msg_invalied_request');
+		}
+		if(!$obj->status && $obj->is_secret == 'Y') {
+			$obj->status = 'SECRET';
+		}
+		if(!$obj->status) {
+			$obj->status = 'PUBLIC';
+		}
 
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.updateDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$oModuleModel = getModel('module');
-		if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
+		if(!$obj->module_srl) {
+			$obj->module_srl = $source_obj->get('module_srl');
+		}
 		$module_srl = $obj->module_srl;
 		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
 		if(!$document_config)
 		{
 			$document_config = new stdClass();
 		}
-		if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+		if(!isset($document_config->use_history)) {
+			$document_config->use_history = 'N';
+		}
 		$bUseHistory = $document_config->use_history == 'Y' || $document_config->use_history == 'Trace';
 
 		if($bUseHistory)
@@ -396,22 +480,31 @@ 
 			$args->history_srl = getNextSequence();
 			$args->document_srl = $obj->document_srl;
 			$args->module_srl = $module_srl;
-			if($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
+			if($document_config->use_history == 'Y') {
+				$args->content = $source_obj->get('content');
+			}
 			$args->nick_name = $logged_info->nick_name;
 			$args->member_srl = $logged_info->member_srl;
 			$args->regdate = $source_obj->get('last_update');
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 			$output = executeQuery("document.insertHistory", $args);
-		}
-		else
+		} else
 		{
 			$obj->ipaddress = $source_obj->get('ipaddress');
 		}
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
+		if($obj->comment_status) {
+			$obj->commentStatus = $obj->comment_status;
+		}
+		if(!$obj->commentStatus) {
+			$obj->commentStatus = 'DENY';
+		}
+		if($obj->commentStatus == 'DENY') {
+			$this->_checkCommentStatusForOldVersion($obj);
+		}
+		if($obj->allow_trackback!='Y') {
+			$obj->allow_trackback = 'N';
+		}
 		if($obj->homepage)
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
@@ -421,7 +514,9 @@ 
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if($obj->notify_message != 'Y') {
+			$obj->notify_message = 'N';
+		}
 		
 		// can modify regdate only manager
                 $grant = Context::get('grant');
@@ -431,7 +526,9 @@ 
 		}
 		
 		// Serialize the $extra_vars
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if(!is_string($obj->extra_vars)) {
+			$obj->extra_vars = serialize($obj->extra_vars);
+		}
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -443,7 +540,9 @@ 
 		if($source_obj->get('category_srl')!=$obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if(!$category_list[$obj->category_srl]) {
+				$obj->category_srl = 0;
+			}
 		}
 		// Change the update order
 		$obj->update_order = getNextSequence() * -1;
@@ -478,9 +577,13 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(strip_tags($obj->content),20,'...');
+		}
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
@@ -500,8 +603,7 @@ 
 				$lang_code_args->document_srl = $source_obj->get('document_srl');
 				$lang_code_args->lang_code = Context::getLangType();
 				$output = executeQuery('document.updateDocumentsLangCode', $lang_code_args);
-			}
-			else
+			} else
 			{
 				$extra_content = new stdClass;
 				$extra_content->title = $obj->title;
@@ -520,7 +622,9 @@ 
 			$obj->content = removeHackTag($obj->content);
 		}
 		// if temporary document, regdate is now setting
-		if($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
+		if($source_obj->get('status') == $this->getConfigStatus('temp')) {
+			$obj->regdate = date('YmdHis');
+		}
 
 		// Insert data into the DB
 		$output = executeQuery('document.updateDocument', $obj);
@@ -543,25 +647,37 @@ 
 					if(isset($obj->{'extra_vars'.$idx}))
 					{
 						$tmp = $obj->{'extra_vars'.$idx};
-						if(is_array($tmp))
-							$value = implode('|@|', $tmp);
-						else
-							$value = trim($tmp);
+						if(is_array($tmp)) {
+													$value = implode('|@|', $tmp);
+						} else {
+													$value = trim($tmp);
+						}
+					} else if(isset($obj->{$extra_item->name})) {
+						$value = trim($obj->{$extra_item->name});
+					}
+					if($value == NULL) {
+						continue;
 					}
-					else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-					if($value == NULL) continue;
 					$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 				}
 			}
 			// Inert extra vars for multi-language support of title and contents.
-			if($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
-			if($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			if($extra_content->title) {
+				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
+			}
+			if($extra_content->content) {
+				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			}
 		}
 		// Update the category if the category_srl exists.
 		if($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
 		{
-			if($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
-			if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			if($source_obj->get('category_srl') != $obj->category_srl) {
+				$this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
+			}
+			if($obj->category_srl) {
+				$this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			}
 		}
 		// Call a trigger (after)
 		if($output->toBool())
@@ -606,7 +722,9 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->document_srl = $document_srl;
 		$output = ModuleHandler::triggerCall('document.deleteDocument', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -618,12 +736,17 @@ 
 			$oDocumentModel = getModel('document');
 			// Check if the documnet exists
 			$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
+		} else if($isEmptyTrash && $oDocument == null) {
+			return new BaseObject(-1, 'document is not exists');
 		}
-		else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
 
-		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
+		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) {
+			return new BaseObject(-1, 'msg_invalid_document');
+		}
 		// Check if a permossion is granted
-		if(!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
+		if(!$oDocument->isGranted()) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		//if empty trash, document already deleted, therefore document not delete
 		$args = new stdClass();
@@ -643,7 +766,9 @@ 
 
 		$this->deleteDocumentHistory(null, $document_srl, null);
 		// Update category information if the category_srl exists.
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if($oDocument->get('category_srl')) {
+			$this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		}
 		// Delete a declared list
 		executeQuery('document.deleteDeclared', $args);
 		// Delete extra variable
@@ -723,8 +848,11 @@ 
 	{
 		$trash_args = new stdClass();
 		// Get trash_srl if a given trash_srl doesn't exist
-		if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
-		else $trash_args->trash_srl = $obj->trash_srl;
+		if(!$obj->trash_srl) {
+			$trash_args->trash_srl = getNextSequence();
+		} else {
+			$trash_args->trash_srl = $obj->trash_srl;
+		}
 		// Get its module_srl which the document belongs to
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
@@ -732,7 +860,9 @@ 
 		$trash_args->module_srl = $oDocument->get('module_srl');
 		$obj->module_srl = $oDocument->get('module_srl');
 		// Cannot throw data from the trash to the trash
-		if($trash_args->module_srl == 0) return false;
+		if($trash_args->module_srl == 0) {
+			return false;
+		}
 		// Data setting
 		$trash_args->document_srl = $obj->document_srl;
 		$trash_args->description = $obj->description;
@@ -793,7 +923,9 @@ 
 		  }*/
 
 		// update category
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if($oDocument->get('category_srl')) {
+			$this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		}
 
 		// remove thumbnails
 		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
@@ -838,7 +970,9 @@ 
 	function updateReadedCount(&$oDocument)
 	{
 		// Pass if Crawler access
-		if(isCrawler()) return false;
+		if(isCrawler()) {
+			return false;
+		}
 		
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
@@ -846,10 +980,14 @@ 
 
 		// Call a trigger when the read count is updated (before)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'before', $oDocument);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		// Pass if read count is increaded on the session information
-		if($_SESSION['readed_document'][$document_srl]) return false;
+		if($_SESSION['readed_document'][$document_srl]) {
+			return false;
+		}
 
 		// Pass if the author's IP address is as same as visitor's.
 		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
@@ -914,7 +1052,9 @@ 
 	 */
 	function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid)
 	{
-		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
@@ -931,8 +1071,7 @@ 
 		if(!$output->data)
 		{
 			$output = executeQuery('document.insertDocumentExtraKey', $obj);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('document.updateDocumentExtraKey', $obj);
 			// Update the extra var(eid)
@@ -958,10 +1097,14 @@ 
 	 */
 	function deleteDocumentExtraKeys($module_srl, $var_idx = null)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if(!is_null($var_idx)) {
+			$obj->var_idx = $var_idx;
+		}
 
 		$oDB = DB::getInstance();
 		$oDB->begin();
@@ -1025,8 +1168,12 @@ 
 	 */
 	function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '')
 	{
-		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-1,'msg_invalid_request');
-		if(!$lang_code) $lang_code = Context::getLangType();
+		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
+		if(!$lang_code) {
+			$lang_code = Context::getLangType();
+		}
 
 		$obj = new stdClass;
 		$obj->module_srl = $module_srl;
@@ -1052,10 +1199,18 @@ 
 	{
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($document_srl)) $obj->document_srl = $document_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
-		if(!is_null($lang_code)) $obj->lang_code = $lang_code;
-		if(!is_null($eid)) $obj->eid = $eid;
+		if(!is_null($document_srl)) {
+			$obj->document_srl = $document_srl;
+		}
+		if(!is_null($var_idx)) {
+			$obj->var_idx = $var_idx;
+		}
+		if(!is_null($lang_code)) {
+			$obj->lang_code = $lang_code;
+		}
+		if(!is_null($eid)) {
+			$obj->eid = $eid;
+		}
 		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
 		return $output;
 	}
@@ -1069,8 +1224,11 @@ 
 	 */
 	function updateVotedCount($document_srl, $point = 1)
 	{
-		if($point > 0) $failed_voted = 'failed_voted';
-		else $failed_voted = 'failed_blamed';
+		if($point > 0) {
+			$failed_voted = 'failed_voted';
+		} else {
+			$failed_voted = 'failed_blamed';
+		}
 		// Return fail if session already has information about votes
 		if($_SESSION['voted_document'][$document_srl])
 		{
@@ -1106,8 +1264,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1129,17 +1286,20 @@ 
 		{
 			$args->blamed_count = $oDocument->get('blamed_count') + $point;
 			$output = executeQuery('document.updateBlamedCount', $args);
-		}
-		else
+		} else
 		{
 			$args->voted_count = $oDocument->get('voted_count') + $point;
 			$output = executeQuery('document.updateVotedCount', $args);
 		}
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Leave logs
 		$args->point = $point;
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$obj = new stdClass;
 		$obj->member_srl = $oDocument->get('member_srl');
@@ -1175,8 +1335,7 @@ 
 		{
 			$output->setMessage('success_voted');
 			$output->add('voted_count', $obj->after_point);
-		}
-		else
+		} else
 		{
 			$output->setMessage('success_blamed');
 			$output->add('blamed_count', $obj->after_point);
@@ -1193,13 +1352,17 @@ 
 	function declaredDocument($document_srl)
 	{
 		// Fail if session information already has a reported document
-		if($_SESSION['declared_document'][$document_srl]) return new BaseObject(-1, 'failed_declared');
+		if($_SESSION['declared_document'][$document_srl]) {
+			return new BaseObject(-1, 'failed_declared');
+		}
 
 		// Check if previously reported
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
 
@@ -1243,8 +1406,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1264,9 +1426,14 @@ 
 		$oDB->begin();
 
 		// Add the declared document
-		if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
-		else $output = executeQuery('document.insertDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if($declared_count > 0) {
+			$output = executeQuery('document.updateDeclaredDocument', $args);
+		} else {
+			$output = executeQuery('document.insertDeclaredDocument', $args);
+		}
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Leave logs
 		$output = executeQuery('document.insertDocumentDeclaredLog', $args);
 		if(!$output->toBool())
@@ -1365,9 +1532,10 @@ 
 			$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
 			$obj->list_order = $parent_category->list_order;
 			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1);
-			if(!$obj->category_srl) $obj->category_srl = getNextSequence();
-		}
-		else
+			if(!$obj->category_srl) {
+				$obj->category_srl = getNextSequence();
+			}
+		} else
 		{
 			$obj->list_order = $obj->category_srl = getNextSequence();
 		}
@@ -1407,13 +1575,17 @@ 
 	{
 		// Create a document model object
 		$oDocumentModel = getModel('document');
-		if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		if(!$document_count) {
+			$document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		}
 
 		$args = new stdClass;
 		$args->category_srl = $category_srl;
 		$args->document_count = $document_count;
 		$output = executeQuery('document.updateCategoryCount', $args);
-		if($output->toBool()) $this->makeCategoryFile($module_srl);
+		if($output->toBool()) {
+			$this->makeCategoryFile($module_srl);
+		}
 
 		return $output;
 	}
@@ -1426,7 +1598,9 @@ 
 	function updateCategory($obj)
 	{
 		$output = executeQuery('document.updateCategory', $obj);
-		if($output->toBool()) $this->makeCategoryFile($obj->module_srl);
+		if($output->toBool()) {
+			$this->makeCategoryFile($obj->module_srl);
+		}
 		return $output;
 	}
 
@@ -1443,11 +1617,17 @@ 
 		$category_info = $oDocumentModel->getCategory($category_srl);
 		// Display an error that the category cannot be deleted if it has a child
 		$output = executeQuery('document.getChildCategoryCount', $args);
-		if(!$output->toBool()) return $output;
-		if($output->data->count>0) return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if($output->data->count>0) {
+			return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		}
 		// Delete a category information
 		$output = executeQuery('document.deleteCategory', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->makeCategoryFile($category_info->module_srl);
 		// remvove cache
@@ -1462,8 +1642,9 @@ 
 				$args->page = ++$page;
 				$output = executeQuery('document.getDocumentList', $args, array('document_srl'));
 
-				if($output->data == array())
-					break;
+				if($output->data == array()) {
+									break;
+				}
 
 				foreach($output->data as $val)
 				{
@@ -1515,18 +1696,26 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new BaseObject();
+		if(count($category_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		$prev_category = NULL;
 		foreach($category_list as $key => $val)
 		{
-			if($key==$category_srl) break;
+			if($key==$category_srl) {
+				break;
+			}
 			$prev_category = $val;
 		}
 		// Return if the previous category doesn't exist
-		if(!$prev_category) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if(!$prev_category) {
+			return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		}
 		// Return if the selected category is the top level
-		if($category_srl_list[0]==$category_srl) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if($category_srl_list[0]==$category_srl) {
+			return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		}
 		// Information of the selected category
 		$cur_args = new stdClass;
 		$cur_args->category_srl = $category_srl;
@@ -1562,15 +1751,21 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new BaseObject();
+		if(count($category_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		for($i=0;$i<count($category_srl_list);$i++)
 		{
-			if($category_srl_list[$i]==$category_srl) break;
+			if($category_srl_list[$i]==$category_srl) {
+				break;
+			}
 		}
 
 		$next_category_srl = $category_srl_list[$i+1];
-		if(!$category_list[$next_category_srl]) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if(!$category_list[$next_category_srl]) {
+			return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		}
 		$next_category = $category_list[$next_category_srl];
 		// Information of the selected category
 		$cur_args = new stdClass;
@@ -1597,7 +1792,9 @@ 
 	{
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!count($extra_keys)) return;
+		if(!count($extra_keys)) {
+			return;
+		}
 
 		$js_code = array();
 		$js_code[] = '<script>//<![CDATA[';
@@ -1616,7 +1813,9 @@ 
 			}
 			$name = str_ireplace(array('<script', '</script'), array('<scr" + "ipt', '</scr" + "ipt'), $val->name);
 			$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $idx, $name);
-			if($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			if($val->is_required == 'Y') {
+				$js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			}
 		}
 
 		$js_code[] = '})(jQuery);';
@@ -1634,7 +1833,9 @@ 
 	function procDocumentInsertCategory($args = null)
 	{
 		// List variables
-		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		if(!$args) {
+			$args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		}
 		$args->title = $args->category_title;
 		$args->description = $args->category_description;
 		$args->color = $args->category_color;
@@ -1650,11 +1851,18 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
-		if($args->expand !="Y") $args->expand = "N";
-		if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls);
-		else $args->group_srls = implode(',', $args->group_srls);
+		if($args->expand !="Y") {
+			$args->expand = "N";
+		}
+		if(!is_array($args->group_srls)) {
+			$args->group_srls = str_replace('|@|',',',$args->group_srls);
+		} else {
+			$args->group_srls = implode(',', $args->group_srls);
+		}
 		$args->parent_srl = (int)$args->parent_srl;
 
 		$oDocumentModel = getModel('document');
@@ -1665,7 +1873,9 @@ 
 		if($args->category_srl)
 		{
 			$category_info = $oDocumentModel->getCategory($args->category_srl);
-			if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
+			if($category_info->category_srl != $args->category_srl) {
+				$args->category_srl = null;
+			}
 		}
 		// Update if exists
 		if($args->category_srl)
@@ -1677,8 +1887,7 @@ 
 				return $output;
 			}
 			// Insert if not exist
-		}
-		else
+		} else
 		{
 			$output = $this->insertCategory($args);
 			if(!$output->toBool())
@@ -1720,7 +1929,9 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		// First child of the parent_category_srl
 		$source_args = new stdClass;
@@ -1733,30 +1944,39 @@ 
 			$args->parent_srl = $parent_category_srl;
 			$output = executeQuery('document.getChildCategoryMinListOrder', $args);
 
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$args->list_order = (int)$output->data->list_order;
-			if(!$args->list_order) $args->list_order = 0;
+			if(!$args->list_order) {
+				$args->list_order = 0;
+			}
 			$args->list_order--;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $parent_category_srl;
 			$source_args->list_order = $args->list_order;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			// Sibling of the $target_category_srl
-		}
-		else if($target_category_srl > 0)
+		} else if($target_category_srl > 0)
 		{
 			$target_category = $oDocumentModel->getCategory($target_category_srl);
 			// Move all siblings of the $target_category down
 			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $target_category->parent_srl;
 			$source_args->list_order = $target_category->list_order+1;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Re-generate the xml file
 		$xml_file = $this->makeCategoryFile($source_category->module_srl);
@@ -1781,14 +2001,20 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$oDocumentModel = getModel('document');
 		// Get original information
 		$category_info = $oDocumentModel->getCategory($args->category_srl);
-		if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
+		if($category_info->parent_srl) {
+			$parent_srl = $category_info->parent_srl;
+		}
 		// Display an error that the category cannot be deleted if it has a child node
-		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) {
+			return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		}
 		// Remove from the DB
 		$output = $this->deleteCategory($args->category_srl);
 		if(!$output->toBool())
@@ -1822,7 +2048,9 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$xml_file = $this->makeCategoryFile($module_srl);
 		// Set return value
@@ -1837,14 +2065,18 @@ 
 	function makeCategoryFile($module_srl)
 	{
 		// Return if there is no information you need for creating a cache file
-		if(!$module_srl) return false;
+		if(!$module_srl) {
+			return false;
+		}
 		// Get module information (to obtain mid)
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'mid', 'site_srl');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$mid = $module_info->mid;
 
-		if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
+		if(!is_dir('./files/cache/document_category')) {
+			FileHandler::makeDir('./files/cache/document_category');
+		}
 		// Cache file's name
 		$xml_file = sprintf("./files/cache/document_category/%s.xml.php", $module_srl);
 		$php_file = sprintf("./files/cache/document_category/%s.php", $module_srl);
@@ -1856,13 +2088,17 @@ 
 
 		$category_list = $output->data;
 
-		if(!is_array($category_list)) $category_list = array($category_list);
+		if(!is_array($category_list)) {
+			$category_list = array($category_list);
+		}
 
 		$category_count = count($category_list);
 		for($i=0;$i<$category_count;$i++)
 		{
 			$category_srl = $category_list[$i]->category_srl;
-			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
+			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) {
+				$category_list[$i]->group_srls = '';
+			}
 			$list[$category_srl] = $category_list[$i];
 		}
 		// Create the xml file without node data if no data is obtained
@@ -1874,7 +2110,9 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 		// Create a tree for loop
 		foreach($list as $category_srl => $node)
 		{
@@ -1953,13 +2191,17 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff)
 	{
-		if(!$source_node) return;
+		if(!$source_node) {
+			return;
+		}
 
 		foreach($source_node as $category_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			if($category_srl && $tree[$category_srl]) {
+				$child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			}
 			// List variables
 			$expand = ($node->expand) ? $node->expand : 'N';
 			$group_srls = ($node->group_srls) ? $node->group_srls : '';
@@ -1969,8 +2211,11 @@ 
 			$color = ($node->color) ? $node->color : '';
 			$description = ($node->description) ? $node->description : '';
 			// If node->group_srls value exists
-			if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
-			else $group_check_code = "true";
+			if($group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
+			} else {
+				$group_check_code = "true";
+			}
 
 			$title = $node->title;
 			$oModuleAdminModel = getAdminModel('module');
@@ -2010,8 +2255,11 @@ 
 				$node->document_count
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if($child_buff) {
+				$buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			} else {
+				$buff .=  sprintf('<node %s />', $attribute);
+			}
 		}
 		return $buff;
 	}
@@ -2030,7 +2278,9 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff)
 	{
 		$output = array("buff"=>"", "category_srl_list"=>array());
-		if(!$source_node) return $output;
+		if(!$source_node) {
+			return $output;
+		}
 
 		// Set to an arraty for looping and then generate php script codes to be included
 		foreach($source_node as $category_srl => $node)
@@ -2129,7 +2379,9 @@ 
 	function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$document_popup_menu_list = Context::get('document_popup_menu_list');
-		if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
+		if(!is_array($document_popup_menu_list)) {
+			$document_popup_menu_list = array();
+		}
 
 		$obj = new stdClass();
 		$obj->url = $url;
@@ -2147,7 +2399,9 @@ 
 	 */
 	function procDocumentAddCart()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		// Get document_srl
 		$srls = explode(',',Context::get('srls'));
@@ -2155,11 +2409,15 @@ 
 		{
 			$srl = trim($srls[$i]);
 
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$document_srls[] = $srl;
 		}
-		if(!count($document_srls)) return;
+		if(!count($document_srls)) {
+			return;
+		}
 
 		// Get module_srl of the documents
 		$args = new stdClass;
@@ -2167,14 +2425,18 @@ 
 		$args->document_srls = implode(',',$document_srls);
 		$args->order_type = 'asc';
 		$output = executeQueryArray('document.getDocuments', $args);
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 
 		unset($document_srls);
 		foreach($output->data as $key => $val)
 		{
 			$document_srls[$val->module_srl][] = $val->document_srl;
 		}
-		if(!$document_srls || !count($document_srls)) return new BaseObject();
+		if(!$document_srls || !count($document_srls)) {
+			return new BaseObject();
+		}
 
 		// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
 		$oModuleModel = getModel('module');
@@ -2199,7 +2461,9 @@ 
 				}
 			}
 		}
-		if(!count($document_srls)) return new BaseObject();
+		if(!count($document_srls)) {
+			return new BaseObject();
+		}
 
 		foreach($document_srls as $module_srl => $documents)
 		{
@@ -2207,9 +2471,14 @@ 
 			for($i=0;$i<$cnt;$i++)
 			{
 				$document_srl = (int)trim($documents[$i]);
-				if(!$document_srls) continue;
-				if($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
-				else $_SESSION['document_management'][$document_srl] = true;
+				if(!$document_srls) {
+					continue;
+				}
+				if($_SESSION['document_management'][$document_srl]) {
+					unset($_SESSION['document_management'][$document_srl]);
+				} else {
+					$_SESSION['document_management'][$document_srl] = true;
+				}
 			}
 		}
 	}
@@ -2221,7 +2490,9 @@ 
 	function procDocumentManageCheckedDocument()
 	{
 		@set_time_limit(0);
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		if(!checkCSRF())
 		{
@@ -2231,14 +2502,21 @@ 
 		$type = Context::get('type');
 		$target_module = Context::get('target_module');
 		$module_srl = Context::get('module_srl');
-		if($target_module && !$module_srl) $module_srl = $target_module;
+		if($target_module && !$module_srl) {
+			$module_srl = $target_module;
+		}
 		$category_srl = Context::get('target_category');
 		$message_content = Context::get('message_content');
-		if($message_content) $message_content = nl2br($message_content);
+		if($message_content) {
+			$message_content = nl2br($message_content);
+		}
 
 		$cart = Context::get('cart');
-		if(!is_array($cart)) $document_srl_list = explode('|@|', $cart);
-		else $document_srl_list = $cart;
+		if(!is_array($cart)) {
+			$document_srl_list = explode('|@|', $cart);
+		} else {
+			$document_srl_list = $cart;
+		}
 
 		$document_srl_count = count($document_srl_list);
 
@@ -2248,7 +2526,9 @@ 
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			$document_items[] = $oDocument;
-			if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+			if(!$oDocument->isGranted()) {
+				return $this->stop('msg_not_permitted');
+			}
 		}
 
 		// Send a message
@@ -2264,10 +2544,15 @@ 
 
 			foreach($document_items as $oDocument)
 			{
-				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
+				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) {
+					continue;
+				}
 
-				if($type=='move') $purl = sprintf("<a href=\"%s\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
-				else $purl = "";
+				if($type=='move') {
+					$purl = sprintf("<a href=\"%s\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
+				} else {
+					$purl = "";
+				}
 				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
 
 				$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
@@ -2280,24 +2565,30 @@ 
 		$oDocumentAdminController = getAdminController('document');
 		if($type == 'move')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if(!$output->toBool()) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$msg_code = 'success_moved';
 
-		}
-		else if($type == 'copy')
+		} else if($type == 'copy')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if(!$output->toBool()) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$msg_code = 'success_copied';
-		}
-		else if($type =='delete')
+		} else if($type =='delete')
 		{
 			$oDB = &DB::getInstance();
 			$oDB->begin();
@@ -2305,12 +2596,13 @@ 
 			{
 				$document_srl = $document_srl_list[$i];
 				$output = $this->deleteDocument($document_srl, true);
-				if(!$output->toBool()) return new BaseObject(-1, 'fail_to_delete');
+				if(!$output->toBool()) {
+					return new BaseObject(-1, 'fail_to_delete');
+				}
 			}
 			$oDB->commit();
 			$msg_code = 'success_deleted';
-		}
-		else if($type == 'trash')
+		} else if($type == 'trash')
 		{
 			$args = new stdClass();
 			$args->description = $message_content;
@@ -2320,12 +2612,13 @@ 
 			for($i=0;$i<$document_srl_count;$i++) {
 				$args->document_srl = $document_srl_list[$i];
 				$output = $this->moveDocumentToTrash($args);
-				if(!$output || !$output->toBool()) return new BaseObject(-1, 'fail_to_trash');
+				if(!$output || !$output->toBool()) {
+					return new BaseObject(-1, 'fail_to_trash');
+				}
 			}
 			$oDB->commit();
 			$msg_code = 'success_trashed';
-		}
-		else if($type == 'cancelDeclare')
+		} else if($type == 'cancelDeclare')
 		{
 			$args->document_srl = $document_srl_list;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
@@ -2347,18 +2640,27 @@ 
 	function procDocumentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-		else $module_srl = array($module_srl);
+		if(preg_match('/^([0-9,]+)$/',$module_srl)) {
+			$module_srl = explode(',',$module_srl);
+		} else {
+			$module_srl = array($module_srl);
+		}
 
 		$document_config = new stdClass();
 		$document_config->use_history = Context::get('use_history');
-		if(!$document_config->use_history) $document_config->use_history = 'N';
+		if(!$document_config->use_history) {
+			$document_config->use_history = 'N';
+		}
 
 		$document_config->use_vote_up = Context::get('use_vote_up');
-		if(!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
+		if(!$document_config->use_vote_up) {
+			$document_config->use_vote_up = 'Y';
+		}
 
 		$document_config->use_vote_down = Context::get('use_vote_down');
-		if(!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
+		if(!$document_config->use_vote_down) {
+			$document_config->use_vote_down = 'Y';
+		}
 
 		$document_config->use_status = Context::get('use_status');
 
@@ -2366,7 +2668,9 @@ 
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$output = $oModuleController->insertModulePartConfig('document',$srl,$document_config);
 		}
 		$this->setError(-1);
@@ -2383,7 +2687,9 @@ 
 	function procDocumentTempSave()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_logged');
+		}
 		$module_info = Context::get('module_info');
 		$logged_info = Context::get('logged_info');
 
@@ -2421,8 +2727,7 @@ 
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 			$msg_code = 'success_updated';
 			// Otherwise, get a new
-		}
-		else
+		} else
 		{
 			$output = $oDocumentController->insertDocument($obj);
 			$msg_code = 'success_registed';
@@ -2448,17 +2753,20 @@ 
 	 */
 	function procDocumentGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		$documentSrls = Context::get('document_srls');
-		if($documentSrls) $documentSrlList = explode(',', $documentSrls);
+		if($documentSrls) {
+			$documentSrlList = explode(',', $documentSrls);
+		}
 
 		if(count($documentSrlList) > 0)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'title', 'nick_name', 'status');
 			$documentList = $oDocumentModel->getDocuments($documentSrlList, $this->grant->is_admin, false, $columnList);
-		}
-		else
+		} else
 		{
 			global $lang;
 			$documentList = array();
@@ -2476,11 +2784,18 @@ 
 	 */
 	function _checkCommentStatusForOldVersion(&$obj)
 	{
-		if(!isset($obj->allow_comment)) $obj->allow_comment = 'N';
-		if(!isset($obj->lock_comment)) $obj->lock_comment = 'N';
+		if(!isset($obj->allow_comment)) {
+			$obj->allow_comment = 'N';
+		}
+		if(!isset($obj->lock_comment)) {
+			$obj->lock_comment = 'N';
+		}
 
-		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
-		else $obj->commentStatus = 'DENY';
+		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') {
+			$obj->commentStatus = 'ALLOW';
+		} else {
+			$obj->commentStatus = 'DENY';
+		}
 	}
 
 	/**
@@ -2490,8 +2805,12 @@ 
 	 */
 	function _checkDocumentStatusForOldVersion(&$obj)
 	{
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
-		if(!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
+		if(!$obj->status && $obj->is_secret == 'Y') {
+			$obj->status = $this->getConfigStatus('secret');
+		}
+		if(!$obj->status && $obj->is_secret != 'Y') {
+			$obj->status = $this->getConfigStatus('public');
+		}
 	}
 
 	public function updateUploaedCount($documentSrlList)

modules/point/point.controller.php

Spacing +101 added lines, -101 removed lines

@@ -31,7 +31,7 @@ 
 		$point = $config->signup_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point, 'signup');
+		$this->setPoint($member_srl, $cur_point, 'signup');
 
 		return new BaseObject();
 	}
@@ -42,9 +42,9 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new BaseObject();
+		if (!$member_srl) return new BaseObject();
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new BaseObject();
+		if (substr($obj->last_login, 0, 8) == date("Ymd")) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -55,7 +55,7 @@ 
 		$point = $config->login_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -66,30 +66,30 @@ 
 	function triggerInsertDocument(&$obj)
 	{
 		$oDocumentModel = getModel('document');
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new BaseObject();
+			if (!$module_srl || !$member_srl) return new BaseObject();
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new BaseObject();
+			if ($module_srl == $member_srl) return new BaseObject();
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new BaseObject();
@@ -106,24 +106,24 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 
 		// if status is TEMP or PUBLIC... give not point, only status is empty
-		if($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$oModuleModel = getModel('module');
 
 			// Get the point module information
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $obj->module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,42 +141,42 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
+		if (!$oDocument->isExists()) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
-		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
+		$module_config = $oModuleModel->getModulePartConfig('point', $oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if (strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new BaseObject();
+		if ($comment_point > 0) return new BaseObject();
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if ($output->data[$i]->member_srl < 1) continue;
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new BaseObject();
+		if ($member_srl) unset($member_srls[abs($member_srl)]);
+		if (!count($member_srls)) return new BaseObject();
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
 		$point = $module_config['download_file'];
-		foreach($member_srls as $member_srl => $cnt)
+		foreach ($member_srls as $member_srl => $cnt)
 		{
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 			$cur_point -= $cnt * $comment_point;
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new BaseObject();
@@ -189,15 +189,15 @@ 
 	{
 		$oDocumentModel = getModel('document');
 
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
 			// The process related to clearing the post object
-			if(!$module_srl || !$member_srl) return new BaseObject();
+			if (!$module_srl || !$member_srl) return new BaseObject();
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new BaseObject();
+			if (!$logged_info->member_srl) return new BaseObject();
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,12 +207,12 @@ 
 			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-			if($point < 0) return new BaseObject();
+			if ($point < 0) return new BaseObject();
 			$cur_point -= $point;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new BaseObject();
@@ -225,12 +225,12 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new BaseObject();
+		if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == abs($member_srl)) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -240,10 +240,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -260,11 +260,11 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
-		if($oDocument->get('member_srl')==$member_srl) return new BaseObject();
+		if (!$oDocument->isExists()) return new BaseObject();
+		if ($oDocument->get('member_srl') == $member_srl) return new BaseObject();
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -272,12 +272,12 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new BaseObject();
+		if ($point < 0) return new BaseObject();
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -297,11 +297,11 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new BaseObject();
+		if ($obj->isvalid != 'Y') return new BaseObject();
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -311,10 +311,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -327,10 +327,10 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if ($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -344,11 +344,11 @@ 
 		}
 
 		// If the user is not logged in and download requires points, deny access.
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
-			if($config->disable_download == 'Y' && $point)
+			if ($config->disable_download == 'Y' && $point)
 			{
-				return new BaseObject(-1,'msg_not_permitted_download');
+				return new BaseObject(-1, 'msg_not_permitted_download');
 			}
 			else
 			{
@@ -363,7 +363,7 @@ 
 		// If the member does not have enough points, deny access.
 		if ($config->disable_download == 'Y' && $cur_point + $point < 0)
 		{
-			return new BaseObject(-1,'msg_cannot_download');
+			return new BaseObject(-1, 'msg_cannot_download');
 		}
 
 		// Otherwise, points will be adjusted after downloading (triggerDownloadFile).
@@ -377,13 +377,13 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new BaseObject();
+		if (!$logged_info->member_srl) return new BaseObject();
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if ($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
 
 		// Get the point module information
 		$oModuleModel = getModel('module');
@@ -424,22 +424,22 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new BaseObject();
+		if ($target_member_srl == $member_srl) return new BaseObject();
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
 		// Pass if there are no requested points
-		if(!$point) return new BaseObject();
+		if (!$point) return new BaseObject();
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new BaseObject();
+			if ($output->data->count) return new BaseObject();
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 		}
 		else
@@ -450,7 +450,7 @@ 
 		$config = $oModuleModel->getModuleConfig('point');
 		// When the requested points are negative, compared it with the current point
 		$_SESSION['banned_document'][$obj->document_srl] = false;
-		if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
+		if ($config->disable_read_document == 'Y' && $point < 0 && abs($point) > $cur_point)
 		{
 			$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
 			$obj->add('content', $message);
@@ -458,14 +458,14 @@ 
 			return new BaseObject(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new BaseObject();
+		if (!$logged_info->member_srl) return new BaseObject();
 		// Pass, if there are no requested points
-		if(!$point) return new BaseObject();
+		if (!$point) return new BaseObject();
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -477,7 +477,7 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -486,21 +486,21 @@ 
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
-		if( $obj->point > 0 )
+		if ($obj->point > 0)
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->voted;
 		}
 		else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
 		}
 
-		if(!$point) return new BaseObject();
+		if (!$point) return new BaseObject();
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -512,7 +512,7 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if (!$mode || !in_array($mode, $mode_arr)) $mode = 'update';
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -529,7 +529,7 @@ 
 		$args->member_srl = $member_srl;
 		$args->point = $current_point;
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'add' :
 				$args->point += $point;
@@ -542,7 +542,7 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if ($args->point < 0) $args->point = 0;
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -553,7 +553,7 @@ 
 		$trigger_obj->current_level = $current_level;
 		$trigger_obj->set_point = $point;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -564,19 +564,19 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
+		if ($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
 		else executeQuery("point.insertPoint", $args);
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
 
 		// If existing level and a new one are different attempt to set a point group
-		if($level != $current_level)
+		if ($level != $current_level)
 		{
 			// Check if the level, for which the current points are prepared, is calculate and set the correct group
 			$point_group = $config->point_group;
 			// If the point group exists
-			if($point_group && is_array($point_group) && count($point_group) )
+			if ($point_group && is_array($point_group) && count($point_group))
 			{
 				// Get the default group
 				$default_group = $oMemberModel->getDefaultGroup();
@@ -586,29 +586,29 @@ 
 
 				asort($point_group);
 				// Reset group after initialization
-				if($config->group_reset != 'N')
+				if ($config->group_reset != 'N')
 				{
 					// If the new level is in the right group
-					if(in_array($level, $point_group))
+					if (in_array($level, $point_group))
 					{
 						// Delete all groups except the one which the current level belongs to
-						foreach($point_group as $group_srl => $target_level)
+						foreach ($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if ($target_level == $level) $new_group_list[] = $group_srl;
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
 					else
 					{
 						$i = $level;
-						while($i > 0)
+						while ($i > 0)
 						{
-							if(in_array($i, $point_group))
+							if (in_array($i, $point_group))
 							{
-								foreach($point_group as $group_srl => $target_level)
+								foreach ($point_group as $group_srl => $target_level)
 								{
-									if($target_level == $i)
+									if ($target_level == $i)
 									{
 										$new_group_list[] = $group_srl;
 									}
@@ -619,9 +619,9 @@ 
 						}
 					}
 					// Delete the group of a level which is higher than the current level
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if ($target_level > $level) $del_group_list[] = $group_srl;
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -629,16 +629,16 @@ 
 				else
 				{
 					// Check until the current level by rotating setting the configurations of the point groups
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if ($target_level <= $level) $new_group_list[] = $group_srl;
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if (!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
 				// Remove linkage group
-				if($del_group_list && count($del_group_list))
+				if ($del_group_list && count($del_group_list))
 				{
 					$del_group_args = new stdClass;
 					$del_group_args->member_srl = $member_srl;
@@ -646,7 +646,7 @@ 
 					$del_group_output = executeQuery('point.deleteMemberGroup', $del_group_args);
 				}
 				// Grant a new group
-				foreach($new_group_list as $group_srl)
+				foreach ($new_group_list as $group_srl)
 				{
 					$new_group_args = new stdClass;
 					$new_group_args->member_srl = $member_srl;
@@ -661,7 +661,7 @@ 
 		$trigger_obj->del_group_list = $del_group_list;
 		$trigger_obj->new_level = $level;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -677,17 +677,17 @@ 
 		FileHandler::writeFile($cache_filename, $point);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
+			$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_0';
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
-			$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
+			$object_key = 'member_info:'.getNumberingPath($member_srl).$member_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
@@ -701,9 +701,9 @@ 
 		$pointConfig = $oModuleModel->getModulePartConfig('point', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('point', $moduleSrl, $pointConfig);
 			}

Braces +169 added lines, -65 removed lines

@@ -42,9 +42,13 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new BaseObject();
+		if(!$member_srl) {
+			return new BaseObject();
+		}
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new BaseObject();
+		if(substr($obj->last_login,0,8)==date("Ymd")) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -70,9 +74,13 @@ 
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new BaseObject();
+			if(!$module_srl || !$member_srl) {
+				return new BaseObject();
+			}
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new BaseObject();
+			if($module_srl == $member_srl) {
+				return new BaseObject();
+			}
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
@@ -82,12 +90,18 @@ 
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}
@@ -118,12 +132,18 @@ 
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,33 +161,47 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
+		if(!$oDocument->isExists()) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if(strlen($comment_point) == 0 && !is_int($comment_point)) {
+			$comment_point = $config->insert_comment;
+		}
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new BaseObject();
+		if($comment_point>0) {
+			return new BaseObject();
+		}
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
 		for($i=0;$i<$cnt;$i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if($output->data[$i]->member_srl<1) {
+				continue;
+			}
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new BaseObject();
+		if($member_srl) {
+			unset($member_srls[abs($member_srl)]);
+		}
+		if(!count($member_srls)) {
+			return new BaseObject();
+		}
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
@@ -194,10 +228,14 @@ 
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
 			// The process related to clearing the post object
-			if(!$module_srl || !$member_srl) return new BaseObject();
+			if(!$module_srl || !$member_srl) {
+				return new BaseObject();
+			}
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new BaseObject();
+			if(!$logged_info->member_srl) {
+				return new BaseObject();
+			}
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,9 +245,13 @@ 
 			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-			if($point < 0) return new BaseObject();
+			if($point < 0) {
+				return new BaseObject();
+			}
 			$cur_point -= $point;
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
@@ -225,12 +267,16 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new BaseObject();
+		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -240,7 +286,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -260,11 +308,17 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
-		if($oDocument->get('member_srl')==$member_srl) return new BaseObject();
+		if(!$oDocument->isExists()) {
+			return new BaseObject();
+		}
+		if($oDocument->get('member_srl')==$member_srl) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -272,9 +326,13 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new BaseObject();
+		if($point < 0) {
+			return new BaseObject();
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -297,11 +355,15 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new BaseObject();
+		if($obj->isvalid != 'Y') {
+			return new BaseObject();
+		}
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -311,7 +373,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->upload_file;
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -327,18 +391,21 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if($member_srl && abs($obj->member_srl) == $member_srl) {
+			return new BaseObject();
+		}
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 		if (isset($module_config['download_file']))
 		{
 			$point = intval($module_config['download_file']);
-		}
-		else
+		} else
 		{
 			$point = intval($config->download_file);
 		}
@@ -349,8 +416,7 @@ 
 			if($config->disable_download == 'Y' && $point)
 			{
 				return new BaseObject(-1,'msg_not_permitted_download');
-			}
-			else
+			} else
 			{
 				return new BaseObject();
 			}
@@ -377,13 +443,19 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new BaseObject();
+		if(!$logged_info->member_srl) {
+			return new BaseObject();
+		}
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if($member_srl && abs($obj->member_srl) == $member_srl) {
+			return new BaseObject();
+		}
 
 		// Get the point module information
 		$oModuleModel = getModel('module');
@@ -392,8 +464,7 @@ 
 		if (isset($module_config['download_file']))
 		{
 			$point = intval($module_config['download_file']);
-		}
-		else
+		} else
 		{
 			$point = intval($config->download_file);
 		}
@@ -424,25 +495,32 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new BaseObject();
+		if($target_member_srl == $member_srl) {
+			return new BaseObject();
+		}
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->read_document;
+		}
 		// Pass if there are no requested points
-		if(!$point) return new BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new BaseObject();
+			if($output->data->count) {
+				return new BaseObject();
+			}
 			$cur_point = $oPointModel->getPoint($member_srl, true);
-		}
-		else
+		} else
 		{
 			$cur_point = 0;
 		}
@@ -458,9 +536,13 @@ 
 			return new BaseObject(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new BaseObject();
+		if(!$logged_info->member_srl) {
+			return new BaseObject();
+		}
 		// Pass, if there are no requested points
-		if(!$point) return new BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
@@ -477,7 +559,9 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -489,15 +573,20 @@ 
 		if( $obj->point > 0 )
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
-		}
-		else
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->voted;
+			}
+		} else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->blamed;
+			}
 		}
 
-		if(!$point) return new BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -512,7 +601,9 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if(!$mode || !in_array($mode,$mode_arr)) {
+			$mode = 'update';
+		}
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -542,7 +633,9 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if($args->point < 0) {
+			$args->point = 0;
+		}
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -564,8 +657,11 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
-		else executeQuery("point.insertPoint", $args);
+		if($oPointModel->isExistsPoint($member_srl)) {
+			executeQuery("point.updatePoint", $args);
+		} else {
+			executeQuery("point.insertPoint", $args);
+		}
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
@@ -595,7 +691,9 @@ 
 						foreach($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if($target_level == $level) {
+								$new_group_list[] = $group_srl;
+							}
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
@@ -621,7 +719,9 @@ 
 					// Delete the group of a level which is higher than the current level
 					foreach($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if($target_level > $level) {
+							$del_group_list[] = $group_srl;
+						}
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -632,11 +732,15 @@ 
 					foreach($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if($target_level <= $level) {
+							$new_group_list[] = $group_srl;
+						}
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if(!$new_group_list[0]) {
+					$new_group_list[0] = $default_group->group_srl;
+				}
 				// Remove linkage group
 				if($del_group_list && count($del_group_list))
 				{

modules/editor/editor.class.php

Spacing +31 added lines, -31 removed lines

@@ -16,16 +16,16 @@ 
 		$oModuleController = getController('module');
 		// Add the default editor component
 		$oEditorController = getAdminController('editor');
-		$oEditorController->insertComponent('colorpicker_text',true);
-		$oEditorController->insertComponent('colorpicker_bg',true);
-		$oEditorController->insertComponent('emoticon',true);
-		$oEditorController->insertComponent('url_link',true);
-		$oEditorController->insertComponent('image_link',true);
-		$oEditorController->insertComponent('multimedia_link',true);
-		$oEditorController->insertComponent('quotation',true);
-		$oEditorController->insertComponent('table_maker',true);
-		$oEditorController->insertComponent('poll_maker',true);
-		$oEditorController->insertComponent('image_gallery',true);
+		$oEditorController->insertComponent('colorpicker_text', true);
+		$oEditorController->insertComponent('colorpicker_bg', true);
+		$oEditorController->insertComponent('emoticon', true);
+		$oEditorController->insertComponent('url_link', true);
+		$oEditorController->insertComponent('image_link', true);
+		$oEditorController->insertComponent('multimedia_link', true);
+		$oEditorController->insertComponent('quotation', true);
+		$oEditorController->insertComponent('table_maker', true);
+		$oEditorController->insertComponent('poll_maker', true);
+		$oEditorController->insertComponent('image_gallery', true);
 		// Create a directory to use in the editor module
 		FileHandler::makeDir('./files/cache/editor');
 		// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
@@ -48,26 +48,26 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2009. 06. 15 Save module_srl when auto-saving
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) return true;
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) return true;
+			if (!$oDB->isColumnExists("editor_autosave", "module_srl")) return true;
+			if (!$oDB->isIndexExists("editor_autosave", "idx_module_srl")) return true;
 
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
 			// 2007. 10. 23 Add an editor trigger on the module addition setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
+			if (!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
 			// 2009. 06. 19 Remove unused trigger
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
+			if ($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
 
-			if(!$oDB->isIndexExists('editor_autosave', 'certify_key')) return true;
+			if (!$oDB->isIndexExists('editor_autosave', 'certify_key')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -84,37 +84,37 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// Save module_srl when auto-saving 15/06/2009
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) 
-				$oDB->addColumn("editor_autosave","module_srl","number",11);
+			if (!$oDB->isColumnExists("editor_autosave", "module_srl")) 
+				$oDB->addColumn("editor_autosave", "module_srl", "number", 11);
 
 			// create an index on module_srl
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) $oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
+			if (!$oDB->isIndexExists("editor_autosave", "idx_module_srl")) $oDB->addIndex("editor_autosave", "idx_module_srl", "module_srl");
 
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
 				$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
 				$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
 			// 2007. 10. Add an editor trigger on the module addition setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
+			if (!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
 				$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
 			// 2009. 06. 19 Remove unused trigger
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
+			if ($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
 				$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after');
 			}
 
-			if(!$oDB->isColumnExists('editor_autosave','certify_key'))
+			if (!$oDB->isColumnExists('editor_autosave', 'certify_key'))
 			{
 				$oDB->addColumn('editor_autosave', 'certify_key', 'varchar', 100);
 			}

Braces +48 added lines, -22 removed lines

@@ -51,23 +51,41 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2009. 06. 15 Save module_srl when auto-saving
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) return true;
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) return true;
+			if(!$oDB->isColumnExists("editor_autosave","module_srl")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) {
+				return true;
+			}
 
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
+				return true;
+			}
 			// 2007. 10. 23 Add an editor trigger on the module addition setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) {
+				return true;
+			}
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
+			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) {
+				return true;
+			}
 			// 2009. 06. 19 Remove unused trigger
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
+			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) {
+				return true;
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) {
+				return true;
+			}
 
-			if(!$oDB->isIndexExists('editor_autosave', 'certify_key')) return true;
+			if(!$oDB->isIndexExists('editor_autosave', 'certify_key')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -87,26 +105,34 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// Save module_srl when auto-saving 15/06/2009
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) 
-				$oDB->addColumn("editor_autosave","module_srl","number",11);
+			if(!$oDB->isColumnExists("editor_autosave","module_srl")) {
+							$oDB->addColumn("editor_autosave","module_srl","number",11);
+			}
 
 			// create an index on module_srl
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) $oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
+			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) {
+				$oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
+			}
 
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
-				$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
-				$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
+							$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
+							$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+			}
 			// 2007. 10. Add an editor trigger on the module addition setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) {
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
+			}
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
-				$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
+			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) {
+							$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
+			}
 			// 2009. 06. 19 Remove unused trigger
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
-				$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
+			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) {
+							$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))

modules/editor/editor.model.php

Spacing +142 added lines, -142 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function getEditorConfig($module_srl = null)
 	{
-		if(!$GLOBALS['__editor_module_config__'][$module_srl] && $module_srl)
+		if (!$GLOBALS['__editor_module_config__'][$module_srl] && $module_srl)
 		{
 			// Get trackback settings of the selected module
 			$oModuleModel = getModel('module');
@@ -34,55 +34,55 @@ 
 		$oModuleModel = getModel('module');
 		$editor_default_config = $oModuleModel->getModuleConfig('editor');
 
-		if(!is_object($editor_config)) $editor_config = new stdClass();
+		if (!is_object($editor_config)) $editor_config = new stdClass();
 
-		if($editor_config->enable_autosave != 'N') $editor_config->enable_autosave = 'Y';
-		if(!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
-		if(!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
-		if(!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
-		if(!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
-		if(!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
-		if(!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
-		if(!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
-		if(!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant= array();
+		if ($editor_config->enable_autosave != 'N') $editor_config->enable_autosave = 'Y';
+		if (!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
+		if (!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
+		if (!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
+		if (!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
+		if (!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
+		if (!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
+		if (!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
+		if (!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant = array();
 
-		if(!$editor_config->editor_height)
+		if (!$editor_config->editor_height)
 		{
 			$editor_config->editor_height = ($editor_default_config->editor_height) ? $editor_default_config->editor_height : 500;
 		}
-		if(!$editor_config->comment_editor_height)
+		if (!$editor_config->comment_editor_height)
 		{
 			$editor_config->comment_editor_height = ($editor_default_config->comment_editor_height) ? $editor_default_config->comment_editor_height : 120;
 		}
-		if(!$editor_config->editor_skin)
+		if (!$editor_config->editor_skin)
 		{
 			$editor_config->editor_skin = ($editor_default_config->editor_skin) ? $editor_default_config->editor_skin : 'ckeditor';
 		}
-		if(!$editor_config->comment_editor_skin)
+		if (!$editor_config->comment_editor_skin)
 		{
 			$editor_config->comment_editor_skin = ($editor_default_config->comment_editor_skin) ? $editor_default_config->comment_editor_skin : 'ckeditor';
 		}
-		if(!$editor_config->content_style)
+		if (!$editor_config->content_style)
 		{
 			$editor_config->content_style = ($editor_default_config->content_style) ? $editor_default_config->content_style : 'ckeditor_light';
 		}
-		if(!$editor_config->content_font && $editor_default_config->content_font)
+		if (!$editor_config->content_font && $editor_default_config->content_font)
 		{
 			$editor_config->content_font = $editor_default_config->content_font;
 		}
-		if(!$editor_config->content_font_size && $editor_default_config->content_font_size)
+		if (!$editor_config->content_font_size && $editor_default_config->content_font_size)
 		{
 			$editor_config->content_font_size = $editor_default_config->content_font_size;
 		}
-		if(!$editor_config->sel_editor_colorset && $editor_default_config->sel_editor_colorset)
+		if (!$editor_config->sel_editor_colorset && $editor_default_config->sel_editor_colorset)
 		{
 			$editor_config->sel_editor_colorset = $editor_default_config->sel_editor_colorset;
 		}
-		if(!$editor_config->sel_comment_editor_colorset && $editor_default_config->sel_comment_editor_colorset)
+		if (!$editor_config->sel_comment_editor_colorset && $editor_default_config->sel_comment_editor_colorset)
 		{
 			$editor_config->sel_comment_editor_colorset = $editor_default_config->sel_comment_editor_colorset;
 		}
-		if(!$editor_config->comment_content_style && $editor_default_config->comment_content_style)
+		if (!$editor_config->comment_content_style && $editor_default_config->comment_content_style)
 		{
 			$editor_config->comment_content_style = $editor_default_config->comment_content_style;
 		}
@@ -92,25 +92,25 @@ 
 
 	function loadDrComponents()
 	{
-		$drComponentPath = _XE_PATH_ . 'modules/editor/skins/dreditor/drcomponents/';
+		$drComponentPath = _XE_PATH_.'modules/editor/skins/dreditor/drcomponents/';
 		$drComponentList = FileHandler::readDir($drComponentPath);
 
 		$oTemplate = &TemplateHandler::getInstance();
 
 		$drComponentInfo = array();
-		if($drComponentList)
+		if ($drComponentList)
 		{
-			foreach($drComponentList as $i => $drComponent)
+			foreach ($drComponentList as $i => $drComponent)
 			{
 				unset($obj);
 				$obj = $this->getDrComponentXmlInfo($drComponent);
-				Context::loadLang(sprintf('%s%s/lang/',$drComponentPath,$drComponent));
-				$path = sprintf('%s%s/tpl/',$drComponentPath,$drComponent);
-				$obj->html = $oTemplate->compile($path,$drComponent);
+				Context::loadLang(sprintf('%s%s/lang/', $drComponentPath, $drComponent));
+				$path = sprintf('%s%s/tpl/', $drComponentPath, $drComponent);
+				$obj->html = $oTemplate->compile($path, $drComponent);
 				$drComponentInfo[$drComponent] = $obj;
 			}
 		}
-		Context::set('drComponentList',$drComponentInfo);
+		Context::set('drComponentList', $drComponentInfo);
 	}
 
 	function getDrComponentXmlInfo($drComponentName)
@@ -122,7 +122,7 @@ 
 		$xml_file = sprintf('%sinfo.xml', $component_path);
 		$cache_file = sprintf('./files/cache/editor/dr_%s.%s.php', $drComponentName, $lang_type);
 		// Return information after including it after cached xml file exists
-		if(file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file))
+		if (file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			include($cache_file);
 			return $xml_info;
@@ -151,10 +151,10 @@ 
 		$buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
 
 		// Author information
-		if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
+		if (!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
 		else $author_list = $xml_doc->component->author;
 
-		for($i=0; $i < count($author_list); $i++)
+		for ($i = 0; $i < count($author_list); $i++)
 		{
 			$buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
 			$buff .= sprintf('$xml_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
@@ -163,10 +163,10 @@ 
 
 		// List extra variables (text type only in the editor component)
 		$extra_vars = $xml_doc->component->extra_vars->var;
-		if($extra_vars)
+		if ($extra_vars)
 		{
-			if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
-			foreach($extra_vars as $key => $val)
+			if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
+			foreach ($extra_vars as $key => $val)
 			{
 				unset($obj);
 				$key = $val->attrs->name;
@@ -198,47 +198,47 @@ 
 		 * Editor's default options
 		 */
 		// Option setting to allow file upload
-		if($upload_target_srl)
+		if ($upload_target_srl)
 		{
 			$option->editor_sequence = $upload_target_srl;
 		}
-		if(!$option->allow_fileupload) $allow_fileupload = false;
+		if (!$option->allow_fileupload) $allow_fileupload = false;
 		else $allow_fileupload = true;
 		// content_style setting
-		if(!$option->content_style) $option->content_style = 'ckeditor_light';
+		if (!$option->content_style) $option->content_style = 'ckeditor_light';
 		Context::set('content_style', $option->content_style);
-		Context::set('content_style_path', getScriptPath() . ltrim($this->module_path, './') . 'styles/' . $option->content_style);
+		Context::set('content_style_path', getScriptPath().ltrim($this->module_path, './').'styles/'.$option->content_style);
 		// Default font setting
 		Context::set('content_font', addslashes($option->content_font));
 		Context::set('content_font_size', $option->content_font_size);
 
 		// Option setting to allow auto-save
-		if(!$option->enable_autosave) $enable_autosave = false;
-		elseif(Context::get($option->primary_key_name)) $enable_autosave = false;
+		if (!$option->enable_autosave) $enable_autosave = false;
+		elseif (Context::get($option->primary_key_name)) $enable_autosave = false;
 		else $enable_autosave = true;
 		// Option setting to allow the default editor component
-		if(!$option->enable_default_component) $enable_default_component = false;
+		if (!$option->enable_default_component) $enable_default_component = false;
 		else $enable_default_component = true;
 		// Option setting to allow other extended components
-		if(!$option->enable_component) $enable_component = false;
+		if (!$option->enable_component) $enable_component = false;
 		else $enable_component = true;
 		// Setting for html-mode
-		if($option->disable_html) $html_mode = false;
+		if ($option->disable_html) $html_mode = false;
 		else $html_mode = true;
 		// Set Height
-		if(!$option->height) $editor_height = 300;
+		if (!$option->height) $editor_height = 300;
 		else $editor_height = $option->height;
 		// Skin Setting
 		$skin = $option->skin;
-		if(!$skin) $skin = 'ckeditor';
+		if (!$skin) $skin = 'ckeditor';
 
 		$colorset = $option->colorset;
-		if(!$colorset) $colorset = 'moono';
+		if (!$colorset) $colorset = 'moono';
 		Context::set('colorset', $colorset);
 		Context::set('skin', $skin);
 		Context::set('module_type', $option->module_type);
 
-		if($skin=='dreditor')
+		if ($skin == 'dreditor')
 		{
 			$this->loadDrComponents();
 		}
@@ -246,7 +246,7 @@ 
 		/**
 		 * Check the automatic backup feature (do not use if the post is edited)
 		 */
-		if($enable_autosave)
+		if ($enable_autosave)
 		{
 			// Extract auto-saved data
 			$saved_doc = $this->getSavedDoc($upload_target_srl);
@@ -258,26 +258,26 @@ 
 		/**
 		 * Extract editor's unique number (in order to display multiple editors on a single page)
 		 */
-		if($option->editor_sequence) $editor_sequence = $option->editor_sequence;
+		if ($option->editor_sequence) $editor_sequence = $option->editor_sequence;
 		else
 		{
-			if(!$_SESSION['_editor_sequence_']) $_SESSION['_editor_sequence_'] = 1;
-			$editor_sequence = $_SESSION['_editor_sequence_'] ++;
+			if (!$_SESSION['_editor_sequence_']) $_SESSION['_editor_sequence_'] = 1;
+			$editor_sequence = $_SESSION['_editor_sequence_']++;
 		}
 
 		/**
 		 * Upload setting by using configuration of the file module internally
 		 */
 		$files_count = 0;
-		if($allow_fileupload)
+		if ($allow_fileupload)
 		{
 			$oFileModel = getModel('file');
 			// Get upload configuration to set on SWFUploader
 			$file_config = $oFileModel->getUploadConfig();
-			$file_config->allowed_attach_size = $file_config->allowed_attach_size*1024*1024;
-			$file_config->allowed_filesize = $file_config->allowed_filesize*1024*1024;
+			$file_config->allowed_attach_size = $file_config->allowed_attach_size * 1024 * 1024;
+			$file_config->allowed_filesize = $file_config->allowed_filesize * 1024 * 1024;
 
-			Context::set('file_config',$file_config);
+			Context::set('file_config', $file_config);
 			// Configure upload status such as file size
 			$upload_status = $oFileModel->getUploadStatus();
 			Context::set('upload_status', $upload_status);
@@ -285,9 +285,9 @@ 
 			$oFileController = getController('file');
 			$oFileController->setUploadInfo($editor_sequence, $upload_target_srl);
 			// Check if the file already exists
-			if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
+			if ($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
 		}
-		Context::set('files_count', (int)$files_count);
+		Context::set('files_count', (int) $files_count);
 
 		Context::set('allow_fileupload', $allow_fileupload);
 		// Set editor_sequence value
@@ -304,10 +304,10 @@ 
 		 * Check editor component
 		 */
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
-		if($enable_component)
+		$site_srl = (int) $site_module_info->site_srl;
+		if ($enable_component)
 		{
-			if(!Context::get('component_list'))
+			if (!Context::get('component_list'))
 			{
 				$component_list = $this->getComponentList(true, $site_srl);
 				Context::set('component_list', $component_list);
@@ -334,7 +334,7 @@ 
 		$tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
 		$tpl_file = 'editor.html';
 
-		if(!file_exists($tpl_path.$tpl_file))
+		if (!file_exists($tpl_path.$tpl_file))
 		{
 			$skin = 'ckeditor';
 			$tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
@@ -364,7 +364,7 @@ 
 		$config->module_type = $type;
 
 		// Configurations listed according to a type
-		if($type == 'document')
+		if ($type == 'document')
 		{
 			$config->editor_skin = $editor_config->editor_skin;
 			$config->content_style = $editor_config->content_style;
@@ -393,7 +393,7 @@ 
 			$config->enable_autosave = 'N';
 		}
 		// Check a group_list of the currently logged-in user for permission check
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$group_list = $logged_info->group_list;
@@ -412,12 +412,12 @@ 
 		$option->colorset = $config->sel_editor_colorset;
 		// Permission check for file upload
 		$option->allow_fileupload = false;
-		if($logged_info->is_admin=='Y') $option->allow_fileupload = true;
-		elseif(count($config->upload_file_grant))
+		if ($logged_info->is_admin == 'Y') $option->allow_fileupload = true;
+		elseif (count($config->upload_file_grant))
 		{
-			foreach($group_list as $group_srl => $group_info)
+			foreach ($group_list as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $config->upload_file_grant))
+				if (in_array($group_srl, $config->upload_file_grant))
 				{
 					$option->allow_fileupload = true;
 					break;
@@ -427,12 +427,12 @@ 
 		else $option->allow_fileupload = true;
 		// Permission check for using default components
 		$option->enable_default_component = false;
-		if($logged_info->is_admin=='Y') $option->enable_default_component = true;
-		elseif(count($config->enable_default_component_grant))
+		if ($logged_info->is_admin == 'Y') $option->enable_default_component = true;
+		elseif (count($config->enable_default_component_grant))
 		{
-			foreach($group_list as $group_srl => $group_info)
+			foreach ($group_list as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $config->enable_default_component_grant))
+				if (in_array($group_srl, $config->enable_default_component_grant))
 				{
 					$option->enable_default_component = true;
 					break;
@@ -442,12 +442,12 @@ 
 		else $option->enable_default_component = true;
 		// Permisshion check for using extended components
 		$option->enable_component = false;
-		if($logged_info->is_admin=='Y') $option->enable_component = true;
-		elseif(count($config->enable_component_grant))
+		if ($logged_info->is_admin == 'Y') $option->enable_component = true;
+		elseif (count($config->enable_component_grant))
 		{
-			foreach($group_list as $group_srl => $group_info)
+			foreach ($group_list as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $config->enable_component_grant))
+				if (in_array($group_srl, $config->enable_component_grant))
 				{
 					$option->enable_component = true;
 					break;
@@ -457,12 +457,12 @@ 
 		else $option->enable_component = true;
 		// HTML editing privileges
 		$enable_html = false;
-		if($logged_info->is_admin=='Y') $enable_html = true;
-		elseif(count($config->enable_html_grant))
+		if ($logged_info->is_admin == 'Y') $enable_html = true;
+		elseif (count($config->enable_html_grant))
 		{
-			foreach($group_list as $group_srl => $group_info)
+			foreach ($group_list as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $config->enable_html_grant))
+				if (in_array($group_srl, $config->enable_html_grant))
 				{
 					$enable_html = true;
 					break;
@@ -471,12 +471,12 @@ 
 		}
 		else $enable_html = true;
 
-		if($enable_html) $option->disable_html = false;
+		if ($enable_html) $option->disable_html = false;
 		else $option->disable_html = true;
 		// Set Height
 		$option->height = $config->editor_height;
 		// Set an option for Auto-save
-		$option->enable_autosave = $config->enable_autosave=='Y'?true:false;
+		$option->enable_autosave = $config->enable_autosave == 'Y' ?true:false;
 		// Other settings
 		$option->primary_key_name = $primary_key_name;
 		$option->content_key_name = $content_key_name;
@@ -492,42 +492,42 @@ 
 		$auto_save_args = new stdClass();
 		$auto_save_args->module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$auto_save_args->module_srl)
+		if (!$auto_save_args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$auto_save_args->module_srl = $current_module_info->module_srl;
 		}
 		// Find a document by using member_srl for logged-in user and ipaddress for non-logged user
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$auto_save_args->member_srl = $logged_info->member_srl;
 		}
 		else
 		{
-			$auto_save_args->certify_key = $_COOKIE['autosave_certify_key_' . $auto_save_args->module_srl];
+			$auto_save_args->certify_key = $_COOKIE['autosave_certify_key_'.$auto_save_args->module_srl];
 			// @see https://github.com/xpressengine/xe-core/issues/2208
 			// 변경 이전에 작성된 게시물 호환성 유지
-			if(!$auto_save_args->certify_key) $auto_save_args->ipaddress = $_SERVER['REMOTE_ADDR'];
+			if (!$auto_save_args->certify_key) $auto_save_args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
 		// Extract auto-saved data from the DB
 		$output = executeQuery('editor.getSavedDocument', $auto_save_args);
 		$saved_doc = $output->data;
 		// Return null if no result is auto-saved
-		if(!$saved_doc) return;
+		if (!$saved_doc) return;
 		// Check if the auto-saved document already exists
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-		if($oSaved->isExists()) return;
+		if ($oSaved->isExists()) return;
 		// Move all the files if the auto-saved data contains document_srl and file
 		// Then set document_srl to editor_sequence
-		if($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl'))
+		if ($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl'))
 		{
 			$saved_doc->module_srl = $auto_save_args->module_srl;
 			$oFileController = getController('file');
 			$oFileController->moveFile($saved_doc->document_srl, $saved_doc->module_srl, $upload_target_srl);
 		}
-		else if($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
+		else if ($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
 		// Change auto-saved data
 		$saved_doc->certify_key = $auto_save_args->certify_key;
 		$oEditorController = getController('editor');
@@ -544,18 +544,18 @@ 
 	 */
 	function getComponentObject($component, $editor_sequence = 0, $site_srl = 0)
 	{
-		if(!preg_match('/^[a-zA-Z0-9_-]+$/',$component) || !preg_match('/^[0-9]+$/', $editor_sequence . $site_srl)) return;
+		if (!preg_match('/^[a-zA-Z0-9_-]+$/', $component) || !preg_match('/^[0-9]+$/', $editor_sequence.$site_srl)) return;
 
-		if(!$this->loaded_component_list[$component][$editor_sequence])
+		if (!$this->loaded_component_list[$component][$editor_sequence])
 		{
 			// Create an object of the component and execute
 			$class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
 			$class_file = sprintf('%s%s.class.php', $class_path, $component);
-			if(!file_exists($class_file)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if (!file_exists($class_file)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			// Create an object after loading the class file
 			require_once($class_file);
 			$oComponent = new $component($editor_sequence, $class_path);
-			if(!$oComponent) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if (!$oComponent) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			// Add configuration information
 			$component_info = $this->getComponent($component, $site_srl);
 			$oComponent->setInfo($component_info);
@@ -576,14 +576,14 @@ 
 	/**
 	 * @brief Return the cache file name of editor component list
 	 */
-	function getCacheFile($filter_enabled= true, $site_srl = 0)
+	function getCacheFile($filter_enabled = true, $site_srl = 0)
 	{
 		$lang = Context::getLangType();
 		$cache_path = _XE_PATH_.'files/cache/editor/cache/';
 		FileHandler::makeDir($cache_path);
-		$cache_file = $cache_path.'component_list.' . $lang .'.';
-		if($filter_enabled) $cache_file .= 'filter.';
-		if($site_srl) $cache_file .= $site_srl.'.';
+		$cache_file = $cache_path.'component_list.'.$lang.'.';
+		if ($filter_enabled) $cache_file .= 'filter.';
+		if ($site_srl) $cache_file .= $site_srl.'.';
 		$cache_file .= 'php';
 		return $cache_file;
 	}
@@ -591,19 +591,19 @@ 
 	/**
 	 * @brief Return a component list (DB Information included)
 	 */
-	function getComponentList($filter_enabled = true, $site_srl=0, $from_db=false)
+	function getComponentList($filter_enabled = true, $site_srl = 0, $from_db = false)
 	{
 		$cache_file = $this->getCacheFile(false, $site_srl);
-		if($from_db || !file_exists($cache_file))
+		if ($from_db || !file_exists($cache_file))
 		{
 			$oEditorController = getController('editor');
 			$oEditorController->makeCache(false, $site_srl);
 		}
 
-		if(!file_exists($cache_file)) return;
+		if (!file_exists($cache_file)) return;
 		include($cache_file);
 		$logged_info = Context::get('logged_info');
-		if($logged_info && is_array($logged_info->group_list))
+		if ($logged_info && is_array($logged_info->group_list))
 		{
 			$group_list = array_keys($logged_info->group_list);
 		}
@@ -612,45 +612,45 @@ 
 			$group_list = array();
 		}
 
-		if(count($component_list))
+		if (count($component_list))
 		{
-			foreach($component_list as $key => $val)
+			foreach ($component_list as $key => $val)
 			{
-				if(!trim($key)) continue;
-				if(!is_dir(_XE_PATH_.'modules/editor/components/'.$key))
+				if (!trim($key)) continue;
+				if (!is_dir(_XE_PATH_.'modules/editor/components/'.$key))
 				{
 					FileHandler::removeFile($cache_file);
 					return $this->getComponentList($filter_enabled, $site_srl);
 				}
-				if(!$filter_enabled) continue;
-				if($val->enabled == "N")
+				if (!$filter_enabled) continue;
+				if ($val->enabled == "N")
 				{
 					unset($component_list->{$key});
 					continue;
 				}
-				if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
-				if($val->target_group)
+				if ($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
+				if ($val->target_group)
 				{
-					if(!$logged_info)
+					if (!$logged_info)
 					{
 						$val->enabled = "N";
 					}
 					else
 					{
 						$is_granted = false;
-						foreach($group_list as $group_srl)
+						foreach ($group_list as $group_srl)
 						{
-							if(in_array($group_srl, $val->target_group)) $is_granted = true;
+							if (in_array($group_srl, $val->target_group)) $is_granted = true;
 						}
-						if(!$is_granted) $val->enabled = "N";
+						if (!$is_granted) $val->enabled = "N";
 					}
 				}
-				if($val->enabled != "N" && $val->mid_list)
+				if ($val->enabled != "N" && $val->mid_list)
 				{
 					$mid = Context::get('mid');
-					if(!in_array($mid, $val->mid_list)) $val->enabled = "N";
+					if (!in_array($mid, $val->mid_list)) $val->enabled = "N";
 				}
-				if($val->enabled == "N")
+				if ($val->enabled == "N")
 				{
 					unset($component_list->{$key});
 					continue;
@@ -668,7 +668,7 @@ 
 		$args = new stdClass();
 		$args->component_name = $component_name;
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponent', $args);
@@ -679,7 +679,7 @@ 
 		}
 		$component = $output->data;
 
-		if(!$output->data) return false;
+		if (!$output->data) return false;
 
 		$component_name = $component->component_name;
 
@@ -691,25 +691,25 @@ 
 
 		$xml_info->mid_list = array();
 
-		if($component->extra_vars)
+		if ($component->extra_vars)
 		{
 			$extra_vars = unserialize($component->extra_vars);
 
-			if($extra_vars->target_group)
+			if ($extra_vars->target_group)
 			{
 				$xml_info->target_group = $extra_vars->target_group;
 				unset($extra_vars->target_group);
 			}
 
-			if($extra_vars->mid_list)
+			if ($extra_vars->mid_list)
 			{
 				$xml_info->mid_list = $extra_vars->mid_list;
 				unset($extra_vars->mid_list);
 			}
 
-			if($xml_info->extra_vars)
+			if ($xml_info->extra_vars)
 			{
-				foreach($xml_info->extra_vars as $key => $val)
+				foreach ($xml_info->extra_vars as $key => $val)
 				{
 					$xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
 				}
@@ -733,7 +733,7 @@ 
 		$cache_file = sprintf('./files/cache/editor/%s.%s.php', $component, $lang_type);
 
 		// Include and return xml file information if cached file exists
-		if(file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file))
+		if (file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			include($cache_file);
 
@@ -750,7 +750,7 @@ 
 		$component_info->component_name = $component;
 		$component_info->title = $xml_doc->component->title->body;
 
-		if($xml_doc->component->version)
+		if ($xml_doc->component->version)
 		{
 			$component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body);
 			$component_info->version = $xml_doc->component->version->body;
@@ -776,10 +776,10 @@ 
 
 		// Author information
 		$author_list = array();
-		if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
+		if (!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
 		else $author_list = $xml_doc->component->author;
 
-		for($i = 0; $i < count($author_list); $i++)
+		for ($i = 0; $i < count($author_list); $i++)
 		{
 			$author = new stdClass;
 			$author->name = $author_list[$i]->name->body;
@@ -790,39 +790,39 @@ 
 
 		// List extra variables (text type only for editor component)
 		$extra_vars = $xml_doc->component->extra_vars;
-		if($extra_vars)
+		if ($extra_vars)
 		{
 			$extra_var_groups = $extra_vars->group;
-			if(!$extra_var_groups)
+			if (!$extra_var_groups)
 			{
 				$extra_var_groups = $extra_vars;
 			}
-			if(!is_array($extra_var_groups))
+			if (!is_array($extra_var_groups))
 			{
 				$extra_var_groups = array($extra_var_groups);
 			}
 
-			foreach($extra_var_groups as $group)
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
-				if(!is_array($group->var))
+				if (!is_array($group->var))
 				{
 					$extra_vars = array($group->var);
 				}
 
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(!$val)
+					if (!$val)
 					{
 						continue;
 					}
 
 					$obj = new stdClass();
-					if(!$val->attrs)
+					if (!$val->attrs)
 					{
 						$val->attrs = new stdClass();
 					}
-					if(!$val->attrs->type)
+					if (!$val->attrs->type)
 					{
 						$val->attrs->type = 'text';
 					}
@@ -832,26 +832,26 @@ 
 					$obj->title = $val->title->body;
 					$obj->type = $val->attrs->type;
 					$obj->description = $val->description->body;
-					if($obj->name)
+					if ($obj->name)
 					{
 						$obj->value = $extra_vals->{$obj->name};
 					}
-					if(strpos($obj->value, '|@|') != FALSE)
+					if (strpos($obj->value, '|@|') != FALSE)
 					{
 						$obj->value = explode('|@|', $obj->value);
 					}
-					if($obj->type == 'mid_list' && !is_array($obj->value))
+					if ($obj->type == 'mid_list' && !is_array($obj->value))
 					{
 						$obj->value = array($obj->value);
 					}
 
 					// 'Select'type obtained from the option list.
-					if($val->options && !is_array($val->options))
+					if ($val->options && !is_array($val->options))
 					{
 						$val->options = array($val->options);
 					}
 
-					for($i = 0, $c = count($val->options); $i < $c; $i++)
+					for ($i = 0, $c = count($val->options); $i < $c; $i++)
 					{
 						$obj->options[$i] = new stdClass();
 						$obj->options[$i]->title = $val->options[$i]->title->body;
@@ -865,7 +865,7 @@ 
 
 		$buff = array();
 		$buff[] = '<?php if(!defined(\'__XE__\')) exit();';
-		$buff[] = '$xml_info = ' . var_export($component_info, TRUE) . ';';
+		$buff[] = '$xml_info = '.var_export($component_info, TRUE).';';
 		$buff = str_replace('stdClass::__set_state', '(object)', implode(PHP_EOL, $buff));
 
 		FileHandler::writeFile($cache_file, $buff, 'w');

Braces +176 added lines, -81 removed lines

@@ -34,17 +34,37 @@ 
 		$oModuleModel = getModel('module');
 		$editor_default_config = $oModuleModel->getModuleConfig('editor');
 
-		if(!is_object($editor_config)) $editor_config = new stdClass();
-
-		if($editor_config->enable_autosave != 'N') $editor_config->enable_autosave = 'Y';
-		if(!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
-		if(!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
-		if(!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
-		if(!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
-		if(!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
-		if(!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
-		if(!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
-		if(!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant= array();
+		if(!is_object($editor_config)) {
+			$editor_config = new stdClass();
+		}
+
+		if($editor_config->enable_autosave != 'N') {
+			$editor_config->enable_autosave = 'Y';
+		}
+		if(!is_array($editor_config->enable_html_grant)) {
+			$editor_config->enable_html_grant = array();
+		}
+		if(!is_array($editor_config->enable_comment_html_grant)) {
+			$editor_config->enable_comment_html_grant = array();
+		}
+		if(!is_array($editor_config->upload_file_grant)) {
+			$editor_config->upload_file_grant = array();
+		}
+		if(!is_array($editor_config->comment_upload_file_grant)) {
+			$editor_config->comment_upload_file_grant = array();
+		}
+		if(!is_array($editor_config->enable_default_component_grant)) {
+			$editor_config->enable_default_component_grant = array();
+		}
+		if(!is_array($editor_config->enable_comment_default_component_grant)) {
+			$editor_config->enable_comment_default_component_grant = array();
+		}
+		if(!is_array($editor_config->enable_component_grant)) {
+			$editor_config->enable_component_grant = array();
+		}
+		if(!is_array($editor_config->enable_comment_component_grant)) {
+			$editor_config->enable_comment_component_grant= array();
+		}
 
 		if(!$editor_config->editor_height)
 		{
@@ -151,8 +171,11 @@ 
 		$buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
 
 		// Author information
-		if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
-		else $author_list = $xml_doc->component->author;
+		if(!is_array($xml_doc->component->author)) {
+			$author_list[] = $xml_doc->component->author;
+		} else {
+			$author_list = $xml_doc->component->author;
+		}
 
 		for($i=0; $i < count($author_list); $i++)
 		{
@@ -165,7 +188,9 @@ 
 		$extra_vars = $xml_doc->component->extra_vars->var;
 		if($extra_vars)
 		{
-			if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+			if(!is_array($extra_vars)) {
+				$extra_vars = array($extra_vars);
+			}
 			foreach($extra_vars as $key => $val)
 			{
 				unset($obj);
@@ -202,10 +227,15 @@ 
 		{
 			$option->editor_sequence = $upload_target_srl;
 		}
-		if(!$option->allow_fileupload) $allow_fileupload = false;
-		else $allow_fileupload = true;
+		if(!$option->allow_fileupload) {
+			$allow_fileupload = false;
+		} else {
+			$allow_fileupload = true;
+		}
 		// content_style setting
-		if(!$option->content_style) $option->content_style = 'ckeditor_light';
+		if(!$option->content_style) {
+			$option->content_style = 'ckeditor_light';
+		}
 		Context::set('content_style', $option->content_style);
 		Context::set('content_style_path', getScriptPath() . ltrim($this->module_path, './') . 'styles/' . $option->content_style);
 		// Default font setting
@@ -213,27 +243,47 @@ 
 		Context::set('content_font_size', $option->content_font_size);
 
 		// Option setting to allow auto-save
-		if(!$option->enable_autosave) $enable_autosave = false;
-		elseif(Context::get($option->primary_key_name)) $enable_autosave = false;
-		else $enable_autosave = true;
+		if(!$option->enable_autosave) {
+			$enable_autosave = false;
+		} elseif(Context::get($option->primary_key_name)) {
+			$enable_autosave = false;
+		} else {
+			$enable_autosave = true;
+		}
 		// Option setting to allow the default editor component
-		if(!$option->enable_default_component) $enable_default_component = false;
-		else $enable_default_component = true;
+		if(!$option->enable_default_component) {
+			$enable_default_component = false;
+		} else {
+			$enable_default_component = true;
+		}
 		// Option setting to allow other extended components
-		if(!$option->enable_component) $enable_component = false;
-		else $enable_component = true;
+		if(!$option->enable_component) {
+			$enable_component = false;
+		} else {
+			$enable_component = true;
+		}
 		// Setting for html-mode
-		if($option->disable_html) $html_mode = false;
-		else $html_mode = true;
+		if($option->disable_html) {
+			$html_mode = false;
+		} else {
+			$html_mode = true;
+		}
 		// Set Height
-		if(!$option->height) $editor_height = 300;
-		else $editor_height = $option->height;
+		if(!$option->height) {
+			$editor_height = 300;
+		} else {
+			$editor_height = $option->height;
+		}
 		// Skin Setting
 		$skin = $option->skin;
-		if(!$skin) $skin = 'ckeditor';
+		if(!$skin) {
+			$skin = 'ckeditor';
+		}
 
 		$colorset = $option->colorset;
-		if(!$colorset) $colorset = 'moono';
+		if(!$colorset) {
+			$colorset = 'moono';
+		}
 		Context::set('colorset', $colorset);
 		Context::set('skin', $skin);
 		Context::set('module_type', $option->module_type);
@@ -258,10 +308,13 @@ 
 		/**
 		 * Extract editor's unique number (in order to display multiple editors on a single page)
 		 */
-		if($option->editor_sequence) $editor_sequence = $option->editor_sequence;
-		else
+		if($option->editor_sequence) {
+			$editor_sequence = $option->editor_sequence;
+		} else
 		{
-			if(!$_SESSION['_editor_sequence_']) $_SESSION['_editor_sequence_'] = 1;
+			if(!$_SESSION['_editor_sequence_']) {
+				$_SESSION['_editor_sequence_'] = 1;
+			}
 			$editor_sequence = $_SESSION['_editor_sequence_'] ++;
 		}
 
@@ -285,7 +338,9 @@ 
 			$oFileController = getController('file');
 			$oFileController->setUploadInfo($editor_sequence, $upload_target_srl);
 			// Check if the file already exists
-			if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
+			if($upload_target_srl) {
+				$files_count = $oFileModel->getFilesCount($upload_target_srl);
+			}
 		}
 		Context::set('files_count', (int)$files_count);
 
@@ -377,8 +432,7 @@ 
 			$config->enable_html_grant = $editor_config->enable_html_grant;
 			$config->editor_height = $editor_config->editor_height;
 			$config->enable_autosave = $editor_config->enable_autosave;
-		}
-		else
+		} else
 		{
 			$config->editor_skin = $editor_config->comment_editor_skin;
 			$config->content_style = $editor_config->comment_content_style;
@@ -397,8 +451,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$group_list = $logged_info->group_list;
-		}
-		else
+		} else
 		{
 			$group_list = array();
 		}
@@ -412,8 +465,9 @@ 
 		$option->colorset = $config->sel_editor_colorset;
 		// Permission check for file upload
 		$option->allow_fileupload = false;
-		if($logged_info->is_admin=='Y') $option->allow_fileupload = true;
-		elseif(count($config->upload_file_grant))
+		if($logged_info->is_admin=='Y') {
+			$option->allow_fileupload = true;
+		} elseif(count($config->upload_file_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -423,12 +477,14 @@ 
 					break;
 				}
 			}
+		} else {
+			$option->allow_fileupload = true;
 		}
-		else $option->allow_fileupload = true;
 		// Permission check for using default components
 		$option->enable_default_component = false;
-		if($logged_info->is_admin=='Y') $option->enable_default_component = true;
-		elseif(count($config->enable_default_component_grant))
+		if($logged_info->is_admin=='Y') {
+			$option->enable_default_component = true;
+		} elseif(count($config->enable_default_component_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -438,12 +494,14 @@ 
 					break;
 				}
 			}
+		} else {
+			$option->enable_default_component = true;
 		}
-		else $option->enable_default_component = true;
 		// Permisshion check for using extended components
 		$option->enable_component = false;
-		if($logged_info->is_admin=='Y') $option->enable_component = true;
-		elseif(count($config->enable_component_grant))
+		if($logged_info->is_admin=='Y') {
+			$option->enable_component = true;
+		} elseif(count($config->enable_component_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -453,12 +511,14 @@ 
 					break;
 				}
 			}
+		} else {
+			$option->enable_component = true;
 		}
-		else $option->enable_component = true;
 		// HTML editing privileges
 		$enable_html = false;
-		if($logged_info->is_admin=='Y') $enable_html = true;
-		elseif(count($config->enable_html_grant))
+		if($logged_info->is_admin=='Y') {
+			$enable_html = true;
+		} elseif(count($config->enable_html_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -468,11 +528,15 @@ 
 					break;
 				}
 			}
+		} else {
+			$enable_html = true;
 		}
-		else $enable_html = true;
 
-		if($enable_html) $option->disable_html = false;
-		else $option->disable_html = true;
+		if($enable_html) {
+			$option->disable_html = false;
+		} else {
+			$option->disable_html = true;
+		}
 		// Set Height
 		$option->height = $config->editor_height;
 		// Set an option for Auto-save
@@ -502,23 +566,28 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$auto_save_args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$auto_save_args->certify_key = $_COOKIE['autosave_certify_key_' . $auto_save_args->module_srl];
 			// @see https://github.com/xpressengine/xe-core/issues/2208
 			// 변경 이전에 작성된 게시물 호환성 유지
-			if(!$auto_save_args->certify_key) $auto_save_args->ipaddress = $_SERVER['REMOTE_ADDR'];
+			if(!$auto_save_args->certify_key) {
+				$auto_save_args->ipaddress = $_SERVER['REMOTE_ADDR'];
+			}
 		}
 		// Extract auto-saved data from the DB
 		$output = executeQuery('editor.getSavedDocument', $auto_save_args);
 		$saved_doc = $output->data;
 		// Return null if no result is auto-saved
-		if(!$saved_doc) return;
+		if(!$saved_doc) {
+			return;
+		}
 		// Check if the auto-saved document already exists
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-		if($oSaved->isExists()) return;
+		if($oSaved->isExists()) {
+			return;
+		}
 		// Move all the files if the auto-saved data contains document_srl and file
 		// Then set document_srl to editor_sequence
 		if($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl'))
@@ -526,8 +595,9 @@ 
 			$saved_doc->module_srl = $auto_save_args->module_srl;
 			$oFileController = getController('file');
 			$oFileController->moveFile($saved_doc->document_srl, $saved_doc->module_srl, $upload_target_srl);
+		} else if($upload_target_srl) {
+			$saved_doc->document_srl = $upload_target_srl;
 		}
-		else if($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
 		// Change auto-saved data
 		$saved_doc->certify_key = $auto_save_args->certify_key;
 		$oEditorController = getController('editor');
@@ -544,18 +614,24 @@ 
 	 */
 	function getComponentObject($component, $editor_sequence = 0, $site_srl = 0)
 	{
-		if(!preg_match('/^[a-zA-Z0-9_-]+$/',$component) || !preg_match('/^[0-9]+$/', $editor_sequence . $site_srl)) return;
+		if(!preg_match('/^[a-zA-Z0-9_-]+$/',$component) || !preg_match('/^[0-9]+$/', $editor_sequence . $site_srl)) {
+			return;
+		}
 
 		if(!$this->loaded_component_list[$component][$editor_sequence])
 		{
 			// Create an object of the component and execute
 			$class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
 			$class_file = sprintf('%s%s.class.php', $class_path, $component);
-			if(!file_exists($class_file)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if(!file_exists($class_file)) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			}
 			// Create an object after loading the class file
 			require_once($class_file);
 			$oComponent = new $component($editor_sequence, $class_path);
-			if(!$oComponent) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if(!$oComponent) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			}
 			// Add configuration information
 			$component_info = $this->getComponent($component, $site_srl);
 			$oComponent->setInfo($component_info);
@@ -582,8 +658,12 @@ 
 		$cache_path = _XE_PATH_.'files/cache/editor/cache/';
 		FileHandler::makeDir($cache_path);
 		$cache_file = $cache_path.'component_list.' . $lang .'.';
-		if($filter_enabled) $cache_file .= 'filter.';
-		if($site_srl) $cache_file .= $site_srl.'.';
+		if($filter_enabled) {
+			$cache_file .= 'filter.';
+		}
+		if($site_srl) {
+			$cache_file .= $site_srl.'.';
+		}
 		$cache_file .= 'php';
 		return $cache_file;
 	}
@@ -600,14 +680,15 @@ 
 			$oEditorController->makeCache(false, $site_srl);
 		}
 
-		if(!file_exists($cache_file)) return;
+		if(!file_exists($cache_file)) {
+			return;
+		}
 		include($cache_file);
 		$logged_info = Context::get('logged_info');
 		if($logged_info && is_array($logged_info->group_list))
 		{
 			$group_list = array_keys($logged_info->group_list);
-		}
-		else
+		} else
 		{
 			$group_list = array();
 		}
@@ -616,39 +697,50 @@ 
 		{
 			foreach($component_list as $key => $val)
 			{
-				if(!trim($key)) continue;
+				if(!trim($key)) {
+					continue;
+				}
 				if(!is_dir(_XE_PATH_.'modules/editor/components/'.$key))
 				{
 					FileHandler::removeFile($cache_file);
 					return $this->getComponentList($filter_enabled, $site_srl);
 				}
-				if(!$filter_enabled) continue;
+				if(!$filter_enabled) {
+					continue;
+				}
 				if($val->enabled == "N")
 				{
 					unset($component_list->{$key});
 					continue;
 				}
-				if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
+				if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") {
+					continue;
+				}
 				if($val->target_group)
 				{
 					if(!$logged_info)
 					{
 						$val->enabled = "N";
-					}
-					else
+					} else
 					{
 						$is_granted = false;
 						foreach($group_list as $group_srl)
 						{
-							if(in_array($group_srl, $val->target_group)) $is_granted = true;
+							if(in_array($group_srl, $val->target_group)) {
+								$is_granted = true;
+							}
+						}
+						if(!$is_granted) {
+							$val->enabled = "N";
 						}
-						if(!$is_granted) $val->enabled = "N";
 					}
 				}
 				if($val->enabled != "N" && $val->mid_list)
 				{
 					$mid = Context::get('mid');
-					if(!in_array($mid, $val->mid_list)) $val->enabled = "N";
+					if(!in_array($mid, $val->mid_list)) {
+						$val->enabled = "N";
+					}
 				}
 				if($val->enabled == "N")
 				{
@@ -672,14 +764,15 @@ 
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponent', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('editor.getComponent', $args);
 		}
 		$component = $output->data;
 
-		if(!$output->data) return false;
+		if(!$output->data) {
+			return false;
+		}
 
 		$component_name = $component->component_name;
 
@@ -758,8 +851,7 @@ 
 			$component_info->homepage = $xml_doc->component->link->body;
 			$component_info->license = $xml_doc->component->license->body;
 			$component_info->license_link = $xml_doc->component->license->attrs->link;
-		}
-		else
+		} else
 		{
 			sscanf($xml_doc->component->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -776,8 +868,11 @@ 
 
 		// Author information
 		$author_list = array();
-		if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
-		else $author_list = $xml_doc->component->author;
+		if(!is_array($xml_doc->component->author)) {
+			$author_list[] = $xml_doc->component->author;
+		} else {
+			$author_list = $xml_doc->component->author;
+		}
 
 		for($i = 0; $i < count($author_list); $i++)
 		{

modules/editor/editor.controller.php

Spacing +81 added lines, -81 removed lines

@@ -47,28 +47,28 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component);
-		if(!$oComponent->toBool()) return $oComponent;
+		if (!$oComponent->toBool()) return $oComponent;
 
-		if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
 		//$output = call_user_method($method, $oComponent);
 		//$output = call_user_func(array($oComponent, $method));
-		if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
-		else return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		if (method_exists($oComponent, $method)) $output = $oComponent->{$method}();
+		else return new BaseObject(-1, sprintf('%s method is not exists', $method));
 
-		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
+		if ((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
 
 		$this->setError($oComponent->getError());
 		$this->setMessage($oComponent->getMessage());
 
 		$vars = $oComponent->getVariables();
-		if(count($vars))
+		if (count($vars))
 		{
-			foreach($vars as $key => $val)
+			foreach ($vars as $key => $val)
 			{
 				$this->add($key, $val);
 			}
@@ -86,18 +86,18 @@ 
 		$module_srl = array();
 		$oModuleModel = getModel('module');
 
-		foreach($target_module_srl as $srl)
+		foreach ($target_module_srl as $srl)
 		{
-			if(!$srl) continue;
+			if (!$srl) continue;
 
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
-			if(!$module_info->module_srl)
+			if (!$module_info->module_srl)
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
 			$module_grant = $oModuleModel->getGrant($module_info, $logged_info);
-			if(!$module_grant->manager)
+			if (!$module_grant->manager)
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
@@ -111,32 +111,32 @@ 
 		$editor_config->content_style = Context::get('content_style');
 		$editor_config->comment_content_style = Context::get('comment_content_style');
 		$editor_config->content_font = Context::get('content_font');
-		if($editor_config->content_font)
+		if ($editor_config->content_font)
 		{
 			$font_list = array();
-			$fonts = explode(',',$editor_config->content_font);
-			for($i=0,$c=count($fonts);$i<$c;$i++)
+			$fonts = explode(',', $editor_config->content_font);
+			for ($i = 0, $c = count($fonts); $i < $c; $i++)
 			{
-				$font = trim(str_replace(array('"','\''),'',$fonts[$i]));
-				if(!$font) continue;
+				$font = trim(str_replace(array('"', '\''), '', $fonts[$i]));
+				if (!$font) continue;
 				$font_list[] = $font;
 			}
-			if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
+			if (count($font_list)) $editor_config->content_font = '"'.implode('","', $font_list).'"';
 		}
 		$editor_config->content_font_size = Context::get('content_font_size');
 		$editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
 		$editor_config->sel_comment_editor_colorset = Context::get('sel_comment_editor_colorset');
 
-		$grants = array('enable_html_grant','enable_comment_html_grant','upload_file_grant','comment_upload_file_grant','enable_default_component_grant','enable_comment_default_component_grant','enable_component_grant','enable_comment_component_grant');
+		$grants = array('enable_html_grant', 'enable_comment_html_grant', 'upload_file_grant', 'comment_upload_file_grant', 'enable_default_component_grant', 'enable_comment_default_component_grant', 'enable_component_grant', 'enable_comment_component_grant');
 
-		foreach($grants as $key)
+		foreach ($grants as $key)
 		{
 			$grant = Context::get($key);
-			if(!$grant)
+			if (!$grant)
 			{
 				$editor_config->{$key} = array();
 			}
-			else if(is_array($grant))
+			else if (is_array($grant))
 			{
 				$editor_config->{$key} = $grant;
 			}
@@ -146,13 +146,13 @@ 
 			}
 		}
 
-		$editor_config->editor_height = (int)Context::get('editor_height');
-		$editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
+		$editor_config->editor_height = (int) Context::get('editor_height');
+		$editor_config->comment_editor_height = (int) Context::get('comment_editor_height');
 		$editor_config->enable_autosave = Context::get('enable_autosave');
-		if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
+		if ($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
 
 		$oModuleController = getController('module');
-		foreach($module_srl as $srl)
+		foreach ($module_srl as $srl)
 		{
 			$oModuleController->insertModulePartConfig('editor', $srl, $editor_config);
 		}
@@ -169,31 +169,31 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new BaseObject();
+		if (Context::getResponseMethod() != 'HTML') return new BaseObject();
 
 		$module_info = Context::get('module_info');
 		$module_srl = $module_info->module_srl;
-		if($module_srl)
+		if ($module_srl)
 		{
 			$oEditorModel = getModel('editor');
 			$editor_config = $oEditorModel->getEditorConfig($module_srl);
 			$content_style = $editor_config->content_style;
-			if($content_style)
+			if ($content_style)
 			{
-				$path = _XE_PATH_ . 'modules/editor/styles/'.$content_style.'/';
-				if(is_dir($path) && file_exists($path . 'style.ini'))
+				$path = _XE_PATH_.'modules/editor/styles/'.$content_style.'/';
+				if (is_dir($path) && file_exists($path.'style.ini'))
 				{
 					$ini = file($path.'style.ini');
-					for($i = 0, $c = count($ini); $i < $c; $i++)
+					for ($i = 0, $c = count($ini); $i < $c; $i++)
 					{
 						$file = trim($ini[$i]);
-						if(!$file) continue;
+						if (!$file) continue;
 
-						if(substr_compare($file, '.css', -4) === 0)
+						if (substr_compare($file, '.css', -4) === 0)
 						{
 							Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
-						elseif(substr_compare($file, '.js', -3) === 0)
+						elseif (substr_compare($file, '.js', -3) === 0)
 						{
 							Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
@@ -202,12 +202,12 @@ 
 			}
 			$content_font = $editor_config->content_font;
 			$content_font_size = $editor_config->content_font_size;
-			if($content_font || $content_font_size)
+			if ($content_font || $content_font_size)
 			{
 				$buff = array();
 				$buff[] = '<style> .xe_content { ';
-				if($content_font) $buff[] = 'font-family:'.$content_font.';';
-				if($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
+				if ($content_font) $buff[] = 'font-family:'.$content_font.';';
+				if ($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
 				$buff[] = ' }</style>';
 				Context::addHtmlHeader(implode('', $buff));
 			}
@@ -222,7 +222,7 @@ 
 	 */
 	function transComponent($content)
 	{
-		$content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this,'transEditorComponent'), $content);
+		$content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this, 'transEditorComponent'), $content);
 		return $content;
 	}
 
@@ -237,19 +237,19 @@ 
 
 		$xml_obj = new stdClass;
 		$xml_obj->attrs = new stdClass;
-		for($i=0,$c=count($m[0]);$i<$c;$i++)
+		for ($i = 0, $c = count($m[0]); $i < $c; $i++)
 		{
-			if(!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
+			if (!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
 			$xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
 		}
 		$xml_obj->body = $match[4];
 
-		if(!$xml_obj->attrs->editor_component) return $match[0];
+		if (!$xml_obj->attrs->editor_component) return $match[0];
 
 		// Get converted codes by using component::transHTML()
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
-		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
+		if (!is_object($oComponent) || !method_exists($oComponent, 'transHTML')) return $match[0];
 
 		return $oComponent->transHTML($xml_obj);
 	}
@@ -259,26 +259,26 @@ 
 	 */
 	function doSaveDoc($args)
 	{
-		if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl) $args->module_srl = Context::get('module_srl');
-		if(!$args->module_srl)
+		if (!$args->module_srl) $args->module_srl = Context::get('module_srl');
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
 		}
 
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
 		}
 		else
 		{
-			$args->certify_key = $_COOKIE['autosave_certify_key_' . $args->module_srl];
-			if(!$args->certify_key) $args->certify_key = Password::createSecureSalt(40);
-			setcookie('autosave_certify_key_' . $args->module_srl, $args->certify_key, $_SERVER['REQUEST_TIME'] + 3600, '', '', false, true);
+			$args->certify_key = $_COOKIE['autosave_certify_key_'.$args->module_srl];
+			if (!$args->certify_key) $args->certify_key = Password::createSecureSalt(40);
+			setcookie('autosave_certify_key_'.$args->module_srl, $args->certify_key, $_SERVER['REQUEST_TIME'] + 3600, '', '', false, true);
 		}
 
 		return executeQuery('editor.insertSavedDoc', $args);
@@ -324,22 +324,22 @@ 
 		$args->module_srl = Context::get('module_srl');
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
 		}
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
 		}
 		else
 		{
-			$args->certify_key = $_COOKIE['autosave_certify_key_' . $args->module_srl];
+			$args->certify_key = $_COOKIE['autosave_certify_key_'.$args->module_srl];
 			// @see https://github.com/xpressengine/xe-core/issues/2208
 			// 변경 이전에 작성된 게시물 호환성 유지
-			if(!$args->certify_key) {
+			if (!$args->certify_key) {
 				unset($args->certify_key);
 				$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 			}
@@ -347,13 +347,13 @@ 
 		// Check if the auto-saved document already exists
 		$output = executeQuery('editor.getSavedDocument', $args);
 		$saved_doc = $output->data;
-		if(!$saved_doc) return;
+		if (!$saved_doc) return;
 
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-		if(!$oSaved->isExists())
+		if (!$oSaved->isExists())
 		{
-			if($mode)
+			if ($mode)
 			{
 				$output = executeQuery('editor.getSavedDocument', $args);
 				$output = ModuleHandler::triggerCall('editor.deleteSavedDoc', 'after', $saved_doc);
@@ -382,9 +382,9 @@ 
 		$oEditorModel = getModel('editor');
 		$args = new stdClass;
 
-		if($filter_enabled) $args->enabled = "Y";
+		if ($filter_enabled) $args->enabled = "Y";
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponentList', $args);
@@ -397,10 +397,10 @@ 
 
 		// Get information about log-in status and its group
 		$is_logged = Context::get('is_logged');
-		if($is_logged)
+		if ($is_logged)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->group_list && is_array($logged_info->group_list))
+			if ($logged_info->group_list && is_array($logged_info->group_list))
 			{
 				$group_list = array_keys($logged_info->group_list);
 			}
@@ -408,30 +408,30 @@ 
 		}
 
 		// Get xml information for looping DB list
-		if(!is_array($db_list)) $db_list = array($db_list);
+		if (!is_array($db_list)) $db_list = array($db_list);
 		$component_list = new stdClass();
-		foreach($db_list as $component)
+		foreach ($db_list as $component)
 		{
-			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if (in_array($component->component_name, array('colorpicker_text', 'colorpicker_bg'))) continue;
 
 			$component_name = $component->component_name;
-			if(!$component_name) continue;
+			if (!$component_name) continue;
 
-			if(!in_array($component_name, $downloaded_list)) continue;
+			if (!in_array($component_name, $downloaded_list)) continue;
 
 			unset($xml_info);
 			$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
 			$xml_info->enabled = $component->enabled;
 
-			if($component->extra_vars)
+			if ($component->extra_vars)
 			{
 				$extra_vars = unserialize($component->extra_vars);
-				if($extra_vars->target_group)
+				if ($extra_vars->target_group)
 				{
 					$xml_info->target_group = $extra_vars->target_group;
 				}
 
-				if($extra_vars->mid_list && count($extra_vars->mid_list))
+				if ($extra_vars->mid_list && count($extra_vars->mid_list))
 				{
 					$xml_info->mid_list = $extra_vars->mid_list;
 				}
@@ -458,9 +458,9 @@ 
 				if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
 				}*/
 				// Check the configuration of the editor component
-				if($xml_info->extra_vars)
+				if ($xml_info->extra_vars)
 				{
-					foreach($xml_info->extra_vars as $key => $val)
+					foreach ($xml_info->extra_vars as $key => $val)
 					{
 						$xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
 					}
@@ -471,25 +471,25 @@ 
 			// Get buttons, icons, images
 			$icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
 			$component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
-			if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
-			if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
+			if (file_exists($icon_file)) $component_list->{$component_name}->icon = true;
+			if (file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
 		}
 
 		// Return if it checks enabled only
-		if($filter_enabled)
+		if ($filter_enabled)
 		{
 			$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-			$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+			$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"', '\\"', serialize($component_list)));
 			FileHandler::writeFile($cache_file, $buff);
 			return $component_list;
 		}
 
 		// Get xml_info of downloaded list
-		foreach($downloaded_list as $component_name)
+		foreach ($downloaded_list as $component_name)
 		{
-			if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if (in_array($component_name, array('colorpicker_text', 'colorpicker_bg'))) continue;
 			// Pass if configured
-			if($component_list->{$component_name}) continue;
+			if ($component_list->{$component_name}) continue;
 			// Insert data into the DB
 			$oEditorController = getAdminController('editor');
 			$oEditorController->insertComponent($component_name, false, $site_srl);
@@ -502,7 +502,7 @@ 
 		}
 
 		$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-		$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+		$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"', '\\"', serialize($component_list)));
 		FileHandler::writeFile($cache_file, $buff);
 
 		return $component_list;
@@ -524,9 +524,9 @@ 
 		$editorConfig = $oModuleModel->getModulePartConfig('editor', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('editor', $moduleSrl, $editorConfig);
 			}

Braces +98 added lines, -42 removed lines

@@ -47,20 +47,31 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!$component) {
+			return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		}
 
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component);
-		if(!$oComponent->toBool()) return $oComponent;
+		if(!$oComponent->toBool()) {
+			return $oComponent;
+		}
 
-		if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!method_exists($oComponent, $method)) {
+			return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		}
 
 		//$output = call_user_method($method, $oComponent);
 		//$output = call_user_func(array($oComponent, $method));
-		if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
-		else return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		if(method_exists($oComponent, $method)) {
+			$output = $oComponent->{$method}();
+		} else {
+			return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		}
 
-		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
+		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) {
+			return $output;
+		}
 
 		$this->setError($oComponent->getError());
 		$this->setMessage($oComponent->getMessage());
@@ -88,7 +99,9 @@ 
 
 		foreach($target_module_srl as $srl)
 		{
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
 			if(!$module_info->module_srl)
@@ -118,10 +131,14 @@ 
 			for($i=0,$c=count($fonts);$i<$c;$i++)
 			{
 				$font = trim(str_replace(array('"','\''),'',$fonts[$i]));
-				if(!$font) continue;
+				if(!$font) {
+					continue;
+				}
 				$font_list[] = $font;
 			}
-			if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
+			if(count($font_list)) {
+				$editor_config->content_font = '"'.implode('","',$font_list).'"';
+			}
 		}
 		$editor_config->content_font_size = Context::get('content_font_size');
 		$editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
@@ -135,12 +152,10 @@ 
 			if(!$grant)
 			{
 				$editor_config->{$key} = array();
-			}
-			else if(is_array($grant))
+			} else if(is_array($grant))
 			{
 				$editor_config->{$key} = $grant;
-			}
-			else
+			} else
 			{
 				$editor_config->{$key} = explode('|@|', $grant);
 			}
@@ -149,7 +164,9 @@ 
 		$editor_config->editor_height = (int)Context::get('editor_height');
 		$editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
 		$editor_config->enable_autosave = Context::get('enable_autosave');
-		if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
+		if($editor_config->enable_autosave != 'Y') {
+			$editor_config->enable_autosave = 'N';
+		}
 
 		$oModuleController = getController('module');
 		foreach($module_srl as $srl)
@@ -169,7 +186,9 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new BaseObject();
+		if(Context::getResponseMethod()!='HTML') {
+			return new BaseObject();
+		}
 
 		$module_info = Context::get('module_info');
 		$module_srl = $module_info->module_srl;
@@ -187,13 +206,14 @@ 
 					for($i = 0, $c = count($ini); $i < $c; $i++)
 					{
 						$file = trim($ini[$i]);
-						if(!$file) continue;
+						if(!$file) {
+							continue;
+						}
 
 						if(substr_compare($file, '.css', -4) === 0)
 						{
 							Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
-						}
-						elseif(substr_compare($file, '.js', -3) === 0)
+						} elseif(substr_compare($file, '.js', -3) === 0)
 						{
 							Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
@@ -206,8 +226,12 @@ 
 			{
 				$buff = array();
 				$buff[] = '<style> .xe_content { ';
-				if($content_font) $buff[] = 'font-family:'.$content_font.';';
-				if($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
+				if($content_font) {
+					$buff[] = 'font-family:'.$content_font.';';
+				}
+				if($content_font_size) {
+					$buff[] = 'font-size:'.$content_font_size.';';
+				}
 				$buff[] = ' }</style>';
 				Context::addHtmlHeader(implode('', $buff));
 			}
@@ -239,17 +263,23 @@ 
 		$xml_obj->attrs = new stdClass;
 		for($i=0,$c=count($m[0]);$i<$c;$i++)
 		{
-			if(!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
+			if(!isset($xml_obj->attrs)) {
+				$xml_obj->attrs = new stdClass;
+			}
 			$xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
 		}
 		$xml_obj->body = $match[4];
 
-		if(!$xml_obj->attrs->editor_component) return $match[0];
+		if(!$xml_obj->attrs->editor_component) {
+			return $match[0];
+		}
 
 		// Get converted codes by using component::transHTML()
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
-		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
+		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) {
+			return $match[0];
+		}
 
 		return $oComponent->transHTML($xml_obj);
 	}
@@ -259,10 +289,14 @@ 
 	 */
 	function doSaveDoc($args)
 	{
-		if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$args->document_srl) {
+			$args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl) $args->module_srl = Context::get('module_srl');
+		if(!$args->module_srl) {
+			$args->module_srl = Context::get('module_srl');
+		}
 		if(!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
@@ -273,11 +307,12 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->certify_key = $_COOKIE['autosave_certify_key_' . $args->module_srl];
-			if(!$args->certify_key) $args->certify_key = Password::createSecureSalt(40);
+			if(!$args->certify_key) {
+				$args->certify_key = Password::createSecureSalt(40);
+			}
 			setcookie('autosave_certify_key_' . $args->module_srl, $args->certify_key, $_SERVER['REQUEST_TIME'] + 3600, '', '', false, true);
 		}
 
@@ -333,8 +368,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->certify_key = $_COOKIE['autosave_certify_key_' . $args->module_srl];
 			// @see https://github.com/xpressengine/xe-core/issues/2208
@@ -347,7 +381,9 @@ 
 		// Check if the auto-saved document already exists
 		$output = executeQuery('editor.getSavedDocument', $args);
 		$saved_doc = $output->data;
-		if(!$saved_doc) return;
+		if(!$saved_doc) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
@@ -382,14 +418,17 @@ 
 		$oEditorModel = getModel('editor');
 		$args = new stdClass;
 
-		if($filter_enabled) $args->enabled = "Y";
+		if($filter_enabled) {
+			$args->enabled = "Y";
+		}
 
 		if($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponentList', $args);
+		} else {
+			$output = executeQuery('editor.getComponentList', $args);
 		}
-		else $output = executeQuery('editor.getComponentList', $args);
 		$db_list = $output->data;
 
 		// Get a list of files
@@ -403,21 +442,30 @@ 
 			if($logged_info->group_list && is_array($logged_info->group_list))
 			{
 				$group_list = array_keys($logged_info->group_list);
+			} else {
+				$group_list = array();
 			}
-			else $group_list = array();
 		}
 
 		// Get xml information for looping DB list
-		if(!is_array($db_list)) $db_list = array($db_list);
+		if(!is_array($db_list)) {
+			$db_list = array($db_list);
+		}
 		$component_list = new stdClass();
 		foreach($db_list as $component)
 		{
-			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) {
+				continue;
+			}
 
 			$component_name = $component->component_name;
-			if(!$component_name) continue;
+			if(!$component_name) {
+				continue;
+			}
 
-			if(!in_array($component_name, $downloaded_list)) continue;
+			if(!in_array($component_name, $downloaded_list)) {
+				continue;
+			}
 
 			unset($xml_info);
 			$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
@@ -471,8 +519,12 @@ 
 			// Get buttons, icons, images
 			$icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
 			$component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
-			if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
-			if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
+			if(file_exists($icon_file)) {
+				$component_list->{$component_name}->icon = true;
+			}
+			if(file_exists($component_icon_file)) {
+				$component_list->{$component_name}->component_icon = true;
+			}
 		}
 
 		// Return if it checks enabled only
@@ -487,9 +539,13 @@ 
 		// Get xml_info of downloaded list
 		foreach($downloaded_list as $component_name)
 		{
-			if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) {
+				continue;
+			}
 			// Pass if configured
-			if($component_list->{$component_name}) continue;
+			if($component_list->{$component_name}) {
+				continue;
+			}
 			// Insert data into the DB
 			$oEditorController = getAdminController('editor');
 			$oEditorController->insertComponent($component_name, false, $site_srl);