xpressengine / xe-core

addons/openid_delegation_id/openid_delegation_id.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 openid_delegation_id.addon.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -13,19 +13,19 @@ 
  * 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;
 }
 
 $header_script = sprintf(
-		'<link rel="openid.server" href="%s" />' . "\n" .
-		'<link rel="openid.delegate" href="%s" />' . "\n" .
+		'<link rel="openid.server" href="%s" />'."\n".
+		'<link rel="openid.delegate" href="%s" />'."\n".
 		'<meta http-equiv="X-XRDS-Location" content="%s" />',
 		$addon_info->server,
 		$addon_info->delegate,

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/cache/CacheMemcache.class.php

Braces +1 added lines, -2 removed lines

@@ -64,8 +64,7 @@
 		if($this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1))
 		{
 			$GLOBALS['XE_MEMCACHE_SUPPORT'] = true;
-		}
-		else
+		} else
 		{
 			$GLOBALS['XE_MEMCACHE_SUPPORT'] = false;
 		}

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
 	 */
 	function getInstance($url)
 	{
-		if(!$GLOBALS['__CacheMemcache__'])
+		if (!$GLOBALS['__CacheMemcache__'])
 		{
 			$GLOBALS['__CacheMemcache__'] = new CacheMemcache($url);
 		}
@@ -42,7 +42,7 @@ 
 		$config['url'] = is_array($url) ? $url : array($url);
 		$this->Memcache = new Memcache;
 
-		foreach($config['url'] as $url)
+		foreach ($config['url'] as $url)
 		{
 			$info = parse_url($url);
 			$this->Memcache->addServer($info['host'], $info['port']);
@@ -56,12 +56,12 @@ 
 	 */
 	function isSupport()
 	{
-		if(isset($GLOBALS['XE_MEMCACHE_SUPPORT']))
+		if (isset($GLOBALS['XE_MEMCACHE_SUPPORT']))
 		{
 			return true;
 		}
 
-		if($this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1))
+		if ($this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1))
 		{
 			$GLOBALS['XE_MEMCACHE_SUPPORT'] = true;
 		}
@@ -81,7 +81,7 @@ 
 	 */
 	function getKey($key)
 	{
-		return md5(_XE_PATH_ . $key);
+		return md5(_XE_PATH_.$key);
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
@@ -124,13 +124,13 @@ 
 		$_key = $this->getKey($key);
 
 		$obj = $this->Memcache->get($_key);
-		if(!$obj || !is_array($obj))
+		if (!$obj || !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;
@@ -153,12 +153,12 @@ 
 	{
 		$_key = $this->getKey($key);
 		$obj = $this->Memcache->get($_key);
-		if(!$obj || !is_array($obj))
+		if (!$obj || !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;

classes/db/queryparts/condition/ConditionGroup.class.php

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
 		if(count($this->conditions) === 0)

 		{

 			$this->_show = false;

-		}

-		else

+		} else

 		{

 			$this->_show = true;

 		}

Spacing +12 added lines, -12 removed lines

@@ -32,14 +32,14 @@ 
 	function ConditionGroup($conditions, $pipe = "")

 	{

 		$this->conditions = array();

-		foreach($conditions as $condition)

+		foreach ($conditions as $condition)

 		{

-			if($condition->show())

+			if ($condition->show())

 			{

 				$this->conditions[] = $condition;

 			}

 		}

-		if(count($this->conditions) === 0)

+		if (count($this->conditions) === 0)

 		{

 			$this->_show = false;

 		}

@@ -58,7 +58,7 @@ 
 

 	function setPipe($pipe)

 	{

-		if($this->pipe !== $pipe)

+		if ($this->pipe !== $pipe)

 		{

 			$this->_group = null;

 		}

@@ -72,24 +72,24 @@ 
 	 */

 	function toString($with_value = true)

 	{

-		if(!isset($this->_group))

+		if (!isset($this->_group))

 		{

 			$cond_indx = 0;

 			$group = '';

 

-			foreach($this->conditions as $condition)

+			foreach ($this->conditions as $condition)

 			{

-				if($cond_indx === 0)

+				if ($cond_indx === 0)

 				{

 					$condition->setPipe("");

 				}

-				$group .= $condition->toString($with_value) . ' ';

+				$group .= $condition->toString($with_value).' ';

 				$cond_indx++;

 			}

 

-			if($this->pipe !== "" && trim($group) !== '')

+			if ($this->pipe !== "" && trim($group) !== '')

 			{

-				$group = $this->pipe . ' (' . $group . ')';

+				$group = $this->pipe.' ('.$group.')';

 			}

 

 			$this->_group = $group;

@@ -104,10 +104,10 @@ 
 	function getArguments()

 	{

 		$args = array();

-		foreach($this->conditions as $condition)

+		foreach ($this->conditions as $condition)

 		{

 			$arg = $condition->getArgument();

-			if($arg)

+			if ($arg)

 			{

 				$args[] = $arg;

 			}

classes/db/queryparts/condition/ConditionWithArgument.class.php

Braces +5 added lines, -6 removed lines

@@ -30,8 +30,9 @@ 
 

 	function getArgument()

 	{

-		if(!$this->show())

-			return;

+		if(!$this->show()) {
+					return;
+		}
 		return $this->argument;

 	}

 

@@ -55,15 +56,13 @@ 
 				$q = substr($q, 0, -1);

 			}

 			$q = '(' . $q . ')';

-		}

-		else

+		} else

 		{

 			// Prepared statements: column names should not be sent as query arguments, but instead concatenated to query string

 			if($this->argument->isColumnName())

 			{

 				$q = $value;

-			}

-			else

+			} else

 			{

 				$q = '?';

 			}

Spacing +12 added lines, -12 removed lines

@@ -19,7 +19,7 @@ 
 	 */

 	function ConditionWithArgument($column_name, $argument, $operation, $pipe = "")

 	{

-		if($argument === null)

+		if ($argument === null)

 		{

 			$this->_show = false;

 			return;

@@ -30,7 +30,7 @@ 
 

 	function getArgument()

 	{

-		if(!$this->show())

+		if (!$this->show())

 			return;

 		return $this->argument;

 	}

@@ -43,23 +43,23 @@ 
 	{

 		$value = $this->argument->getUnescapedValue();

 

-		if(is_array($value))

+		if (is_array($value))

 		{

 			$q = '';

-			foreach($value as $v)

+			foreach ($value as $v)

 			{

 				$q .= '?,';

 			}

-			if($q !== '')

+			if ($q !== '')

 			{

 				$q = substr($q, 0, -1);

 			}

-			$q = '(' . $q . ')';

+			$q = '('.$q.')';

 		}

 		else

 		{

 			// Prepared statements: column names should not be sent as query arguments, but instead concatenated to query string

-			if($this->argument->isColumnName())

+			if ($this->argument->isColumnName())

 			{

 				$q = $value;

 			}

@@ -68,7 +68,7 @@ 
 				$q = '?';

 			}

 		}

-		return $this->pipe . ' ' . $this->getConditionPart($q);

+		return $this->pipe.' '.$this->getConditionPart($q);

 	}

 

 	/**

@@ -76,17 +76,17 @@ 
 	 */

 	function show()

 	{

-		if(!isset($this->_show))

+		if (!isset($this->_show))

 		{

-			if(!$this->argument->isValid())

+			if (!$this->argument->isValid())

 			{

 				$this->_show = false;

 			}

-			if($this->_value === '\'\'')

+			if ($this->_value === '\'\'')

 			{

 				$this->_show = false;

 			}

-			if(!isset($this->_show))

+			if (!isset($this->_show))

 			{

 				return parent::show();

 			}

classes/db/queryparts/expression/ClickCountExpression.class.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	{

 		parent::SelectExpression($column_name, $alias);

 

-		if(!is_bool($click_count))

+		if (!is_bool($click_count))

 		{

 			// error_log("Click_count value for $column_name was not boolean", 0);

 			$this->click_count = false;

@@ -47,7 +47,7 @@ 
 	function getExpression()

 	{

 		$db_type = Context::getDBType();

-		if($db_type == 'cubrid')

+		if ($db_type == 'cubrid')

 		{

 			return "INCR($this->column_name)";

 		}

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 		if($db_type == 'cubrid')

 		{

 			return "INCR($this->column_name)";

-		}

-		else

+		} else

 		{

 			return "$this->column_name";

 		}

classes/db/queryparts/expression/InsertExpression.class.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 

 	function getValue($with_values = true)

 	{

-		if($with_values)

+		if ($with_values)

 		{

 			return $this->argument->getValue();

 		}

@@ -40,12 +40,12 @@ 
 

 	function show()

 	{

-		if(!$this->argument)

+		if (!$this->argument)

 		{

 			return false;

 		}

 		$value = $this->argument->getValue();

-		if(!isset($value))

+		if (!isset($value))

 		{

 			return false;

 		}

@@ -59,7 +59,7 @@ 
 

 	function getArguments()

 	{

-		if($this->argument)

+		if ($this->argument)

 		{

 			return array($this->argument);

 		}

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
 		if($this->argument)

 		{

 			return array($this->argument);

-		}

-		else

+		} else

 		{

 			return array();

 		}