Inspection of "PHP 7 호환성 개선 (진행중)" - xpressengine/xe-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#1814)

unknown

created 2015-12-14 06:15 UTC

Status

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -20,14 +20,14 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	 **/
 	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 @@  discard block
 block discarded – undo
 	 **/
 	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'));
-			printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
+			$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");

Please login to merge, or discard this patch.

Braces +14 added lines, -8 removed lines patch added patch discarded remove patch

@@ -20,13 +20,17 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		{
 			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 @@  discard block
 block discarded – undo
 		{
 			$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");
 		}

Please login to merge, or discard this patch.

addons/mobile/classes/wml.class.php 3 patches

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@
 block discarded – undo
 <?php
 /**
- * WML Library ver 0.1
- * @author NAVER ([email protected]) / lang_select : misol
- */
+	 * WML Library ver 0.1
+	 * @author NAVER ([email protected]) / lang_select : misol
+	 */
 class wap extends mobileXE
 {
 	/**

Please login to merge, or discard this patch.

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@  discard block
 block discarded – undo
 	function printHeader()
 	{
 		header("Content-Type: text/vnd.wap.wml");
-		header("charset: ".$this->charset);
-		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");
+		header("charset: " . $this->charset);
+		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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	 */
 	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'));
-			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
+			$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,9 +112,9 @@  discard block
 block discarded – undo
 	// 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();
+			return "vnd.skmn" . parent::getNo();
 		}
 		else
 		{

Please login to merge, or discard this patch.

Braces +15 added lines, -10 removed lines patch added patch discarded remove patch

@@ -20,7 +20,9 @@  discard block
 block discarded – undo
 	{
 		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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 		{
 			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 @@  discard block
 block discarded – undo
 		{
 			$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 @@  discard block
 block discarded – undo
 		if(Context::get('mobile_skt')==1)
 		{
 			return "vnd.skmn".parent::getNo();
-		}
-		else
+		} else
 		{
 			return parent::getNo();
 		}

Please login to merge, or discard this patch.

addons/mobile/mobile.addon.php 2 patches

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -19,24 +19,24 @@  discard block
 block discarded – undo
  * 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())
+if (!mobileXE::getBrowserType())
 {
 	return;
 }
 // Generate mobile instance
 $oMobile = &mobileXE::getInstance();
-if(!$oMobile)
+if (!$oMobile)
 {
 	return;
 }
@@ -48,15 +48,15 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 	}
 	// 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();

Please login to merge, or discard this patch.

Braces +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,8 +1,9 @@  discard block
 block discarded – undo
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file mobile.addon.php
@@ -66,8 +67,7 @@  discard block
 block discarded – undo
 		$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();

Please login to merge, or discard this patch.

addons/oembed/oembed.addon.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@
 block discarded – undo
 <?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);

Please login to merge, or discard this patch.

addons/openid_delegation_id/openid_delegation_id.addon.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -13,12 +13,12 @@  discard block
 block discarded – undo
  * Enter your open ID service information on the configuration.
  * */
 // Execute only wen called_position is before_module_init
-if($called_position != 'before_module_init')
+if ($called_position != 'before_module_init')
 {
 	return;
 }
 // Get add-on settings(openid_delegation_id)
-if(!$addon_info->server || !$addon_info->delegate || !$addon_info->xrds)
+if (!$addon_info->server || !$addon_info->delegate || !$addon_info->xrds)
 {
 	return;
 }

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

addons/point_level_icon/point_level_icon.addon.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
  * 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;
 }
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 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;
 }

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

