xpressengine / xe-core

modules/document/document.model.php

Doc Comments +4 added lines, -4 removed lines

@@ -472,7 +472,7 @@ 
 	/**
 	 * Show pop-up menu of the selected posts
 	 * Printing, scrap, recommendations and negative, reported the Add Features
-	 * @return void
+	 * @return Object|null
 	 */
 	function getDocumentMenu()
 	{
@@ -884,7 +884,7 @@ 
 
 	/**
 	 * Get a list for a particular module
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function getDocumentCategories()
 	{
@@ -970,7 +970,7 @@ 
 	/**
 	 * Certain categories of information, return the template guhanhu
 	 * Manager on the page to add information about a particular menu from the server after compiling tpl compiled a direct return html
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function getDocumentCategoryTplInfo()
 	{
@@ -1227,7 +1227,7 @@ 
 	 * Setting sort index
 	 * @param object $obj
 	 * @param bool $load_extra_vars
-	 * @return object
+	 * @return stdClass
 	 */
 	function _setSortIndex($obj, $load_extra_vars)
 	{

Spacing +231 added lines, -231 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	function getDocumentExtraVarsFromDB($documentSrls)
 	{
-		if(!is_array($documentSrls) || count($documentSrls) == 0)
+		if (!is_array($documentSrls) || count($documentSrls) == 0)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -56,52 +56,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;
 				}
@@ -111,11 +111,11 @@ 
 			$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]);
 
-			if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
+			if ($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
 			{
 				unset($checked_documents[$document_srl]);
 			}
@@ -132,17 +132,17 @@ 
 	 * @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);
 			$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];
 	}
@@ -155,12 +155,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
 		{
@@ -173,33 +173,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];
 			}
@@ -216,7 +216,7 @@ 
 	 * @param array $columnList
 	 * @return Object
 	 */
-	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;
@@ -226,7 +226,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 Object && !$output->toBool())
+		if ($output instanceof Object && !$output->toBool())
 		{
 			return $output;
 		}
@@ -243,10 +243,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)
@@ -258,16 +258,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;
@@ -275,7 +275,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;
@@ -292,35 +292,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;
 			}
 
@@ -328,11 +328,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];
 			}
@@ -354,16 +354,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();
@@ -374,7 +374,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];
 		}
@@ -390,20 +390,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;
@@ -413,13 +413,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;
@@ -433,7 +433,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;
@@ -450,16 +450,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);
 				}
@@ -480,14 +480,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];
 	}
 
@@ -510,71 +510,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 Object(-1, 'msg_invalid_request');
+			if (!$module_srl) return new Object(-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);
 		}
@@ -590,13 +590,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;
 	}
 
 	/**
@@ -607,7 +607,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;
 	}
@@ -626,7 +626,7 @@ 
 		$output = executeQuery('document.getDocumentExtraVarsCount', $args);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -643,17 +643,17 @@ 
 
 		$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
 				{
@@ -667,9 +667,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;
 	}
 
@@ -681,16 +681,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;
 		}
@@ -711,8 +711,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;
 	}
 
@@ -728,10 +728,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);
@@ -751,10 +751,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'];
@@ -763,7 +763,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;
@@ -771,26 +771,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;
 				}
@@ -798,10 +798,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;
 	}
 
 	/**
@@ -816,7 +816,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;
 	}
 
 	/**
@@ -826,8 +826,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);
@@ -842,8 +842,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);
@@ -858,7 +858,7 @@ 
 	 */
 	function getMonthlyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -866,13 +866,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;
 	}
@@ -884,7 +884,7 @@ 
 	 */
 	function getDailyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -892,14 +892,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;
 	}
@@ -910,17 +910,17 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-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);
@@ -932,13 +932,13 @@ 
 	 */
 	function getDocumentConfig()
 	{
-		if(!$GLOBALS['__document_config__'])
+		if (!$GLOBALS['__document_config__'])
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('document');
 
-			if(!$config) $config = new stdClass();
-			if(!$config->thumbnail_type) $config->thumbnail_type = 'crop';
+			if (!$config) $config = new stdClass();
+			if (!$config->thumbnail_type) $config->thumbnail_type = 'crop';
 			$GLOBALS['__document_config__'] = $config;
 		}
 		return $GLOBALS['__document_config__'];
@@ -1003,11 +1003,11 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if (!$grant->manager) return new Object(-1, 'msg_not_permitted');
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
-		if(!$category_info)
+		if (!$category_info)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -1023,14 +1023,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;
 	}
 
@@ -1042,15 +1042,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;
 		}
 	}
@@ -1062,12 +1062,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;
 	}
 
@@ -1110,32 +1110,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;
@@ -1143,13 +1143,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' :
@@ -1158,7 +1158,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' :
@@ -1170,9 +1170,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();
@@ -1191,46 +1191,46 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if (!$document_srl) return new Object(-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 Object(-1, 'msg_invalid_request');
+		if (!$module_srl) return new Object(-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 Object(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_down != 'S') return new Object(-1, 'msg_invalid_request');
 			$args->below_point = 0;
 		}
 		else
 		{
-			if($document_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_up != 'S') return new Object(-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);
 	}
 
 	/**
@@ -1240,7 +1240,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;
 	}
@@ -1255,7 +1255,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)
@@ -1270,11 +1270,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;
 				}
 			}
@@ -1302,13 +1302,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;
 
 		$logged_info = Context::get('logged_info');
@@ -1317,10 +1317,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);
@@ -1328,30 +1328,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)
@@ -1364,24 +1364,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;
@@ -1389,18 +1389,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' :
@@ -1408,10 +1408,10 @@ 
 				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 'blamed_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword * -1;
+					$args->{"s_".$search_target} = (int) $search_keyword * -1;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1424,7 +1424,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':
@@ -1432,9 +1432,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';
 					}
@@ -1451,18 +1451,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';
@@ -1474,7 +1474,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;
@@ -1485,7 +1485,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;
@@ -1494,10 +1494,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;
@@ -1509,7 +1509,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;
@@ -1517,14 +1517,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;
@@ -1557,7 +1557,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;
@@ -1565,8 +1565,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;	
 	}

Braces +303 added lines, -135 removed lines

@@ -56,18 +56,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);
@@ -75,8 +81,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);
 			}
 		}
@@ -87,7 +97,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];
@@ -99,10 +111,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;
 				}
 			}
@@ -111,9 +128,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]);
+			}
 
 			if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
 			{
@@ -134,15 +155,21 @@ 
 	 */
 	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])
 		{
 			$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
 			$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];
 	}
@@ -161,8 +188,7 @@ 
 		{
 			$list_count = count($document_srls);
 			$document_srls = implode(',',$document_srls);
-		}
-		else
+		} else
 		{
 			$list_count = 1;
 		}
@@ -173,28 +199,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))
@@ -242,18 +278,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
@@ -263,11 +296,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;
@@ -285,14 +322,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);
@@ -307,20 +345,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;
 			}
 
@@ -328,7 +372,9 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		if(count($output->data))
 		{
@@ -356,12 +402,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])
 			{
@@ -457,7 +507,9 @@ 
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if(!$keys) {
+					$keys = array();
+				}
 
 				if($oCacheHandler->isSupport())
 				{
@@ -487,7 +539,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];
 	}
 
@@ -517,7 +571,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 Object(-1, 'msg_invalid_request');
+			if(!$module_srl) {
+				return new Object(-1, 'msg_invalid_request');
+			}
 
 			$oModuleModel = getModel('module');
 			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
@@ -590,7 +646,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);
@@ -607,7 +665,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;
 	}
@@ -646,21 +706,18 @@ 
 		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);
 				}
-			}
-			else
+			} else
 			{
 				return 1;
 			}
@@ -686,15 +743,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();
@@ -712,7 +770,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;
 	}
 
@@ -731,7 +791,9 @@ 
 		if(!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if(!$oDocumentController->makeCategoryFile($module_srl)) {
+				return array();
+			}
 		}
 
 		include($filename);
@@ -751,7 +813,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)
@@ -771,8 +835,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;
 
@@ -783,14 +850,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;
 				}
@@ -798,7 +869,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;
@@ -866,13 +939,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;
 	}
@@ -892,14 +972,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;
 	}
@@ -910,7 +997,9 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		$module_srl = Context::get('module_srl');
 		$categories= $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
@@ -937,8 +1026,12 @@ 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('document');
 
-			if(!$config) $config = new stdClass();
-			if(!$config->thumbnail_type) $config->thumbnail_type = 'crop';
+			if(!$config) {
+				$config = new stdClass();
+			}
+			if(!$config->thumbnail_type) {
+				$config->thumbnail_type = 'crop';
+			}
 			$GLOBALS['__document_config__'] = $config;
 		}
 		return $GLOBALS['__document_config__'];
@@ -1003,7 +1096,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
@@ -1023,15 +1118,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;
+		}
 	}
 
 	/**
@@ -1042,15 +1142,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;
 		}
 	}
@@ -1062,13 +1167,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;
+		}
 	}
 
 	/**
@@ -1125,17 +1235,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;
@@ -1143,13 +1259,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' :
@@ -1191,34 +1312,45 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-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 Object(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-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 Object(-1, 'msg_invalid_request');
+			if($document_config->use_vote_down!='S') {
+				return new Object(-1, 'msg_invalid_request');
+			}
 			$args->below_point = 0;
-		}
-		else
+		} else
 		{
-			if($document_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request');
+			if($document_config->use_vote_up!='S') {
+				return new Object(-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)
@@ -1240,9 +1372,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;
+		}
 	}
 
 	/**
@@ -1266,20 +1400,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;
@@ -1317,7 +1453,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)
@@ -1328,21 +1466,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
@@ -1370,18 +1516,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;
@@ -1389,18 +1541,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' :
@@ -1445,13 +1607,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
@@ -1466,8 +1629,7 @@ 
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
-				}
-				else
+				} else
 				{
 					$listSqlID = 'document.getDocumentList';
 					$divisionSqlID = 'document.getDocumentDivision';
@@ -1524,7 +1686,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;
@@ -1565,8 +1729,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;	
 	}

modules/document/document.view.php

Doc Comments +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 	/**
 	 * Document printing
 	 * I make it out to find the geulman;;
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function dispDocumentPrint()
 	{
@@ -65,7 +65,7 @@ 
 
 	/**
 	 * Selected by the administrator for the document management
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function dispDocumentManageDocument()
 	{
@@ -146,7 +146,7 @@ 
 
 	/**
 	 * Document temp saved list
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function dispTempSavedList()
 	{

Braces +24 added lines, -8 removed lines

@@ -36,9 +36,13 @@ 
 		$oDocumentModel = getModel('document');
 		// Creates an object for displaying the selected document
 		$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager);
-		if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+		if(!$oDocument->isExists()) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Check permissions
-		if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted');
+		if(!$oDocument->isAccessible()) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		// Information setting module
 		//Context::set('module_info', $module_info);	//module_info not use in UI
 		// Browser title settings
@@ -69,14 +73,18 @@ 
 	 */
 	function dispDocumentManageDocument()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		// Taken from a list of selected sessions
 		$flag_list = $_SESSION['document_management'];
 		if(count($flag_list))
 		{
 			foreach($flag_list as $key => $val)
 			{
-				if(!is_bool($val)) continue;
+				if(!is_bool($val)) {
+					continue;
+				}
 				$document_srl_list[] = $key;
 			}
 		}
@@ -90,7 +98,9 @@ 
 
 		$oModuleModel = getModel('module');
 		// The combination of module categories list and the list of modules
-		if(count($module_list)>1) Context::set('module_list', $module_categories);
+		if(count($module_list)>1) {
+			Context::set('module_list', $module_categories);
+		}
 
 		$module_srl=Context::get('module_srl');
 		Context::set('module_srl',$module_srl);
@@ -122,7 +132,9 @@ 
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if(!$current_module_srl) {
+				return new Object();
+			}
 		}
 
 		$oModuleModel = getModel('module');
