xpressengine / xe-core

addons/point_level_icon/point_level_icon.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();
 
 /**
@@ -12,7 +12,7 @@ 
  * 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 @@ 
 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;
 }

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

addons/point_level_icon/point_level_icon.lib.php

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
 function pointLevelIconTrans($matches)
 {
 	$member_srl = $matches[3];
-	if($member_srl < 1)
+	if ($member_srl < 1)
 	{
 		return $matches[0];
 	}
@@ -16,15 +16,15 @@ 
 
 	// 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 @@ 
 		$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 @@ 
 
 		// 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 . '%';

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

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
 	 */
 	function getInstance($opt = null)
 	{
-		if(!$GLOBALS['__CacheApc__'])
+		if (!$GLOBALS['__CacheApc__'])
 		{
 			$GLOBALS['__CacheApc__'] = new CacheApc();
 		}
@@ -56,7 +56,7 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
@@ -76,13 +76,13 @@ 
 	{
 		$_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 @@ 
 	{
 		$_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 @@ 
 	}
 }
 
-CacheApc::$isSupport  = function_exists('apc_add');
+CacheApc::$isSupport = function_exists('apc_add');
 
 /* End of file CacheApc.class.php */
 /* Location: ./classes/cache/CacheApc.class.php */

classes/cache/CacheMemcache.class.php

Spacing +9 added lines, -9 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;
 		}
@@ -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;

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
 		if($absolute_url)
 		{
 			return getFullUrl('','vid',$vid, 'mid',$mid, 'act',$format);
-		}
-		else
+		} else
 		{
 			return getUrl('','vid',$vid, 'mid',$mid, 'act',$format);
 		}

classes/cache/CacheWincache.class.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
 	 */
 	function getInstance($opt = null)
 	{
-		if(!$GLOBALS['__CacheWincache__'])
+		if (!$GLOBALS['__CacheWincache__'])
 		{
 			$GLOBALS['__CacheWincache__'] = new CacheWincache();
 		}
@@ -59,7 +59,7 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
@@ -78,13 +78,13 @@ 
 	{
 		$_key = md5(_XE_PATH_ . $key);
 		$obj = wincache_ucache_get($_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;
@@ -105,12 +105,12 @@ 
 	{
 		$_key = md5(_XE_PATH_ . $key);
 		$obj = wincache_ucache_get($_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;

classes/db/DBMysqli.class.php

Spacing +35 added lines, -35 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,7 +132,7 @@ 
 
 					// 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));
 					}
@@ -141,7 +141,7 @@ 
 				// 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));
 				}
@@ -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,9 +247,9 @@ 
 		 * 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;
 			}
@@ -258,14 +258,14 @@ 
 			$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);
 		}

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()
 	{

classes/db/queryparts/Subquery.class.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 

 	function isJoinTable()

 	{

-		if($this->join_type)

+		if ($this->join_type)

 		{

 			return true;

 		}

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

Spacing +10 added lines, -10 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,14 +72,14 @@ 
 	 */

 	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("");

 				}

@@ -87,7 +87,7 @@ 
 				$cond_indx++;

 			}

 

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

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

 			{

 				$group = $this->pipe . ' (' . $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;

 			}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}