addons/point_level_icon/point_level_icon.lib.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
 function pointLevelIconTrans($matches)
 {
 	$member_srl = $matches[3];
-	if($member_srl < 1)
+	if ($member_srl < 1)
 	{
 		return $matches[0];
 	}
@@ -16,15 +16,15 @@  discard block
 block discarded – undo
 
 	// Check Group Image Mark
 	$oMemberModel = getModel('member');
-	if($oMemberModel->getGroupImageMark($member_srl))
+	if ($oMemberModel->getGroupImageMark($member_srl))
 	{
 		return $orig_text . $matches[5] . '</' . $matches[6] . '>';
 	}
 
-	if(!isset($GLOBALS['_pointLevelIcon'][$member_srl]))
+	if (!isset($GLOBALS['_pointLevelIcon'][$member_srl]))
 	{
 		// Get point configuration
-		if(!$GLOBALS['_pointConfig'])
+		if (!$GLOBALS['_pointConfig'])
 		{
 			$oModuleModel = getModel('module');
 			$GLOBALS['_pointConfig'] = $oModuleModel->getModuleConfig('point');
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
 		$config = $GLOBALS['_pointConfig'];
 
 		// Get point model
-		if(!$GLOBALS['_pointModel'])
+		if (!$GLOBALS['_pointModel'])
 		{
 			$GLOBALS['_pointModel'] = getModel('point');
 		}
 		$oPointModel = &$GLOBALS['_pointModel'];
 
 		// Get points
-		if(!$oPointModel->isExistsPoint($member_srl))
+		if (!$oPointModel->isExistsPoint($member_srl))
 		{
 			return $matches[0];
 		}
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
 
 		// Get per to go to the next level if not a top level
 		$per = NULL;
-		if($level < $config->max_level)
+		if ($level < $config->max_level)
 		{
 			$next_point = $config->level_step[$level + 1];
 			$present_point = $config->level_step[$level];
-			if($next_point > 0)
+			if ($next_point > 0)
 			{
 				$per = (int) (($point - $present_point) / ($next_point - $present_point) * 100);
 				$per = $per . '%';

Please login to merge, or discard this patch.

addons/resize_image/resize_image.addon.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
  * @author NAVER ([email protected])
  * @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);
 	}

Please login to merge, or discard this patch.

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -16,8 +16,7 @@
 block discarded – undo
 	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);

Please login to merge, or discard this patch.

classes/cache/CacheApc.class.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -18,7 +18,7 @@  discard block
 block discarded – undo
 	 */
 	function getInstance($opt = null)
 	{
-		if(!$GLOBALS['__CacheApc__'])
+		if (!$GLOBALS['__CacheApc__'])
 		{
 			$GLOBALS['__CacheApc__'] = new CacheApc();
 		}
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
@@ -76,13 +76,13 @@  discard block
 block discarded – undo
 	{
 		$_key = md5(_XE_PATH_ . $key);
 		$obj = apc_fetch($_key, $success);
-		if(!$success || !is_array($obj))
+		if (!$success || !is_array($obj))
 		{
 			return false;
 		}
 		unset($obj[1]);
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->delete($key);
 			return false;
@@ -103,12 +103,12 @@  discard block
 block discarded – undo
 	{
 		$_key = md5(_XE_PATH_ . $key);
 		$obj = apc_fetch($_key, $success);
-		if(!$success || !is_array($obj))
+		if (!$success || !is_array($obj))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->delete($key);
 			return false;
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
 	}
 }
 
-CacheApc::$isSupport  = function_exists('apc_add');
+CacheApc::$isSupport = function_exists('apc_add');
 
 /* End of file CacheApc.class.php */
 /* Location: ./classes/cache/CacheApc.class.php */

Please login to merge, or discard this patch.

GitHub Access Token became invalid

Pull Request — develop (#1814)

Status

Category

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Braces +14 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Braces +15 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

		@@ -20,14 +20,14 @@ discard block
		block discarded – undo
20	20	function printHeader()
21	21	{
22	22	print("<html><head>\n");
23		- if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
24		- 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));
	23	+ if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
	24	+ 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));
25	25	}
26	26	// Output title
27	27	function printTitle()
28	28	{
29		- if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
30		- printf('<%s%s><br>%s', htmlspecialchars($this->title, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false),"\n");
	29	+ if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
	30	+ printf('<%s%s><br>%s', htmlspecialchars($this->title, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false), htmlspecialchars($titlePageStr, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false), "\n");
31	31	}
32	32
33	33	/**
		@@ -36,18 +36,18 @@ discard block
		block discarded – undo
36	36	**/
37	37	function printContent()
38	38	{
39		- if($this->hasChilds())
	39	+ if ($this->hasChilds())
40	40	{
41		- foreach($this->getChilds() as $key => $val)
	41	+ foreach ($this->getChilds() as $key => $val)
42	42	{
43		- if(!$val['link']) continue;
	43	+ if (!$val['link']) continue;
44	44	printf('<a href="%s" accesskey="%s">%s</a><br>%s', $val['href'], $this->getNo(), $val['text'], "\n");
45		- if($val['extra']) printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
	45	+ if ($val['extra']) printf("<br>%s\n", str_replace('<br/>', '<br>', $val['extra']));
46	46	}
47	47	}
48	48	else
49	49	{
50		- print(str_replace('<br/>','<br>',$this->getContent())."\n");
	50	+ print(str_replace('<br/>', '<br>', $this->getContent()) . "\n");
51	51	}
52	52	print "<hr><br>";
53	53	}
		@@ -57,32 +57,32 @@ discard block
		block discarded – undo
