xpressengine / xe-core

modules/seo/seo.class.php

Doc Comments +7 added lines

@@ -54,6 +54,9 @@ 
 		return $config;
 	}
 
+	/**
+	 * @param string $property
+	 */
 	public function addMeta($property, $content, $attr_name = 'property')
 	{
 		if (!$content) return;
@@ -68,6 +71,10 @@ 
 		$this->SEO['meta'][] = array('property' => $property, 'content' => $content, 'attr_name' => $attr_name);
 	}
 
+	/**
+	 * @param string $rel
+	 * @param string $href
+	 */
 	public function addLink($rel, $href)
 	{
 		if (!$href) return;

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('seo');
 
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$request_uri = $IDN->encode(Context::get('request_uri'));
 
@@ -31,16 +31,16 @@ 
 		if (!$config->ga_track_subdomain) $config->ga_track_subdomain = 'N';
 		if ($config->site_image) 
 		{
-			$config->site_image_url = $request_uri . 'files/attach/site_image/' . $config->site_image;
+			$config->site_image_url = $request_uri.'files/attach/site_image/'.$config->site_image;
 
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport()) {
+			if ($oCacheHandler->isSupport()) {
 				$site_image = false;
 				$cache_key = 'seo:site_image';
 				$site_image = $oCacheHandler->get($cache_key);
-				if(!$site_image) {
-					$path = _XE_PATH_ . 'files/attach/site_image/';
-					list($width, $height) = @getimagesize($path . $config->site_image);
+				if (!$site_image) {
+					$path = _XE_PATH_.'files/attach/site_image/';
+					list($width, $height) = @getimagesize($path.$config->site_image);
 					$site_image_dimension = array(
 						'width' => $width,
 						'height' => $height
@@ -86,9 +86,9 @@ 
 			foreach ($list as $val) {
 				if ($type == 'meta') {
 					$attr_name = $val['attr_name'];
-					Context::addHtmlHeader('<meta ' . $attr_name . '="' . $val['property'] . '" content="' . $val['content'] . '" />');
+					Context::addHtmlHeader('<meta '.$attr_name.'="'.$val['property'].'" content="'.$val['content'].'" />');
 				} elseif ($type == 'link') {
-					Context::addHtmlHeader('<link rel="' . $val['rel'] . '" href="' . $val['href'] . '" />');
+					Context::addHtmlHeader('<link rel="'.$val['rel'].'" href="'.$val['href'].'" />');
 				}
 			}
 		}
@@ -114,7 +114,7 @@ 
 </script>
 GASCRIPT;
 
-			Context::addHtmlHeader($ga_script . PHP_EOL);
+			Context::addHtmlHeader($ga_script.PHP_EOL);
 		}
 
 		// Naver Analytics
@@ -124,7 +124,7 @@ 
 <script src="//wcs.naver.net/wcslog.js"></script>
 <script>if(!wcs_add){var wcs_add={wa:'{$config->na_id}'};}if(typeof wcs_do!="undefined"){wcs_do();}</script>
 NASCRIPT;
-			Context::addHtmlFooter($na_script . PHP_EOL);
+			Context::addHtmlFooter($na_script.PHP_EOL);
 		}
 	}
 
@@ -139,7 +139,7 @@ 
 
 		$seo_config = $this->getConfig();
 
-		if($seo_config->enable === 'Y') {
+		if ($seo_config->enable === 'Y') {
 			foreach ($this->triggers as $trigger) {
 				if (!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) return TRUE;
 			}
@@ -155,7 +155,7 @@ 
 
 		$seo_config = $this->getConfig();
 
-		if($seo_config->enable === 'Y') {
+		if ($seo_config->enable === 'Y') {
 			foreach ($this->triggers as $trigger) {
 				if (!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) {
 					$oModuleController->insertTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]);

Braces +27 added lines, -9 removed lines

@@ -24,11 +24,21 @@ 
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$request_uri = $IDN->encode(Context::get('request_uri'));
 
-		if (!$config) $config = new stdClass;
-		if (!$config->enable) $config->enable = 'Y';
-		if (!$config->use_optimize_title) $config->use_optimize_title = 'N';
-		if (!$config->ga_except_admin) $config->ga_except_admin = 'N';
-		if (!$config->ga_track_subdomain) $config->ga_track_subdomain = 'N';
+		if (!$config) {
+			$config = new stdClass;
+		}
+		if (!$config->enable) {
+			$config->enable = 'Y';
+		}
+		if (!$config->use_optimize_title) {
+			$config->use_optimize_title = 'N';
+		}
+		if (!$config->ga_except_admin) {
+			$config->ga_except_admin = 'N';
+		}
+		if (!$config->ga_track_subdomain) {
+			$config->ga_track_subdomain = 'N';
+		}
 		if ($config->site_image) 
 		{
 			$config->site_image_url = $request_uri . 'files/attach/site_image/' . $config->site_image;
@@ -56,7 +66,9 @@ 
 
 	public function addMeta($property, $content, $attr_name = 'property')
 	{
-		if (!$content) return;
+		if (!$content) {
+			return;
+		}
 
 		$oModuleController = getController('module');
 		$oModuleController->replaceDefinedLangCode($content);
@@ -70,7 +82,9 @@ 
 
 	public function addLink($rel, $href)
 	{
-		if (!$href) return;
+		if (!$href) {
+			return;
+		}
 
 		$this->SEO['link'][] = array('rel' => $rel, 'href' => $href);
 	}
@@ -81,7 +95,9 @@ 
 		$logged_info = Context::get('logged_info');
 
 		foreach ($this->SEO as $type => $list) {
-			if (!$list || !count($list)) continue;
+			if (!$list || !count($list)) {
+				continue;
+			}
 
 			foreach ($list as $val) {
 				if ($type == 'meta') {
@@ -141,7 +157,9 @@ 
 
 		if($seo_config->enable === 'Y') {
 			foreach ($this->triggers as $trigger) {
-				if (!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) return TRUE;
+				if (!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) {
+					return TRUE;
+				}
 			}
 		}
 

modules/syndication/syndication.model.php

Doc Comments +18 added lines

@@ -63,6 +63,9 @@ 
 		return $module_srls;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	function getLang($key, $site_srl)
 	{
 		if(!$this->langs[$site_srl])
@@ -438,6 +441,12 @@ 
 		return $article;
 	}
 
+	/**
+	 * @param string $startTime
+	 * @param string $endTime
+	 * @param string $type
+	 * @param string $id
+	 */
 	function getArticles($module_srl = null, $page=1, $startTime = null, $endTime = null, $type = null, $id = null) {
 		if($this->site_url==null) $this->init();
 
@@ -481,6 +490,12 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $startTime
+	 * @param string $endTime
+	 * @param string $type
+	 * @param string $id
+	 */
 	function getDeleted($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
 		if($this->site_url==null) $this->init();
 
@@ -538,6 +553,9 @@ 
 		return $output->data;
 	}
 
+	/**
+	 * @param string $type
+	 */
 	function getID($type, $target_id = null) {
 		if($this->site_url==null) $this->init();
 

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/syndication/syndication.admin.view.php

Spacing +10 added lines, -10 removed lines

@@ -21,28 +21,28 @@ 
 		$oSyndicationModel = getModel('syndication');
 		Context::set('ping_log', $oSyndicationModel->getResentPingLog());
 
-		if(!$module_config->syndication_use)
+		if (!$module_config->syndication_use)
 		{
 			$module_config->syndication_use = 'Y';
 		}
 
-		if(!$module_config->site_url)
+		if (!$module_config->site_url)
 		{
-			$module_config->site_url = Context::getDefaultUrl()?Context::getDefaultUrl():getFullUrl();
+			$module_config->site_url = Context::getDefaultUrl() ?Context::getDefaultUrl() : getFullUrl();
 		}
 
-		if(!$module_config->year)
+		if (!$module_config->year)
 		{
 			$module_config->year = date("Y");
 		}
 
-		if(!isset($module_config->syndication_password))
+		if (!isset($module_config->syndication_password))
 		{
 			$module_config->syndication_password = uniqid();
 		}
 
 		Context::set('syndication_use', $module_config->syndication_use);
-		Context::set('site_url', preg_replace('/^(http|https):\/\//i','',$module_config->site_url));
+		Context::set('site_url', preg_replace('/^(http|https):\/\//i', '', $module_config->site_url));
 		Context::set('year', $module_config->year);
 		Context::set('syndication_token', $module_config->syndication_token);
 		Context::set('syndication_password', $module_config->syndication_password);
@@ -50,9 +50,9 @@ 
 
 		$output = executeQueryArray('syndication.getExceptModules');
 		$except_module_list = array();
-		if($output->data && count($output->data) > 0)
+		if ($output->data && count($output->data) > 0)
 		{
-			foreach($output->data as $item)
+			foreach ($output->data as $item)
 			{
 				$except_module_list[] = $item;
 			}
@@ -62,8 +62,8 @@ 
 
 		//Security
 		$security = new Security();
-		$security->encodeHTML('services..service','except_module..ping');
-		$security->encodeHTML('except_module..mid','except_module..browser_title');
+		$security->encodeHTML('services..service', 'except_module..ping');
+		$security->encodeHTML('except_module..mid', 'except_module..browser_title');
 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('config');

modules/syndication/syndication.admin.controller.php

Spacing +16 added lines, -16 removed lines

@@ -21,36 +21,36 @@ 
 
 		$config = new stdClass;
 		$config->syndication_use = Context::get('syndication_use');
-		$config->site_url = preg_replace('/\/+$/is','',Context::get('site_url'));
+		$config->site_url = preg_replace('/\/+$/is', '', Context::get('site_url'));
 		$config->year = Context::get('year');
 		$config->syndication_token = Context::get('syndication_token');
 		$config->syndication_password = urlencode(Context::get('syndication_password'));
 
-		if(!$config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
+		if (!$config->site_url) return $this->makeObject(-1, 'msg_site_url_is_null');
+		if (!$config->syndication_token) return $this->makeObject(-1, 'msg_syndication_token_is_null');
 
-		$oModuleController->updateModuleConfig('syndication',$config);
+		$oModuleController->updateModuleConfig('syndication', $config);
 
 		$except_module = Context::get('except_module');
 		$output = executeQuery('syndication.deleteExceptModules');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if ($except_module){
-			$modules = explode(',',$except_module);
-			for($i=0,$c=count($modules);$i<$c;$i++) {
+		if ($except_module) {
+			$modules = explode(',', $except_module);
+			for ($i = 0, $c = count($modules); $i < $c; $i++) {
 				$args->module_srl = $modules[$i];
-				$output = executeQuery('syndication.insertExceptModule',$args);
-				if(!$output->toBool()) return $output;
+				$output = executeQuery('syndication.insertExceptModule', $args);
+				if (!$output->toBool()) return $output;
 			}
 		}
 
-		if(!$this->checkOpenSSLSupport())
+		if (!$this->checkOpenSSLSupport())
 		{
 			return $this->makeObject(-1, 'msg_need_openssl_support');
 		}
 
 		$this->setMessage('success_applied');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON'))) {
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSyndicationAdminConfig');
 			$this->setRedirectUrl($returnUrl);
 			return;
@@ -62,18 +62,18 @@ 
 		$oModuleModel = getModel('module');
 
 		$oSyndicationController = getController('syndication');
-		$oSyndicationModel= getModel('syndication');
+		$oSyndicationModel = getModel('syndication');
 
 		$module_config = $oModuleModel->getModuleConfig('syndication');
 
 		$site_url = trim(Context::get('site_url'));
-		if(!$module_config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$module_config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
+		if (!$module_config->site_url) return $this->makeObject(-1, 'msg_site_url_is_null');
+		if (!$module_config->syndication_token) return $this->makeObject(-1, 'msg_syndication_token_is_null');
 
 		$id = $oSyndicationModel->getID('site');
 
 		// site_url 정보와 token 정보를 이용해서 ping 전송 테스트
-		if($oSyndicationController->ping($id, 'site')===FALSE)
+		if ($oSyndicationController->ping($id, 'site') === FALSE)
 		{
 			$this->setError(-1);
 			$this->setMessage($oSyndicationController->ping_message);

Braces +19 added lines, -8 removed lines

@@ -26,21 +26,29 @@ 
 		$config->syndication_token = Context::get('syndication_token');
 		$config->syndication_password = urlencode(Context::get('syndication_password'));
 
-		if(!$config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
+		if(!$config->site_url) {
+			return $this->makeObject(-1,'msg_site_url_is_null');
+		}
+		if(!$config->syndication_token) {
+			return $this->makeObject(-1,'msg_syndication_token_is_null');
+		}
 
 		$oModuleController->updateModuleConfig('syndication',$config);
 
 		$except_module = Context::get('except_module');
 		$output = executeQuery('syndication.deleteExceptModules');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if ($except_module){
 			$modules = explode(',',$except_module);
 			for($i=0,$c=count($modules);$i<$c;$i++) {
 				$args->module_srl = $modules[$i];
 				$output = executeQuery('syndication.insertExceptModule',$args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 
@@ -67,8 +75,12 @@ 
 		$module_config = $oModuleModel->getModuleConfig('syndication');
 
 		$site_url = trim(Context::get('site_url'));
-		if(!$module_config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$module_config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
+		if(!$module_config->site_url) {
+			return $this->makeObject(-1,'msg_site_url_is_null');
+		}
+		if(!$module_config->syndication_token) {
+			return $this->makeObject(-1,'msg_syndication_token_is_null');
+		}
 
 		$id = $oSyndicationModel->getID('site');
 
@@ -77,8 +89,7 @@ 
 		{
 			$this->setError(-1);
 			$this->setMessage($oSyndicationController->ping_message);
-		}
-		else
+		} else
 		{
 			$this->setMessage('msg_success_ping_test');
 		}

modules/seo/seo.controller.php

Spacing +22 added lines, -22 removed lines

@@ -44,7 +44,7 @@ 
 		if (Context::getResponseMethod() != 'HTML') return;
 		if (Context::get('module') == 'admin') return;
 
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
 
@@ -88,7 +88,7 @@ 
 		$piece->image = array();
 		$piece->author = null;
 
-		if(stristr($_SERVER['HTTP_USER_AGENT'], 'facebookexternalhit') != FALSE) {
+		if (stristr($_SERVER['HTTP_USER_AGENT'], 'facebookexternalhit') != FALSE) {
 			$single_image = true;
 		}
 
@@ -108,7 +108,7 @@ 
 		if ($is_article) {
 			if (!$oDocument->isSecret()) {
 				$piece->document_title = $oDocument->getTitleText();
-				$piece->url = getFullUrl('', 'mid', $current_module_info->mid, 'document_srl',$document_srl);
+				$piece->url = getFullUrl('', 'mid', $current_module_info->mid, 'document_srl', $document_srl);
 				$piece->type = 'article';
 				$piece->description = trim(str_replace(' ', ' ', $oDocument->getContentText(400)));
 				$piece->author = $oDocument->getNickName();
@@ -116,12 +116,12 @@ 
 				if (count($tags)) $piece->tags = $tags;
 
 				$document_images = false;
-				if($oCacheHandler->isSupport()) {
-					$cache_key_document_images = 'seo:document_images:' . $document_srl;
+				if ($oCacheHandler->isSupport()) {
+					$cache_key_document_images = 'seo:document_images:'.$document_srl;
 					$document_images = $oCacheHandler->get($cache_key_document_images);
 				}
 
-				if($document_images === false && $oDocument->hasUploadedFiles()) {
+				if ($document_images === false && $oDocument->hasUploadedFiles()) {
 					$image_ext = array('bmp', 'gif', 'jpg', 'jpeg', 'png');
 					$document_images = array();
 
@@ -132,7 +132,7 @@ 
 
 						if (!in_array(strtolower($ext), $image_ext)) continue;
 						list($width, $height) = @getimagesize($file->uploaded_filename);
-						if($width < 100 && $height < 100) continue;
+						if ($width < 100 && $height < 100) continue;
 
 						$image = array(
 							'filepath' => $file->uploaded_filename,
@@ -140,35 +140,35 @@ 
 							'height' => $height
 						);
 
-						if($file->cover_image === 'Y') {
+						if ($file->cover_image === 'Y') {
 							array_unshift($document_images, $image);
 						} else {
 							$document_images[] = $image;
 						}
 					}
 
-					if($oCacheHandler->isSupport()) {
+					if ($oCacheHandler->isSupport()) {
 						$oCacheHandler->put($cache_key_document_images, $document_images);
 					}
 				}
 
-				if($document_images) $piece->image = $document_images;
+				if ($document_images) $piece->image = $document_images;
 			} else {
 				$piece->url = getFullUrl('', 'mid', $current_module_info->mid);
 			}
 		} else {
 			if (!$is_index) {
 				$page = (Context::get('page') > 1) ? Context::get('page') : null;
-				$piece->url = getNotEncodedFullUrl('mid', $current_module_info->mid, 'page',$page);
+				$piece->url = getNotEncodedFullUrl('mid', $current_module_info->mid, 'page', $page);
 			}
 		}
 
 		$piece->title = $this->getBrowserTitle($piece->document_title);
 
-		if($oCacheHandler->isSupport()) {
+		if ($oCacheHandler->isSupport()) {
 			$cache_key = 'seo:site_image';
 			$site_image = $oCacheHandler->get($cache_key);
-			if($site_image) {
+			if ($site_image) {
 				$site_image['url'] = $config->site_image_url;
 			}
 			$piece->image[] = $site_image;
@@ -185,8 +185,8 @@ 
 		$this->addMeta('og:site_name', $config->site_name);
 		$this->addMeta('og:title', $piece->title);
 		$this->addMeta('og:description', $piece->description);
-		if($is_article) {
-			if(Context::getLangType() !== $oDocument->getLangCode()) {
+		if ($is_article) {
+			if (Context::getLangType() !== $oDocument->getLangCode()) {
 				$this->addMeta('og:locale:alternate', $locales[$oDocument->getLangCode()]);
 			}
 			$this->addMeta('article:published_time', $oDocument->getRegdate('c'));
@@ -197,15 +197,15 @@ 
 		}
 
 		foreach ($piece->image as $img) {
-			if(!$img['url']) {
-				if(!$img['filepath']) continue;
-				$img['url'] = $request_uri . $img['filepath'];
+			if (!$img['url']) {
+				if (!$img['filepath']) continue;
+				$img['url'] = $request_uri.$img['filepath'];
 			}
 
 			$this->addMeta('og:image', $img['url']);
 			$this->addMeta('og:image:width', $img['width']);
 			$this->addMeta('og:image:height', $img['height']);
-			if($single_image) break;
+			if ($single_image) break;
 		}
 
 		$this->canonical_url = $piece->url;
@@ -218,7 +218,7 @@ 
 	function triggerAfterFileDeleteFile($data)
 	{
 		$document_srl = $data->upload_target_srl;
-		if(!$document_srl) return $this->makeObject();
+		if (!$document_srl) return $this->makeObject();
 
 		$this->deleteCacheDocumentImages($document_srl);
 	}
@@ -238,8 +238,8 @@ 
 	private function deleteCacheDocumentImages($document_srl)
 	{
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport()) {
-			$cache_key_document_images = 'seo:document_images:' . $document_srl;
+		if ($oCacheHandler->isSupport()) {
+			$cache_key_document_images = 'seo:document_images:'.$document_srl;
 			$oCacheHandler->delete($cache_key_document_images);
 		}
 	}

Braces +45 added lines, -15 removed lines

@@ -4,10 +4,14 @@ 
 	function getBrowserTitle($document_title = null)
 	{
 		$site_module_info = Context::get('site_module_info');
-		if ($site_module_info->site_srl != 0) return Context::getBrowserTitle();
+		if ($site_module_info->site_srl != 0) {
+			return Context::getBrowserTitle();
+		}
 
 		$config = $this->getConfig();
-		if ($config->use_optimize_title != 'Y') return Context::getBrowserTitle();
+		if ($config->use_optimize_title != 'Y') {
+			return Context::getBrowserTitle();
+		}
 
 		$current_module_info = Context::get('current_module_info');
 		$is_index = ($current_module_info->module_srl == $site_module_info->module_srl) ? true : false;
@@ -16,7 +20,9 @@ 
 		$piece['[:site_name:]'] = $config->site_name;
 		$piece['[:site_slogan:]'] = $config->site_slogan;
 		$piece['[:module_title:]'] = $current_module_info->browser_title;
-		if ($document_title) $piece['[:document_title:]'] = $document_title;
+		if ($document_title) {
+			$piece['[:document_title:]'] = $document_title;
+		}
 
 		if ($config->use_optimize_title == 'Y') {
 			$title = array();
@@ -27,7 +33,9 @@ 
 			} else {
 				if ($is_index) {
 					$title[] = $piece['[:site_name:]'];
-					if ($piece['[:site_slogan:]']) $title[] = $piece['[:site_slogan:]'];
+					if ($piece['[:site_slogan:]']) {
+						$title[] = $piece['[:site_slogan:]'];
+					}
 				} else {
 					$title[] = $piece['[:module_title:]'];
 					$title[] = $piece['[:site_name:]'];
@@ -41,8 +49,12 @@ 
 
 	function triggerBeforeDisplay(&$output_content)
 	{
-		if (Context::getResponseMethod() != 'HTML') return;
-		if (Context::get('module') == 'admin') return;
+		if (Context::getResponseMethod() != 'HTML') {
+			return;
+		}
+		if (Context::get('module') == 'admin') {
+			return;
+		}
 
 		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
 
@@ -113,7 +125,9 @@ 
 				$piece->description = trim(str_replace(' ', ' ', $oDocument->getContentText(400)));
 				$piece->author = $oDocument->getNickName();
 				$tags = $oDocument->get('tag_list');
-				if (count($tags)) $piece->tags = $tags;
+				if (count($tags)) {
+					$piece->tags = $tags;
+				}
 
 				$document_images = false;
 				if($oCacheHandler->isSupport()) {
@@ -126,13 +140,19 @@ 
 					$document_images = array();
 
 					foreach ($oDocument->getUploadedFiles() as $file) {
-						if ($file->isvalid != 'Y') continue;
+						if ($file->isvalid != 'Y') {
+							continue;
+						}
 
 						$ext = array_pop(explode('.', $file->uploaded_filename));
 
-						if (!in_array(strtolower($ext), $image_ext)) continue;
+						if (!in_array(strtolower($ext), $image_ext)) {
+							continue;
+						}
 						list($width, $height) = @getimagesize($file->uploaded_filename);
-						if($width < 100 && $height < 100) continue;
+						if($width < 100 && $height < 100) {
+							continue;
+						}
 
 						$image = array(
 							'filepath' => $file->uploaded_filename,
@@ -152,7 +172,9 @@ 
 					}
 				}
 
-				if($document_images) $piece->image = $document_images;
+				if($document_images) {
+					$piece->image = $document_images;
+				}
 			} else {
 				$piece->url = getFullUrl('', 'mid', $current_module_info->mid);
 			}
@@ -198,27 +220,35 @@ 
 
 		foreach ($piece->image as $img) {
 			if(!$img['url']) {
-				if(!$img['filepath']) continue;
+				if(!$img['filepath']) {
+					continue;
+				}
 				$img['url'] = $request_uri . $img['filepath'];
 			}
 
 			$this->addMeta('og:image', $img['url']);
 			$this->addMeta('og:image:width', $img['width']);
 			$this->addMeta('og:image:height', $img['height']);
-			if($single_image) break;
+			if($single_image) {
+				break;
+			}
 		}
 
 		$this->canonical_url = $piece->url;
 
 		$this->applySEO();
 
-		if ($config->use_optimize_title == 'Y') Context::setBrowserTitle($piece->title);
+		if ($config->use_optimize_title == 'Y') {
+			Context::setBrowserTitle($piece->title);
+		}
 	}
 
 	function triggerAfterFileDeleteFile($data)
 	{
 		$document_srl = $data->upload_target_srl;
-		if(!$document_srl) return $this->makeObject();
+		if(!$document_srl) {
+			return $this->makeObject();
+		}
 
 		$this->deleteCacheDocumentImages($document_srl);
 	}

modules/seo/seo.admin.view.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 {
 	function init()
 	{
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile(str_replace('dispSeo', '', $this->act));
 	}
 
@@ -15,7 +15,7 @@ 
 	function dispSeoAdminSetting()
 	{
 		$vars = Context::getRequestVars();
-		if(!$vars->setting_section) Context::set('setting_section', 'general');
+		if (!$vars->setting_section) Context::set('setting_section', 'general');
 
 		$config = $this->getConfig();
 

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 	function dispSeoAdminSetting()
 	{
 		$vars = Context::getRequestVars();
-		if(!$vars->setting_section) Context::set('setting_section', 'general');
+		if(!$vars->setting_section) {
+			Context::set('setting_section', 'general');
+		}
 
 		$config = $this->getConfig();
 

modules/seo/seo.admin.controller.php

Spacing +5 added lines, -5 removed lines

@@ -18,16 +18,16 @@ 
 			$config->site_keywords = $vars->site_keywords;
 
 			if ($vars->site_image) {
-				$path = _XE_PATH_ . 'files/attach/site_image/';
+				$path = _XE_PATH_.'files/attach/site_image/';
 				$ext = strtolower(array_pop(explode('.', $vars->site_image['name'])));
 				$timestamp = time();
 				$filename = "site_image.{$timestamp}.{$ext}";
-				FileHandler::copyFile($vars->site_image['tmp_name'], $path . $filename);
+				FileHandler::copyFile($vars->site_image['tmp_name'], $path.$filename);
 				$config->site_image = $filename;
 
 				$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-				if($oCacheHandler->isSupport()) {
-					list($width, $height) = @getimagesize($path . $filename);
+				if ($oCacheHandler->isSupport()) {
+					list($width, $height) = @getimagesize($path.$filename);
 					$site_image_dimension = array(
 						'width' => $width,
 						'height' => $height
@@ -58,7 +58,7 @@ 
 
 		$oModuleController->updateModuleConfig('seo', $config);
 
-		if($config->enable === 'Y') {
+		if ($config->enable === 'Y') {
 			$this->moduleUpdate();
 		} else {
 			// Delete Triggers

modules/krzip/krzip.controller.php

Spacing +2 added lines, -2 removed lines

@@ -10,14 +10,14 @@
 {
 	function updateConfig($args)
 	{
-		if(!$args || !is_object($args))
+		if (!$args || !is_object($args))
 		{
 			$args = new stdClass();
 		}
 
 		$oModuleController = getController('module');
 		$output = $oModuleController->updateModuleConfig('krzip', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			unset($this->module_config);
 		}

modules/krzip/krzip.admin.view.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 {
 	function init()
 	{
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile(lcfirst(str_replace('dispKrzipAdmin', '', $this->act)));
 	}