@@ -134,7 +146,9 @@ 
 		{
 			$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';
+		}
 		Context::set('document_config', $document_config);
 
 		$oTemplate = &TemplateHandler::getInstance();
@@ -154,7 +168,9 @@ 
 
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if(!$oMemberModel->isLogged()) {
+			return $this->stop('msg_not_logged');
+		}
 		// Get the saved document (module_srl is set to member_srl instead)
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();

Spacing +21 added lines, -21 removed lines

@@ -36,16 +36,16 @@ 
 		$oDocumentModel = getModel('document');
 		// Creates an object for displaying the selected document
 		$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager);
-		if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+		if (!$oDocument->isExists()) return new Object(-1, 'msg_invalid_request');
 		// Check permissions
-		if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted');
+		if (!$oDocument->isAccessible()) return new Object(-1, 'msg_not_permitted');
 		// Information setting module
 		//Context::set('module_info', $module_info);	//module_info not use in UI
 		// Browser title settings
 		Context::setBrowserTitle($oDocument->getTitleText());
 		Context::set('oDocument', $oDocument);
 
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('print_page');
 	}
@@ -56,7 +56,7 @@ 
 	 */
 	function dispDocumentPreview()
 	{
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 
 		$content = Context::get('content');
 		$this->setTemplatePath($this->module_path.'tpl');
@@ -69,19 +69,19 @@ 
 	 */
 	function dispDocumentManageDocument()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		// Taken from a list of selected sessions
 		$flag_list = $_SESSION['document_management'];
-		if(count($flag_list))
+		if (count($flag_list))
 		{
-			foreach($flag_list as $key => $val)
+			foreach ($flag_list as $key => $val)
 			{
-				if(!is_bool($val)) continue;
+				if (!is_bool($val)) continue;
 				$document_srl_list[] = $key;
 			}
 		}
 
-		if(count($document_srl_list))
+		if (count($document_srl_list))
 		{
 			$oDocumentModel = getModel('document');
 			$document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
@@ -90,13 +90,13 @@ 
 
 		$oModuleModel = getModel('module');
 		// The combination of module categories list and the list of modules
-		if(count($module_list)>1) Context::set('module_list', $module_categories);
+		if (count($module_list) > 1) Context::set('module_list', $module_categories);
 
-		$module_srl=Context::get('module_srl');
-		Context::set('module_srl',$module_srl);
+		$module_srl = Context::get('module_srl');
+		Context::set('module_srl', $module_srl);
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		Context::set('mid',$module_info->mid);
-		Context::set('browser_title',$module_info->browser_title);
+		Context::set('mid', $module_info->mid);
+		Context::set('browser_title', $module_info->browser_title);
 
 		// Select Pop-up layout
 		$this->setLayoutPath('./common/tpl');
@@ -117,24 +117,24 @@ 
 		$current_module_srl = Context::get('module_srl');
 		$current_module_srls = Context::get('module_srls');
 
-		if(!$current_module_srl && !$current_module_srls)
+		if (!$current_module_srl && !$current_module_srls)
 		{
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if (!$current_module_srl) return new Object();
 		}
 
 		$oModuleModel = getModel('module');
-		if($current_module_srl)
+		if ($current_module_srl)
 		{
 			$document_config = $oModuleModel->getModulePartConfig('document', $current_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';
 		Context::set('document_config', $document_config);
 
 		$oTemplate = &TemplateHandler::getInstance();
@@ -154,13 +154,13 @@ 
 
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 		// Get the saved document (module_srl is set to member_srl instead)
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();
 		$args->member_srl = $logged_info->member_srl;
 		$args->statusList = array($this->getConfigStatus('temp'));
-		$args->page = (int)Context::get('page');
+		$args->page = (int) Context::get('page');
 		$args->list_count = 10;
 
 		$oDocumentModel = getModel('document');

modules/editor/editor.controller.php

Doc Comments +1 added lines

@@ -238,6 +238,7 @@
 
 	/**
 	 * @brief AutoSave
+	 * @param stdClass $args
 	 */
 	function doSaveDoc($args)
 	{

Braces +97 added lines, -42 removed lines

@@ -47,20 +47,31 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!$component) {
+			return new Object(-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 Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!method_exists($oComponent, $method)) {
+			return new Object(-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 Object(-1,sprintf('%s method is not exists', $method));
+		if(method_exists($oComponent, $method)) {
+			$output = $oComponent->{$method}();
+		} else {
+			return new Object(-1,sprintf('%s method is not exists', $method));
+		}
 
-		if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
+		if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) {
+			return $output;
+		}
 
 		$this->setError($oComponent->getError());
 		$this->setMessage($oComponent->getMessage());
@@ -82,8 +93,11 @@ 
 	{
 		$module_srl = Context::get('target_module_srl');
 		// To configure many of modules at once
-		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);
+		}
 
 		$editor_config = new stdClass;
 		$editor_config->editor_skin = Context::get('editor_skin');
@@ -98,10 +112,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');
@@ -115,12 +133,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);
 			}
@@ -129,13 +145,17 @@ 
 		$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');
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$oModuleController->insertModulePartConfig('editor',$srl,$editor_config);
 		}
 
@@ -151,7 +171,9 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new Object();
+		if(Context::getResponseMethod()!='HTML') {
+			return new Object();
+		}
 
 		$module_info = Context::get('module_info');
 		$module_srl = $module_info->module_srl;
@@ -169,13 +191,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);
 						}
@@ -188,8 +211,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));
 			}
@@ -221,17 +248,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);
 	}
@@ -241,13 +274,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;
+		}
 		if(Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -307,8 +341,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -322,7 +355,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);
@@ -356,14 +391,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
@@ -377,21 +415,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);
@@ -445,8 +492,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
@@ -461,9 +512,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);

Spacing +75 added lines, -75 removed lines

@@ -47,28 +47,28 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!$component) return new Object(-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 Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!method_exists($oComponent, $method)) return new Object(-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 Object(-1,sprintf('%s method is not exists', $method));
+		if (method_exists($oComponent, $method)) $output = $oComponent->{$method}();
+		else return new Object(-1, sprintf('%s method is not exists', $method));
 
-		if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
+		if ((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$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);
 			}
@@ -82,7 +82,7 @@ 
 	{
 		$module_srl = Context::get('target_module_srl');
 		// To configure many of modules at once
-		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);
 
 		$editor_config = new stdClass;
@@ -91,32 +91,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;
 			}
@@ -126,17 +126,17 @@ 
 			}
 		}
 
-		$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');
-		for($i=0;$i<count($module_srl);$i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
-			$oModuleController->insertModulePartConfig('editor',$srl,$editor_config);
+			if (!$srl) continue;
+			$oModuleController->insertModulePartConfig('editor', $srl, $editor_config);
 		}
 
 		$this->setError(-1);
@@ -151,31 +151,31 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new Object();
+		if (Context::getResponseMethod() != 'HTML') return new Object();
 
 		$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);
 						}
@@ -184,12 +184,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));
 			}
@@ -204,7 +204,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;
 	}
 
@@ -219,19 +219,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);
 	}
@@ -241,8 +241,8 @@ 
 	 */
 	function doSaveDoc($args)
 	{
-		if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-		if(Context::get('is_logged'))
+		if (!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -253,11 +253,11 @@ 
 		}
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$args->module_srl = Context::get('module_srl');
 		}
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
@@ -303,7 +303,7 @@ 
 	function deleteSavedDoc($mode = false)
 	{
 		$args = new stdClass();
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -314,7 +314,7 @@ 
 		}
 		$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;
@@ -322,13 +322,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);
@@ -356,9 +356,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);
@@ -371,10 +371,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);
 			}
@@ -382,30 +382,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;
 				}
@@ -432,9 +432,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};
 					}
@@ -445,25 +445,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);
@@ -476,7 +476,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;
@@ -498,9 +498,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);
 			}

modules/editor/editor.model.php

Doc Comments +9 added lines

@@ -113,6 +113,11 @@ 
 		Context::set('drComponentList',$drComponentInfo);
 	}
 
+	/**
+	 * @param string $drComponentName
+	 *
+	 * @return string
+	 */
 	function getDrComponentXmlInfo($drComponentName)
 	{
 		$lang_type = Context::getLangType();
@@ -191,6 +196,7 @@ 
 	 * @brief Return the editor template
 	 * You can call upload_target_srl when modifying content
 	 * The upload_target_srl is used for a routine to check if an attachment exists
+	 * @param stdClass $option
 	 */
 	function getEditor($upload_target_srl = 0, $option = null)
 	{
@@ -486,6 +492,8 @@ 
 
 	/**
 	 * @brief Get information which has been auto-saved
+	 * @param integer $upload_target_srl
+	 * @return string
 	 */
 	function getSavedDoc($upload_target_srl)
 	{
@@ -586,6 +594,7 @@ 
 
 	/**
 	 * @brief Return a component list (DB Information included)
+	 * @return string
 	 */
 	function getComponentList($filter_enabled = true, $site_srl=0, $from_db=false)
 	{

Braces +170 added lines, -79 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', $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
@@ -495,8 +559,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$auto_save_args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$auto_save_args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -511,11 +574,15 @@ 
 		$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'))
@@ -523,8 +590,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
 		$oEditorController = getController('editor');
 		$oEditorController->deleteSavedDoc(false);
@@ -540,18 +608,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 Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if(!file_exists($class_file)) {
+				return new Object(-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 Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if(!$oComponent) {
+				return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			}
 			// Add configuration information
 			$component_info = $this->getComponent($component, $site_srl);
 			$oComponent->setInfo($component_info);
@@ -578,8 +652,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;
 	}
@@ -596,14 +674,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();
 		}
@@ -612,39 +691,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")
 				{
@@ -668,8 +758,7 @@ 
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponent', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('editor.getComponent', $args);
 		}
@@ -752,8 +841,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);
@@ -770,8 +858,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++)
 		{

Spacing +139 added lines, -139 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', $this->module_path . 'styles/' . $option->content_style);
+		Context::set('content_style_path', $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;
@@ -491,7 +491,7 @@ 
 	{
 		$auto_save_args = new stdClass();
 		// 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;
@@ -502,7 +502,7 @@ 
 		}
 		$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;
@@ -511,20 +511,20 @@ 
 		$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
 		$oEditorController = getController('editor');
 		$oEditorController->deleteSavedDoc(false);
@@ -540,18 +540,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 Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if (!file_exists($class_file)) return new Object(-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 Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if (!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			// Add configuration information
 			$component_info = $this->getComponent($component, $site_srl);
 			$oComponent->setInfo($component_info);
@@ -572,14 +572,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;
 	}
@@ -587,19 +587,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);
 		}
@@ -608,45 +608,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;
@@ -664,7 +664,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);
@@ -685,25 +685,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};
 				}
@@ -727,7 +727,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);
 
@@ -744,7 +744,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;
@@ -770,10 +770,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;
@@ -784,39 +784,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';
 					}
@@ -826,26 +826,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;
@@ -859,7 +859,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');

modules/file/file.admin.controller.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Delete selected files from the administrator page
 	 *