57	57	**/
58	58	function printBtn()
59	59	{
60		- if($this->nextUrl)
	60	+ if ($this->nextUrl)
61	61	{
62	62	$url = $this->nextUrl;
63	63	printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
64	64	}
65		- if($this->prevUrl)
	65	+ if ($this->prevUrl)
66	66	{
67	67	$url = $this->prevUrl;
68	68	printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
69	69	}
70	70	// Select Language
71		- if(!parent::isLangChange())
	71	+ if (!parent::isLangChange())
72	72	{
73		- $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
74		- printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
	73	+ $url = getUrl('', 'lcm', '1', 'sel_lang', Context::getLangType(), 'return_uri', Context::get('current_url'));
	74	+ printf('<a href="%s">%s</a><br>%s', $url, 'Language : ' . Context::getLang('select_lang'), "\n");
75	75	}
76	76	else
77	77	{
78	78	printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
79	79	}
80		- if($this->upperUrl)
	80	+ if ($this->upperUrl)
81	81	{
82	82	$url = $this->upperUrl;
83	83	printf('<btn href="%s" name="%s">%s', $url->url, $url->text, "\n");
84	84	}
85		- if($this->homeUrl)
	85	+ if ($this->homeUrl)
86	86	{
87	87	$url = $this->homeUrl;
88	88	printf('<a btn="%s" href="%s">%s</a><br>%s', $url->text, $url->url, $url->text, "\n");

		@@ -20,13 +20,17 @@ discard block
		block discarded – undo
20	20	function printHeader()
21	21	{
22	22	print("<html><head>\n");
23		- if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
	23	+ if($this->totalPage > $this->mobilePage) {
	24	+ $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
	25	+ }
24	26	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));
25	27	}
26	28	// Output title
27	29	function printTitle()
28	30	{
29		- if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
	31	+ if($this->totalPage > $this->mobilePage) {
	32	+ $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
	33	+ }
30	34	printf('<%s%s><br>%s', htmlspecialchars($this->title, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false),"\n");
31	35	}
32	36
		@@ -40,12 +44,15 @@ discard block
		block discarded – undo
40	44	{
41	45	foreach($this->getChilds() as $key => $val)
42	46	{
43		- if(!$val['link']) continue;
	47	+ if(!$val['link']) {
	48	+ continue;
	49	+ }
44	50	printf('<a href="%s" accesskey="%s">%s</a><br>%s', $val['href'], $this->getNo(), $val['text'], "\n");
45		- if($val['extra']) printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
	51	+ if($val['extra']) {
	52	+ printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
	53	+ }
46	54	}
47		- }
48		- else
	55	+ } else
49	56	{
50	57	print(str_replace('<br/>','<br>',$this->getContent())."\n");
51	58	}
		@@ -72,8 +79,7 @@ discard block
		block discarded – undo
