xpressengine / xe-core

addons/mobile/classes/hdml.class.php

Braces +8 added lines, -6 removed lines

@@ -40,7 +40,9 @@ 
 	 **/
 	function printTitle()
 	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		if($this->totalPage > $this->mobilePage) {
+			$titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		}
 		printf('<b>&lt;%s%s&gt;%s', $this->title,$titlePageStr,"\n");
 	}
 
@@ -54,11 +56,12 @@ 
 		{
 			foreach($this->getChilds() as $key => $val)
 			{
-				if(!$val['link']) continue;
+				if(!$val['link']) {
+					continue;
+				}
 				printf('<ce task=go label="%s" dest="%s">%s%s',Context::getLang('cmd_select'), $val['href'], $val['text'], "\n");
 			}
-		}
-		else
+		} else
 		{
 			printf('<wrap>%s<br>%s', $this->getContent(),"\n");
 		} 
@@ -88,8 +91,7 @@ 
 				printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
 			}
 			// Content Types
-		}
-		else
+		} else
 		{
 			if($this->nextUrl)
 			{

Spacing +17 added lines, -17 removed lines

@@ -25,10 +25,10 @@ 
 
 		print '<hdml version=3.0 ttl=0 markable=true>';
 		print "\n";
-		print $this->hasChilds()?'<choice name=main>':'<display>';
+		print $this->hasChilds() ? '<choice name=main>' : '<display>';
 		print "\n";
 
-		if($this->upperUrl)
+		if ($this->upperUrl)
 		{
 			$url = $this->upperUrl;
 			printf('<action type=soft1 task=go dest="%s" label="%s">%s', $url->url, $url->text, "\n");
@@ -40,8 +40,8 @@ 
 	 **/
 	function printTitle()
 	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		printf('<b>&lt;%s%s&gt;%s', $this->title,$titlePageStr,"\n");
+		if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
+		printf('<b>&lt;%s%s&gt;%s', $this->title, $titlePageStr, "\n");
 	}
 
 	/**
@@ -50,17 +50,17 @@ 
 	 **/
 	function printContent()
 	{
-		if($this->hasChilds())
+		if ($this->hasChilds())
 		{
-			foreach($this->getChilds() as $key => $val)
+			foreach ($this->getChilds() as $key => $val)
 			{
-				if(!$val['link']) continue;
-				printf('<ce task=go label="%s" dest="%s">%s%s',Context::getLang('cmd_select'), $val['href'], $val['text'], "\n");
+				if (!$val['link']) continue;
+				printf('<ce task=go label="%s" dest="%s">%s%s', Context::getLang('cmd_select'), $val['href'], $val['text'], "\n");
 			}
 		}
 		else
 		{
-			printf('<wrap>%s<br>%s', $this->getContent(),"\n");
+			printf('<wrap>%s<br>%s', $this->getContent(), "\n");
 		} 
 	}
 
@@ -70,19 +70,19 @@ 
 	function printBtn()
 	{
 		// Menu Types
-		if($this->hasChilds())
+		if ($this->hasChilds())
 		{
-			if($this->nextUrl)
+			if ($this->nextUrl)
 			{
 				$url = $this->nextUrl;
 				printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
 			}
-			if($this->prevUrl)
+			if ($this->prevUrl)
 			{
 				$url = $this->prevUrl;
 				printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
 			}
-			if($this->homeUrl)
+			if ($this->homeUrl)
 			{
 				$url = $this->homeUrl;
 				printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
@@ -91,17 +91,17 @@ 
 		}
 		else
 		{
-			if($this->nextUrl)
+			if ($this->nextUrl)
 			{
 				$url = $this->nextUrl;
 				printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
 			}
-			if($this->prevUrl)
+			if ($this->prevUrl)
 			{
 				$url = $this->prevUrl;
 				printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
 			}
-			if($this->homeUrl)
+			if ($this->homeUrl)
 			{
 				$url = $this->homeUrl;
 				printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
@@ -114,7 +114,7 @@ 
 	 **/
 	function printFooter()
 	{
-		print $this->hasChilds()?'</choice>':'</display>';
+		print $this->hasChilds() ? '</choice>' : '</display>';
 		print "\n";
 		print("</hdml>");
 	}

addons/mobile/classes/mhtml.class.php

Braces +14 added lines, -8 removed lines

@@ -20,13 +20,17 @@ 
 	function printHeader()
 	{
 		print("<html><head>\n");
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		if($this->totalPage > $this->mobilePage) {
+			$titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		}
 		printf("<title>%s%s</title></head><body>\n", htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 	}
 	// Output title
 	function printTitle()
 	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		if($this->totalPage > $this->mobilePage) {
+			$titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		}
 		printf('&lt;%s%s&gt;<br>%s', htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),"\n");
 	}
 
@@ -40,12 +44,15 @@ 
 		{
 			foreach($this->getChilds() as $key => $val)
 			{
-				if(!$val['link']) continue;
+				if(!$val['link']) {
+					continue;
+				}
 				printf('<a href="%s" accesskey="%s">%s</a><br>%s', $val['href'], $this->getNo(), $val['text'], "\n");
-				if($val['extra']) printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
+				if($val['extra']) {
+					printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
+				}
 			}
-		}
-		else
+		} else
 		{
 			print(str_replace('<br/>','<br>',$this->getContent())."\n");
 		}
@@ -72,8 +79,7 @@ 
 		{
 			$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
 			printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
-		}
-		else
+		} else
 		{
 			printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
 		}

Spacing +15 added lines, -15 removed lines

@@ -20,14 +20,14 @@ 
 	function printHeader()
 	{
 		print("<html><head>\n");
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		printf("<title>%s%s</title></head><body>\n", htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
+		printf("<title>%s%s</title></head><body>\n", htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 	}
 	// Output title
 	function printTitle()
 	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		printf('&lt;%s%s&gt;<br>%s', htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),"\n");
+		if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
+		printf('&lt;%s%s&gt;<br>%s', htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), "\n");
 	}
 
 	/**
@@ -36,18 +36,18 @@ 
 	 **/
 	function printContent()
 	{
-		if($this->hasChilds())
+		if ($this->hasChilds())
 		{
-			foreach($this->getChilds() as $key => $val)
+			foreach ($this->getChilds() as $key => $val)
 			{
-				if(!$val['link']) continue;
+				if (!$val['link']) continue;
 				printf('<a href="%s" accesskey="%s">%s</a><br>%s', $val['href'], $this->getNo(), $val['text'], "\n");
-				if($val['extra']) printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
+				if ($val['extra']) printf("<br>%s\n", str_replace('<br/>', '<br>', $val['extra']));
 			}
 		}
 		else
 		{
-			print(str_replace('<br/>','<br>',$this->getContent())."\n");
+			print(str_replace('<br/>', '<br>', $this->getContent())."\n");
 		}
 		print "<hr><br>";
 	}
@@ -57,32 +57,32 @@ 
 	 **/
 	function printBtn()
 	{
-		if($this->nextUrl)
+		if ($this->nextUrl)
 		{
 			$url = $this->nextUrl;
 			printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
 		}
-		if($this->prevUrl)
+		if ($this->prevUrl)
 		{
 			$url = $this->prevUrl;
 			printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
 		}
 		// Select Language
-		if(!parent::isLangChange())
+		if (!parent::isLangChange())
 		{
-			$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
+			$url = getUrl('', 'lcm', '1', 'sel_lang', Context::getLangType(), 'return_uri', Context::get('current_url'));
 			printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
 		}
 		else
 		{
 			printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
 		}
-		if($this->upperUrl)
+		if ($this->upperUrl)
 		{
 			$url = $this->upperUrl;
 			printf('<btn href="%s" name="%s">%s', $url->url, $url->text, "\n");
 		}
-		if($this->homeUrl)
+		if ($this->homeUrl)
 		{
 			$url = $this->homeUrl;
 			printf('<a btn="%s" href="%s">%s</a><br>%s', $url->text, $url->url, $url->text, "\n");

addons/mobile/classes/wml.class.php

Braces +15 added lines, -10 removed lines

@@ -20,7 +20,9 @@ 
 	{
 		header("Content-Type: text/vnd.wap.wml");
 		header("charset: ".$this->charset);
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		if($this->totalPage > $this->mobilePage) {
+			$titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		}
 		print("<?xml version=\"1.0\" encoding=\"".$this->charset."\"?><!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\" \"http://www.wapforum.org/DTD/wml_1.1.xml\">\n");
 		// Card Title
 		printf("<wml>\n<card title=\"%s%s\">\n<p>\n",htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
@@ -31,7 +33,9 @@ 
 	 */
 	function printTitle()
 	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		if($this->totalPage > $this->mobilePage) {
+			$titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		}
 		printf('&lt;%s%s&gt;<br/>%s', htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),"\n");
 	}
 
@@ -45,12 +49,15 @@ 
 		{
 			foreach($this->getChilds() as $key => $val)
 			{
-				if(!$val['link']) continue;
+				if(!$val['link']) {
+					continue;
+				}
 				printf('<do type="%s" label="%s"><go href="%s" /></do>%s', $this->getNo(), htmlspecialchars($val['text'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $val['href'], "\n");
-				if($val['extra']) printf("%s\n",$val['extra']);
+				if($val['extra']) {
+					printf("%s\n",$val['extra']);
+				}
 			}
-		}
-		else
+		} else
 		{
 			printf('%s<br/>%s', str_replace("<br>","<br/>",$this->getContent()),"\n");
 		}
@@ -88,8 +95,7 @@ 
 		{
 			$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
 			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
-		}
-		else
+		} else
 		{
 			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
 		}
@@ -115,8 +121,7 @@ 
 		if(Context::get('mobile_skt')==1)
 		{
 			return "vnd.skmn".parent::getNo();
-		}
-		else
+		} else
 		{
 			return parent::getNo();
 		}

Spacing +19 added lines, -19 removed lines

@@ -20,10 +20,10 @@ 
 	{
 		header("Content-Type: text/vnd.wap.wml");
 		header("charset: ".$this->charset);
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+		if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
 		print("<?xml version=\"1.0\" encoding=\"".$this->charset."\"?><!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\" \"http://www.wapforum.org/DTD/wml_1.1.xml\">\n");
 		// Card Title
-		printf("<wml>\n<card title=\"%s%s\">\n<p>\n",htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		printf("<wml>\n<card title=\"%s%s\">\n<p>\n", htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 	}
 
 	/**
@@ -31,8 +31,8 @@ 
 	 */
 	function printTitle()
 	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		printf('&lt;%s%s&gt;<br/>%s', htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),"\n");
+		if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
+		printf('&lt;%s%s&gt;<br/>%s', htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), "\n");
 	}
 
 	/**
@@ -41,18 +41,18 @@ 
 	 */
 	function printContent()
 	{
-		if($this->hasChilds())
+		if ($this->hasChilds())
 		{
-			foreach($this->getChilds() as $key => $val)
+			foreach ($this->getChilds() as $key => $val)
 			{
-				if(!$val['link']) continue;
+				if (!$val['link']) continue;
 				printf('<do type="%s" label="%s"><go href="%s" /></do>%s', $this->getNo(), htmlspecialchars($val['text'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $val['href'], "\n");
-				if($val['extra']) printf("%s\n",$val['extra']);
+				if ($val['extra']) printf("%s\n", $val['extra']);
 			}
 		}
 		else
 		{
-			printf('%s<br/>%s', str_replace("<br>","<br/>",$this->getContent()),"\n");
+			printf('%s<br/>%s', str_replace("<br>", "<br/>", $this->getContent()), "\n");
 		}
 		print('<br/>');
 	}
@@ -62,43 +62,43 @@ 
 	 */
 	function printBtn()
 	{
-		if($this->nextUrl)
+		if ($this->nextUrl)
 		{
 			$url = $this->nextUrl;
 			printf('<do type="vnd.next" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
 		}
-		if($this->prevUrl)
+		if ($this->prevUrl)
 		{
 			$url = $this->prevUrl;
 			printf('<do type="vnd.prev" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
 		}
 		// Others are not applicable in charge of the button output (array passed) type??
-		if($this->etcBtn)
+		if ($this->etcBtn)
 		{
-			if(is_array($this->etcBtn))
+			if (is_array($this->etcBtn))
 			{
-				foreach($this->etcBtn as $key=>$val)
+				foreach ($this->etcBtn as $key=>$val)
 				{
 					printf('<do type="vnd.btn%s" label="%s"><go href="%s"/></do>%s', $key, $val['text'], $val['url'], "\n");
 				}
 			}
 		}
 		// Select Language
-		if(!parent::isLangChange())
+		if (!parent::isLangChange())
 		{
-			$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
+			$url = getUrl('', 'lcm', '1', 'sel_lang', Context::getLangType(), 'return_uri', Context::get('current_url'));
 			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
 		}
 		else
 		{
 			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
 		}
-		if($this->homeUrl)
+		if ($this->homeUrl)
 		{
 			$url = $this->homeUrl;
 			printf('<do type="access" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
 		}
-		if($this->upperUrl)
+		if ($this->upperUrl)
 		{
 			$url = $this->upperUrl;
 			printf('<do type="vnd.up" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
@@ -112,7 +112,7 @@ 
 	// And returns a list of serial numbers in
 	function getNo()
 	{
-		if(Context::get('mobile_skt')==1)
+		if (Context::get('mobile_skt') == 1)
 		{
 			return "vnd.skmn".parent::getNo();
 		}

addons/mobile/mobile.addon.php

Braces +3 added lines, -3 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file mobile.addon.php
@@ -66,8 +67,7 @@ 
 		$oMobile->displayModuleContent();
 	}
 	// If neither navigation mode nor WAP class is, display the module's result
-}
-else if($called_position == 'after_module_proc')
+} else if($called_position == 'after_module_proc')
 {
 	// Display
 	$oMobile->displayContent();

Spacing +10 added lines, -10 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -19,24 +19,24 @@ 
  * Condition
  * */
 // Ignore admin page
-if(Context::get('module') == 'admin')
+if (Context::get('module') == 'admin')
 {
 	return;
 }
 // Manage when to call it
-if($called_position != 'before_module_proc' && $called_position != 'after_module_proc')
+if ($called_position != 'before_module_proc' && $called_position != 'after_module_proc')
 {
 	return;
 }
 // Ignore if not mobile browser
-require_once(_XE_PATH_ . 'addons/mobile/classes/mobile.class.php');
-if(!mobileXE::getBrowserType())
+require_once(_XE_PATH_.'addons/mobile/classes/mobile.class.php');
+if (!mobileXE::getBrowserType())
 {
 	return;
 }
 // Generate mobile instance
 $oMobile = &mobileXE::getInstance();
-if(!$oMobile)
+if (!$oMobile)
 {
 	return;
 }
@@ -48,15 +48,15 @@ 
 $oMobile->setModuleInstance($this);
 
 // Extract content and display/exit if navigate mode is or if WAP class exists
-if($called_position == 'before_module_proc')
+if ($called_position == 'before_module_proc')
 {
-	if($oMobile->isLangChange())
+	if ($oMobile->isLangChange())
 	{
 		$oMobile->setLangType();
 		$oMobile->displayLangSelect();
 	}
 	// On navigation mode, display navigation content
-	if($oMobile->isNavigationMode())
+	if ($oMobile->isNavigationMode())
 	{
 		$oMobile->displayNavigationContent();
 	}
@@ -67,7 +67,7 @@ 
 	}
 	// If neither navigation mode nor WAP class is, display the module's result
 }
-else if($called_position == 'after_module_proc')
+else if ($called_position == 'after_module_proc')
 {
 	// Display
 	$oMobile->displayContent();

addons/oembed/oembed.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
 
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
+if ($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
 {
 	Context::loadFile('./addons/oembed/jquery.oembed.css');
 	Context::loadFile(array('./addons/oembed/jquery.oembed.js', 'body', '', null), true);

addons/point_level_icon/point_level_icon.addon.php

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file point.addon.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -12,15 +12,15 @@ 
  * Display point level icon before user name when point system is enabled.
  * */
 // return unless before_display_content
-if($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
+if ($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
 {
 	return;
 }
 
-require_once(_XE_PATH_ . 'addons/point_level_icon/point_level_icon.lib.php');
+require_once(_XE_PATH_.'addons/point_level_icon/point_level_icon.lib.php');
 
 $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
-if($temp_output)
+if ($temp_output)
 {
 	$output = $temp_output;
 }

addons/resize_image/resize_image.addon.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -11,9 +11,9 @@ 
  * @author NAVER (developers@xpressengine.com)
  * @brief Add-on to resize images in the body
  */
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML" && !isCrawler())
+if ($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML" && !isCrawler())
 {
-	if(Mobile::isFromMobilePhone())
+	if (Mobile::isFromMobilePhone())
 	{
 		Context::loadFile('./addons/resize_image/css/resize_image.mobile.css', true);
 	}

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
 	if(Mobile::isFromMobilePhone())
 	{
 		Context::loadFile('./addons/resize_image/css/resize_image.mobile.css', true);
-	}
-	else
+	} else
 	{
 		Context::loadJavascriptPlugin('ui');
 		Context::loadFile(array('./addons/resize_image/js/resize_image.min.js', 'body', '', null), true);

classes/cache/CacheHandler.class.php

Braces +7 added lines, -14 removed lines

@@ -63,37 +63,30 @@
 				if($info->use_object_cache == 'apc')
 				{
 					$type = 'apc';
-				}
-				else if(substr($info->use_object_cache, 0, 8) == 'memcache')
+				} else if(substr($info->use_object_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_object_cache;
-				}
-				else if($info->use_object_cache == 'wincache')
+				} else if($info->use_object_cache == 'wincache')
 				{
 					$type = 'wincache';
-				}
-				else if($info->use_object_cache == 'file')
+				} else if($info->use_object_cache == 'file')
 				{
 					$type = 'file';
-				}
-				else if($always_use_file)
+				} else if($always_use_file)
 				{
 					$type = 'file';
 				}
-			}
-			else if($target == 'template')
+			} else if($target == 'template')
 			{
 				if($info->use_template_cache == 'apc')
 				{
 					$type = 'apc';
-				}
-				else if(substr($info->use_template_cache, 0, 8) == 'memcache')
+				} else if(substr($info->use_template_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_template_cache;
-				}
-				else if($info->use_template_cache == 'wincache')
+				} else if($info->use_template_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}

Spacing +26 added lines, -26 removed lines

@@ -30,8 +30,8 @@ 
 	 */
 	function &getInstance($target = 'object', $info = null, $always_use_file = false)
 	{
-		$cache_handler_key = $target . ($always_use_file ? '_file' : '');
-		if(!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key])
+		$cache_handler_key = $target.($always_use_file ? '_file' : '');
+		if (!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key])
 		{
 			$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key] = new CacheHandler($target, $info, $always_use_file);
 		}
@@ -51,61 +51,61 @@ 
 	 */
 	function CacheHandler($target, $info = null, $always_use_file = false)
 	{
-		if(!$info)
+		if (!$info)
 		{
 			$info = Context::getDBInfo();
 		}
 
-		if($info)
+		if ($info)
 		{
-			if($target == 'object')
+			if ($target == 'object')
 			{
-				if($info->use_object_cache == 'apc')
+				if ($info->use_object_cache == 'apc')
 				{
 					$type = 'apc';
 				}
-				else if(substr($info->use_object_cache, 0, 8) == 'memcache')
+				else if (substr($info->use_object_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_object_cache;
 				}
-				else if($info->use_object_cache == 'wincache')
+				else if ($info->use_object_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}
-				else if($info->use_object_cache == 'file')
+				else if ($info->use_object_cache == 'file')
 				{
 					$type = 'file';
 				}
-				else if($always_use_file)
+				else if ($always_use_file)
 				{
 					$type = 'file';
 				}
 			}
-			else if($target == 'template')
+			else if ($target == 'template')
 			{
-				if($info->use_template_cache == 'apc')
+				if ($info->use_template_cache == 'apc')
 				{
 					$type = 'apc';
 				}
-				else if(substr($info->use_template_cache, 0, 8) == 'memcache')
+				else if (substr($info->use_template_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_template_cache;
 				}
-				else if($info->use_template_cache == 'wincache')
+				else if ($info->use_template_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}
 			}
 
-			if($type)
+			if ($type)
 			{
-				$class = 'Cache' . ucfirst($type);
+				$class = 'Cache'.ucfirst($type);
 				include_once sprintf('%sclasses/cache/%s.class.php', _XE_PATH_, $class);
 				$this->handler = call_user_func(array($class, 'getInstance'), $url);
 				$this->keyGroupVersions = $this->handler->get('key_group_versions', 0);
-				if(!$this->keyGroupVersions)
+				if (!$this->keyGroupVersions)
 				{
 					$this->keyGroupVersions = array();
 					$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
@@ -121,7 +121,7 @@ 
 	 */
 	function isSupport()
 	{
-		if($this->handler && $this->handler->isSupport())
+		if ($this->handler && $this->handler->isSupport())
 		{
 			return true;
 		}
@@ -139,7 +139,7 @@ 
 	{
 		$key = str_replace('/', ':', $key);
 
-		return __XE_VERSION__ . ':' . $key;
+		return __XE_VERSION__.':'.$key;
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 */
 	function get($key, $modified_time = 0)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -174,7 +174,7 @@ 
 	 */
 	function put($key, $obj, $valid_time = 0)
 	{
-		if(!$this->handler && !$key)
+		if (!$this->handler && !$key)
 		{
 			return false;
 		}
@@ -192,7 +192,7 @@ 
 	 */
 	function delete($key)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -212,7 +212,7 @@ 
 	 */
 	function isValid($key, $modified_time)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -229,7 +229,7 @@ 
 	 */
 	function truncate()
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -255,13 +255,13 @@ 
 	 */
 	function getGroupKey($keyGroupName, $key)
 	{
-		if(!$this->keyGroupVersions[$keyGroupName])
+		if (!$this->keyGroupVersions[$keyGroupName])
 		{
 			$this->keyGroupVersions[$keyGroupName] = 1;
 			$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
 		}
 
-		return 'cache_group_' . $this->keyGroupVersions[$keyGroupName] . ':' . $keyGroupName . ':' . $key;
+		return 'cache_group_'.$this->keyGroupVersions[$keyGroupName].':'.$keyGroupName.':'.$key;
 	}
 
 	/**

Doc Comments +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
 	 * @param string $key Cache key
 	 * @param int $modified_time 	Unix time of data modified.
 	 * 								If stored time is older then modified time, return false.
-	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 * @return boolean Return false on failure or older then modified time. Return the string associated with the $key on success.
 	 */
 	function get($key, $modified_time = 0)
 	{
@@ -297,7 +297,7 @@ 
 	 * @param string $key Cache key
 	 * @param int $modified_time 	Unix time of data modified.
 	 * 								If stored time is older then modified time, return false.
-	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 * @return boolean Return false on failure or older then modified time. Return the string associated with the $key on success.
 	 */
 	function get($key, $modified_time = 0)
 	{

classes/db/DBMysqli.class.php

Braces +7 added lines, -9 removed lines

@@ -51,8 +51,7 @@ 
 							, $connection["db_password"]
 							, $connection["db_database"]
 							, $connection["db_port"]);
-		}
-		else
+		} else
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -209,8 +208,7 @@ 
 					$params[] = $v;
 					$types .= $type;
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $value;
 				$types .= $type;
@@ -249,10 +247,12 @@ 
 		$longtext_exists = false;
 		foreach($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if(isset($resultArray[$field->name])) {
+				// When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
 				$field->name = 'repeat_' . $field->name;
 			}
+			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
@@ -301,8 +301,7 @@ 
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
-		}
-		else
+		} else
 		{
 			$output = $rows;
 		}
@@ -312,8 +311,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	/**
 	 * Search Result
 	 *
-	 * @return Object
+	 * @return Object|null
 	 */
 	function IS()
 	{

Spacing +38 added lines, -38 removed lines

@@ -44,7 +44,7 @@ 
 	function __connect($connection)
 	{
 		// Attempt to connect
-		if($connection["db_port"])
+		if ($connection["db_port"])
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -60,7 +60,7 @@ 
 							, $connection["db_database"]);
 		}
 		$error = mysqli_connect_errno();
-		if($error)
+		if ($error)
 		{
 			$this->setError($error, mysqli_connect_error());
 			return;
@@ -87,11 +87,11 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
-		if(!is_numeric($string))
+		if (!is_numeric($string))
 		{
 			$connection = $this->_getConnection('master');
 			$string = mysqli_escape_string($connection, $string);
@@ -108,23 +108,23 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			// 1. Prepare query
 			$stmt = mysqli_prepare($connection, $query);
-			if($stmt)
+			if ($stmt)
 			{
 				$types = '';
 				$params = array();
 				$this->_prepareQueryParameters($types, $params);
 
-				if(!empty($params))
+				if (!empty($params))
 				{
 					$args[0] = $stmt;
 					$args[1] = $types;
 
 					$i = 2;
-					foreach($params as $key => $param)
+					foreach ($params as $key => $param)
 					{
 						$copy[$key] = $param;
 						$args[$i++] = &$copy[$key];
@@ -132,18 +132,18 @@ 
 
 					// 2. Bind parameters
 					$status = call_user_func_array('mysqli_stmt_bind_param', $args);
-					if(!$status)
+					if (!$status)
 					{
-						$this->setError(-1, "Invalid arguments: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
+						$this->setError(-1, "Invalid arguments: $query".mysqli_error($connection).PHP_EOL.print_r($args, true));
 					}
 				}
 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
-					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
+					$this->setError(-1, "Prepared statement failed: $query".mysqli_error($connection).PHP_EOL.print_r($args, true));
 				}
 
 				// Return stmt for other processing - like retrieving resultset (_fetch)
@@ -155,7 +155,7 @@ 
 		$result = mysqli_query($connection, $query);
 		// Error Check
 		$error = mysqli_error($connection);
-		if($error)
+		if ($error)
 		{
 			$this->setError(mysqli_errno($connection), $error);
 		}
@@ -174,23 +174,23 @@ 
 	{
 		$types = '';
 		$params = array();
-		if(!$this->param)
+		if (!$this->param)
 		{
 			return;
 		}
 
-		foreach($this->param as $k => $o)
+		foreach ($this->param as $k => $o)
 		{
 			$value = $o->getUnescapedValue();
 			$type = $o->getType();
 
 			// Skip column names -> this should be concatenated to query string
-			if($o->isColumnName())
+			if ($o->isColumnName())
 			{
 				continue;
 			}
 
-			switch($type)
+			switch ($type)
 			{
 				case 'number' :
 					$type = 'i';
@@ -202,9 +202,9 @@ 
 					$type = 's';
 			}
 
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
 					$params[] = $v;
 					$types .= $type;
@@ -226,12 +226,12 @@ 
 	 */
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_fetch($result, $arrayIndexEndValue);
 		}
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
@@ -247,25 +247,25 @@ 
 		 * MYSQLI_TYPE for longtext is 252
 		 */
 		$longtext_exists = false;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if (isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
-				$field->name = 'repeat_' . $field->name;
+				$field->name = 'repeat_'.$field->name;
 			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
 			$resultArray[$field->name] = &$row[$field->name];
 
-			if($field->type == 252)
+			if ($field->type == 252)
 			{
 				$longtext_exists = true;
 			}
 		}
 		$resultArray = array_merge(array($stmt), $resultArray);
 
-		if($longtext_exists)
+		if ($longtext_exists)
 		{
 			mysqli_stmt_store_result($stmt);
 		}
@@ -273,17 +273,17 @@ 
 		call_user_func_array('mysqli_stmt_bind_result', $resultArray);
 
 		$rows = array();
-		while(mysqli_stmt_fetch($stmt))
+		while (mysqli_stmt_fetch($stmt))
 		{
 			$resultObject = new stdClass();
 
-			foreach($resultArray as $key => $value)
+			foreach ($resultArray as $key => $value)
 			{
-				if($key === 0)
+				if ($key === 0)
 				{
 					continue; // Skip stmt object
 				}
-				if(strpos($key, 'repeat_'))
+				if (strpos($key, 'repeat_'))
 				{
 					$key = substr($key, 6);
 				}
@@ -295,9 +295,9 @@ 
 
 		mysqli_stmt_close($stmt);
 
-		if($arrayIndexEndValue)
+		if ($arrayIndexEndValue)
 		{
-			foreach($rows as $row)
+			foreach ($rows as $row)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -307,9 +307,9 @@ 
 			$output = $rows;
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -330,7 +330,7 @@ 
 	 */
 	function _executeInsertAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeInsertAct($queryObject);
 		}
@@ -348,7 +348,7 @@ 
 	 */
 	function _executeUpdateAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeUpdateAct($queryObject);
 		}
@@ -366,7 +366,7 @@ 
 	 */
 	function _executeDeleteAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeDeleteAct($queryObject);
 		}
@@ -387,7 +387,7 @@ 
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeSelectAct($queryObject, $connection);
 		}