xpressengine / xe-core

modules/seo/seo.class.php

Braces +30 added lines, -10 removed lines

@@ -25,12 +25,24 @@ 
 		$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->link_nofollow) $config->link_nofollow = 'N';
-		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->link_nofollow) {
+			$config->link_nofollow = 'N';
+		}
+		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;
@@ -58,7 +70,9 @@ 
 
 	public function addMeta($property, $content, $attr_name = 'property')
 	{
-		if (!$content) return;
+		if (!$content) {
+			return;
+		}
 
 		$oModuleController = getController('module');
 		$oModuleController->replaceDefinedLangCode($content);
@@ -72,7 +86,9 @@ 
 
 	public function addLink($rel, $href)
 	{
-		if (!$href) return;
+		if (!$href) {
+			return;
+		}
 
 		$this->SEO['link'][] = array('rel' => $rel, 'href' => $href);
 	}
@@ -83,7 +99,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') {
@@ -143,7 +161,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/seo/seo.controller.php

Spacing +27 added lines, -27 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,14 +88,14 @@ 
 		$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;
 		}
 
 
-		if($current_module_info->module_srl !== $site_module_info->module_srl) {
+		if ($current_module_info->module_srl !== $site_module_info->module_srl) {
 			$mdoulePartConfig = $oModuleModel->getModulePartConfig('seo', $current_module_info->module_srl);
-			if($mdoulePartConfig && isset($mdoulePartConfig->meta_description) && trim($mdoulePartConfig->meta_description)) {
+			if ($mdoulePartConfig && isset($mdoulePartConfig->meta_description) && trim($mdoulePartConfig->meta_description)) {
 				$piece->description = trim($mdoulePartConfig->meta_description);
 			}
 		}
@@ -116,7 +116,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();
@@ -124,12 +124,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();
 
@@ -140,7 +140,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,
@@ -148,35 +148,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;
@@ -193,8 +193,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'));
@@ -205,15 +205,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;
@@ -222,8 +222,8 @@ 
 
 		if ($config->use_optimize_title == 'Y') Context::setBrowserTitle($piece->title);
 
-		if($config->link_nofollow == 'Y') {
-			$temp_output = (string)$output_content;
+		if ($config->link_nofollow == 'Y') {
+			$temp_output = (string) $output_content;
 			$temp_output = preg_replace_callback('!<\!--BeforeComment\([0-9]+,[0-9]+\)-->(.+?)<\!--AfterComment\([0-9]+,[0-9]+\)-->!is', array($this, 'replaceCommentHyperlink'), $temp_output);
 			$output_content = $temp_output;
 		}
@@ -236,13 +236,13 @@ 
 
 	private function _addNofollow($matches)
 	{
-		return '<a' . preg_replace('!\srel=(?:"|\')?([^"\']+)(?:"|\')?!is', '', $matches[1]) . ' rel="nofollow">' . $matches[2] . '</a>';
+		return '<a'.preg_replace('!\srel=(?:"|\')?([^"\']+)(?:"|\')?!is', '', $matches[1]).' rel="nofollow">'.$matches[2].'</a>';
 	}
 
 	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);
 	}
@@ -262,8 +262,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');
 
@@ -121,7 +133,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()) {
@@ -134,13 +148,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,
@@ -160,7 +180,9 @@ 
 					}
 				}
 
-				if($document_images) $piece->image = $document_images;
+				if($document_images) {
+					$piece->image = $document_images;
+				}
 			} else {
 				$piece->url = getFullUrl('', 'mid', $current_module_info->mid);
 			}
@@ -206,21 +228,27 @@ 
 
 		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);
+		}
 
 		if($config->link_nofollow == 'Y') {
 			$temp_output = (string)$output_content;
@@ -242,7 +270,9 @@ 
 	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);
 	}