-	 * @return Object
+	 * @return ModuleObject|null
 	 */
 	function procFileAdminDeleteChecked()
 	{
@@ -110,7 +110,7 @@ 
 	/**
 	 * Add file information for each module
 	 *
-	 * @return void
+	 * @return Object|null
 	 */
 	function procFileAdminInsertModuleConfig()
 	{

Braces +47 added lines, -18 removed lines

@@ -27,12 +27,16 @@ 
 		$args->module_srl = $module_srl;
 		$columnList = array('file_srl', 'uploaded_filename');
 		$output = executeQueryArray('file.getModuleFiles',$args, $columnList);
-		if(!$output) return $output;
+		if(!$output) {
+			return $output;
+		}
 		$files = $output->data;
 		// Remove from the DB
 		$args->module_srl = $module_srl;
 		$output = executeQuery('file.deleteModuleFiles', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Remove the file
 		FileHandler::removeDir( sprintf("./files/attach/images/%s/", $module_srl) ) ;
 		FileHandler::removeDir( sprintf("./files/attach/binaries/%s/", $module_srl) );
@@ -45,10 +49,14 @@ 
 			FileHandler::removeFile($uploaded_filename);
 
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if(!in_array($path_info['dirname'], $path)) {
+				$path[] = $path_info['dirname'];
+			}
 		}
 		// Remove a file directory of the document
-		for($i=0;$i<count($path);$i++) FileHandler::removeBlankDir($path[$i]);
+		for($i=0;$i<count($path);$i++) {
+			FileHandler::removeBlankDir($path[$i]);
+		}
 
 		return $output;
 	}
@@ -62,18 +70,27 @@ 
 	{
 		// An error appears if no document is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_file_cart_is_null');
-		if(!is_array($cart)) $file_srl_list= explode('|@|', $cart);
-		else $file_srl_list = $cart;
+		if(!$cart) {
+			return $this->stop('msg_file_cart_is_null');
+		}
+		if(!is_array($cart)) {
+			$file_srl_list= explode('|@|', $cart);
+		} else {
+			$file_srl_list = $cart;
+		}
 		$file_count = count($file_srl_list);
-		if(!$file_count) return $this->stop('msg_file_cart_is_null');
+		if(!$file_count) {
+			return $this->stop('msg_file_cart_is_null');
+		}
 
 		$oFileController = getController('file');
 		// Delete the post
 		for($i=0;$i<$file_count;$i++)
 		{
 			$file_srl = trim($file_srl_list[$i]);
-			if(!$file_srl) continue;
+			if(!$file_srl) {
+				continue;
+			}
 
 			$oFileController->deleteFile($file_srl);
 		}
@@ -117,8 +134,11 @@ 
 		// Get variables
 		$module_srl = Context::get('target_module_srl');
 		// In order to configure multiple modules at once
-		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);
+		}
 
 		$download_grant = Context::get('download_grant');
 
@@ -130,8 +150,11 @@ 
 		$file_config->allowed_attach_size = Context::get('allowed_attach_size');
 		$file_config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes'));
 
-		if(!is_array($download_grant)) $file_config->download_grant = explode('|@|',$download_grant);
-		else $file_config->download_grant = $download_grant;
+		if(!is_array($download_grant)) {
+			$file_config->download_grant = explode('|@|',$download_grant);
+		} else {
+			$file_config->download_grant = $download_grant;
+		}
 
 		//관리자가 허용한 첨부파일의 사이즈가 php.ini의 값보다 큰지 확인하기 - by ovclas
 		$userFileAllowSize = FileHandler::returnbytes($file_config->allowed_filesize.'M');
@@ -140,14 +163,17 @@ 
 		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
 		$iniMinSzie = min($iniPostMaxSize, $iniUploadMaxSize);
 
-		if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
-			return new Object(-1, 'input size over than config in php.ini');
+		if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie) {
+					return new Object(-1, 'input size over than config in php.ini');
+		}
 
 		$oModuleController = getController('module');
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$oModuleController->insertModulePartConfig('file',$srl,$file_config);
 		}
 
@@ -174,8 +200,11 @@ 
 
 		if($output->file_srl)
 		{
-			if($_SESSION['file_management'][$output->file_srl]) unset($_SESSION['file_management'][$output->file_srl]);
-			else $_SESSION['file_management'][$output->file_srl] = true;
+			if($_SESSION['file_management'][$output->file_srl]) {
+				unset($_SESSION['file_management'][$output->file_srl]);
+			} else {
+				$_SESSION['file_management'][$output->file_srl] = true;
+			}
 		}
 	}
 }

Spacing +24 added lines, -24 removed lines

@@ -26,29 +26,29 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$columnList = array('file_srl', 'uploaded_filename');
-		$output = executeQueryArray('file.getModuleFiles',$args, $columnList);
-		if(!$output) return $output;
+		$output = executeQueryArray('file.getModuleFiles', $args, $columnList);
+		if (!$output) return $output;
 		$files = $output->data;
 		// Remove from the DB
 		$args->module_srl = $module_srl;
 		$output = executeQuery('file.deleteModuleFiles', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Remove the file
-		FileHandler::removeDir( sprintf("./files/attach/images/%s/", $module_srl) ) ;
-		FileHandler::removeDir( sprintf("./files/attach/binaries/%s/", $module_srl) );
+		FileHandler::removeDir(sprintf("./files/attach/images/%s/", $module_srl));
+		FileHandler::removeDir(sprintf("./files/attach/binaries/%s/", $module_srl));
 		// Remove the file list obtained from the DB
 		$path = array();
 		$cnt = count($files);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
 			$uploaded_filename = $files[$i]->uploaded_filename;
 			FileHandler::removeFile($uploaded_filename);
 
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if (!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
 		}
 		// Remove a file directory of the document
-		for($i=0;$i<count($path);$i++) FileHandler::removeBlankDir($path[$i]);
+		for ($i = 0; $i < count($path); $i++) FileHandler::removeBlankDir($path[$i]);
 
 		return $output;
 	}
@@ -62,23 +62,23 @@ 
 	{
 		// An error appears if no document is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_file_cart_is_null');
-		if(!is_array($cart)) $file_srl_list= explode('|@|', $cart);
+		if (!$cart) return $this->stop('msg_file_cart_is_null');
+		if (!is_array($cart)) $file_srl_list = explode('|@|', $cart);
 		else $file_srl_list = $cart;
 		$file_count = count($file_srl_list);
-		if(!$file_count) return $this->stop('msg_file_cart_is_null');
+		if (!$file_count) return $this->stop('msg_file_cart_is_null');
 
 		$oFileController = getController('file');
 		// Delete the post
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			$file_srl = trim($file_srl_list[$i]);
-			if(!$file_srl) continue;
+			if (!$file_srl) continue;
 
 			$oFileController->deleteFile($file_srl);
 		}
 
-		$this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) );
+		$this->setMessage(sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count));
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList');
 		$this->setRedirectUrl($returnUrl);
@@ -101,7 +101,7 @@ 
 		$config->allow_outlink_site = Context::get('allow_outlink_site');
 		// Create module Controller object
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('file',$config);
+		$output = $oModuleController->insertModuleConfig('file', $config);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig');
 		return $this->setRedirectUrl($returnUrl, $output);
@@ -117,7 +117,7 @@ 
 		// Get variables
 		$module_srl = Context::get('target_module_srl');
 		// In order to configure multiple modules at once
-		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);
 
 		$download_grant = Context::get('download_grant');
@@ -130,7 +130,7 @@ 
 		$file_config->allowed_attach_size = Context::get('allowed_attach_size');
 		$file_config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes'));
 
-		if(!is_array($download_grant)) $file_config->download_grant = explode('|@|',$download_grant);
+		if (!is_array($download_grant)) $file_config->download_grant = explode('|@|', $download_grant);
 		else $file_config->download_grant = $download_grant;
 
 		//관리자가 허용한 첨부파일의 사이즈가 php.ini의 값보다 큰지 확인하기 - by ovclas
@@ -140,15 +140,15 @@ 
 		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
 		$iniMinSzie = min($iniPostMaxSize, $iniUploadMaxSize);
 
-		if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
+		if ($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
 			return new Object(-1, 'input size over than config in php.ini');
 
 		$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;
-			$oModuleController->insertModulePartConfig('file',$srl,$file_config);
+			if (!$srl) continue;
+			$oModuleController->insertModulePartConfig('file', $srl, $file_config);
 		}
 
 		$this->setError(-1);
@@ -165,16 +165,16 @@ 
 	 */
 	function procFileAdminAddCart()
 	{
-		$file_srl = (int)Context::get('file_srl');
+		$file_srl = (int) Context::get('file_srl');
 		//$fileSrlList = array(500, 502);
 
 		$oFileModel = getModel('file');
 		$output = $oFileModel->getFile($file_srl);
 		//$output = $oFileModel->getFile($fileSrlList);
 
-		if($output->file_srl)
+		if ($output->file_srl)
 		{
-			if($_SESSION['file_management'][$output->file_srl]) unset($_SESSION['file_management'][$output->file_srl]);
+			if ($_SESSION['file_management'][$output->file_srl]) unset($_SESSION['file_management'][$output->file_srl]);
 			else $_SESSION['file_management'][$output->file_srl] = true;
 		}
 	}

modules/file/file.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 	 * Make search parameters from object(private)
 	 *
 	 * @param object $obj Original searach options
-	 * @param object $args Result searach options
+	 * @param stdClass $args Result searach options
 	 * @return void
 	 */
 	function _makeSearchParam(&$obj, &$args)

Spacing +22 added lines, -22 removed lines

@@ -68,28 +68,28 @@ 
 		$this->_makeSearchParam($obj, $args);
 
 		// Set valid/invalid state
-		if($obj->isvalid == 'Y') $args->isvalid = 'Y';
-		elseif($obj->isvalid == 'N') $args->isvalid = 'N';
+		if ($obj->isvalid == 'Y') $args->isvalid = 'Y';
+		elseif ($obj->isvalid == 'N') $args->isvalid = 'N';
 		// Set multimedia/common file
-		if($obj->direct_download == 'Y') $args->direct_download = 'Y';
-		elseif($obj->direct_download == 'N') $args->direct_download= 'N';
+		if ($obj->direct_download == 'Y') $args->direct_download = 'Y';
+		elseif ($obj->direct_download == 'N') $args->direct_download = 'N';
 		// Set variables
 		$args->sort_index = $obj->sort_index;