72	79	{
73	80	$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
74	81	printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
75		- }
76		- else
	82	+ } else
77	83	{
78	84	printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
79	85	}

		@@ -1,8 +1,8 @@
		block discarded – undo
1	1	<?php
2	2	/**
3		- * WML Library ver 0.1
4		- * @author NAVER ([email protected]) / lang_select : misol
5		- */
	3	+ * WML Library ver 0.1
	4	+ * @author NAVER ([email protected]) / lang_select : misol
	5	+ */
6	6	class wap extends mobileXE
7	7	{
8	8	/**

		@@ -19,11 +19,11 @@ discard block
		block discarded – undo
19	19	function printHeader()
20	20	{
21	21	header("Content-Type: text/vnd.wap.wml");
22		- header("charset: ".$this->charset);
23		- if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
24		- 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");
	22	+ header("charset: " . $this->charset);
	23	+ if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
	24	+ 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");
25	25	// Card Title
26		- 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));
	26	+ 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));
27	27	}
28	28
29	29	/**
		@@ -31,8 +31,8 @@ discard block
		block discarded – undo
31	31	*/
32	32	function printTitle()
33	33	{
34		- if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
35		- printf('<%s%s><br/>%s', htmlspecialchars($this->title, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false),"\n");
	34	+ if ($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)", $this->mobilePage, $this->totalPage);
	35	+ printf('<%s%s><br/>%s', htmlspecialchars($this->title, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false), htmlspecialchars($titlePageStr, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false), "\n");
36	36	}
37	37
38	38	/**
		@@ -41,18 +41,18 @@ discard block
		block discarded – undo
41	41	*/
42	42	function printContent()
43	43	{
44		- if($this->hasChilds())
	44	+ if ($this->hasChilds())
45	45	{
46		- foreach($this->getChilds() as $key => $val)
	46	+ foreach ($this->getChilds() as $key => $val)
47	47	{
48		- if(!$val['link']) continue;
	48	+ if (!$val['link']) continue;
49	49	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");
50		- if($val['extra']) printf("%s\n",$val['extra']);
	50	+ if ($val['extra']) printf("%s\n", $val['extra']);
51	51	}
52	52	}
53	53	else
54	54	{
55		- printf('%s<br/>%s', str_replace("<br>","<br/>",$this->getContent()),"\n");
	55	+ printf('%s<br/>%s', str_replace("<br>", "<br/>", $this->getContent()), "\n");
56	56	}
57	57	print('<br/>');
58	58	}
		@@ -62,43 +62,43 @@ discard block
		block discarded – undo
62	62	*/
63	63	function printBtn()
64	64	{
65		- if($this->nextUrl)
	65	+ if ($this->nextUrl)
66	66	{
67	67	$url = $this->nextUrl;
68	68	printf('<do type="vnd.next" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
69	69	}
70		- if($this->prevUrl)
	70	+ if ($this->prevUrl)
71	71	{
72	72	$url = $this->prevUrl;
73	73	printf('<do type="vnd.prev" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
74	74	}
75	75	// Others are not applicable in charge of the button output (array passed) type??
76		- if($this->etcBtn)
	76	+ if ($this->etcBtn)
77	77	{
78		- if(is_array($this->etcBtn))
	78	+ if (is_array($this->etcBtn))
79	79	{
80		- foreach($this->etcBtn as $key=>$val)
	80	+ foreach ($this->etcBtn as $key=>$val)
81	81	{
82	82	printf('<do type="vnd.btn%s" label="%s"><go href="%s"/></do>%s', $key, $val['text'], $val['url'], "\n");
83	83	}
84	84	}
85	85	}
86	86	// Select Language
87		- if(!parent::isLangChange())
	87	+ if (!parent::isLangChange())
88	88	{
89		- $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
90		- printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
	89	+ $url = getUrl('', 'lcm', '1', 'sel_lang', Context::getLangType(), 'return_uri', Context::get('current_url'));
	90	+ printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : ' . Context::getLang('select_lang'), $url, "\n");
91	91	}
92	92	else
93	93	{
94	94	printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
95	95	}
96		- if($this->homeUrl)
	96	+ if ($this->homeUrl)
97	97	{
98	98	$url = $this->homeUrl;
99	99	printf('<do type="access" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
100	100	}
101		- if($this->upperUrl)
	101	+ if ($this->upperUrl)
102	102	{
103	103	$url = $this->upperUrl;
104	104	printf('<do type="vnd.up" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
		@@ -112,9 +112,9 @@ discard block
		block discarded – undo
112	112	// And returns a list of serial numbers in
113	113	function getNo()
114	114	{
115		- if(Context::get('mobile_skt')==1)
	115	+ if (Context::get('mobile_skt') == 1)
116	116	{
117		- return "vnd.skmn".parent::getNo();
	117	+ return "vnd.skmn" . parent::getNo();
118	118	}
119	119	else
120	120	{

		@@ -20,7 +20,9 @@ discard block
		block discarded – undo
20	20	{
21	21	header("Content-Type: text/vnd.wap.wml");
22	22	header("charset: ".$this->charset);
23		- if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
	23	+ if($this->totalPage > $this->mobilePage) {
	24	+ $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
	25	+ }
24	26	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");
25	27	// Card Title
26	28	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 @@ discard block
		block discarded – undo
31	33	*/
32	34	function printTitle()
33	35	{
34		- if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
	36	+ if($this->totalPage > $this->mobilePage) {
	37	+ $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
	38	+ }
35	39	printf('<%s%s><br/>%s', htmlspecialchars($this->title, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT \| ENT_HTML401, 'UTF-8', false),"\n");
36	40	}
37	41
		@@ -45,12 +49,15 @@ discard block
		block discarded – undo
45	49	{
46	50	foreach($this->getChilds() as $key => $val)
47	51	{
48		- if(!$val['link']) continue;
	52	+ if(!$val['link']) {
	53	+ continue;
	54	+ }
49	55	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");
50		- if($val['extra']) printf("%s\n",$val['extra']);
	56	+ if($val['extra']) {
	57	+ printf("%s\n",$val['extra']);
	58	+ }
51	59	}
52		- }
53		- else
	60	+ } else
54	61	{
55	62	printf('%s<br/>%s', str_replace("<br>","<br/>",$this->getContent()),"\n");
56	63	}
		@@ -88,8 +95,7 @@ discard block
		block discarded – undo
88	95	{
89	96	$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
90	97	printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
91		- }
92		- else
	98	+ } else
93	99	{
94	100	printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
95	101	}
		@@ -115,8 +121,7 @@ discard block
		block discarded – undo
115	121	if(Context::get('mobile_skt')==1)
116	122	{
117	123	return "vnd.skmn".parent::getNo();
118		- }
119		- else
	124	+ } else
120	125	{
121	126	return parent::getNo();
122	127	}

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2	2	/* Copyright (C) NAVER <http://www.navercorp.com> */
3	3
4		-if(!defined('__XE__'))
	4	+if (!defined('__XE__'))
5	5	exit();
6	6
7	7	/**
		@@ -19,24 +19,24 @@ discard block
		block discarded – undo
19	19	* Condition
20	20	* */
21	21	// Ignore admin page
22		-if(Context::get('module') == 'admin')
	22	+if (Context::get('module') == 'admin')
23	23	{
24	24	return;
25	25	}
26	26	// Manage when to call it
27		-if($called_position != 'before_module_proc' && $called_position != 'after_module_proc')
	27	+if ($called_position != 'before_module_proc' && $called_position != 'after_module_proc')
28	28	{
29	29	return;
30	30	}
31	31	// Ignore if not mobile browser
32	32	require_once(_XE_PATH_ . 'addons/mobile/classes/mobile.class.php');
33		-if(!mobileXE::getBrowserType())
	33	+if (!mobileXE::getBrowserType())
34	34	{
35	35	return;
36	36	}
37	37	// Generate mobile instance
38	38	$oMobile = &mobileXE::getInstance();
39		-if(!$oMobile)
	39	+if (!$oMobile)
40	40	{
41	41	return;
42	42	}
		@@ -48,15 +48,15 @@ discard block
		block discarded – undo
48	48	$oMobile->setModuleInstance($this);
49	49
50	50	// Extract content and display/exit if navigate mode is or if WAP class exists
51		-if($called_position == 'before_module_proc')
	51	+if ($called_position == 'before_module_proc')
52	52	{
53		- if($oMobile->isLangChange())
	53	+ if ($oMobile->isLangChange())
54	54	{
55	55	$oMobile->setLangType();
56	56	$oMobile->displayLangSelect();
57	57	}
58	58	// On navigation mode, display navigation content
59		- if($oMobile->isNavigationMode())
	59	+ if ($oMobile->isNavigationMode())
60	60	{
61	61	$oMobile->displayNavigationContent();
62	62	}
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	}
68	68	// If neither navigation mode nor WAP class is, display the module's result
69	69	}
70		-else if($called_position == 'after_module_proc')
	70	+else if ($called_position == 'after_module_proc')
71	71	{
72	72	// Display
73	73	$oMobile->displayContent();

		@@ -1,8 +1,9 @@ discard block
		block discarded – undo
1	1	<?php
2	2	/* Copyright (C) NAVER <http://www.navercorp.com> */
3	3
4		-if(!defined('__XE__'))
	4	+if(!defined('__XE__')) {
5	5	exit();
	6	+}
6	7
7	8	/**
8	9	* @file mobile.addon.php
		@@ -66,8 +67,7 @@ discard block
		block discarded – undo
66	67	$oMobile->displayModuleContent();
67	68	}
68	69	// If neither navigation mode nor WAP class is, display the module's result
69		-}
70		-else if($called_position == 'after_module_proc')
	70	+} else if($called_position == 'after_module_proc')
71	71	{
72	72	// Display
73	73	$oMobile->displayContent();

		@@ -1,12 +1,12 @@
		block discarded – undo
1	1	<?php
2	2	/* Copyright (C) NAVER <http://www.navercorp.com> */
3	3
4		-if(!defined('__XE__'))
	4	+if (!defined('__XE__'))
5	5	{
6	6	exit();
7	7	}
8	8
9		-if($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
	9	+if ($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
10	10	{
11	11	Context::loadFile('./addons/oembed/jquery.oembed.css');
12	12	Context::loadFile(array('./addons/oembed/jquery.oembed.js', 'body', '', null), true);

		@@ -1,8 +1,9 @@
		block discarded – undo
1	1	<?php
2	2	/* Copyright (C) NAVER <http://www.navercorp.com> */
3	3
4		-if(!defined('__XE__'))
	4	+if(!defined('__XE__')) {
5	5	exit();
	6	+}
6	7
7	8	/**
8	9	* @file point.addon.php

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	function pointLevelIconTrans($matches)
8	8	{
9	9	$member_srl = $matches[3];
10		- if($member_srl < 1)
	10	+ if ($member_srl < 1)
11	11	{
12	12	return $matches[0];
13	13	}
		@@ -16,15 +16,15 @@ discard block
		block discarded – undo
16	16
17	17	// Check Group Image Mark
18	18	$oMemberModel = getModel('member');
19		- if($oMemberModel->getGroupImageMark($member_srl))
	19	+ if ($oMemberModel->getGroupImageMark($member_srl))
20	20	{
21	21	return $orig_text . $matches[5] . '</' . $matches[6] . '>';
22	22	}
23	23
24		- if(!isset($GLOBALS['_pointLevelIcon'][$member_srl]))
	24	+ if (!isset($GLOBALS['_pointLevelIcon'][$member_srl]))
25	25	{
26	26	// Get point configuration
27		- if(!$GLOBALS['_pointConfig'])
	27	+ if (!$GLOBALS['_pointConfig'])
28	28	{
29	29	$oModuleModel = getModel('module');
30	30	$GLOBALS['_pointConfig'] = $oModuleModel->getModuleConfig('point');
		@@ -32,14 +32,14 @@ discard block
		block discarded – undo
32	32	$config = $GLOBALS['_pointConfig'];
33	33
34	34	// Get point model
35		- if(!$GLOBALS['_pointModel'])
	35	+ if (!$GLOBALS['_pointModel'])
36	36	{
37	37	$GLOBALS['_pointModel'] = getModel('point');
38	38	}
39	39	$oPointModel = &$GLOBALS['_pointModel'];
40	40
41	41	// Get points
42		- if(!$oPointModel->isExistsPoint($member_srl))
	42	+ if (!$oPointModel->isExistsPoint($member_srl))
43	43	{
44	44	return $matches[0];
45	45	}
		@@ -55,11 +55,11 @@ discard block
		block discarded – undo
55	55
56	56	// Get per to go to the next level if not a top level
57	57	$per = NULL;
58		- if($level < $config->max_level)
	58	+ if ($level < $config->max_level)
59	59	{
60	60	$next_point = $config->level_step[$level + 1];
61	61	$present_point = $config->level_step[$level];
62		- if($next_point > 0)
	62	+ if ($next_point > 0)
63	63	{
64	64	$per = (int) (($point - $present_point) / ($next_point - $present_point) * 100);
65	65	$per = $per . '%';

		@@ -16,8 +16,7 @@
		block discarded – undo
16	16	if(Mobile::isFromMobilePhone())
17	17	{
18	18	Context::loadFile('./addons/resize_image/css/resize_image.mobile.css', true);
19		- }
20		- else
	19	+ } else
21	20	{
22	21	Context::loadJavascriptPlugin('ui');
23	22	Context::loadFile(array('./addons/resize_image/js/resize_image.min.js', 'body', '', null), true);

		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	*/
19	19	function getInstance($opt = null)
20	20	{
21		- if(!$GLOBALS['__CacheApc__'])
	21	+ if (!$GLOBALS['__CacheApc__'])
22	22	{
23	23	$GLOBALS['__CacheApc__'] = new CacheApc();
24	24	}
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	*/
57	57	function put($key, $buff, $valid_time = 0)
58	58	{
59		- if($valid_time == 0)
	59	+ if ($valid_time == 0)
60	60	{
61	61	$valid_time = $this->valid_time;
62	62	}
		@@ -76,13 +76,13 @@ discard block
		block discarded – undo
76	76	{
77	77	$_key = md5(_XE_PATH_ . $key);
78	78	$obj = apc_fetch($_key, $success);
79		- if(!$success \|\| !is_array($obj))
	79	+ if (!$success \|\| !is_array($obj))
80	80	{
81	81	return false;
82	82	}
83	83	unset($obj[1]);
84	84
85		- if($modified_time > 0 && $modified_time > $obj[0])
	85	+ if ($modified_time > 0 && $modified_time > $obj[0])
86	86	{
87	87	$this->delete($key);
88	88	return false;
		@@ -103,12 +103,12 @@ discard block
		block discarded – undo
103	103	{
104	104	$_key = md5(_XE_PATH_ . $key);
105	105	$obj = apc_fetch($_key, $success);
106		- if(!$success \|\| !is_array($obj))
	106	+ if (!$success \|\| !is_array($obj))
107	107	{
108	108	return false;
109	109	}
110	110
111		- if($modified_time > 0 && $modified_time > $obj[0])
	111	+ if ($modified_time > 0 && $modified_time > $obj[0])
112	112	{
113	113	$this->delete($key);
114	114	return false;
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	}
149	149	}
150	150
151		-CacheApc::$isSupport = function_exists('apc_add');
	151	+CacheApc::$isSupport = function_exists('apc_add');
152	152
153	153	/* End of file CacheApc.class.php */
154	154	/* Location: ./classes/cache/CacheApc.class.php */

xpressengine / xe-core

GitHub Access Token became invalid

Pull Request — develop (#1814)

Status

Category

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Braces +14 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Braces +15 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch