xpressengine / xe-core

modules/syndication/syndication.controller.php

Doc Comments +3 added lines

@@ -162,6 +162,9 @@
 		$output = executeQuery('syndication.deleteLog', $args);
 	}
 
+	/**
+	 * @param string $type
+	 */
 	function ping($id, $type, $page=1) {
 		$this->ping_message = '';
 		$oSyndicationModel = getModel('syndication');

Spacing +26 added lines, -26 removed lines

@@ -12,17 +12,17 @@ 
 	var $ping_message = '';
 
 	function triggerInsertDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
-		if($obj->status !== 'PUBLIC') return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->status !== 'PUBLIC') return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -32,22 +32,22 @@ 
 	}
 
 	function triggerUpdateDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
 
 		// PUBLIC 외 삭제
-		if($obj->status === 'PUBLIC')
+		if ($obj->status === 'PUBLIC')
 		{
 			$this->ping($id, 'article');
 		}
@@ -60,14 +60,14 @@ 
 	}
 
 	function triggerDeleteDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oModuleModel = getModel('module');
 		$oSyndicationModel = getModel('syndication');
 
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if($config->syndication_use != 'Y') return $this->makeObject();
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
 
@@ -85,25 +85,25 @@ 
 
 	function triggerMoveDocumentModule(&$obj)
 	{
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$arr_document_srl = explode(',', $obj->document_srls);
-		if(!$arr_document_srl) return $this->makeObject();
+		if (!$arr_document_srl) return $this->makeObject();
 
-		foreach($arr_document_srl as $document_srl)
+		foreach ($arr_document_srl as $document_srl)
 		{
 			// 기존 문서 삭제
 			$source_module_srl = $obj->source_module_srl[$document_srl];
-			if(!!$source_module_srl)
+			if (!!$source_module_srl)
 			{
 				$target_id = sprintf('%s-%s', $source_module_srl, $document_srl);
 				$id = $oSyndicationModel->getID('article', $target_id);
@@ -123,11 +123,11 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, '', '');
 
@@ -162,21 +162,21 @@ 
 		$output = executeQuery('syndication.deleteLog', $args);
 	}
 
-	function ping($id, $type, $page=1) {
+	function ping($id, $type, $page = 1) {
 		$this->ping_message = '';
 		$oSyndicationModel = getModel('syndication');
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if(!$config->syndication_token)
+		if (!$config->syndication_token)
 		{
 			$this->ping_message = 'Syndication Token empty';
 			$oSyndicationModel->setResentPingLog($this->ping_message);
 			return false;
 		}
 
-		if(!$this->checkOpenSSLSupport())
+		if (!$this->checkOpenSSLSupport())
 		{
 			$lang = Context::get('lang');
 			$this->ping_message = $lang->msg_need_openssl_support;
@@ -184,7 +184,7 @@ 
 			return false;
 		}
 
-		if(substr($config->site_url,-1)!='/')
+		if (substr($config->site_url, -1) != '/')
 		{
 			$config->site_url .= '/';
 		}
@@ -204,11 +204,11 @@ 
 		$buff = FileHandler::getRemoteResource($ping_url, null, 10, 'POST', 'application/x-www-form-urlencoded', $ping_header, array(), array('ping_url'=>$ping_body), $request_config);
 
 		$xml = new XmlParser();
-		$xmlDoc= $xml->parse($buff);
+		$xmlDoc = $xml->parse($buff);
 
-		if($xmlDoc->result->error_code->body != '000')
+		if ($xmlDoc->result->error_code->body != '000')
 		{
-			if(!$buff)
+			if (!$buff)
 			{
 				$this->ping_message = 'Socket connection error. Check your Server Environment.';
 			}

Braces +50 added lines, -20 removed lines

@@ -12,17 +12,25 @@ 
 	var $ping_message = '';
 
 	function triggerInsertDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
-		if($obj->status !== 'PUBLIC') return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
+		if($obj->status !== 'PUBLIC') {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -32,16 +40,22 @@ 
 	}
 
 	function triggerUpdateDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -50,8 +64,7 @@ 
 		if($obj->status === 'PUBLIC')
 		{
 			$this->ping($id, 'article');
-		}
-		else
+		} else
 		{
 			$this->ping($id, 'deleted');
 		}
@@ -60,14 +73,20 @@ 
 	}
 
 	function triggerDeleteDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oModuleModel = getModel('module');
 		$oSyndicationModel = getModel('syndication');
 
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if($config->syndication_use != 'Y') return $this->makeObject();
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($config->syndication_use != 'Y') {
+			return $this->makeObject();
+		}
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
 
@@ -85,19 +104,27 @@ 
 
 	function triggerMoveDocumentModule(&$obj)
 	{
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$arr_document_srl = explode(',', $obj->document_srls);
-		if(!$arr_document_srl) return $this->makeObject();
+		if(!$arr_document_srl) {
+			return $this->makeObject();
+		}
 
 		foreach($arr_document_srl as $document_srl)
 		{
@@ -123,11 +150,15 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, '', '');
 
@@ -211,8 +242,7 @@ 
 			if(!$buff)
 			{
 				$this->ping_message = 'Socket connection error. Check your Server Environment.';
-			}
-			else
+			} else
 			{
 				$this->ping_message = $xmlDoc->result->message->body;
 			}

modules/syndication/syndication.class.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
 		$oModuleController->insertTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after');
 
 		$oAddonAdminModel = getAdminModel('addon');
-		if($oAddonAdminModel->getAddonInfoXml('catpcha')){
+		if ($oAddonAdminModel->getAddonInfoXml('catpcha')) {
 			$oAddonAdminController = &addonAdminController::getInstance();
 			$oAddonAdminController->doActivate('catpcha');
 			$oAddonAdminController->makeCacheFile();
@@ -47,9 +47,9 @@ 
 
 	function checkUpdate() {
 		$oModuleModel = getModel('module');
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
 		// if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
 
 		return false;
 	}
@@ -58,18 +58,18 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')){
+		if (!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) {
 			$oModuleController->insertTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after');
 		}
 		// if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')){
 		// 	$oModuleController->insertTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after');
 		// }
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')){
+		if (!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) {
 			$oModuleController->insertTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after');
 		}
 
 		$oAddonAdminModel = getAdminModel('addon');
-		if($oAddonAdminModel->getAddonInfoXml('catpcha')){
+		if ($oAddonAdminModel->getAddonInfoXml('catpcha')) {
 			$oAddonAdminController = &addonAdminController::getInstance();
 			$oAddonAdminController->doActivate('catpcha');
 			$oAddonAdminController->makeCacheFile();
@@ -81,7 +81,7 @@ 
 
 	function checkOpenSSLSupport()
 	{
-		if(!in_array('ssl', stream_get_transports())) {
+		if (!in_array('ssl', stream_get_transports())) {
 			return FALSE;
 		}
 		return TRUE;

Braces +6 added lines, -2 removed lines

@@ -47,9 +47,13 @@
 
 	function checkUpdate() {
 		$oModuleModel = getModel('module');
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
+		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) {
+			return true;
+		}
 		// if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
+		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) {
+			return true;
+		}
 
 		return false;
 	}

modules/syndication/syndication.model.php

Spacing +113 added lines, -113 removed lines

@@ -11,7 +11,7 @@ 
 {
 	private $site_url = null;
 	private $uri_scheme = 'http://';
-	private $syndication_password= null;
+	private $syndication_password = null;
 	private $year = null;
 	private $langs = array();
 	private $granted_modules = array();
@@ -20,15 +20,15 @@ 
 	function init() {
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if(Context::getSslStatus() == 'always') $this->uri_scheme = 'https://';
+		if (Context::getSslStatus() == 'always') $this->uri_scheme = 'https://';
 
 		$this->site_url = preg_replace('/\/+$/is', '', $config->site_url);
 		$this->syndication_password = $config->syndication_password;
 		$this->year = $config->year;
 
 		$output = executeQueryArray('syndication.getGrantedModules');
-		if($output->data) {
-			foreach($output->data as $key => $val) {
+		if ($output->data) {
+			foreach ($output->data as $key => $val) {
 				$this->granted_modules[] = $val->module_srl;
 			}
 		}
@@ -41,10 +41,10 @@ 
 		$args->module_srl = $module_srl;
 
 		$output = executeQuery('syndication.getExceptModule', $args);
-		if($output->data->count) return TRUE;
+		if ($output->data->count) return TRUE;
 
 		$output = executeQuery('syndication.getGrantedModule', $args);
-		if($output->data->count) return TRUE;
+		if ($output->data->count) return TRUE;
 
 		return FALSE;
 	}
@@ -55,7 +55,7 @@ 
 		$module_srls = array();
 		if (is_array($output->data))
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
 				$module_srls[] = $val->module_srl;
 			}
@@ -65,21 +65,21 @@ 
 
 	function getLang($key, $site_srl)
 	{
-		if(!$this->langs[$site_srl])
+		if (!$this->langs[$site_srl])
 		{
 			$this->langs[$site_srl] = array();
 			$args = new stdClass;
 			$args->site_srl = $site_srl;
 			$args->lang_code = Context::getLangType();
 			$output = executeQueryArray("syndication.getLang", $args);
-			if(!$output->toBool() || !$output->data) return $key;
+			if (!$output->toBool() || !$output->data) return $key;
 
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
 				$this->langs[$site_srl][$value->name] = $value->value;
 			}
 		}
-		if($this->langs[$site_srl][$key])
+		if ($this->langs[$site_srl][$key])
 		{
 			return $this->langs[$site_srl][$key];
 		}
@@ -89,7 +89,7 @@ 
 	function handleLang($title, $site_srl)
 	{
 		$matches = NULL;
-		if(!preg_match("/\\\$user_lang->(.+)/", $title, $matches))
+		if (!preg_match("/\\\$user_lang->(.+)/", $title, $matches))
 		{
 			return $title;
 		}
@@ -102,9 +102,9 @@ 
 	function getSyndicationList() {
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if(!$config->year || !$config->site_url || !$config->syndication_token) 
+		if (!$config->year || !$config->site_url || !$config->syndication_token) 
 		{
-			return $this->makeObject(-1,'msg_check_syndication_config');
+			return $this->makeObject(-1, 'msg_check_syndication_config');
 		}
 
 		$id = Context::get('id');
@@ -114,49 +114,49 @@ 
 		$endTime = Context::get('end-time');
 
 		$page = Context::get('page');
-		if(!$page)
+		if (!$page)
 		{
 			$page = 1;
 		}
 		$vars = Context::getRequestVars();
-		if(!$id || !$type)
+		if (!$id || !$type)
 		{
-			return $this->makeObject(-1,'msg_invalid_request');
+			return $this->makeObject(-1, 'msg_invalid_request');
 		}
 
-		if(!preg_match('/^tag:([^,]+),([0-9]+):(site|channel|article)(.*)$/i',$id,$matches)) 
+		if (!preg_match('/^tag:([^,]+),([0-9]+):(site|channel|article)(.*)$/i', $id, $matches)) 
 		{
-			return $this->makeObject(-1,'msg_invalid_request');
+			return $this->makeObject(-1, 'msg_invalid_request');
 		}
 
-		if($config->syndication_password != Context::get('syndication_password'))
+		if ($config->syndication_password != Context::get('syndication_password'))
 		{
-			return $this->makeObject(-1,'msg_invalid_request');
+			return $this->makeObject(-1, 'msg_invalid_request');
 		}
 
 		$url = $matches[1];
 		$year = $matches[2];
 		$target = $matches[3];
 		$id = $matches[4];
-		if($id && $id{0}==':')
+		if ($id && $id{0} == ':')
 		{
 			$id = substr($id, 1);
 		}
 
 		$module_srl = null;
 		$document_srl = null;
-		if($id && strpos($id,'-')!==false) 
+		if ($id && strpos($id, '-') !== false) 
 		{
 			list($module_srl, $document_srl) = explode('-', $id);
 		}
-		elseif($id) 
+		elseif ($id) 
 		{
 			$module_srl = $id;
 		}
 
-		if(!$url || !$year || !$target)
+		if (!$url || !$year || !$target)
 		{
-			return $this->makeObject(-1,'msg_invalid_request');
+			return $this->makeObject(-1, 'msg_invalid_request');
 		}
 
 		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
@@ -164,12 +164,12 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 
-		if($target == 'channel' && !$module_srl)
+		if ($target == 'channel' && !$module_srl)
 		{
 			$target = 'site';
 		}
 
-		if($module_srl)
+		if ($module_srl)
 		{
 			$args = new stdClass;
 			$args->module_srls = $module_srl;
@@ -178,13 +178,13 @@ 
 			self::$modules[$module_srl] = $output->data;
 		}
 
-		if($target == 'channel' && $module_srl)
+		if ($target == 'channel' && $module_srl)
 		{
-			if($module_info) 
+			if ($module_info) 
 			{
 				$args->module_srl = $module_srl;
 				$output = executeQuery('syndication.getExceptModules', $args);
-				if($output->data->count) 
+				if ($output->data->count) 
 				{
 					$error = 'target is not founded';
 				}
@@ -197,7 +197,7 @@ 
 			unset($args);
 		}
 
-		if(!$error) 
+		if (!$error) 
 		{
 			Context::set('target', $target);
 			Context::set('type', $type);
@@ -208,20 +208,20 @@ 
 			$oModuleModel = getModel('module');
 			$site_config = $oModuleModel->getModuleConfig('module');
 
-			switch($target) 
+			switch ($target) 
 			{
 				case 'site' :
 						$site_info = new stdClass;
 						$site_info->id = $this->getID('site');
-						$site_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
+						$site_info->site_url = getFullSiteUrl($this->uri_scheme.$this->site_url, '');
 						$site_info->site_title = $this->handleLang($site_module_info->browser_title, $site_module_info->site_srl);
 						$site_info->title = $site_info->site_title;
 
-						if($module_srl)
+						if ($module_srl)
 						{
 							$args->module_srl = $module_srl;
 							$site_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
-							if(!$site_info->title)
+							if (!$site_info->title)
 							{
 								$site_info->title = $site_info->site_title;
 							}
@@ -229,10 +229,10 @@ 
 						else
 						{
 							$except_module_output = executeQueryArray('syndication.getExceptModuleSrls');
-							if(is_array($except_module_output->data))
+							if (is_array($except_module_output->data))
 							{
 								$except_module_srls = array();
-								foreach($except_module_output->data as $val)
+								foreach ($except_module_output->data as $val)
 								{
 									$except_module_srls[] = $val->module_srl;
 								}
@@ -242,25 +242,25 @@ 
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
 
-						if($output->data)
+						if ($output->data)
 						{
 							$site_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
 						}
 
-						$site_info->self_href = $this->getSelfHref($site_info->id,$type);
+						$site_info->self_href = $this->getSelfHref($site_info->id, $type);
 						Context::set('site_info', $site_info);
 
 						$this->setTemplateFile('site');
-						switch($type) {
+						switch ($type) {
 							case 'article' :
 								// 문서 전체를 신디케이션에 추가
-								Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article',$site_info->id));
+								Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article', $site_info->id));
 								$next_url = Context::get('articles')->next_url;
 								
 								break;
 							case 'deleted' :
 								// 문서 전체를 신디케이션에서 삭제
-								Context::set('deleted', $this->getArticles($module_srl, $page, $startTime, $endTime, 'deleted',$site_info->id));
+								Context::set('deleted', $this->getArticles($module_srl, $page, $startTime, $endTime, 'deleted', $site_info->id));
 								$next_url = Context::get('deleted')->next_url;
 								break;
 							default :
@@ -269,7 +269,7 @@ 
 						}
 
 						// 다음 페이지가 있다면 다시 신디케이션 호출
-						if($next_url)
+						if ($next_url)
 						{
 							$oSyndicationController = getController('syndication');
 							$oSyndicationController->ping(Context::get('id'), Context::get('type'), ++$page);
@@ -282,10 +282,10 @@ 
 						$channel_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
 						$channel_info->updated = date("Y-m-d\\TH:i:s").$time_zone;
 						$channel_info->self_href = $this->getSelfHref($channel_info->id, $type);
-						$channel_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
+						$channel_info->site_url = getFullSiteUrl($this->uri_scheme.$this->site_url, '');
 						$channel_info->alternative_href = $this->getChannelAlternativeHref($module_info->module_srl);
 						$channel_info->summary = $module_info->description;
-						if($module_info->module == "textyle")
+						if ($module_info->module == "textyle")
 						{
 							$channel_info->type = "blog";
 							$channel_info->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
@@ -295,17 +295,17 @@ 
 							$channel_info->type = "web";
 						}
 						$except_module_srls = $this->getExceptModuleSrls();
-						if($except_module_srls)
+						if ($except_module_srls)
 						{
-							$args->except_modules = implode(',',$except_module_srls);
+							$args->except_modules = implode(',', $except_module_srls);
 						}
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						if ($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
 						Context::set('channel_info', $channel_info);
 
 						$this->setTemplateFile('channel');
-						switch($type) {
+						switch ($type) {
 							case 'article' :
 									Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article', $channel_info->id));
 								break;
@@ -323,29 +323,29 @@ 
 						$channel_info->id = $this->getID('channel', $module_info->module_srl);
 						$channel_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
 						$channel_info->site_title = $site_config->siteTitle;
-						if(!$channel_info->site_title) {
+						if (!$channel_info->site_title) {
 							$channel_info->site_title = $channel_info->title;
 						}
 						$channel_info->updated = date("Y-m-d\\TH:i:s").$time_zone;
 						$channel_info->self_href = $this->getSelfHref($channel_info->id, $type);
-						$channel_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
+						$channel_info->site_url = getFullSiteUrl($this->uri_scheme.$this->site_url, '');
 						$channel_info->alternative_href = $this->getChannelAlternativeHref($module_info->module_srl);
 						$channel_info->webmaster_name = $member_config->webmaster_name;
 						$channel_info->webmaster_email = $member_config->webmaster_email;
 
 						$except_module_srls = $this->getExceptModuleSrls();
-						if($except_module_srls)
+						if ($except_module_srls)
 						{
-							$args->except_modules = implode(',',$except_module_srls);
+							$args->except_modules = implode(',', $except_module_srls);
 						}
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						if ($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
 						Context::set('channel_info', $channel_info);
 						Context::set('member_config', $member_config);
 
 						$this->setTemplateFile('channel');
-						switch($type) {
+						switch ($type) {
 							case "article" :
 								$articles = new stdClass; 
 								$articles->list = array($this->getArticle($document_srl));
@@ -371,15 +371,15 @@ 
 
 	// @DEPRECATED
 	function getChannels() {
-		if($module_srls) $args->module_srls = $module_srls;
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
+		if ($module_srls) $args->module_srls = $module_srls;
+		if (count($this->granted_modules)) $args->except_module_srls = implode(',', $this->granted_modules);
 		$output = executeQueryArray('syndication.getModules', $args);
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
-		if($output->data) {
-			foreach($output->data as $module_info) {
+		if ($output->data) {
+			foreach ($output->data as $module_info) {
 				unset($obj);
 				$obj = new stdClass;
 				$obj->id = $this->getID('channel', $module_info->module_srl);
@@ -388,7 +388,7 @@ 
 				$obj->self_href = $this->getSelfHref($obj->id, 'channel');
 				$obj->alternative_href = $this->getChannelAlternativeHref($module_info);
 				$obj->summary = $module_info->description;
-				if($module_info->module == "textyle")
+				if ($module_info->module == "textyle")
 				{
 					$obj->type = "blog";
 					$obj->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
@@ -405,15 +405,15 @@ 
 	}
 
 	function getArticle($document_srl) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
 		$oDocumentModel = getModel('document');
-		$oDocument = $oDocumentModel->getDocument($document_srl,false,false);
-		if(!$oDocument->isExists()) return;
+		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
+		if (!$oDocument->isExists()) return;
 
 		$val = $oDocument->getObjectVars();
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
 		$mdoule_info = self::$modules[$oDocument->get('module_srl')];
@@ -427,7 +427,7 @@ 
 		$article->nick_name = (!$oDocument->get('nick_name')) ? $oDocument->get('user_name') : $oDocument->get('nick_name');
 		$article->title = $oDocument->getTitle();
 		$article->content = $oDocument->get('content');
-		if($val->category_srl) {
+		if ($val->category_srl) {
 			$category = $oDocumentModel->getCategory($val->category_srl);
 			$category_title = $category->title;
 			$article->category = new stdClass();
@@ -438,14 +438,14 @@ 
 		return $article;
 	}
 
-	function getArticles($module_srl = null, $page=1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
+	function getArticles($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
+		if ($this->site_url == null) $this->init();
 
 		$args = new stdClass;
-		if($module_srl) $args->module_srl = $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
+		if ($module_srl) $args->module_srl = $module_srl;
+		if ($startTime) $args->start_date = $this->getDate($startTime);
+		if ($endTime) $args->end_date = $this->getDate($endTime);
+		if (count($this->granted_modules)) $args->except_module_srls = implode(',', $this->granted_modules);
 		$args->page = $page;
 		$output = executeQueryArray('syndication.getDocumentList', $args);
 		$cur_page = $output->page_navigation->cur_page;
@@ -455,23 +455,23 @@ 
 		$result->next_url = null;
 		$result->list = array();
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
-		if($cur_page<$total_page) {
+		if ($cur_page < $total_page) {
 			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
-			$result->next_url = $next_url.'&page='.($cur_page+1);
+			if ($startTime) $next_url .= '&startTime='.$startTime;
+			if ($endTime) $next_url .= '&endTime='.$endTime;
+			$result->next_url = $next_url.'&page='.($cur_page + 1);
 		}
 
-		if($output->data) {
-			foreach($output->data as $key => $val) {
+		if ($output->data) {
+			foreach ($output->data as $key => $val) {
 				$article = new stdClass();
 				$article->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
 				$article->updated = date("Y-m-d\\TH:i:s", ztime($val->last_update)).$time_zone;
 				$article->published = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-				$article->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'document_srl', $val->document_srl);
+				$article->alternative_href = getFullSiteUrl($this->uri_scheme.$this->site_url, '', 'document_srl', $val->document_srl);
 				$article->channel_alternative_href = $this->getChannelAlternativeHref($val->module_srl);
 				$article->nick_name = (!$val->nick_name) ? $val->user_name : $val->nick_name;
 				$article->content = $val->content;
@@ -482,12 +482,12 @@ 
 	}
 
 	function getDeleted($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
 		$args = new stdClass;
-		if($module_srl) $args->module_srl= $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
+		if ($module_srl) $args->module_srl = $module_srl;
+		if ($startTime) $args->start_date = $this->getDate($startTime);
+		if ($endTime) $args->end_date = $this->getDate($endTime);
 		$args->page = $page;
 
 		$output = executeQueryArray('syndication.getDeletedList', $args);
@@ -499,21 +499,21 @@ 
 		$result->next_url = null;
 		$result->list = array();
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
-		if($cur_page<$total_page) {
+		if ($cur_page < $total_page) {
 			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
-			$result->next_url = $next_url . '&page='.($cur_page+1);
+			if ($startTime) $next_url .= '&startTime='.$startTime;
+			if ($endTime) $next_url .= '&endTime='.$endTime;
+			$result->next_url = $next_url.'&page='.($cur_page + 1);
 		}
 
-		if($output->data) {
-			foreach($output->data as $key => $val) {
+		if ($output->data) {
+			foreach ($output->data as $key => $val) {
 				$val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
 				$val->deleted = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-				$val->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'document_srl', $val->document_srl);
+				$val->alternative_href = getFullSiteUrl($this->uri_scheme.$this->site_url, '', 'document_srl', $val->document_srl);
 				$val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
 				$output->data[$key] = $val;
 			}
@@ -530,25 +530,25 @@ 
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('syndication.getDeletedList', $args);
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$module_srl = $val->module_srl;
 
-			if(!isset($module_info[$module_srl]))
+			if (!isset($module_info[$module_srl]))
 			{
 				$args = new stdClass;
 				$args->module_srl = $module_srl;
 				$module_output = executeQuery('syndication.getModuleSiteInfo', $args);
-				if($module_output->data) $module_info[$module_srl] = $module_output->data;
+				if ($module_output->data) $module_info[$module_srl] = $module_output->data;
 				else $module_info[$module_srl] = null;
 			}
 
 			$val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
 			$val->deleted = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-			$val->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'mid', $module_info[$module_srl]->mid, 'document_srl', $val->document_srl);
+			$val->alternative_href = getFullSiteUrl($this->uri_scheme.$this->site_url, '', 'mid', $module_info[$module_srl]->mid, 'document_srl', $val->document_srl);
 			$val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
 			$output->data[$key] = $val;
 		}
@@ -557,42 +557,42 @@ 
 	}
 
 	function getID($type, $target_id = null) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
-		return sprintf('tag:%s,%d:%s', $this->site_url, $this->year, $type) . ($target_id?':'.$target_id:'');
+		return sprintf('tag:%s,%d:%s', $this->site_url, $this->year, $type).($target_id ? ':'.$target_id : '');
 	}
 
 	function getChannelAlternativeHref($module_srl) {
 		static $module_info = array();
-		if(!isset($module_info[$module_srl])) {
+		if (!isset($module_info[$module_srl])) {
 			$args = new stdClass;
 			$args->module_srl = $module_srl;
 			$output = executeQuery('syndication.getModuleSiteInfo', $args);
-			if($output->data) $module_info[$module_srl] = $output->data;
+			if ($output->data) $module_info[$module_srl] = $output->data;
 			else $module_info[$module_srl] = null;
 		}
 
-		if(is_null($module_info[$module_srl])) return $this->site_url;
+		if (is_null($module_info[$module_srl])) return $this->site_url;
 
 		$domain = $module_info[$module_srl]->domain;
 		$url = getFullSiteUrl($domain, '', 'mid', $module_info[$module_srl]->mid);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url . $url;
+		if (substr($url, 0, 1) == '/') $domain = $this->uri_scheme.$this->site_url.$url;
 		return $url;
 	}
 
 	function getSelfHref($id, $type = null) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
-		return  sprintf('%s/?module=syndication&act=getSyndicationList&id=%s&type=%s&syndication_password=%s', $this->uri_scheme . $this->site_url, $id, $type, $this->syndication_password);
+		return  sprintf('%s/?module=syndication&act=getSyndicationList&id=%s&type=%s&syndication_password=%s', $this->uri_scheme.$this->site_url, $id, $type, $this->syndication_password);
 	}
 
 	/**
 	 * 문서의 고유 URL 반환
 	 */
 	function getAlternativeHref($document_srl, $module_srl) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
-		if(!self::$modules[$module_srl]) {
+		if (!self::$modules[$module_srl]) {
 			$args = new stdClass;
 			$args->module_srls = $module_srl;
 			$output = executeQuery('syndication.getModules', $args);
@@ -604,20 +604,20 @@ 
 
 		$domain = $module_info->domain;
 		$url = getFullSiteUrl($domain, '', 'mid', $module_info->mid, 'document_srl', $document_srl);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url.$url;
+		if (substr($url, 0, 1) == '/') $domain = $this->uri_scheme.$this->site_url.$url;
 		return $url;
 	}
 
 	function getDate($date) {
 		$time = strtotime($date);
-		if($time == -1) $time = ztime(str_replace(array('-','T',':'),'',$date));
+		if ($time == -1) $time = ztime(str_replace(array('-', 'T', ':'), '', $date));
 		return date('YmdHis', $time);
 	}
 
 	function getResentPingLogPath()
 	{
 		$target_filename = _XE_PATH_.'files/cache/tmp/syndication_ping_log';
-		if(!file_exists($target_filename))
+		if (!file_exists($target_filename))
 		{
 			FileHandler::writeFile($target_filename, '');
 		}
@@ -633,7 +633,7 @@ 
 		$args->message = urlencode($msg);
 
 		$list = $this->getResentPingLog();
-		if(count($list)>=10)
+		if (count($list) >= 10)
 		{
 			array_pop($list);
 		}
@@ -648,7 +648,7 @@ 
 		$file_path = $this->getResentPingLogPath();
 		$str = FileHandler::readFile($file_path);
 		$list = array();
-		if($str)
+		if ($str)
 		{
 			$list = unserialize($str);
 		}

Braces +108 added lines, -47 removed lines

@@ -20,7 +20,9 @@ 
 	function init() {
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if(Context::getSslStatus() == 'always') $this->uri_scheme = 'https://';
+		if(Context::getSslStatus() == 'always') {
+			$this->uri_scheme = 'https://';
+		}
 
 		$this->site_url = preg_replace('/\/+$/is', '', $config->site_url);
 		$this->syndication_password = $config->syndication_password;
@@ -41,10 +43,14 @@ 
 		$args->module_srl = $module_srl;
 
 		$output = executeQuery('syndication.getExceptModule', $args);
-		if($output->data->count) return TRUE;
+		if($output->data->count) {
+			return TRUE;
+		}
 
 		$output = executeQuery('syndication.getGrantedModule', $args);
-		if($output->data->count) return TRUE;
+		if($output->data->count) {
+			return TRUE;
+		}
 
 		return FALSE;
 	}
@@ -72,7 +78,9 @@ 
 			$args->site_srl = $site_srl;
 			$args->lang_code = Context::getLangType();
 			$output = executeQueryArray("syndication.getLang", $args);
-			if(!$output->toBool() || !$output->data) return $key;
+			if(!$output->toBool() || !$output->data) {
+				return $key;
+			}
 
 			foreach($output->data as $value)
 			{
@@ -82,8 +90,9 @@ 
 		if($this->langs[$site_srl][$key])
 		{
 			return $this->langs[$site_srl][$key];
+		} else {
+			return $key;
 		}
-		else return $key;
 	}
 
 	function handleLang($title, $site_srl)
@@ -92,8 +101,7 @@ 
 		if(!preg_match("/\\\$user_lang->(.+)/", $title, $matches))
 		{
 			return $title;
-		}
-		else
+		} else
 		{
 			return $this->getLang($matches[1], $site_srl);
 		}
@@ -148,8 +156,7 @@ 
 		if($id && strpos($id,'-')!==false) 
 		{
 			list($module_srl, $document_srl) = explode('-', $id);
-		}
-		elseif($id) 
+		} elseif($id) 
 		{
 			$module_srl = $id;
 		}
@@ -188,8 +195,7 @@ 
 				{
 					$error = 'target is not founded';
 				}
-			} 
-			else 
+			} else 
 			{
 				$error = 'target is not founded';
 			}
@@ -225,8 +231,7 @@ 
 							{
 								$site_info->title = $site_info->site_title;
 							}
-						}
-						else
+						} else
 						{
 							$except_module_output = executeQueryArray('syndication.getExceptModuleSrls');
 							if(is_array($except_module_output->data))
@@ -289,8 +294,7 @@ 
 						{
 							$channel_info->type = "blog";
 							$channel_info->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
-						}
-						else
+						} else
 						{
 							$channel_info->type = "web";
 						}
@@ -301,7 +305,9 @@ 
 						}
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						if($output->data) {
+							$channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						}
 						Context::set('channel_info', $channel_info);
 
 						$this->setTemplateFile('channel');
@@ -340,7 +346,9 @@ 
 						}
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						if($output->data) {
+							$channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						}
 						Context::set('channel_info', $channel_info);
 						Context::set('member_config', $member_config);
 
@@ -371,8 +379,12 @@ 
 
 	// @DEPRECATED
 	function getChannels() {
-		if($module_srls) $args->module_srls = $module_srls;
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
+		if($module_srls) {
+			$args->module_srls = $module_srls;
+		}
+		if(count($this->granted_modules)) {
+			$args->except_module_srls = implode(',',$this->granted_modules);
+		}
 		$output = executeQueryArray('syndication.getModules', $args);
 
 		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
@@ -392,8 +404,7 @@ 
 				{
 					$obj->type = "blog";
 					$obj->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
-				}
-				else
+				} else
 				{
 					$obj->type = "web";
 				}
@@ -405,11 +416,15 @@ 
 	}
 
 	function getArticle($document_srl) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl,false,false);
-		if(!$oDocument->isExists()) return;
+		if(!$oDocument->isExists()) {
+			return;
+		}
 
 		$val = $oDocument->getObjectVars();
 
@@ -439,13 +454,23 @@ 
 	}
 
 	function getArticles($module_srl = null, $page=1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		$args = new stdClass;
-		if($module_srl) $args->module_srl = $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
+		if($module_srl) {
+			$args->module_srl = $module_srl;
+		}
+		if($startTime) {
+			$args->start_date = $this->getDate($startTime);
+		}
+		if($endTime) {
+			$args->end_date = $this->getDate($endTime);
+		}
+		if(count($this->granted_modules)) {
+			$args->except_module_srls = implode(',',$this->granted_modules);
+		}
 		$args->page = $page;
 		$output = executeQueryArray('syndication.getDocumentList', $args);
 		$cur_page = $output->page_navigation->cur_page;
@@ -460,8 +485,12 @@ 
 
 		if($cur_page<$total_page) {
 			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
+			if($startTime) {
+				$next_url .= '&startTime='.$startTime;
+			}
+			if($endTime) {
+				$next_url .= '&endTime='.$endTime;
+			}
 			$result->next_url = $next_url.'&page='.($cur_page+1);
 		}
 
@@ -482,12 +511,20 @@ 
 	}
 
 	function getDeleted($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		$args = new stdClass;
-		if($module_srl) $args->module_srl= $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
+		if($module_srl) {
+			$args->module_srl= $module_srl;
+		}
+		if($startTime) {
+			$args->start_date = $this->getDate($startTime);
+		}
+		if($endTime) {
+			$args->end_date = $this->getDate($endTime);
+		}
 		$args->page = $page;
 
 		$output = executeQueryArray('syndication.getDeletedList', $args);
@@ -504,8 +541,12 @@ 
 
 		if($cur_page<$total_page) {
 			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
+			if($startTime) {
+				$next_url .= '&startTime='.$startTime;
+			}
+			if($endTime) {
+				$next_url .= '&endTime='.$endTime;
+			}
 			$result->next_url = $next_url . '&page='.($cur_page+1);
 		}
 
@@ -542,8 +583,11 @@ 
 				$args = new stdClass;
 				$args->module_srl = $module_srl;
 				$module_output = executeQuery('syndication.getModuleSiteInfo', $args);
-				if($module_output->data) $module_info[$module_srl] = $module_output->data;
-				else $module_info[$module_srl] = null;
+				if($module_output->data) {
+					$module_info[$module_srl] = $module_output->data;
+				} else {
+					$module_info[$module_srl] = null;
+				}
 			}
 
 			$val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
@@ -557,7 +601,9 @@ 
 	}
 
 	function getID($type, $target_id = null) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		return sprintf('tag:%s,%d:%s', $this->site_url, $this->year, $type) . ($target_id?':'.$target_id:'');
 	}
@@ -568,20 +614,29 @@ 
 			$args = new stdClass;
 			$args->module_srl = $module_srl;
 			$output = executeQuery('syndication.getModuleSiteInfo', $args);
-			if($output->data) $module_info[$module_srl] = $output->data;
-			else $module_info[$module_srl] = null;
+			if($output->data) {
+				$module_info[$module_srl] = $output->data;
+			} else {
+				$module_info[$module_srl] = null;
+			}
 		}
 
-		if(is_null($module_info[$module_srl])) return $this->site_url;
+		if(is_null($module_info[$module_srl])) {
+			return $this->site_url;
+		}
 
 		$domain = $module_info[$module_srl]->domain;
 		$url = getFullSiteUrl($domain, '', 'mid', $module_info[$module_srl]->mid);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url . $url;
+		if(substr($url,0,1)=='/') {
+			$domain = $this->uri_scheme . $this->site_url . $url;
+		}
 		return $url;
 	}
 
 	function getSelfHref($id, $type = null) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		return  sprintf('%s/?module=syndication&act=getSyndicationList&id=%s&type=%s&syndication_password=%s', $this->uri_scheme . $this->site_url, $id, $type, $this->syndication_password);
 	}
@@ -590,7 +645,9 @@ 
 	 * 문서의 고유 URL 반환
 	 */
 	function getAlternativeHref($document_srl, $module_srl) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		if(!self::$modules[$module_srl]) {
 			$args = new stdClass;
@@ -604,13 +661,17 @@ 
 
 		$domain = $module_info->domain;
 		$url = getFullSiteUrl($domain, '', 'mid', $module_info->mid, 'document_srl', $document_srl);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url.$url;
+		if(substr($url,0,1)=='/') {
+			$domain = $this->uri_scheme . $this->site_url.$url;
+		}
 		return $url;
 	}
 
 	function getDate($date) {
 		$time = strtotime($date);
-		if($time == -1) $time = ztime(str_replace(array('-','T',':'),'',$date));
+		if($time == -1) {
+			$time = ztime(str_replace(array('-','T',':'),'',$date));
+		}
 		return date('YmdHis', $time);
 	}
 

modules/document/document.admin.controller.php

Spacing +127 added lines, -127 removed lines

@@ -27,21 +27,21 @@ 
 	{
 		// error appears if no doc is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_cart_is_null');
-		$document_srl_list= explode('|@|', $cart);
+		if (!$cart) return $this->stop('msg_cart_is_null');
+		$document_srl_list = explode('|@|', $cart);
 		$document_count = count($document_srl_list);
-		if(!$document_count) return $this->stop('msg_cart_is_null');
+		if (!$document_count) return $this->stop('msg_cart_is_null');
 		// Delete a doc
 		$oDocumentController = getController('document');
-		for($i=0;$i<$document_count;$i++)
+		for ($i = 0; $i < $document_count; $i++)
 		{
 			$document_srl = trim($document_srl_list[$i]);
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
 			$oDocumentController->deleteDocument($document_srl, true);
 		}
 
-		$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
+		$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count));
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	function moveDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(!count($document_srl_list)) return;
+		if (!count($document_srl_list)) return;
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -62,24 +62,24 @@ 
 		$oDB->begin();
 
 		$triggerObj = new stdClass();
-		$triggerObj->document_srls = implode(',',$document_srl_list);
+		$triggerObj->document_srls = implode(',', $document_srl_list);
 		$triggerObj->module_srl = $module_srl;
 		$triggerObj->source_module_srl = array();
 		$triggerObj->category_srl = $category_srl;
 
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.moveDocumentModule', 'before', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		for($i=count($document_srl_list)-1;$i>=0;$i--)
+		for ($i = count($document_srl_list) - 1; $i >= 0; $i--)
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if (!$oDocument->isExists()) continue;
 
 			$triggerObj->source_module_srl[$document_srl] = $oDocument->get('module_srl');
 
@@ -94,27 +94,27 @@ 
 			$obj->content = $output_ori->data->content;
 
 			// Move the attached file if the target module is different
-			if($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles())
+			if ($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles())
 			{
 				$oFileController = getController('file');
 
 				$files = $oDocument->getUploadedFiles();
 				$delete_file_srls = array();
-				if(is_array($files))
+				if (is_array($files))
 				{
-					foreach($files as $val)
+					foreach ($files as $val)
 					{
 						$file_info = array();
 						$file_info['tmp_name'] = $val->uploaded_filename;
 						$file_info['name'] = $val->source_filename;
 						$inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, $val->download_count, true);
-						if($inserted_file && $inserted_file->toBool())
+						if ($inserted_file && $inserted_file->toBool())
 						{
 							// for image/video files
-							if($val->direct_download == 'Y')
+							if ($val->direct_download == 'Y')
 							{
-								$source_filename = substr($val->uploaded_filename,2);
-								$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+								$source_filename = substr($val->uploaded_filename, 2);
+								$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 								$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 								// For binary files
 							}
@@ -133,7 +133,7 @@ 
 				$oFileController->setFilesValid($obj->document_srl);
 			}
 
-			if($module_srl != $obj->module_srl)
+			if ($module_srl != $obj->module_srl)
 			{
 				$oDocumentController->deleteDocumentAliasByDocument($obj->document_srl);
 			}
@@ -141,48 +141,48 @@ 
 			$obj->module_srl = $module_srl;
 			$obj->category_srl = $category_srl;
 			$output = executeQuery('document.updateDocumentModule', $obj);
-			if(!$output->toBool()) {
+			if (!$output->toBool()) {
 				$oDB->rollback();
 				return $output;
 			}
 
 			//Move a module of the extra vars
 			$output = executeQuery('document.moveDocumentExtraVars', $obj);
-			if(!$output->toBool()) {
+			if (!$output->toBool()) {
 				$oDB->rollback();
 				return $output;
 			}
 			// Set 0 if a new category doesn't exist after catergory change
-			if($source_category_srl != $category_srl)
+			if ($source_category_srl != $category_srl)
 			{
-				if($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
-				if($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				if ($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
+				if ($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
 			}
 		}
 
 		$args = new stdClass();
-		$args->document_srls = implode(',',$document_srl_list);
+		$args->document_srls = implode(',', $document_srl_list);
 		$args->module_srl = $module_srl;
 		// move the comment
 		$output = executeQuery('comment.updateCommentModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = executeQuery('comment.updateCommentListModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		
 		// move the trackback
-		if(getClass('trackback'))
+		if (getClass('trackback'))
 		{
 			$output = executeQuery('trackback.updateTrackbackModule', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -191,14 +191,14 @@ 
 
 		// Tags
 		$output = executeQuery('tag.updateTagModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.moveDocumentModule', 'after', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -207,11 +207,11 @@ 
 		$oDB->commit();
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			foreach($document_srl_list as $document_srl)
+			foreach ($document_srl_list as $document_srl)
 			{
-				$cache_key_item = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+				$cache_key_item = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 				$oCacheHandler->delete($cache_key_item);
 			}
 		}
@@ -227,7 +227,7 @@ 
 	 */
 	function copyDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(count($document_srl_list) < 1) return;
+		if (count($document_srl_list) < 1) return;
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -238,12 +238,12 @@ 
 		$oDB->begin();
 
 		$triggerObj = new stdClass();
-		$triggerObj->document_srls = implode(',',$document_srl_list);
+		$triggerObj->document_srls = implode(',', $document_srl_list);
 		$triggerObj->module_srl = $module_srl;
 		$triggerObj->category_srl = $category_srl;
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.copyDocumentModule', 'before', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -251,11 +251,11 @@ 
 
 		$extraVarsList = $oDocumentModel->getDocumentExtraVarsFromDB($document_srl_list);
 		$extraVarsListByDocumentSrl = array();
-		if(is_array($extraVarsList->data))
+		if (is_array($extraVarsList->data))
 		{
-			foreach($extraVarsList->data as $value)
+			foreach ($extraVarsList->data as $value)
 			{
-				if(!isset($extraVarsListByDocumentSrl[$value->document_srl]))
+				if (!isset($extraVarsListByDocumentSrl[$value->document_srl]))
 				{
 					$extraVarsListByDocumentSrl[$value->document_srl] = array();
 				}
@@ -264,22 +264,22 @@ 
 			}
 		}
 
-		for($i=count($document_srl_list)-1;$i>=0;$i--)
+		for ($i = count($document_srl_list) - 1; $i >= 0; $i--)
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if (!$oDocument->isExists()) continue;
 
 			$obj = $oDocument->getObjectVars();
 
 			$extraVars = $extraVarsListByDocumentSrl[$document_srl];
-			if($module_srl == $obj->module_srl)
+			if ($module_srl == $obj->module_srl)
 			{
-				if(is_array($extraVars))
+				if (is_array($extraVars))
 				{
-					foreach($extraVars as $extraItem)
+					foreach ($extraVars as $extraItem)
 					{
-						if($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						if ($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
 					}
 				}
 			}
@@ -291,10 +291,10 @@ 
 			$obj->trackback_count = 0;
 
 			// Pre-register the attachment
-			if($oDocument->hasUploadedFiles())
+			if ($oDocument->hasUploadedFiles())
 			{
 				$files = $oDocument->getUploadedFiles();
-				foreach($files as $val)
+				foreach ($files as $val)
 				{
 					$file_info = array();
 					$file_info['tmp_name'] = $val->uploaded_filename;
@@ -302,10 +302,10 @@ 
 					$oFileController = getController('file');
 					$inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, 0, true);
 					// if image/video files
-					if($val->direct_download == 'Y')
+					if ($val->direct_download == 'Y')
 					{
-						$source_filename = substr($val->uploaded_filename,2);
-						$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+						$source_filename = substr($val->uploaded_filename, 2);
+						$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 						$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 						// If binary file
 					}
@@ -319,23 +319,23 @@ 
 
 			// Write a post
 			$output = $oDocumentController->insertDocument($obj, true, true);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
 			}
 
 			// copy multi language contents
-			if(is_array($extraVars))
+			if (is_array($extraVars))
 			{
-				foreach($extraVars as $value)
+				foreach ($extraVars as $value)
 				{
-					if($value->idx >= 0 && $value->lang_code == Context::getLangType())
+					if ($value->idx >= 0 && $value->lang_code == Context::getLangType())
 					{
 						continue;
 					}
 
-					if( $value->var_idx < 0 || ($module_srl == $value->module_srl && $value->var_idx >= 0) )
+					if ($value->var_idx < 0 || ($module_srl == $value->module_srl && $value->var_idx >= 0))
 					{
 						$oDocumentController->insertDocumentExtraVar($value->module_srl, $obj->document_srl, $value->var_idx, $value->value, $value->eid, $value->lang_code);
 					}
@@ -343,26 +343,26 @@ 
 			}
 
 			// Move the comments
-			if($oDocument->getCommentCount())
+			if ($oDocument->getCommentCount())
 			{
 				$oCommentModel = getModel('comment');
 				$comment_output = $oCommentModel->getCommentList($document_srl, 0, true, 99999999);
 				$comments = $comment_output->data;
-				if(count($comments) > 0)
+				if (count($comments) > 0)
 				{
 					$oCommentController = getController('comment');
 					$success_count = 0;
 					$p_comment_srl = array();
-					foreach($comments as $comment_obj)
+					foreach ($comments as $comment_obj)
 					{
 						$comment_srl = getNextSequence();
 						$p_comment_srl[$comment_obj->comment_srl] = $comment_srl;
 
 						// Pre-register the attachment
-						if($comment_obj->uploaded_count)
+						if ($comment_obj->uploaded_count)
 						{
 							$files = $oFileModel->getFiles($comment_obj->comment_srl, true);
-							foreach($files as $val)
+							foreach ($files as $val)
 							{
 								$file_info = array();
 								$file_info['tmp_name'] = $val->uploaded_filename;
@@ -370,10 +370,10 @@ 
 								$oFileController = getController('file');
 								$inserted_file = $oFileController->insertFile($file_info, $module_srl, $comment_srl, 0, true);
 								// if image/video files
-								if($val->direct_download == 'Y')
+								if ($val->direct_download == 'Y')
 								{
-									$source_filename = substr($val->uploaded_filename,2);
-									$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+									$source_filename = substr($val->uploaded_filename, 2);
+									$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 									$comment_obj->content = str_replace($source_filename, $target_filename, $comment_obj->content);
 									// If binary file
 								}
@@ -389,10 +389,10 @@ 
 						$comment_obj->document_srl = $obj->document_srl;
 						$comment_obj->comment_srl = $comment_srl;
 
-						if($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						if ($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
 
 						$output = $oCommentController->insertComment($comment_obj, true);
-						if($output->toBool()) $success_count ++;
+						if ($output->toBool()) $success_count++;
 					}
 					$oDocumentController->updateCommentCount($obj->document_srl, $success_count, $comment_obj->nick_name, true);
 				}
@@ -400,19 +400,19 @@ 
 
 			// Move the trackbacks
 			$oTrackbackModel = getModel('trackback');
-			if($oTrackbackModel && $oDocument->getTrackbackCount())
+			if ($oTrackbackModel && $oDocument->getTrackbackCount())
 			{
 				$trackbacks = $oTrackbackModel->getTrackbackList($oDocument->document_srl);
-				if(count($trackbacks))
+				if (count($trackbacks))
 				{
 					$success_count = 0;
-					foreach($trackbacks as $trackback_obj)
+					foreach ($trackbacks as $trackback_obj)
 					{
 						$trackback_obj->trackback_srl = getNextSequence();
 						$trackback_obj->module_srl = $obj->module_srl;
 						$trackback_obj->document_srl = $obj->document_srl;
 						$output = executeQuery('trackback.insertTrackback', $trackback_obj);
-						if($output->toBool()) $success_count++;
+						if ($output->toBool()) $success_count++;
 					}
 					// Update the number of trackbacks
 					$oDocumentController->updateTrackbackCount($obj->document_srl, $success_count);
@@ -425,7 +425,7 @@ 
 		// Call a trigger (before)
 		$triggerObj->copied_srls = $copied_srls;
 		$output = ModuleHandler::triggerCall('document.copyDocumentModule', 'after', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -452,7 +452,7 @@ 
 		$document_list = $oDocumentModel->getDocumentList($args);
 		$documents = $document_list->data;
 		$output = executeQuery('document.deleteModuleDocument', $args);
-		if(is_array($documents))
+		if (is_array($documents))
 		{
 			foreach ($documents as $oDocument)
 			{
@@ -461,13 +461,13 @@ 
 		}
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			if(is_array($document_srl_list))
+			if (is_array($document_srl_list))
 			{
-				foreach($document_srl_list as $document_srl)
+				foreach ($document_srl_list as $document_srl)
 				{
-					$cache_key_item = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+					$cache_key_item = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 					$oCacheHandler->delete($cache_key_item);
 				}
 			}
@@ -486,8 +486,8 @@ 
 		$config = getModel('document')->getDocumentConfig();
 		$config->icons = Context::get('icons');
 		$config->micons = Context::get('micons');
-		$output = $oModuleController->insertModuleConfig('document',$config);
-		if(!$output->toBool())
+		$output = $oModuleController->insertModuleConfig('document', $config);
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -506,11 +506,11 @@ 
 	{
 		$document_srl = trim(Context::get('document_srl'));
 
-		if($document_srl)
+		if ($document_srl)
 		{
 			$args->document_srl = $document_srl;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 	}
 
@@ -520,7 +520,7 @@ 
 	 */
 	function procDocumentAdminDeleteAllThumbnail()
 	{
-		$temp_cache_dir = './files/thumbnails_' . $_SERVER['REQUEST_TIME'];
+		$temp_cache_dir = './files/thumbnails_'.$_SERVER['REQUEST_TIME'];
 		FileHandler::rename('./files/thumbnails', $temp_cache_dir);
 		FileHandler::makeDir('./files/thumbnails');
 
@@ -536,12 +536,12 @@ 
 	function deleteThumbnailFile($path)
 	{
 		$directory = dir($path);
-		while($entry = $directory->read()) {
+		while ($entry = $directory->read()) {
 			if ($entry != "." && $entry != "..") {
 				if (is_dir($path."/".$entry)) {
 					$this->deleteThumbnailFile($path."/".$entry);
 				} else {
-					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) continue;
+					if (!preg_match('/^thumbnail_([^\.]*)\.jpg$/i', $entry)) continue;
 					FileHandler::removeFile($path.'/'.$entry);
 				}
 			}
@@ -566,13 +566,13 @@ 
 		$eid = Context::get('eid');
 		$obj = new stdClass();
 
-		if(!$module_srl || !$name || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$name || !$eid) return new BaseObject(-1, 'msg_invalid_request');
 		// set the max value if idx is not specified
-		if(!$var_idx)
+		if (!$var_idx)
 		{
 			$obj->module_srl = $module_srl;
 			$output = executeQuery('document.getDocumentMaxExtraKeyIdx', $obj);
-			$var_idx = $output->data->var_idx+1;
+			$var_idx = $output->data->var_idx + 1;
 		}
 
 		// Check if the module name already exists
@@ -580,7 +580,7 @@ 
 		$obj->var_idx = $var_idx;
 		$obj->eid = $eid;
 		$output = executeQuery('document.isExistsExtraKey', $obj);
-		if(!$output->toBool() || $output->data->count)
+		if (!$output->toBool() || $output->data->count)
 		{
 			return new BaseObject(-1, 'msg_extra_name_exists');
 		}
@@ -588,7 +588,7 @@ 
 		// insert or update
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_registed');
 
@@ -604,11 +604,11 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
-		if(!$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$var_idx) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_deleted');
 	}
@@ -623,19 +623,19 @@ 
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
 
-		if(!$type || !$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if (!$type || !$module_srl || !$var_idx) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info->module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_info->module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!$extra_keys[$var_idx]) return new BaseObject(-1,'msg_invalid_request');
+		if (!$extra_keys[$var_idx]) return new BaseObject(-1, 'msg_invalid_request');
 
-		if($type == 'up') $new_idx = $var_idx-1;
-		else $new_idx = $var_idx+1;
-		if($new_idx<1) return new BaseObject(-1,'msg_invalid_request');
+		if ($type == 'up') $new_idx = $var_idx - 1;
+		else $new_idx = $var_idx + 1;
+		if ($new_idx < 1) return new BaseObject(-1, 'msg_invalid_request');
 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
@@ -646,16 +646,16 @@ 
 		unset($args);
 
 		// update immediately if there is no idx to change
-		if(!$extra_keys[$new_idx])
+		if (!$extra_keys[$new_idx])
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			// replace if exists
 		}
 		else
@@ -665,27 +665,27 @@ 
 			$args->var_idx = $new_idx;
 			$args->new_idx = -10000;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->var_idx = -10000;
 			$args->new_idx = $var_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_document_extra_keys:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -699,9 +699,9 @@ 
 	 */
 	function procDocumentAdminInsertAlias()
 	{
-		$args = Context::gets('module_srl','document_srl', 'alias_title');
+		$args = Context::gets('module_srl', 'document_srl', 'alias_title');
 		$alias_srl = Context::get('alias_srl');
-		if(!$alias_srl)
+		if (!$alias_srl)
 		{
 			$args->alias_srl = getNextSequence();
 			$query = "document.insertAlias";
@@ -744,7 +744,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-		if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+		if (!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
 	
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
@@ -756,31 +756,31 @@ 
 		$oDocumentController->moveDocumentToTrash($args);
 
 		$returnUrl = Context::get('success_return_url');
-		if(!$returnUrl)	
+		if (!$returnUrl)	
 		{
 			$arrUrl = parse_url(Context::get('cur_url'));
 			$query = "";
 
-			if($arrUrl['query'])
+			if ($arrUrl['query'])
 			{
 				parse_str($arrUrl['query'], $arrQuery);
 
 				// set query
-				if(isset($arrQuery['document_srl']))
+				if (isset($arrQuery['document_srl']))
 					unset($arrQuery['document_srl']);
 
 				$searchArgs = new stdClass;
-				foreach($arrQuery as $key=>$val)
+				foreach ($arrQuery as $key=>$val)
 				{
 					$searchArgs->{$key} = $val;
 				}
 
-				if(!isset($searchArgs->sort_index))
+				if (!isset($searchArgs->sort_index))
 					$searchArgs->sort_index = $module_info->order_target;
 
-				foreach($module_info as $key=>$val)
+				foreach ($module_info as $key=>$val)
 				{
-					if(!isset($searchArgs->{$key}))
+					if (!isset($searchArgs->{$key}))
 						$searchArgs->{$key} = $val;
 				}
 
@@ -788,20 +788,20 @@ 
 				$output = $oDocumentModel->getDocumentList($searchArgs, $module_info->except_notice, TRUE, array('document_srl'));
 
 				$cur_page = 1;
-				if(isset($arrQuery['page'])) {
-					$cur_page = (int)$arrQuery['page'];
+				if (isset($arrQuery['page'])) {
+					$cur_page = (int) $arrQuery['page'];
 				}
 
 
-				if($cur_page>1 && count($output->data) == 0)
+				if ($cur_page > 1 && count($output->data) == 0)
 					$arrQuery['page'] = $cur_page - 1;
 
 				$query = "?";
-				foreach($arrQuery as $key=>$val)
+				foreach ($arrQuery as $key=>$val)
 					$query .= sprintf("%s=%s&", $key, $val);
 				$query = substr($query, 0, -1);
 			}
-			$returnUrl = $arrUrl['path'] . $query;
+			$returnUrl = $arrUrl['path'].$query;
 		}
 
 		$this->add('redirect_url', $returnUrl);
@@ -878,7 +878,7 @@ 
 	 */
 	function restoreTrash($originObject)
 	{
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
 		$oDocumentController = getController('document');
 		$oDocumentModel = getModel('document');
@@ -888,12 +888,12 @@ 
 
 		//DB restore
 		$output = $oDocumentController->insertDocument($originObject, false, true, false);
-		if(!$output->toBool()) return new BaseObject(-1, $output->getMessage());
+		if (!$output->toBool()) return new BaseObject(-1, $output->getMessage());
 
 		//FILE restore
 		$oDocument = $oDocumentModel->getDocument($originObject->document_srl);
 		// If the post was not temorarily saved, set the attachment's status to be valid
-		if($oDocument->hasUploadedFiles() && $originObject->member_srl != $originObject->module_srl)
+		if ($oDocument->hasUploadedFiles() && $originObject->member_srl != $originObject->module_srl)
 		{
 			$args = new stdClass();
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -902,10 +902,10 @@ 
 		}
 
 		// call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.restoreTrash', 'after', $originObject);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -926,7 +926,7 @@ 
 	function emptyTrash($originObject)
 	{
 		$originObject = unserialize($originObject);
-		if(is_array($originObject)) $originObject = (object) $originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
 		$oDocument = new documentItem();
 		$oDocument->setAttribute($originObject);

Braces +136 added lines, -59 removed lines

@@ -27,16 +27,22 @@ 
 	{
 		// error appears if no doc is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_cart_is_null');
+		if(!$cart) {
+			return $this->stop('msg_cart_is_null');
+		}
 		$document_srl_list= explode('|@|', $cart);
 		$document_count = count($document_srl_list);
-		if(!$document_count) return $this->stop('msg_cart_is_null');
+		if(!$document_count) {
+			return $this->stop('msg_cart_is_null');
+		}
 		// Delete a doc
 		$oDocumentController = getController('document');
 		for($i=0;$i<$document_count;$i++)
 		{
 			$document_srl = trim($document_srl_list[$i]);
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			$oDocumentController->deleteDocument($document_srl, true);
 		}
@@ -53,7 +59,9 @@ 
 	 */
 	function moveDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(!count($document_srl_list)) return;
+		if(!count($document_srl_list)) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -79,7 +87,9 @@ 
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if(!$oDocument->isExists()) {
+				continue;
+			}
 
 			$triggerObj->source_module_srl[$document_srl] = $oDocument->get('module_srl');
 
@@ -117,8 +127,7 @@ 
 								$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 								$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 								// For binary files
-							}
-							else
+							} else
 							{
 								$obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $obj->content);
 								$obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
@@ -155,8 +164,12 @@ 
 			// Set 0 if a new category doesn't exist after catergory change
 			if($source_category_srl != $category_srl)
 			{
-				if($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
-				if($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				if($source_category_srl) {
+					$oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
+				}
+				if($category_srl) {
+					$oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				}
 			}
 		}
 
@@ -227,7 +240,9 @@ 
 	 */
 	function copyDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(count($document_srl_list) < 1) return;
+		if(count($document_srl_list) < 1) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -268,7 +283,9 @@ 
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if(!$oDocument->isExists()) {
+				continue;
+			}
 
 			$obj = $oDocument->getObjectVars();
 
@@ -279,7 +296,9 @@ 
 				{
 					foreach($extraVars as $extraItem)
 					{
-						if($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						if($extraItem->var_idx >= 0) {
+							$obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						}
 					}
 				}
 			}
@@ -308,8 +327,7 @@ 
 						$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 						$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 						// If binary file
-					}
-					else
+					} else
 					{
 						$obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $obj->content);
 						$obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
@@ -376,8 +394,7 @@ 
 									$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 									$comment_obj->content = str_replace($source_filename, $target_filename, $comment_obj->content);
 									// If binary file
-								}
-								else
+								} else
 								{
 									$comment_obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $comment_obj->content);
 									$comment_obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $comment_obj->content);
@@ -389,10 +406,14 @@ 
 						$comment_obj->document_srl = $obj->document_srl;
 						$comment_obj->comment_srl = $comment_srl;
 
-						if($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						if($comment_obj->parent_srl) {
+							$comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						}
 
 						$output = $oCommentController->insertComment($comment_obj, true);
-						if($output->toBool()) $success_count ++;
+						if($output->toBool()) {
+							$success_count ++;
+						}
 					}
 					$oDocumentController->updateCommentCount($obj->document_srl, $success_count, $comment_obj->nick_name, true);
 				}
@@ -412,7 +433,9 @@ 
 						$trackback_obj->module_srl = $obj->module_srl;
 						$trackback_obj->document_srl = $obj->document_srl;
 						$output = executeQuery('trackback.insertTrackback', $trackback_obj);
-						if($output->toBool()) $success_count++;
+						if($output->toBool()) {
+							$success_count++;
+						}
 					}
 					// Update the number of trackbacks
 					$oDocumentController->updateTrackbackCount($obj->document_srl, $success_count);
@@ -510,7 +533,9 @@ 
 		{
 			$args->document_srl = $document_srl;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 	}
 
@@ -541,7 +566,9 @@ 
 				if (is_dir($path."/".$entry)) {
 					$this->deleteThumbnailFile($path."/".$entry);
 				} else {
-					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) continue;
+					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) {
+						continue;
+					}
 					FileHandler::removeFile($path.'/'.$entry);
 				}
 			}
@@ -566,7 +593,9 @@ 
 		$eid = Context::get('eid');
 		$obj = new stdClass();
 
-		if(!$module_srl || !$name || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$name || !$eid) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// set the max value if idx is not specified
 		if(!$var_idx)
 		{
@@ -588,7 +617,9 @@ 
 		// insert or update
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_registed');
 
@@ -604,11 +635,15 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
-		if(!$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$var_idx) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_deleted');
 	}
@@ -623,26 +658,41 @@ 
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
 
-		if(!$type || !$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if(!$type || !$module_srl || !$var_idx) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info->module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_info->module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!$extra_keys[$var_idx]) return new BaseObject(-1,'msg_invalid_request');
+		if(!$extra_keys[$var_idx]) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
-		if($type == 'up') $new_idx = $var_idx-1;
-		else $new_idx = $var_idx+1;
-		if($new_idx<1) return new BaseObject(-1,'msg_invalid_request');
+		if($type == 'up') {
+			$new_idx = $var_idx-1;
+		} else {
+			$new_idx = $var_idx+1;
+		}
+		if($new_idx<1) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->var_idx = $new_idx;
 		$output = executeQuery('document.getDocumentExtraKeys', $args);
-		if (!$output->toBool()) return $output;
-		if (!$output->data) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$output->toBool()) {
+			return $output;
+		}
+		if (!$output->data) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		unset($args);
 
 		// update immediately if there is no idx to change
@@ -653,35 +703,50 @@ 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			// replace if exists
-		}
-		else
+		} else
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->var_idx = $new_idx;
 			$args->new_idx = -10000;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->var_idx = -10000;
 			$args->new_idx = $var_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
@@ -705,8 +770,7 @@ 
 		{
 			$args->alias_srl = getNextSequence();
 			$query = "document.insertAlias";
-		}
-		else
+		} else
 		{
 			$args->alias_srl = $alias_srl;
 			$query = "document.updateAlias";
@@ -744,7 +808,9 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-		if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+		if(!$oDocument->isGranted()) {
+			return $this->stop('msg_not_permitted');
+		}
 	
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
@@ -766,8 +832,9 @@ 
 				parse_str($arrUrl['query'], $arrQuery);
 
 				// set query
-				if(isset($arrQuery['document_srl']))
-					unset($arrQuery['document_srl']);
+				if(isset($arrQuery['document_srl'])) {
+									unset($arrQuery['document_srl']);
+				}
 
 				$searchArgs = new stdClass;
 				foreach($arrQuery as $key=>$val)
@@ -775,13 +842,15 @@ 
 					$searchArgs->{$key} = $val;
 				}
 
-				if(!isset($searchArgs->sort_index))
-					$searchArgs->sort_index = $module_info->order_target;
+				if(!isset($searchArgs->sort_index)) {
+									$searchArgs->sort_index = $module_info->order_target;
+				}
 
 				foreach($module_info as $key=>$val)
 				{
-					if(!isset($searchArgs->{$key}))
-						$searchArgs->{$key} = $val;
+					if(!isset($searchArgs->{$key})) {
+											$searchArgs->{$key} = $val;
+					}
 				}
 
 				$oDocumentModel = getModel('document');
@@ -793,12 +862,14 @@ 
 				}
 
 
-				if($cur_page>1 && count($output->data) == 0)
-					$arrQuery['page'] = $cur_page - 1;
+				if($cur_page>1 && count($output->data) == 0) {
+									$arrQuery['page'] = $cur_page - 1;
+				}
 
 				$query = "?";
-				foreach($arrQuery as $key=>$val)
-					$query .= sprintf("%s=%s&", $key, $val);
+				foreach($arrQuery as $key=>$val) {
+									$query .= sprintf("%s=%s&", $key, $val);
+				}
 				$query = substr($query, 0, -1);
 			}
 			$returnUrl = $arrUrl['path'] . $query;
@@ -878,7 +949,9 @@ 
 	 */
 	function restoreTrash($originObject)
 	{
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if(is_array($originObject)) {
+			$originObject = (object)$originObject;
+		}
 
 		$oDocumentController = getController('document');
 		$oDocumentModel = getModel('document');
@@ -888,7 +961,9 @@ 
 
 		//DB restore
 		$output = $oDocumentController->insertDocument($originObject, false, true, false);
-		if(!$output->toBool()) return new BaseObject(-1, $output->getMessage());
+		if(!$output->toBool()) {
+			return new BaseObject(-1, $output->getMessage());
+		}
 
 		//FILE restore
 		$oDocument = $oDocumentModel->getDocument($originObject->document_srl);
@@ -926,7 +1001,9 @@ 
 	function emptyTrash($originObject)
 	{
 		$originObject = unserialize($originObject);
-		if(is_array($originObject)) $originObject = (object) $originObject;
+		if(is_array($originObject)) {
+			$originObject = (object) $originObject;
+		}
 
 		$oDocument = new documentItem();
 		$oDocument->setAttribute($originObject);