-		$args->page = $obj->page?$obj->page:1;
-		$args->list_count = $obj->list_count?$obj->list_count:20;
-		$args->page_count = $obj->page_count?$obj->page_count:10;
+		$args->page = $obj->page ? $obj->page : 1;
+		$args->list_count = $obj->list_count ? $obj->list_count : 20;
+		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		$args->s_module_srl = $obj->module_srl;
 		$args->exclude_module_srl = $obj->exclude_module_srl;
 		// Execute the file.getFileList query
 		$output = executeQuery('file.getFileList', $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;
 
 		$oFileModel = getModel('file');
 
-		foreach($output->data as $key => $file)
+		foreach ($output->data as $key => $file)
 		{
-			if($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
+			if ($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
 			else $file->isCarted = false;
 
 			$file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -132,10 +132,10 @@ 
 	 */
 	function getFilesCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if ($date) $args->regDate = date('Ymd', strtotime($date));
 
 		$output = executeQuery('file.getFilesCount', $args);
-		if(!$output->toBool()) return 0;
+		if (!$output->toBool()) return 0;
 
 		return $output->data->count;
 	}
@@ -150,31 +150,31 @@ 
 	function _makeSearchParam(&$obj, &$args)
 	{
 		// Search options
-		$search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
-		$search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
+		$search_target = $obj->search_target ? $obj->search_target : trim(Context::get('search_target'));
+		$search_keyword = $obj->search_keyword ? $obj->search_keyword : trim(Context::get('search_keyword'));
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'filename' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_filename = $search_keyword;
 					break;
 				case 'filesize_more' :
-					$args->s_filesize_more = (int)$search_keyword;
+					$args->s_filesize_more = (int) $search_keyword;
 					break;
 				case 'filesize_mega_more' :
-					$args->s_filesize_more = (int)$search_keyword * 1024 * 1024;
+					$args->s_filesize_more = (int) $search_keyword * 1024 * 1024;
 					break;
 				case 'filesize_less' :
-					$args->s_filesize_less = (int)$search_keyword;
+					$args->s_filesize_less = (int) $search_keyword;
 					break;
 				case 'filesize_mega_less' :
-					$args->s_filesize_less = (int)$search_keyword * 1024 * 1024;
+					$args->s_filesize_less = (int) $search_keyword * 1024 * 1024;
 					break;
 				case 'download_count' :
-					$args->s_download_count = (int)$search_keyword;
+					$args->s_download_count = (int) $search_keyword;
 					break;
 				case 'regdate' :
 					$args->s_regdate = $search_keyword;

Braces +27 added lines, -10 removed lines

@@ -68,11 +68,17 @@ 
 		$this->_makeSearchParam($obj, $args);
 
 		// Set valid/invalid state
-		if($obj->isvalid == 'Y') $args->isvalid = 'Y';
-		elseif($obj->isvalid == 'N') $args->isvalid = 'N';
+		if($obj->isvalid == 'Y') {
+			$args->isvalid = 'Y';
+		} elseif($obj->isvalid == 'N') {
+			$args->isvalid = 'N';
+		}
 		// Set multimedia/common file
-		if($obj->direct_download == 'Y') $args->direct_download = 'Y';
-		elseif($obj->direct_download == 'N') $args->direct_download= 'N';
+		if($obj->direct_download == 'Y') {
+			$args->direct_download = 'Y';
+		} elseif($obj->direct_download == 'N') {
+			$args->direct_download= 'N';
+		}
 		// Set variables
 		$args->sort_index = $obj->sort_index;
 		$args->page = $obj->page?$obj->page:1;
@@ -83,14 +89,19 @@ 
 		// Execute the file.getFileList query
 		$output = executeQuery('file.getFileList', $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;
+		}
 
 		$oFileModel = getModel('file');
 
 		foreach($output->data as $key => $file)
 		{
-			if($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
-			else $file->isCarted = false;
+			if($_SESSION['file_management'][$file->file_srl]) {
+				$file->isCarted = true;
+			} else {
+				$file->isCarted = false;
+			}
 
 			$file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
 			$output->data[$key] = $file;
@@ -132,10 +143,14 @@ 
 	 */
 	function getFilesCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if($date) {
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('file.getFilesCount', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool()) {
+			return 0;
+		}
 
 		return $output->data->count;
 	}
@@ -158,7 +173,9 @@ 
 			switch($search_target)
 			{
 				case 'filename' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_filename = $search_keyword;
 					break;
 				case 'filesize_more' :

modules/file/file.controller.php

Doc Comments +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 	/**
 	 * Image resize
 	 *
-	 * @return Object
+	 * @return Object|null
 	 */
 	function procFileImageResize()
 	{
@@ -396,7 +396,7 @@ 
 	/**
 	 * get file list
 	 *
-	 * @return Object
+	 * @return Object|null
 	 */
 	function procFileGetList()
 	{

Spacing +158 added lines, -158 removed lines

@@ -29,24 +29,24 @@ 
 		$file_info = $_FILES['Filedata'];
 
 		// An error appears if not a normally uploaded file
-		if(!is_uploaded_file($file_info['tmp_name'])) exit();
+		if (!is_uploaded_file($file_info['tmp_name'])) exit();
 
 		// Basic variables setting
 		$oFileModel = getModel('file');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if (!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
 		$module_srl = $this->module_srl;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if (!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
 
 		$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
 		Context::setResponseMethod('JSON');
-		if($output->error != '0') $this->stop($output->message);
+		if ($output->error != '0') $this->stop($output->message);
 	}
 
 	/**
@@ -61,26 +61,26 @@ 
 		$callback = Context::get('callback');
 		$module_srl = $this->module_srl;
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if (!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
 
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if (!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
 		// Delete and then attempt to re-upload if file_srl is requested
 		$file_srl = Context::get('file_srl');
-		if($file_srl) $this->deleteFile($file_srl);
+		if ($file_srl) $this->deleteFile($file_srl);
 
 		$file_info = Context::get('Filedata');
 		// An error appears if not a normally uploaded file
-		if(is_uploaded_file($file_info['tmp_name'])) {
+		if (is_uploaded_file($file_info['tmp_name'])) {
 			$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
-			Context::set('uploaded_fileinfo',$output);
+			Context::set('uploaded_fileinfo', $output);
 		}
 
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('iframe');
@@ -97,24 +97,24 @@ 
 		$width = Context::get('width');
 		$height = Context::get('height');
 
-		if(!$file_srl || !$width)
+		if (!$file_srl || !$width)
 		{
-			return new Object(-1,'msg_invalid_request');
+			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$oFileModel = getModel('file');
 		$fileInfo = $oFileModel->getFile($file_srl);
-		if(!$fileInfo || $fileInfo->direct_download != 'Y')
+		if (!$fileInfo || $fileInfo->direct_download != 'Y')
 		{
-			return new Object(-1,'msg_invalid_request');
+			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$source_src = $fileInfo->uploaded_filename;
-		$output_src = $source_src . '.resized' . strrchr($source_src,'.');
+		$output_src = $source_src.'.resized'.strrchr($source_src, '.');
 
-		if(!$height) $height = $width-1;
+		if (!$height) $height = $width - 1;
 
-		if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio'))
+		if (FileHandler::createImageFile($source_src, $output_src, $width, $height, '', 'ratio'))
 		{
 			$output = new stdClass();
 			$output->info = getimagesize($output_src);
@@ -122,10 +122,10 @@ 
 		}
 		else
 		{
-			return new Object(-1,'msg_invalid_request');
+			return new Object(-1, 'msg_invalid_request');
 		}
 
-		$this->add('resized_info',$output);
+		$this->add('resized_info', $output);
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	{
 		$oFileModel = getModel('file');
 
-		if(isset($this->grant->access) && $this->grant->access !== true) return new Object(-1, 'msg_not_permitted');
+		if (isset($this->grant->access) && $this->grant->access !== true) return new Object(-1, 'msg_not_permitted');
 
 		$file_srl = Context::get('file_srl');
 		$sid = Context::get('sid');
@@ -172,26 +172,26 @@ 
 		$columnList = array('file_srl', 'sid', 'isvalid', 'source_filename', 'module_srl', 'uploaded_filename', 'file_size', 'member_srl', 'upload_target_srl', 'upload_target_type');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 		// If the requested file information is incorrect, an error that file cannot be found appears
-		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
+		if ($file_obj->file_srl != $file_srl || $file_obj->sid != $sid) return $this->stop('msg_file_not_found');
 		// Notify that file download is not allowed when standing-by(Only a top-administrator is permitted)
-		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
+		if ($logged_info->is_admin != 'Y' && $file_obj->isvalid != 'Y') return $this->stop('msg_not_permitted_download');
 		// File name
 		$filename = $file_obj->source_filename;
 		$file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
 		// Not allow the file outlink
-		if($file_module_config->allow_outlink == 'N')
+		if ($file_module_config->allow_outlink == 'N')
 		{
 			// Handles extension to allow outlink
-			if($file_module_config->allow_outlink_format)
+			if ($file_module_config->allow_outlink_format)
 			{
 				$allow_outlink_format_array = array();
 				$allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
-				if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				if (!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
 
-				foreach($allow_outlink_format_array as $val)
+				foreach ($allow_outlink_format_array as $val)
 				{
 					$val = trim($val);
-					if(preg_match("/\.{$val}$/i", $filename))
+					if (preg_match("/\.{$val}$/i", $filename))
 					{
 						$file_module_config->allow_outlink = 'Y';
 						break;
@@ -199,21 +199,21 @@ 
 				}
 			}
 			// Sites that outlink is allowed
-			if($file_module_config->allow_outlink != 'Y')
+			if ($file_module_config->allow_outlink != 'Y')
 			{
 				$referer = parse_url($_SERVER["HTTP_REFERER"]);
-				if($referer['host'] != $_SERVER['HTTP_HOST'])
+				if ($referer['host'] != $_SERVER['HTTP_HOST'])
 				{
-					if($file_module_config->allow_outlink_site)
+					if ($file_module_config->allow_outlink_site)
 					{
 						$allow_outlink_site_array = array();
 						$allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-						if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						if (!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
 
-						foreach($allow_outlink_site_array as $val)
+						foreach ($allow_outlink_site_array as $val)
 						{
 							$site = parse_url(trim($val));
-							if($site['host'] == $referer['host'])
+							if ($site['host'] == $referer['host'])
 							{
 								$file_module_config->allow_outlink = 'Y';
 								break;
@@ -223,49 +223,49 @@ 
 				}
 				else $file_module_config->allow_outlink = 'Y';
 			}
-			if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
+			if ($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
 		}
 
 		// Check if a permission for file download is granted
 		$downloadGrantCount = 0;
-		if(is_array($file_module_config->download_grant))
+		if (is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach ($file_module_config->download_grant AS $value)
+				if ($value) $downloadGrantCount++;
 		}
 
-		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
+		if (is_array($file_module_config->download_grant) && $downloadGrantCount > 0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if (!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
-				$oModuleModel =& getModel('module');
+				$oModuleModel = & getModel('module');
 				$columnList = array('module_srl', 'site_srl');
 				$module_info = $oModuleModel->getModuleInfoByModuleSrl($file_obj->module_srl, $columnList);
 
-				if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
+				if (!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
 				{
-					$oMemberModel =& getModel('member');
+					$oMemberModel = & getModel('member');
 					$member_groups = $oMemberModel->getMemberGroups($logged_info->member_srl, $module_info->site_srl);
 
 					$is_permitted = false;
-					for($i=0;$i<count($file_module_config->download_grant);$i++)
+					for ($i = 0; $i < count($file_module_config->download_grant); $i++)
 					{
 						$group_srl = $file_module_config->download_grant[$i];
-						if($member_groups[$group_srl])
+						if ($member_groups[$group_srl])
 						{
 							$is_permitted = true;
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if (!$is_permitted) return $this->stop('msg_not_permitted_download');
 				}
 			}
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-		if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		if (!$output->toBool()) return $this->stop(($output->message) ? $output->message : 'msg_not_permitted_download');
 
 
 		// 다운로드 후 (가상)
@@ -278,7 +278,7 @@ 
 
 		$random = new Password();
 		$file_key = $_SESSION['__XE_FILE_KEY__'][$file_srl] = $random->createSecureSalt(32, 'hex');
-		header('Location: '.getNotEncodedUrl('', 'act', 'procFileOutput','file_srl',$file_srl,'file_key',$file_key));
+		header('Location: '.getNotEncodedUrl('', 'act', 'procFileOutput', 'file_srl', $file_srl, 'file_key', $file_key));
 		Context::close();
 		exit();
 
@@ -289,18 +289,18 @@ 
 		$oFileModel = getModel('file');
 		$file_srl = Context::get('file_srl');
 		$file_key = Context::get('file_key');
-		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
+		if (strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
 
-		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
+		if ($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
 		else $session_key = '__XE_FILE_KEY__';
 		$columnList = array('source_filename', 'uploaded_filename', 'file_size');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 
 		$uploaded_filename = $file_obj->uploaded_filename;
 
-		if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
+		if (!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
 
-		if(!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
+		if (!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
 		{
 			unset($_SESSION[$session_key][$file_srl]);
 			return $this->stop('msg_invalid_request');
@@ -309,34 +309,34 @@ 
 		$file_size = $file_obj->file_size;
 		$filename = $file_obj->source_filename;
 		
-		if(preg_match('#(?:Chrome|Edge)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 11)
+		if (preg_match('#(?:Chrome|Edge)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 11)
 		{
-			if($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
+			if ($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
 			{
-				$filename_param = 'filename="' . $filename . '"';
+				$filename_param = 'filename="'.$filename.'"';
 			}
 			else
 			{
-				$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
+				$filename_param = "filename*=UTF-8''".rawurlencode($filename).'; filename="'.rawurlencode($filename).'"';
 			}
 		}
-		elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
+		elseif (preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
 		{
-			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
+			$filename_param = "filename*=UTF-8''".rawurlencode($filename).'; filename="'.rawurlencode($filename).'"';
 		}
-		elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+		elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 		{
 			$filename = rawurlencode($filename);
-			$filename_param = 'filename="' . preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1) . '"';
+			$filename_param = 'filename="'.preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1).'"';
 		}
 		else
 		{
-			$filename_param = 'filename="' . $filename . '"';
+			$filename_param = 'filename="'.$filename.'"';
 		}
 
-		if($is_android)
+		if ($is_android)
 		{
-			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			if ($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
 		}
 
 		unset($_SESSION[$session_key][$file_srl]);
@@ -344,21 +344,21 @@ 
 		Context::close();
 
 		$fp = fopen($uploaded_filename, 'rb');
-		if(!$fp) return $this->stop('msg_file_not_found');
+		if (!$fp) return $this->stop('msg_file_not_found');
 
 		header("Cache-Control: ");
 		header("Pragma: ");
 		header("Content-Type: application/octet-stream");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 
-		header("Content-Length: " .(string)($file_size));
-		header('Content-Disposition: attachment; ' . $filename_param);
+		header("Content-Length: ".(string) ($file_size));
+		header('Content-Disposition: attachment; '.$filename_param);
 		header("Content-Transfer-Encoding: binary\n");
 
 		// if file size is lager than 10MB, use fread function (#18675748)
-		if(filesize($uploaded_filename) > 1024 * 1024)
+		if (filesize($uploaded_filename) > 1024 * 1024)
 		{
-			while(!feof($fp)) echo fread($fp, 1024);
+			while (!feof($fp)) echo fread($fp, 1024);
 			fclose($fp);
 		}
 		else
@@ -380,36 +380,36 @@ 
 		$editor_sequence = Context::get('editor_sequence');
 		$file_srl = Context::get('file_srl');
 		$file_srls = Context::get('file_srls');
-		if($file_srls) $file_srl = $file_srls;
+		if ($file_srls) $file_srl = $file_srls;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 
 		$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
 		$logged_info = Context::get('logged_info');
 		$oFileModel = getModel('file');
 
-		$srls = explode(',',$file_srl);
-		if(!count($srls)) return;
+		$srls = explode(',', $file_srl);
+		if (!count($srls)) return;
 
-		for($i=0;$i<count($srls);$i++)
+		for ($i = 0; $i < count($srls); $i++)
 		{
-			$srl = (int)$srls[$i];
-			if(!$srl) continue;
+			$srl = (int) $srls[$i];
+			if (!$srl) continue;
 
 			$args = new stdClass;
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
-			if(!$output->toBool()) continue;
+			if (!$output->toBool()) continue;
 
 			$file_info = $output->data;
-			if(!$file_info) continue;
+			if (!$file_info) continue;
 
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
 
-			if(!$file_grant->is_deletable) continue;
+			if (!$file_grant->is_deletable) continue;
 
-			if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
+			if ($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
 		}
 	}
 
@@ -420,23 +420,23 @@ 
 	 */
 	function procFileGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		$fileSrls = Context::get('file_srls');
-		if($fileSrls) $fileSrlList = explode(',', $fileSrls);
+		if ($fileSrls) $fileSrlList = explode(',', $fileSrls);
 
 		global $lang;
-		if(count($fileSrlList) > 0)
+		if (count($fileSrlList) > 0)
 		{
 			$oFileModel = getModel('file');
 			$fileList = $oFileModel->getFile($fileSrlList);
-			if(!is_array($fileList)) $fileList = array($fileList);
+			if (!is_array($fileList)) $fileList = array($fileList);
 
-			if(is_array($fileList))
+			if (is_array($fileList))
 			{
-				foreach($fileList AS $key=>$value)
+				foreach ($fileList AS $key=>$value)
 				{
 					$value->human_file_size = FileHandler::filesize($value->file_size);
-					if($value->isvalid=='Y') $value->validName = $lang->is_valid;
+					if ($value->isvalid == 'Y') $value->validName = $lang->is_valid;
 					else $value->validName = $lang->is_stand_by;
 				}
 			}
@@ -458,7 +458,7 @@ 
 	function triggerCheckAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
@@ -475,10 +475,10 @@ 
 	function triggerAttachFiles(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 
 		$output = $this->setFilesValid($document_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new Object();
 	}
@@ -492,7 +492,7 @@ 
 	function triggerDeleteAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 
 		$output = $this->deleteFiles($document_srl);
 		return $output;
@@ -507,7 +507,7 @@ 
 	function triggerCommentCheckAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if (!$comment_srl) return new Object();
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
@@ -525,10 +525,10 @@ 
 	{
 		$comment_srl = $obj->comment_srl;
 		$uploaded_count = $obj->uploaded_count;
-		if(!$comment_srl || !$uploaded_count) return new Object();
+		if (!$comment_srl || !$uploaded_count) return new Object();
 
 		$output = $this->setFilesValid($comment_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new Object();
 	}
@@ -542,9 +542,9 @@ 
 	function triggerCommentDeleteAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if (!$comment_srl) return new Object();
 
-		if($obj->isMoveToTrash) return new Object();
+		if ($obj->isMoveToTrash) return new Object();
 
 		$output = $this->deleteFiles($comment_srl);
 		return $output;
@@ -559,7 +559,7 @@ 
 	function triggerDeleteModuleFiles(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 
 		$oFileController = getAdminController('file');
 		return $oFileController->deleteModuleFiles($module_srl);
@@ -572,9 +572,9 @@ 
 	 * @param int $upload_target_srl
 	 * @return void
 	 */
-	function setUploadInfo($editor_sequence, $upload_target_srl=0)
+	function setUploadInfo($editor_sequence, $upload_target_srl = 0)
 	{
-		if(!isset($_SESSION['upload_info'][$editor_sequence]))
+		if (!isset($_SESSION['upload_info'][$editor_sequence]))
 		{
 			$_SESSION['upload_info'][$editor_sequence] = new stdClass();
 		}
@@ -634,36 +634,36 @@ 
 		$trigger_obj->module_srl = $module_srl;
 		$trigger_obj->upload_target_srl = $upload_target_srl;
 		$output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// A workaround for Firefox upload bug
-		if(preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
+		if (preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
 		{
 			$file_info['name'] = base64_decode(strtr($match[1], ':', '/'));
 		}
 
-		if(!$manual_insert)
+		if (!$manual_insert)
 		{
 			// Get the file configurations
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
 				$oFileModel = getModel('file');
 				$config = $oFileModel->getFileConfig($module_srl);
 
 				// check file type
-				if(isset($config->allowed_filetypes) && $config->allowed_filetypes !== '*.*')
+				if (isset($config->allowed_filetypes) && $config->allowed_filetypes !== '*.*')
 				{
 					$filetypes = explode(';', $config->allowed_filetypes);
 					$ext = array();
-					foreach($filetypes as $item) {
+					foreach ($filetypes as $item) {
 						$item = explode('.', $item);
 						$ext[] = strtolower($item[1]);
 					}
 					$uploaded_ext = explode('.', $file_info['name']);
 					$uploaded_ext = strtolower(array_pop($uploaded_ext));
 
-					if(!in_array($uploaded_ext, $ext))
+					if (!in_array($uploaded_ext, $ext))
 					{
 						return $this->stop('msg_not_allowed_filetype');
 					}
@@ -672,63 +672,63 @@ 
 				$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
 				$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
 				// An error appears if file size exceeds a limit
-				if($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
+				if ($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
 				// Get total file size of all attachements (from DB)
 				$size_args = new stdClass;
 				$size_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('file.getAttachedFileSize', $size_args);
-				$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
-				if($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size');
+				$attached_size = (int) $output->data->attached_size + filesize($file_info['tmp_name']);
+				if ($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size');
 			}
 		}
 
 		// https://github.com/xpressengine/xe-core/issues/1713
-		$file_info['name'] = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x',$file_info['name']);
+		$file_info['name'] = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x', $file_info['name']);
 		$file_info['name'] = removeHackTag($file_info['name']);
-		$file_info['name'] = str_replace(array('<','>'),array('%3C','%3E'),$file_info['name']);
+		$file_info['name'] = str_replace(array('<', '>'), array('%3C', '%3E'), $file_info['name']);
 
 		// Get random number generator
 		$random = new Password();
 
 		// Set upload path by checking if the attachement is an image or other kinds of file
-		if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name']))
+		if (preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name']))
 		{
-			$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
+			$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 
 			// special character to '_'
 			// change to random file name. because window php bug. window php is not recognize unicode character file name - by cherryfilter
-			$ext = substr(strrchr($file_info['name'],'.'),1);
+			$ext = substr(strrchr($file_info['name'], '.'), 1);
 			//$_filename = preg_replace('/[#$&*?+%"\']/', '_', $file_info['name']);
 			$_filename = $random->createSecureSalt(32, 'hex').'.'.$ext;
 			$filename  = $path.$_filename;
 			$idx = 1;
-			while(file_exists($filename))
+			while (file_exists($filename))
 			{
-				$filename = $path.preg_replace('/\.([a-z0-9]+)$/i','_'.$idx.'.$1',$_filename);
+				$filename = $path.preg_replace('/\.([a-z0-9]+)$/i', '_'.$idx.'.$1', $_filename);
 				$idx++;
 			}
 			$direct_download = 'Y';
 		}
 		else
 		{
-			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
+			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 			$filename = $path.$random->createSecureSalt(32, 'hex');
 			$direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return new Object(-1,'msg_not_permitted_create');
+		if (!FileHandler::makeDir($path)) return new Object(-1, 'msg_not_permitted_create');
 
 		// Check uploaded file
-		if(!checkUploadedFile($file_info['tmp_name']))  return new Object(-1,'msg_file_upload_error');
+		if (!checkUploadedFile($file_info['tmp_name']))  return new Object(-1, 'msg_file_upload_error');
 
 		// Get random number generator
 		$random = new Password();
 		
 		// Move the file
-		if($manual_insert)
+		if ($manual_insert)
 		{
 			@copy($file_info['tmp_name'], $filename);
-			if(!file_exists($filename))
+			if (!file_exists($filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
 				@copy($file_info['tmp_name'], $filename);
@@ -736,10 +736,10 @@ 
 		}
 		else
 		{
-			if(!@move_uploaded_file($file_info['tmp_name'], $filename))
+			if (!@move_uploaded_file($file_info['tmp_name'], $filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
-				if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new Object(-1,'msg_file_upload_error');
+				if (!@move_uploaded_file($file_info['tmp_name'], $filename))  return new Object(-1, 'msg_file_upload_error');
 			}
 		}
 		// Get member information
@@ -760,10 +760,10 @@ 
 		$args->sid = $random->createSecureSalt(32, 'hex');
 
 		$output = executeQuery('file.insertFile', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
 
@@ -806,18 +806,18 @@ 
 	 */
 	function deleteFile($file_srl)
 	{
-		if(!$file_srl) return;
+		if (!$file_srl) return;
 
 		$srls = (is_array($file_srl)) ? $file_srl : explode(',', $file_srl);
-		if(!count($srls)) return;
+		if (!count($srls)) return;
 
 		$oDocumentController = getController('document');
 		$documentSrlList = array();
 
-		foreach($srls as $srl)
+		foreach ($srls as $srl)
 		{
-			$srl = (int)$srl;
-			if(!$srl) 
+			$srl = (int) $srl;
+			if (!$srl) 
 			{
 				continue;
 			}
@@ -826,14 +826,14 @@ 
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
 
-			if(!$output->toBool() || !$output->data) 
+			if (!$output->toBool() || !$output->data) 
 			{
 				continue;
 			}
 
 			$file_info = $output->data;
 
-			if($file_info->upload_target_srl)
+			if ($file_info->upload_target_srl)
 			{
 				$documentSrlList[] = $file_info->upload_target_srl;
 			}
@@ -844,15 +844,15 @@ 
 			// Call a trigger (before)
 			$trigger_obj = $output->data;
 			$output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			// Remove from the DB
 			$output = executeQuery('file.deleteFile', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			// Call a trigger (after)
 			$trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
-			if(!$trigger_output->toBool()) return $trigger_output;
+			if (!$trigger_output->toBool()) return $trigger_output;
 
 			// If successfully deleted, remove the file
 			FileHandler::removeFile($uploaded_filename);
@@ -876,28 +876,28 @@ 
 		$columnList = array('file_srl', 'uploaded_filename', 'module_srl');
 		$file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
 		// Success returned if no attachement exists
-		if(!is_array($file_list)||!count($file_list)) return new Object();
+		if (!is_array($file_list) || !count($file_list)) return new Object();
 
 		// Delete the file
 		$path = array();
 		$file_count = count($file_list);
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			$this->deleteFile($file_list[$i]->file_srl);
 
 			$uploaded_filename = $file_list[$i]->uploaded_filename;
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if (!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
 		}
 
 		// Remove from the DB
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.deleteFiles', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		
 		// Remove a file directory of the document
-		for($i=0, $c=count($path); $i<$c; $i++)
+		for ($i = 0, $c = count($path); $i < $c; $i++)
 		{
 			FileHandler::removeBlankDir($path[$i]);
 		}
@@ -915,23 +915,23 @@ 
 	 */
 	function moveFile($source_srl, $target_module_srl, $target_srl)
 	{
-		if($source_srl == $target_srl) return;
+		if ($source_srl == $target_srl) return;
 
 		$oFileModel = getModel('file');
 		$file_list = $oFileModel->getFiles($source_srl);
-		if(!$file_list) return;
+		if (!$file_list) return;
 
 		$file_count = count($file_list);
 
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			unset($file_info);
 			$file_info = $file_list[$i];
 			$old_file = $file_info->uploaded_filename;
 			// Determine the file path by checking if the file is an image or other kinds
-			if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_info->source_filename))
+			if (preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_info->source_filename))
 			{
-				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
+				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl, $target_srl);
 				$new_file = $path.$file_info->source_filename;
 			}
 			else
@@ -941,7 +941,7 @@ 
 				$new_file = $path.$random->createSecureSalt(32, 'hex');
 			}
 			// Pass if a target document to move is same
-			if($old_file == $new_file) continue;
+			if ($old_file == $new_file) continue;
 			// Create a directory
 			FileHandler::makeDir($path);
 			// Move the file
@@ -961,18 +961,18 @@ 
 		$vars = Context::getRequestVars();
 		$logged_info = Context::get('logged_info');
 
-		if(!$vars->editor_sequence) return new Object(-1, 'msg_invalid_request');
+		if (!$vars->editor_sequence) return new Object(-1, 'msg_invalid_request');
 
 		$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
 
 		$oFileModel = getModel('file');
 		$file_info = $oFileModel->getFile($vars->file_srl);
 
-		if(!$file_info) return new Object(-1, 'msg_not_founded');
+		if (!$file_info) return new Object(-1, 'msg_not_founded');
 
-		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
+		if (!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
 
-		$args =  new stdClass();
+		$args = new stdClass();
 		$args->file_srl = $vars->file_srl;
 		$args->upload_target_srl = $upload_target_srl;
 
@@ -981,7 +981,7 @@ 
 
 		$args->cover_image = 'N';
 		$output = executeQuery('file.updateClearCoverImage', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -989,7 +989,7 @@ 
 
 		$args->cover_image = 'Y';
 		$output = executeQuery('file.updateCoverImage', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -1021,9 +1021,9 @@ 
 		$fileConfig = $oModuleModel->getModulePartConfig('file', $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('file', $moduleSrl, $fileConfig);
 			}

Braces +232 added lines, -96 removed lines

@@ -29,24 +29,36 @@ 
 		$file_info = $_FILES['Filedata'];
 
 		// An error appears if not a normally uploaded file
-		if(!is_uploaded_file($file_info['tmp_name'])) exit();
+		if(!is_uploaded_file($file_info['tmp_name'])) {
+			exit();
+		}
 
 		// Basic variables setting
 		$oFileModel = getModel('file');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if(!$upload_target_srl) {
+			$upload_target_srl = intval(Context::get('upload_target_srl'));
+		}
 		$module_srl = $this->module_srl;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if(!$upload_target_srl) {
+			$_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		}
 
 		$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
 		Context::setResponseMethod('JSON');
-		if($output->error != '0') $this->stop($output->message);
+		if($output->error != '0') {
+			$this->stop($output->message);
+		}
 	}
 
 	/**
@@ -61,17 +73,27 @@ 
 		$callback = Context::get('callback');
 		$module_srl = $this->module_srl;
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if(!$upload_target_srl) {
+			$upload_target_srl = intval(Context::get('upload_target_srl'));
+		}
 
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if(!$upload_target_srl) {
+			$_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		}
 		// Delete and then attempt to re-upload if file_srl is requested
 		$file_srl = Context::get('file_srl');
-		if($file_srl) $this->deleteFile($file_srl);
+		if($file_srl) {
+			$this->deleteFile($file_srl);
+		}
 
 		$file_info = Context::get('Filedata');
 		// An error appears if not a normally uploaded file
@@ -112,15 +134,16 @@ 
 		$source_src = $fileInfo->uploaded_filename;
 		$output_src = $source_src . '.resized' . strrchr($source_src,'.');
 
-		if(!$height) $height = $width-1;
+		if(!$height) {
+			$height = $width-1;
+		}
 
 		if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio'))
 		{
 			$output = new stdClass();
 			$output->info = getimagesize($output_src);
 			$output->src = $output_src;
-		}
-		else
+		} else
 		{
 			return new Object(-1,'msg_invalid_request');
 		}
@@ -163,7 +186,9 @@ 
 	{
 		$oFileModel = getModel('file');
 
-		if(isset($this->grant->access) && $this->grant->access !== true) return new Object(-1, 'msg_not_permitted');
+		if(isset($this->grant->access) && $this->grant->access !== true) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$file_srl = Context::get('file_srl');
 		$sid = Context::get('sid');
@@ -172,9 +197,13 @@ 
 		$columnList = array('file_srl', 'sid', 'isvalid', 'source_filename', 'module_srl', 'uploaded_filename', 'file_size', 'member_srl', 'upload_target_srl', 'upload_target_type');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 		// If the requested file information is incorrect, an error that file cannot be found appears
-		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
+		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) {
+			return $this->stop('msg_file_not_found');
+		}
 		// Notify that file download is not allowed when standing-by(Only a top-administrator is permitted)
-		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
+		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') {
+			return $this->stop('msg_not_permitted_download');
+		}
 		// File name
 		$filename = $file_obj->source_filename;
 		$file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
@@ -186,7 +215,9 @@ 
 			{
 				$allow_outlink_format_array = array();
 				$allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
-				if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				if(!is_array($allow_outlink_format_array)) {
+					$allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				}
 
 				foreach($allow_outlink_format_array as $val)
 				{
@@ -208,7 +239,9 @@ 
 					{
 						$allow_outlink_site_array = array();
 						$allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-						if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						if(!is_array($allow_outlink_site_array)) {
+							$allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						}
 
 						foreach($allow_outlink_site_array as $val)
 						{
@@ -220,23 +253,29 @@ 
 							}
 						}
 					}
+				} else {
+					$file_module_config->allow_outlink = 'Y';
 				}
-				else $file_module_config->allow_outlink = 'Y';
 			}
-			if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
+			if($file_module_config->allow_outlink != 'Y') {
+				return $this->stop('msg_not_allowed_outlink');
+			}
 		}
 
 		// Check if a permission for file download is granted
 		$downloadGrantCount = 0;
 		if(is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach($file_module_config->download_grant AS $value) {
+							if($value) $downloadGrantCount++;
+			}
 		}
 
 		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if(!Context::get('is_logged')) {
+				return $this->stop('msg_not_permitted_download');
+			}
 			$logged_info = Context::get('logged_info');
 			if($logged_info->is_admin != 'Y')
 			{
@@ -259,13 +298,17 @@ 
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if(!$is_permitted) {
+						return $this->stop('msg_not_permitted_download');
+					}
 				}
 			}
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-		if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		if(!$output->toBool()) {
+			return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		}
 
 
 		// 다운로드 후 (가상)
@@ -289,16 +332,23 @@ 
 		$oFileModel = getModel('file');
 		$file_srl = Context::get('file_srl');
 		$file_key = Context::get('file_key');
-		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
+		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) {
+			$is_android = true;
+		}
 
-		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
-		else $session_key = '__XE_FILE_KEY__';
+		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) {
+			$session_key = '__XE_FILE_KEY_AND__';
+		} else {
+			$session_key = '__XE_FILE_KEY__';
+		}
 		$columnList = array('source_filename', 'uploaded_filename', 'file_size');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 
 		$uploaded_filename = $file_obj->uploaded_filename;
 
-		if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
+		if(!file_exists($uploaded_filename)) {
+			return $this->stop('msg_file_not_found');
+		}
 
 		if(!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
 		{
@@ -314,29 +364,27 @@ 
 			if($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
 			{
 				$filename_param = 'filename="' . $filename . '"';
-			}
-			else
+			} else
 			{
 				$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
 			}
-		}
-		elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
+		} elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
 		{
 			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
-		}
-		elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+		} elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 		{
 			$filename = rawurlencode($filename);
 			$filename_param = 'filename="' . preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1) . '"';
-		}
-		else
+		} else
 		{
 			$filename_param = 'filename="' . $filename . '"';
 		}
 
 		if($is_android)
 		{
-			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) {
+				$_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			}
 		}
 
 		unset($_SESSION[$session_key][$file_srl]);
@@ -344,7 +392,9 @@ 
 		Context::close();
 
 		$fp = fopen($uploaded_filename, 'rb');
-		if(!$fp) return $this->stop('msg_file_not_found');
+		if(!$fp) {
+			return $this->stop('msg_file_not_found');
+		}
 
 		header("Cache-Control: ");
 		header("Pragma: ");
@@ -358,10 +408,11 @@ 
 		// if file size is lager than 10MB, use fread function (#18675748)
 		if(filesize($uploaded_filename) > 1024 * 1024)
 		{
-			while(!feof($fp)) echo fread($fp, 1024);
+			while(!feof($fp)) {
+				echo fread($fp, 1024);
+			}
 			fclose($fp);
-		}
-		else
+		} else
 		{
 			fpassthru($fp);
 		}
@@ -380,9 +431,13 @@ 
 		$editor_sequence = Context::get('editor_sequence');
 		$file_srl = Context::get('file_srl');
 		$file_srls = Context::get('file_srls');
-		if($file_srls) $file_srl = $file_srls;
+		if($file_srls) {
+			$file_srl = $file_srls;
+		}
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 
 		$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
@@ -390,26 +445,38 @@ 
 		$oFileModel = getModel('file');
 
 		$srls = explode(',',$file_srl);
-		if(!count($srls)) return;
+		if(!count($srls)) {
+			return;
+		}
 
 		for($i=0;$i<count($srls);$i++)
 		{
 			$srl = (int)$srls[$i];
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$args = new stdClass;
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
-			if(!$output->toBool()) continue;
+			if(!$output->toBool()) {
+				continue;
+			}
 
 			$file_info = $output->data;
-			if(!$file_info) continue;
+			if(!$file_info) {
+				continue;
+			}
 
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
 
-			if(!$file_grant->is_deletable) continue;
+			if(!$file_grant->is_deletable) {
+				continue;
+			}
 
-			if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
+			if($upload_target_srl && $file_srl) {
+				$output = $this->deleteFile($file_srl);
+			}
 		}
 	}
 
@@ -420,28 +487,36 @@ 
 	 */
 	function procFileGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		$fileSrls = Context::get('file_srls');
-		if($fileSrls) $fileSrlList = explode(',', $fileSrls);
+		if($fileSrls) {
+			$fileSrlList = explode(',', $fileSrls);
+		}
 
 		global $lang;
 		if(count($fileSrlList) > 0)
 		{
 			$oFileModel = getModel('file');
 			$fileList = $oFileModel->getFile($fileSrlList);
-			if(!is_array($fileList)) $fileList = array($fileList);
+			if(!is_array($fileList)) {
+				$fileList = array($fileList);
+			}
 
 			if(is_array($fileList))
 			{
 				foreach($fileList AS $key=>$value)
 				{
 					$value->human_file_size = FileHandler::filesize($value->file_size);
-					if($value->isvalid=='Y') $value->validName = $lang->is_valid;
-					else $value->validName = $lang->is_stand_by;
+					if($value->isvalid=='Y') {
+						$value->validName = $lang->is_valid;
+					} else {
+						$value->validName = $lang->is_stand_by;
+					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$fileList = array();
 			$this->setMessage($lang->no_files);
@@ -458,7 +533,9 @@ 
 	function triggerCheckAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
@@ -475,10 +552,14 @@ 
 	function triggerAttachFiles(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 
 		$output = $this->setFilesValid($document_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new Object();
 	}
@@ -492,7 +573,9 @@ 
 	function triggerDeleteAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 
 		$output = $this->deleteFiles($document_srl);
 		return $output;
@@ -507,7 +590,9 @@ 
 	function triggerCommentCheckAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if(!$comment_srl) {
+			return new Object();
+		}
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
@@ -525,10 +610,14 @@ 
 	{
 		$comment_srl = $obj->comment_srl;
 		$uploaded_count = $obj->uploaded_count;
-		if(!$comment_srl || !$uploaded_count) return new Object();
+		if(!$comment_srl || !$uploaded_count) {
+			return new Object();
+		}
 
 		$output = $this->setFilesValid($comment_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new Object();
 	}
@@ -542,9 +631,13 @@ 
 	function triggerCommentDeleteAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if(!$comment_srl) {
+			return new Object();
+		}
 
-		if($obj->isMoveToTrash) return new Object();
+		if($obj->isMoveToTrash) {
+			return new Object();
+		}
 
 		$output = $this->deleteFiles($comment_srl);
 		return $output;
@@ -559,7 +652,9 @@ 
 	function triggerDeleteModuleFiles(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 
 		$oFileController = getAdminController('file');
 		return $oFileController->deleteModuleFiles($module_srl);
@@ -634,7 +729,9 @@ 
 		$trigger_obj->module_srl = $module_srl;
 		$trigger_obj->upload_target_srl = $upload_target_srl;
 		$output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// A workaround for Firefox upload bug
 		if(preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
@@ -672,13 +769,17 @@ 
 				$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
 				$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
 				// An error appears if file size exceeds a limit
-				if($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
+				if($allowed_filesize < filesize($file_info['tmp_name'])) {
+					return new Object(-1, 'msg_exceeds_limit_size');
+				}
 				// Get total file size of all attachements (from DB)
 				$size_args = new stdClass;
 				$size_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('file.getAttachedFileSize', $size_args);
 				$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
-				if($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size');
+				if($attached_size > $allowed_attach_size) {
+					return new Object(-1, 'msg_exceeds_limit_size');
+				}
 			}
 		}
 
@@ -708,18 +809,21 @@ 
 				$idx++;
 			}
 			$direct_download = 'Y';
-		}
-		else
+		} else
 		{
 			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
 			$filename = $path.$random->createSecureSalt(32, 'hex');
 			$direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return new Object(-1,'msg_not_permitted_create');
+		if(!FileHandler::makeDir($path)) {
+			return new Object(-1,'msg_not_permitted_create');
+		}
 
 		// Check uploaded file
-		if(!checkUploadedFile($file_info['tmp_name']))  return new Object(-1,'msg_file_upload_error');
+		if(!checkUploadedFile($file_info['tmp_name'])) {
+			return new Object(-1,'msg_file_upload_error');
+		}
 
 		// Get random number generator
 		$random = new Password();
@@ -733,13 +837,14 @@ 
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
 				@copy($file_info['tmp_name'], $filename);
 			}
-		}
-		else
+		} else
 		{
 			if(!@move_uploaded_file($file_info['tmp_name'], $filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
-				if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new Object(-1,'msg_file_upload_error');
+				if(!@move_uploaded_file($file_info['tmp_name'], $filename)) {
+					return new Object(-1,'msg_file_upload_error');
+				}
 			}
 		}
 		// Get member information
@@ -760,10 +865,14 @@ 
 		$args->sid = $random->createSecureSalt(32, 'hex');
 
 		$output = executeQuery('file.insertFile', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
 
@@ -806,10 +915,14 @@ 
 	 */
 	function deleteFile($file_srl)
 	{
-		if(!$file_srl) return;
+		if(!$file_srl) {
+			return;
+		}
 
 		$srls = (is_array($file_srl)) ? $file_srl : explode(',', $file_srl);
-		if(!count($srls)) return;
+		if(!count($srls)) {
+			return;
+		}
 
 		$oDocumentController = getController('document');
 		$documentSrlList = array();
@@ -844,15 +957,21 @@ 
 			// Call a trigger (before)
 			$trigger_obj = $output->data;
 			$output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// Remove from the DB
 			$output = executeQuery('file.deleteFile', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// Call a trigger (after)
 			$trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
-			if(!$trigger_output->toBool()) return $trigger_output;
+			if(!$trigger_output->toBool()) {
+				return $trigger_output;
+			}
 
 			// If successfully deleted, remove the file
 			FileHandler::removeFile($uploaded_filename);
@@ -876,7 +995,9 @@ 
 		$columnList = array('file_srl', 'uploaded_filename', 'module_srl');
 		$file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
 		// Success returned if no attachement exists
-		if(!is_array($file_list)||!count($file_list)) return new Object();
+		if(!is_array($file_list)||!count($file_list)) {
+			return new Object();
+		}
 
 		// Delete the file
 		$path = array();
@@ -887,14 +1008,18 @@ 
 
 			$uploaded_filename = $file_list[$i]->uploaded_filename;
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if(!in_array($path_info['dirname'], $path)) {
+				$path[] = $path_info['dirname'];
+			}
 		}
 
 		// Remove from the DB
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.deleteFiles', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		
 		// Remove a file directory of the document
 		for($i=0, $c=count($path); $i<$c; $i++)
@@ -915,11 +1040,15 @@ 
 	 */
 	function moveFile($source_srl, $target_module_srl, $target_srl)
 	{
-		if($source_srl == $target_srl) return;
+		if($source_srl == $target_srl) {
+			return;
+		}
 
 		$oFileModel = getModel('file');
 		$file_list = $oFileModel->getFiles($source_srl);
-		if(!$file_list) return;
+		if(!$file_list) {
+			return;
+		}
 
 		$file_count = count($file_list);
 
@@ -933,15 +1062,16 @@ 
 			{
 				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
 				$new_file = $path.$file_info->source_filename;
-			}
-			else
+			} else
 			{
 				$path = sprintf("./files/attach/binaries/%s/%s/", $target_module_srl, $target_srl);
 				$random = new Password();
 				$new_file = $path.$random->createSecureSalt(32, 'hex');
 			}
 			// Pass if a target document to move is same
-			if($old_file == $new_file) continue;
+			if($old_file == $new_file) {
+				continue;
+			}
 			// Create a directory
 			FileHandler::makeDir($path);
 			// Move the file
@@ -961,16 +1091,22 @@ 
 		$vars = Context::getRequestVars();
 		$logged_info = Context::get('logged_info');
 
-		if(!$vars->editor_sequence) return new Object(-1, 'msg_invalid_request');
+		if(!$vars->editor_sequence) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
 
 		$oFileModel = getModel('file');
 		$file_info = $oFileModel->getFile($vars->file_srl);
 
-		if(!$file_info) return new Object(-1, 'msg_not_founded');
+		if(!$file_info) {
+			return new Object(-1, 'msg_not_founded');
+		}
 
-		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
+		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$args =  new stdClass();
 		$args->file_srl = $vars->file_srl;

modules/file/file.model.php

Doc Comments +3 added lines, -3 removed lines

@@ -113,7 +113,7 @@ 
 	 * Get file configurations
 	 *
 	 * @param int $module_srl If set this, returns specific module's configuration. Otherwise returns global configuration.
-	 * @return object Returns configuration.
+	 * @return stdClass Returns configuration.
 	 */
 	function getFileConfig($module_srl = null)
 	{
@@ -231,7 +231,7 @@ 
 	/**
 	 * Return configurations of the attachement (it automatically checks if an administrator is)
 	 *
-	 * @return object Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
+	 * @return stdClass Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
 	 */
 	function getUploadConfig()
 	{
@@ -285,7 +285,7 @@ 
 	 * Return file configuration of the module
 	 *
 	 * @param int $module_srl The sequence of module to get configuration
-	 * @return object
+	 * @return stdClass
 	 */
 	function getFileModuleConfig($module_srl)
 	{

Spacing +50 added lines, -50 removed lines

@@ -29,24 +29,24 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
-		if($upload_target_srl)
+		if ($upload_target_srl)
 		{
 			$tmp_files = $this->getFiles($upload_target_srl);
 			$file_count = count($tmp_files);
 
-			for($i=0;$i<$file_count;$i++)
+			for ($i = 0; $i < $file_count; $i++)
 			{
 				$file_info = $tmp_files[$i];
-				if(!$file_info->file_srl) continue;
+				if (!$file_info->file_srl) continue;
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				if ($file_info->direct_download == 'N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
 				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
@@ -66,17 +66,17 @@ 
 		//$config = $oModuleModel->getModuleInfoByMid($mid);	//perhaps config varialbles not used
 
 		$file_config = $this->getUploadConfig();
-		$left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
+		$left_size = $file_config->allowed_attach_size * 1024 * 1024 - $attached_size;
 		// Settings of required information
 		$attached_size = FileHandler::filesize($attached_size);
-		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size*1024*1024);
-		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize*1024*1024);
+		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024);
+		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024);
 		$allowed_filetypes = $file_config->allowed_filetypes;
-		$this->add("files",$files);
-		$this->add("editor_sequence",$editor_sequence);
-		$this->add("upload_target_srl",$upload_target_srl);
-		$this->add("upload_status",$upload_status);
-		$this->add("left_size",$left_size);
+		$this->add("files", $files);
+		$this->add("editor_sequence", $editor_sequence);
+		$this->add("upload_target_srl", $upload_target_srl);
+		$this->add("upload_status", $upload_status);
+		$this->add("left_size", $left_size);
 		$this->add('attached_size', $attached_size);
 		$this->add('allowed_attach_size', $allowed_attach_size);
 		$this->add('allowed_filesize', $allowed_filesize);
@@ -94,7 +94,7 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.getFilesCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 * @param string $sid
 	 * @return string Returns a url
 	 */
-	function getDownloadUrl($file_srl, $sid, $module_srl="")
+	function getDownloadUrl($file_srl, $sid, $module_srl = "")
 	{
 		return sprintf('?module=%s&amp;act=%s&amp;file_srl=%s&amp;sid=%s&amp;module_srl=%s', 'file', 'procFileDownload', $file_srl, $sid, $module_srl);
 	}
@@ -122,12 +122,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if ($module_srl) $file_config = $oModuleModel->getModulePartConfig('file', $module_srl);
+		if (!$file_config) $file_config = $file_module_config;
 
 		$config = new stdClass();
 
-		if($file_config)
+		if ($file_config)
 		{
 			$config->allowed_filesize = $file_config->allowed_filesize;
 			$config->allowed_attach_size = $file_config->allowed_attach_size;
@@ -138,31 +138,31 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if (!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		if (!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
+		if (!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		if (!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		if (!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if (!$config->allowed_filesize) $config->allowed_filesize = '2';
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = '3';
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
+		if (!$config->allow_outlink) $config->allow_outlink = 'Y';
+		if (!$config->download_grant) $config->download_grant = array();
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
-		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		$size = (float) $size;
+		if ($unit == 'g') $size *= 1024;
+		if ($unit == 'k') $size /= 1024;
 
-		if($config->allowed_filesize > $size) 
+		if ($config->allowed_filesize > $size) 
 		{	
 			$config->allowed_filesize = $size;
 		}
-		if($config->allowed_attach_size > $size) 
+		if ($config->allowed_attach_size > $size) 
 		{
 			$config->allowed_attach_size = $size;
 		}
@@ -182,10 +182,10 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// old version compatibility
-		if(count($output->data) == 1)
+		if (count($output->data) == 1)
 		{
 			$file = $output->data[0];
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -196,9 +196,9 @@ 
 		{
 			$fileList = array();
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $key=>$value)
+				foreach ($output->data as $key=>$value)
 				{
 					$file = $value;
 					$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -222,16 +222,16 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if ($ckValid) $args->isvalid = 'Y';
 		$output = executeQuery('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if ($file_list && !is_array($file_list)) $file_list = array($file_list);
 
 		$file_count = count($file_list);
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			$file = $file_list[$i];
 			$file->source_filename = stripslashes($file->source_filename);
@@ -254,14 +254,14 @@ 
 
 		$module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$module_srl = $current_module_info->module_srl;
 		}
 		$file_config = $this->getFileConfig($module_srl);
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 			$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
@@ -287,9 +287,9 @@ 
 			'%s : %s/ %s<br /> %s : %s (%s : %s)',
 			Context::getLang('allowed_attach_size'),
 			FileHandler::filesize($attached_size),
-			FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
+			FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024),
 			Context::getLang('allowed_filesize'),
-			FileHandler::filesize($file_config->allowed_filesize*1024*1024),
+			FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024),
 			Context::getLang('allowed_filetypes'),
 			$file_config->allowed_filetypes
 		);
@@ -316,9 +316,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if (!$file_info) return null;
 
-		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
+		if ($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
 			$file_grant->is_deletable = true;
 			return $file_grant;
@@ -329,7 +329,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if ($oDocument->isExists()) $document_grant = $oDocument->isGranted();
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

Braces +79 added lines, -30 removed lines

@@ -29,7 +29,9 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 
 		if($upload_target_srl)
 		{
@@ -39,22 +41,26 @@ 
 			for($i=0;$i<$file_count;$i++)
 			{
 				$file_info = $tmp_files[$i];
-				if(!$file_info->file_srl) continue;
+				if(!$file_info->file_srl) {
+					continue;
+				}
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
-				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				if($file_info->direct_download=='N') {
+					$obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				} else {
+					$obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				}
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
 				$files[] = $obj;
 				$attached_size += $file_info->file_size;
 			}
-		}
-		else
+		} else
 		{
 			$upload_target_srl = 0;
 			$attached_size = 0;
@@ -122,8 +128,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if($module_srl) {
+			$file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
+		}
+		if(!$file_config) {
+			$file_config = $file_module_config;
+		}
 
 		$config = new stdClass();
 
@@ -138,25 +148,53 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = $file_module_config->allowed_filesize;
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = $file_module_config->allow_outlink;
+		}
+		if(!$config->allow_outlink_site) {
+			$config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		}
+		if(!$config->allow_outlink_format) {
+			$config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = $file_module_config->download_grant;
+		}
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = '2';
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = '3';
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = '*.*';
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = 'Y';
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = array();
+		}
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
 		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		if($unit == 'g') {
+			$size *= 1024;
+		}
+		if($unit == 'k') {
+			$size /= 1024;
+		}
 
 		if($config->allowed_filesize > $size) 
 		{	
@@ -182,7 +220,9 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// old version compatibility
 		if(count($output->data) == 1)
@@ -191,8 +231,7 @@ 
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
 
 			return $file;
-		}
-		else
+		} else
 		{
 			$fileList = array();
 
@@ -222,13 +261,19 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if($ckValid) {
+			$args->isvalid = 'Y';
+		}
 		$output = executeQuery('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if($file_list && !is_array($file_list)) {
+			$file_list = array($file_list);
+		}
 
 		$file_count = count($file_list);
 		for($i=0;$i<$file_count;$i++)
@@ -316,7 +361,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if(!$file_info) {
+			return null;
+		}
 
 		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
@@ -329,7 +376,9 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if($oDocument->isExists()) {
+			$document_grant = $oDocument->isGranted();
+		}
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

modules/importer/extract.class.php

Doc Comments +6 added lines

@@ -216,6 +216,7 @@ 
 
 	/**
 	 * Merge item
+	 * @param string $filename
 	 * @return void
 	 */
 	function mergeItems($filename)
@@ -310,6 +311,11 @@ 
 		return $this->key;
 	}
 
+	/**
+	 * @param string $str
+	 *
+	 * @return string
+	 */
 	function _addTagCRTail($str) {
 		$str = preg_replace('/<\/([^>]*)></i', "</$1>\r\n<", $str);
 		return $str;

Braces +33 added lines, -16 removed lines

@@ -99,7 +99,9 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if($endTag) {
+			$this->endTag = $endTag;
+		}
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +110,9 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if(!is_dir($this->cache_path)) {
+			FileHandler::makeDir($this->cache_path);
+		}
 
 		return $this->openFile();
 	}
@@ -124,18 +128,25 @@ 
 		// If local file
 		if(strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new Object(-1,'msg_no_xml_file');
+			if(!file_exists($this->filename)) {
+				return new Object(-1,'msg_no_xml_file');
+			}
 			$this->fd = fopen($this->filename,"r");
 			// If remote file
-		}
-		else
+		} else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if(!$url_info['port']) {
+				$url_info['port'] = 80;
+			}
+			if(!$url_info['path']) {
+				$url_info['path'] = '/';
+			}
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new Object(-1,'msg_no_xml_file');
+			if(!$this->fd) {
+				return new Object(-1,'msg_no_xml_file');
+			}
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
 			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
@@ -155,9 +166,13 @@ 
 			while(!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if(!trim($str)) {
+					break;
+				}
+			}
+			if(preg_match('/404 Not Found/i',$buff)) {
+				return new Object(-1,'msg_no_xml_file');
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new Object(-1,'msg_no_xml_file');
 		}
 
 		if($this->startTag)
@@ -174,8 +189,7 @@ 
 					break;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->isStarted = true;
 			$this->isFinished = false;
@@ -231,7 +245,9 @@ 
 		while(!feof($index_fd))
 		{
 			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			if(!file_exists($target_file)) {
+				continue;
+			}
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,7 +263,9 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if($this->isFinished()) {
+			return;
+		}
 
 		while(!feof($this->fd))
 		{
@@ -257,8 +275,7 @@ 
 				$this->buff = substr($this->buff, $startPos);
 				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
 				break;
-			}
-			elseif($this->endTag)
+			} elseif($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
 				if($endPos !== false)

Spacing +39 added lines, -39 removed lines

@@ -99,7 +99,7 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if ($endTag) $this->endTag = $endTag;
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +108,7 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if (!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
 
 		return $this->openFile();
 	}
@@ -120,55 +120,55 @@ 
 	function openFile()
 	{
 		FileHandler::removeFile($this->cache_index_file);
-		$this->index_fd = fopen($this->cache_index_file,"a");
+		$this->index_fd = fopen($this->cache_index_file, "a");
 		// If local file
-		if(strncasecmp('http://', $this->filename, 7) !== 0)
+		if (strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new Object(-1,'msg_no_xml_file');
-			$this->fd = fopen($this->filename,"r");
+			if (!file_exists($this->filename)) return new Object(-1, 'msg_no_xml_file');
+			$this->fd = fopen($this->filename, "r");
 			// If remote file
 		}
 		else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if (!$url_info['port']) $url_info['port'] = 80;
+			if (!$url_info['path']) $url_info['path'] = '/';
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new Object(-1,'msg_no_xml_file');
+			if (!$this->fd) return new Object(-1, 'msg_no_xml_file');
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
-			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
+			if (preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path) && function_exists('iconv'))
 			{
-				$path_list = explode('/',$path);
+				$path_list = explode('/', $path);
 				$cnt = count($path_list);
-				$filename = $path_list[$cnt-1];
-				$filename = urlencode(iconv("UTF-8","EUC-KR",$filename));
-				$path_list[$cnt-1] = $filename;
-				$path = implode('/',$path_list);
+				$filename = $path_list[$cnt - 1];
+				$filename = urlencode(iconv("UTF-8", "EUC-KR", $filename));
+				$path_list[$cnt - 1] = $filename;
+				$path = implode('/', $path_list);
 				$url_info['path'] = $path;
 			}
 
 			$header = sprintf("GET %s?%s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\nConnection: Close\r\n\r\n", $url_info['path'], $url_info['query'], $url_info['host'], $url_info['scheme'], $url_info['host']);
 			@fwrite($this->fd, $header);
 			$buff = '';
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if (!trim($str)) break;
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new Object(-1,'msg_no_xml_file');
+			if (preg_match('/404 Not Found/i', $buff)) return new Object(-1, 'msg_no_xml_file');
 		}
 
-		if($this->startTag)
+		if ($this->startTag)
 		{
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$str = fgets($this->fd, 1024);
 				$pos = strpos($str, $this->startTag);
-				if($pos !== false)
+				if ($pos !== false)
 				{
-					$this->buff = substr($this->buff, $pos+strlen($this->startTag));
+					$this->buff = substr($this->buff, $pos + strlen($this->startTag));
 					$this->isStarted = true;
 					$this->isFinished = false;
 					break;
@@ -208,7 +208,7 @@ 
 	{
 		FileHandler::removeDir($this->cache_path.$this->key);
 		$this->index = 0;
-		while(!$this->isFinished())
+		while (!$this->isFinished())
 		{
 			$this->getItem();
 		}
@@ -224,14 +224,14 @@ 
 
 		$filename = sprintf('%s/%s', $this->cache_path, $filename);
 
-		$index_fd = fopen($this->cache_index_file,"r");
-		$fd = fopen($filename,'w');
+		$index_fd = fopen($this->cache_index_file, "r");
+		$fd = fopen($filename, 'w');
 
 		fwrite($fd, '<items>');
-		while(!feof($index_fd))
+		while (!feof($index_fd))
 		{
-			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			$target_file = trim(fgets($index_fd, 1024));
+			if (!file_exists($target_file)) continue;
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,21 +247,21 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if ($this->isFinished()) return;
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$startPos = strpos($this->buff, $this->itemStartTag);
-			if($startPos !== false)
+			if ($startPos !== false)
 			{
 				$this->buff = substr($this->buff, $startPos);
-				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
+				$this->buff = preg_replace("/\>/", ">\r\n", $this->buff, 1);
 				break;
 			}
-			elseif($this->endTag)
+			elseif ($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
-				if($endPos !== false)
+				if ($endPos !== false)
 				{
 					$this->closeFile();
 					return;
@@ -271,21 +271,21 @@ 
 		}
 
 		$startPos = strpos($this->buff, $this->itemStartTag);
-		if($startPos === false)
+		if ($startPos === false)
 		{
 			$this->closeFile();
 			return;
 		}
 
-		$filename = sprintf('%s/%s.xml',$this->cache_path, $this->index++);
+		$filename = sprintf('%s/%s.xml', $this->cache_path, $this->index++);
 		fwrite($this->index_fd, $filename."\r\n");
 
-		$fd = fopen($filename,'w');
+		$fd = fopen($filename, 'w');
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$endPos = strpos($this->buff, $this->itemEndTag);
-			if($endPos !== false)
+			if ($endPos !== false)
 			{
 				$endPos += strlen($this->itemEndTag);
 				$buff = substr($this->buff, 0, $endPos);