xpressengine / xe-core

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

Braces +1 added lines, -2 removed lines

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

 		{

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

-		}

-		else

+		} else

 		{

 			return "";

 		}

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

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,7 @@ 
 		if(strpos($name, '.') === FALSE)

 		{

 			$this->column_name = $name;

-		}

-		else

+		} else

 		{

 			list($prefix, $name) = explode('.', $name);

 			$this->column_name = $name;

@@ -159,8 +158,7 @@ 
 					, $this->argument_name

 					, $this->argument_name

 			);

-		}

-		else

+		} else

 		{

 			$arg = sprintf("\n" . '${\'%s_argument\'} = new Argument(\'%s\', %s);' . "\n"

 					, $this->argument_name

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	function Limit($list_count, $page = NULL, $page_count = NULL)

 	{

 		$this->list_count = $list_count;

-		if($page)

+		if ($page)

 		{

 			$list_count_value = $list_count->getValue();

 			$page_value = $page->getValue();

@@ -59,7 +59,7 @@ 
 	 */

 	function isPageHandler()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return true;

 		}

@@ -81,9 +81,9 @@ 
 

 	function toString()

 	{

-		if($this->page)

+		if ($this->page)

 		{

-			return $this->start . ' , ' . $this->list_count->getValue();

+			return $this->start.' , '.$this->list_count->getValue();

 		}

 		else

 		{

classes/display/VirtualXMLDisplayHandler.php

Braces +2 added lines, -4 removed lines

@@ -103,8 +103,7 @@ 
 			if($category->parent_srl)
 			{
 				$categoryList[$category->parent_srl]->children[] = & $categoryList[$key];
-			}
-			else
+			} else
 			{
 				$depth0[] = $key;
 			}
@@ -324,8 +323,7 @@ 
 		if(method_exists($oModule, "moduleUninstall"))
 		{
 			return TRUE;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

Spacing +9 added lines, -9 removed lines

@@ -17,19 +17,19 @@ 
 		$request_url = Context::getRequestUri();
 		$output = new stdClass();
 
-		if(substr_compare($request_url, '/', -1) !== 0)
+		if (substr_compare($request_url, '/', -1) !== 0)
 		{
 			$request_url .= '/';
 		}
 
-		if($error === 0)
+		if ($error === 0)
 		{
-			if($message != 'success')
+			if ($message != 'success')
 			{
 				$output->message = $message;
 			}
 
-			if($redirect_url)
+			if ($redirect_url)
 			{
 				$output->url = $redirect_url;
 			}
@@ -40,7 +40,7 @@ 
 		}
 		else
 		{
-			if($message != 'fail')
+			if ($message != 'fail')
 			{
 				$output->message = $message;
 			}
@@ -50,15 +50,15 @@ 
 		$html[] = '<script type="text/javascript">';
 		$html[] = '//<![CDATA[';
 
-		if($output->message)
+		if ($output->message)
 		{
-			$html[] = 'alert("' . $output->message . '");';
+			$html[] = 'alert("'.$output->message.'");';
 		}
 
-		if($output->url)
+		if ($output->url)
 		{
 			$url = preg_replace('/#(.+)$/i', '', $output->url);
-			$html[] = 'self.location.href = "' . $request_url . 'common/tpl/redirect.html?redirect_url=' . urlencode($url) . '";';
+			$html[] = 'self.location.href = "'.$request_url.'common/tpl/redirect.html?redirect_url='.urlencode($url).'";';
 		}
 		$html[] = '//]]>';
 		$html[] = '</script>';

classes/xml/xmlquery/DBParser.class.php

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,7 @@ 
 		if(strpos($name, '.') === FALSE)

 		{

 			$this->column_name = $name;

-		}

-		else

+		} else

 		{

 			list($prefix, $name) = explode('.', $name);

 			$this->column_name = $name;

@@ -159,8 +158,7 @@ 
 					, $this->argument_name

 					, $this->argument_name

 			);

-		}

-		else

+		} else

 		{

 			$arg = sprintf("\n" . '${\'%s_argument\'} = new Argument(\'%s\', %s);' . "\n"

 					, $this->argument_name

Spacing +25 added lines, -25 removed lines

@@ -63,7 +63,7 @@ 
 	function DBParser($escape_char_left, $escape_char_right = "", $table_prefix = "xe_")

 	{

 		$this->escape_char_left = $escape_char_left;

-		if($escape_char_right !== "")

+		if ($escape_char_right !== "")

 		{

 			$this->escape_char_right = $escape_char_right;

 		}

@@ -82,7 +82,7 @@ 
 	 */

 	function getEscapeChar($leftOrRight)

 	{

-		if($leftOrRight === 'left')

+		if ($leftOrRight === 'left')

 		{

 			return $this->escape_char_left;

 		}

@@ -100,7 +100,7 @@ 
 	 */

 	function escape($name)

 	{

-		return $this->escape_char_left . $name . $this->escape_char_right;

+		return $this->escape_char_left.$name.$this->escape_char_right;

 	}

 

 	/**

@@ -111,7 +111,7 @@ 
 	 */

 	function escapeString($name)

 	{

-		return "'" . $this->escapeStringValue($name) . "'";

+		return "'".$this->escapeStringValue($name)."'";

 	}

 

 	/**

@@ -122,11 +122,11 @@ 
 	 */

 	function escapeStringValue($value)

 	{

-		if($value == "*")

+		if ($value == "*")

 		{

 			return $value;

 		}

-		if(is_string($value))

+		if (is_string($value))

 		{

 			return $value = str_replace("'", "''", $value);

 		}

@@ -142,7 +142,7 @@ 
 	 */

 	function parseTableName($name)

 	{

-		return $this->table_prefix . $name;

+		return $this->table_prefix.$name;

 	}

 

 	/**

@@ -165,15 +165,15 @@ 
 	 */

 	function escapeColumn($column_name)

 	{

-		if($this->isUnqualifiedColumnName($column_name))

+		if ($this->isUnqualifiedColumnName($column_name))

 		{

 			return $this->escape($column_name);

 		}

-		if($this->isQualifiedColumnName($column_name))

+		if ($this->isQualifiedColumnName($column_name))

 		{

 			list($table, $column) = explode('.', $column_name);

 			// $table can also be an alias, so the prefix should not be added

-			return $this->escape($table) . '.' . $this->escape($column);

+			return $this->escape($table).'.'.$this->escape($column);

 			//return $this->escape($this->parseTableName($table)).'.'.$this->escape($column);

 		}

 	}

@@ -189,7 +189,7 @@ 
 	 */

 	function isUnqualifiedColumnName($column_name)

 	{

-		if(strpos($column_name, '.') === FALSE && strpos($column_name, '(') === FALSE)

+		if (strpos($column_name, '.') === FALSE && strpos($column_name, '(') === FALSE)

 		{

 			return TRUE;

 		}

@@ -207,7 +207,7 @@ 
 	 */

 	function isQualifiedColumnName($column_name)

 	{

-		if(strpos($column_name, '.') !== FALSE && strpos($column_name, '(') === FALSE)

+		if (strpos($column_name, '.') !== FALSE && strpos($column_name, '(') === FALSE)

 		{

 			return TRUE;

 		}

@@ -235,10 +235,10 @@ 
 	function parseExpression($column_name)

 	{

 		$functions = preg_split('/([\+\-\*\/\ ])/', $column_name, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

-		foreach($functions as $k => $v)

+		foreach ($functions as $k => $v)

 		{

 			$function = &$functions[$k];

-			if(strlen($function) == 1)

+			if (strlen($function) == 1)

 			{

 				continue; // skip delimiters

 			}

@@ -246,25 +246,25 @@ 
 			$matches = preg_split('/([a-zA-Z0-9_*]+)/', $function, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 			$total_brackets = substr_count($function, "(");

 			$brackets = 0;

-			foreach($matches as $i => $j)

+			foreach ($matches as $i => $j)

 			{

 				$match = &$matches[$i];

-				if($match == '(')

+				if ($match == '(')

 				{

 					$brackets++;

 					continue;

 				}

-				if(strpos($match, ')') !== FALSE)

+				if (strpos($match, ')') !== FALSE)

 				{

 					continue;

 				}

-				if(in_array($match, array(',', '.')))

+				if (in_array($match, array(',', '.')))

 				{

 					continue;

 				}

-				if($brackets == $total_brackets)

+				if ($brackets == $total_brackets)

 				{

-					if(!is_numeric($match) && !in_array(strtoupper($match), array('UNSIGNED', 'INTEGER', 'AS')))

+					if (!is_numeric($match) && !in_array(strtoupper($match), array('UNSIGNED', 'INTEGER', 'AS')))

 					{

 						$match = $this->escapeColumnExpression($match);

 					}

@@ -283,7 +283,7 @@ 
 	 */

 	function isStar($column_name)

 	{

-		if(substr($column_name, -1) == '*')

+		if (substr($column_name, -1) == '*')

 		{

 			return TRUE;

 		}

@@ -299,7 +299,7 @@ 
 	 */

 	function isStarFunction($column_name)

 	{

-		if(strpos($column_name, "(*)") !== FALSE)

+		if (strpos($column_name, "(*)") !== FALSE)

 		{

 			return TRUE;

 		}

@@ -313,15 +313,15 @@ 
 	 */

 	function escapeColumnExpression($column_name)

 	{

-		if($this->isStar($column_name))

+		if ($this->isStar($column_name))

 		{

 			return $column_name;

 		}

-		if($this->isStarFunction($column_name))

+		if ($this->isStarFunction($column_name))

 		{

 			return $column_name;

 		}

-		if(stripos($column_name, 'distinct') !== FALSE)

+		if (stripos($column_name, 'distinct') !== FALSE)

 		{

 			return $column_name;

 		}

classes/xml/xmlquery/tags/column/SelectColumnTag.class.php

Braces +1 added lines, -2 removed lines

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

 		{

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

-		}

-		else

+		} else

 		{

 			return "";

 		}

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
 	 */

 	function SelectColumnTag($column)

 	{

-		if($column == "*" || $column->attrs->name == '*')

+		if ($column == "*" || $column->attrs->name == '*')

 		{

 			parent::ColumnTag(NULL);

 			$this->name = "*";

@@ -63,20 +63,20 @@ 
 	 */

 	function getExpressionString()

 	{

-		if($this->name == '*')

+		if ($this->name == '*')

 		{

 			return "new StarExpression()";

 		}

-		if($this->click_count)

+		if ($this->click_count)

 		{

-			return sprintf('new ClickCountExpression(\'%s\', %s, $args->%s)', $this->name, $this->alias ? '\'' . $this->alias . '\'' : "''", $this->click_count);

+			return sprintf('new ClickCountExpression(\'%s\', %s, $args->%s)', $this->name, $this->alias ? '\''.$this->alias.'\'' : "''", $this->click_count);

 		}

-		if(strpos($this->name, '$') === 0)

+		if (strpos($this->name, '$') === 0)

 		{

 			return sprintf('new SelectExpression($args->%s)', substr($this->name, 1));

 		}

 		$dbParser = DB::getParser();

-		return sprintf('new SelectExpression(\'%s\'%s)', $this->name, $this->alias ? ', \'' . $dbParser->escape($this->alias) . '\'' : '');

+		return sprintf('new SelectExpression(\'%s\'%s)', $this->name, $this->alias ? ', \''.$dbParser->escape($this->alias).'\'' : '');

 	}

 

 }

classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 			if($column->name === 'query')

 			{

 				$this->columns[] = new QueryTag($column, true);

-			}

-			else

+			} else

 			{

 				$this->columns[] = new UpdateColumnTag($column);

 			}

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
 	 */

 	function SelectColumnsTag($xml_columns_tag)

 	{

-		if(!$xml_columns_tag)

+		if (!$xml_columns_tag)

 		{

 			$xml_columns_tag = new Xml_Node_();

 		}

@@ -37,34 +37,34 @@ 
 

 		$this->columns = array();

 

-		if(!$xml_columns)

+		if (!$xml_columns)

 		{

 			$this->columns[] = new SelectColumnTag("*");

 			return;

 		}

 

-		if(!is_array($xml_columns))

+		if (!is_array($xml_columns))

 		{

 			$xml_columns = array($xml_columns);

 		}

 

-		foreach($xml_columns as $column)

+		foreach ($xml_columns as $column)

 		{

 			$this->columns[] = new SelectColumnTag($column);

 		}

 

 

-		if(!$xml_queries)

+		if (!$xml_queries)

 		{

 			return;

 		}

 

-		if(!is_array($xml_queries))

+		if (!is_array($xml_queries))

 		{

 			$xml_queries = array($xml_queries);

 		}

 

-		foreach($xml_queries as $column)

+		foreach ($xml_queries as $column)

 		{

 			$this->columns[] = new QueryTag($column, TRUE);

 		}

@@ -77,16 +77,16 @@ 
 	 */

 	function toString()

 	{

-		$output_columns = 'array(' . PHP_EOL;

-		foreach($this->columns as $column)

+		$output_columns = 'array('.PHP_EOL;

+		foreach ($this->columns as $column)

 		{

-			if(is_a($column, 'QueryTag'))

+			if (is_a($column, 'QueryTag'))

 			{

-				$output_columns .= $column->toString() . PHP_EOL . ',';

+				$output_columns .= $column->toString().PHP_EOL.',';

 			}

 			else

 			{

-				$output_columns .= $column->getExpressionString() . PHP_EOL . ',';

+				$output_columns .= $column->getExpressionString().PHP_EOL.',';

 			}

 		}

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

@@ -102,9 +102,9 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		foreach($this->columns as $column)

+		foreach ($this->columns as $column)

 		{

-			if(is_a($column, 'QueryTag'))

+			if (is_a($column, 'QueryTag'))

 			{

 				$arguments = array_merge($arguments, $column->getArguments());

 			}

classes/xml/xmlquery/tags/navigation/IndexTag.class.php

Braces +1 added lines, -2 removed lines

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

 		{

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

-		}

-		else

+		} else

 		{

 			return "";

 		}

Spacing +4 added lines, -4 removed lines

@@ -59,18 +59,18 @@ 
 		// Sort order - asc / desc

 		$this->sort_order = $index->attrs->order;

 		$sortList = array('asc' => 1, 'desc' => 1);

-		if(!isset($sortList[$this->sort_order]))

+		if (!isset($sortList[$this->sort_order]))

 		{

 			$arg = new Xml_Node_();

 			$arg->attrs = new Xml_Node_();

 			$arg->attrs->var = $this->sort_order;

 			$arg->attrs->default = 'asc';

 			$this->sort_order_argument = new SortQueryArgument($arg);

-			$this->sort_order = '$' . $this->sort_order_argument->getArgumentName() . '_argument';

+			$this->sort_order = '$'.$this->sort_order_argument->getArgumentName().'_argument';

 		}

 		else

 		{

-			$this->sort_order = '"' . $this->sort_order . '"';

+			$this->sort_order = '"'.$this->sort_order.'"';

 		}

 	}

 

@@ -83,7 +83,7 @@ 
 	{

 		$arguments = array();

 		$arguments[] = $this->argument;

-		if($this->sort_order_argument)

+		if ($this->sort_order_argument)

 		{

 			$arguments[] = $this->sort_order_argument;

 		}

libs/PEAR.1.9.5/HTTP/Request.php

Spacing +4 added lines, -4 removed lines

@@ -18,28 +18,28 @@
 	}
 
 	public function getResponseCode() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getStatus();
 		}
 	}
 
 	public function getResponseHeader() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getHeader();	
 		}
 	}
 
 	public function getResponseBody() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getBody();
 		}
 	}
 
 	public function getResponseCookies() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getCookies();
 		}

modules/addon/addon.admin.view.php

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);
 		}

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 	 */
 	function init()
 	{
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 	}
 
 	/**
@@ -34,7 +34,7 @@ 
 		$security = new Security($addon_list);
 		$addon_list = $security->encodeHTML('..', '..author..');
 
-		foreach($addon_list as $no => $addon_info)
+		foreach ($addon_list as $no => $addon_info)
 		{
 			$addon_list[$no]->description = nl2br(trim($addon_info->description));
 		}
@@ -64,21 +64,21 @@ 
 		$oModuleAdminModel = getAdminModel('module');
 
 		$args = new stdClass();
-		if($site_module_info->site_srl)
+		if ($site_module_info->site_srl)
 		{
 			$args->site_srl = $site_module_info->site_srl;
 		}
 		$columnList = array('module_srl', 'module_category_srl', 'mid', 'browser_title');
 		$mid_list = $oModuleModel->getMidList($args, $columnList);
 		// module_category and module combination
-		if(!$site_module_info->site_srl)
+		if (!$site_module_info->site_srl)
 		{
 			// Get a list of module categories
 			$module_categories = $oModuleModel->getModuleCategories();
 
-			if(is_array($mid_list))
+			if (is_array($mid_list))
 			{
-				foreach($mid_list as $module_srl => $module)
+				foreach ($mid_list as $module_srl => $module)
 				{
 					$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
 				}
@@ -96,7 +96,7 @@ 
 		// Template specifies the path and file
 		$this->setTemplateFile('setup_addon');
 
-		if(Context::get('module') != 'admin')
+		if (Context::get('module') != 'admin')
 		{
 			$this->setLayoutPath('./common/tpl');
 			$this->setLayoutFile('popup_layout');