xpressengine / xe-core

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

Spacing +14 added lines, -14 removed lines

@@ -49,36 +49,36 @@ 
 	function __construct($xml_navigation)
 	{
 		$this->order = array();
-		if($xml_navigation)
+		if ($xml_navigation)
 		{
 			$order = $xml_navigation->index;
-			if($order)
+			if ($order)
 			{
-				if(!is_array($order))
+				if (!is_array($order))
 				{
 					$order = array($order);
 				}
-				foreach($order as $order_info)
+				foreach ($order as $order_info)
 				{
 					$this->order[] = new IndexTag($order_info);
 				}
 
-				if($xml_navigation->page && $xml_navigation->page->attrs || $xml_navigation->list_count && $xml_navigation->list_count->attrs)
+				if ($xml_navigation->page && $xml_navigation->page->attrs || $xml_navigation->list_count && $xml_navigation->list_count->attrs)
 				{
 					$this->limit = new LimitTag($xml_navigation);
 				}
 
-				if($xml_navigation->list_count)
+				if ($xml_navigation->list_count)
 				{
 					$this->list_count = $xml_navigation->list_count->attrs;
 				}
 
-				if($xml_navigation->page_count)
+				if ($xml_navigation->page_count)
 				{
 					$this->page_count = $xml_navigation->page_count->attrs;
 				}
 
-				if($xml_navigation->page)
+				if ($xml_navigation->page)
 				{
 					$this->page = $xml_navigation->page->attrs;
 				}
@@ -92,10 +92,10 @@ 
 	 */
 	function getOrderByString()
 	{
-		$output = 'array(' . PHP_EOL;
-		foreach($this->order as $order)
+		$output = 'array('.PHP_EOL;
+		foreach ($this->order as $order)
 		{
-			$output .= $order->toString() . PHP_EOL . ',';
+			$output .= $order->toString().PHP_EOL.',';
 		}
 		$output = substr($output, 0, -1);
 		$output .= ')';
@@ -108,7 +108,7 @@ 
 	 */
 	function getLimitString()
 	{
-		if($this->limit)
+		if ($this->limit)
 		{
 			return $this->limit->toString();
 		}
@@ -121,11 +121,11 @@ 
 	function getArguments()
 	{
 		$arguments = array();
-		foreach($this->order as $order)
+		foreach ($this->order as $order)
 		{
 			$arguments = array_merge($order->getArguments(), $arguments);
 		}
-		if($this->limit)
+		if ($this->limit)
 		{
 			$arguments = array_merge($this->limit->getArguments(), $arguments);
 		}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)
 		{
 			return $this->limit->toString();
-		}
-		else
+		} else
 		{
 			return "";
 		}

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

Spacing +9 added lines, -9 removed lines

@@ -28,23 +28,23 @@ 
 	{
 		$this->columns = array();
 
-		if(!$xml_columns)
+		if (!$xml_columns)
 		{
 			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)
 		{
-			if($column->name === 'query')
+			if ($column->name === 'query')
 			{
 				$this->columns[] = new QueryTag($column, TRUE);
 			}
-			else if(!isset($column->attrs->var) && !isset($column->attrs->default))
+			else if (!isset($column->attrs->var) && !isset($column->attrs->default))
 			{
 				$this->columns[] = new InsertColumnTagWithoutArgument($column);
 			}
@@ -62,10 +62,10 @@ 
 	 */
 	function toString()
 	{
-		$output_columns = 'array(' . PHP_EOL;
-		foreach($this->columns as $column)
+		$output_columns = 'array('.PHP_EOL;
+		foreach ($this->columns as $column)
 		{
-			$output_columns .= $column->getExpressionString() . PHP_EOL . ',';
+			$output_columns .= $column->getExpressionString().PHP_EOL.',';
 		}
 		$output_columns = substr($output_columns, 0, -1);
 		$output_columns .= ')';
@@ -80,7 +80,7 @@ 
 	function getArguments()
 	{
 		$arguments = array();
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
 			$arguments[] = $column->getArgument();
 		}

Braces +2 added lines, -4 removed lines

@@ -43,12 +43,10 @@
 			if($column->name === 'query')
 			{
 				$this->columns[] = new QueryTag($column, TRUE);
-			}
-			else if(!isset($column->attrs->var) && !isset($column->attrs->default))
+			} else if(!isset($column->attrs->var) && !isset($column->attrs->default))
 			{
 				$this->columns[] = new InsertColumnTagWithoutArgument($column);
-			}
-			else
+			} else
 			{
 				$this->columns[] = new InsertColumnTag($column);
 			}

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

Spacing +9 added lines, -9 removed lines

@@ -38,20 +38,20 @@ 
 		$dbParser = DB::getParser();
 		$this->name = $dbParser->parseColumnName($this->name);
 
-		if($column->attrs->var)
+		if ($column->attrs->var)
 		{
 			$this->argument = new QueryArgument($column);
 		}
 		else
 		{
-			if(strpos($column->attrs->default, '.') !== FALSE)
+			if (strpos($column->attrs->default, '.') !== FALSE)
 			{
-				$this->default_value = "'" . $dbParser->parseColumnName($column->attrs->default) . "'";
+				$this->default_value = "'".$dbParser->parseColumnName($column->attrs->default)."'";
 			}
 			else
 			{
 				$default_value = new DefaultValue($this->name, $column->attrs->default);
-				if($default_value->isOperation())
+				if ($default_value->isOperation())
 				{
 					$this->argument = new QueryArgument($column, TRUE);
 				}
@@ -59,13 +59,13 @@ 
 				else
 				{
 					$this->default_value = $default_value->toString();
-					if($default_value->isStringFromFunction())
+					if ($default_value->isStringFromFunction())
 					{
-						$this->default_value = '"\'".' . $this->default_value . '."\'"';
+						$this->default_value = '"\'".'.$this->default_value.'."\'"';
 					}
-					if($default_value->isString())
+					if ($default_value->isString())
 					{
-						$this->default_value = '"' . $this->default_value . '"';
+						$this->default_value = '"'.$this->default_value.'"';
 					}
 				}
 			}
@@ -79,7 +79,7 @@ 
 	 */
 	function getExpressionString()
 	{
-		if($this->argument)
+		if ($this->argument)
 		{
 			return sprintf('new UpdateExpression(\'%s\', ${\'%s_argument\'})'
 							, $this->name

Braces +3 added lines, -6 removed lines

@@ -41,14 +41,12 @@ 
 		if($column->attrs->var)
 		{
 			$this->argument = new QueryArgument($column);
-		}
-		else
+		} else
 		{
 			if(strpos($column->attrs->default, '.') !== FALSE)
 			{
 				$this->default_value = "'" . $dbParser->parseColumnName($column->attrs->default) . "'";
-			}
-			else
+			} else
 			{
 				$default_value = new DefaultValue($this->name, $column->attrs->default);
 				if($default_value->isOperation())
@@ -84,8 +82,7 @@ 
 			return sprintf('new UpdateExpression(\'%s\', ${\'%s_argument\'})'
 							, $this->name
 							, $this->argument->argument_name);
-		}
-		else
+		} else
 		{
 			return sprintf('new UpdateExpressionWithoutArgument(\'%s\', %s)'
 							, $this->name

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

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
 	 */
 	function __construct($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());
 			}

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
 			if(is_a($column, 'QueryTag'))
 			{
 				$output_columns .= $column->toString() . PHP_EOL . ',';
-			}
-			else
+			} else
 			{
 				$output_columns .= $column->getExpressionString() . PHP_EOL . ',';
 			}

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

Spacing +7 added lines, -7 removed lines

@@ -28,14 +28,14 @@ 
 	{
 		$this->columns = array();
 
-		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)
 		{
-			if($column->name === 'query')
+			if ($column->name === 'query')
 			{
 				$this->columns[] = new QueryTag($column, true);
 			}
@@ -53,10 +53,10 @@ 
 	 */
 	function toString()
 	{
-		$output_columns = 'array(' . PHP_EOL;
-		foreach($this->columns as $column)
+		$output_columns = 'array('.PHP_EOL;
+		foreach ($this->columns as $column)
 		{
-			$output_columns .= $column->getExpressionString() . PHP_EOL . ',';
+			$output_columns .= $column->getExpressionString().PHP_EOL.',';
 		}
 		$output_columns = substr($output_columns, 0, -1);
 		$output_columns .= ')';
@@ -71,7 +71,7 @@ 
 	function getArguments()
 	{
 		$arguments = array();
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
 			$arguments[] = $column->getArgument();
 		}

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

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

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
 	 */
 	function __construct($column)
 	{
-		if($column == "*" || $column->attrs->name == '*')
+		if ($column == "*" || $column->attrs->name == '*')
 		{
 			parent::__construct(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).'\'' : '');
 	}
 
 }

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
 		{
 			parent::__construct(NULL);
 			$this->name = "*";
-		}
-		else
+		} else
 		{
 			parent::__construct($column->attrs->name);
 			$dbParser = DB::getParser();

classes/xml/xmlquery/tags/table/TablesTag.class.php

Spacing +14 added lines, -14 removed lines

@@ -38,21 +38,21 @@ 
 		$this->tables = array();
 
 		$xml_tables = $xml_tables_tag->table;
-		if(!is_array($xml_tables))
+		if (!is_array($xml_tables))
 		{
 			$xml_tables = array($xml_tables);
 		}
 
-		if($xml_index_hints_tag)
+		if ($xml_index_hints_tag)
 		{
 			$index_nodes = $xml_index_hints_tag->index;
-			if(!is_array($index_nodes))
+			if (!is_array($index_nodes))
 			{
 				$index_nodes = array($index_nodes);
 			}
-			foreach($index_nodes as $index_node)
+			foreach ($index_nodes as $index_node)
 			{
-				if(!isset($indexes[$index_node->attrs->table]))
+				if (!isset($indexes[$index_node->attrs->table]))
 				{
 					$indexes[$index_node->attrs->table] = array();
 				}
@@ -63,15 +63,15 @@ 
 			}
 		}
 
-		foreach($xml_tables as $tag)
+		foreach ($xml_tables as $tag)
 		{
-			if($tag->attrs->query == 'true')
+			if ($tag->attrs->query == 'true')
 			{
 				$this->tables[] = new QueryTag($tag, true);
 			}
 			else
 			{
-				if(isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])
+				if (isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])
 				{
 					$this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);
 				}
@@ -90,16 +90,16 @@ 
 
 	function toString()
 	{
-		$output_tables = 'array(' . PHP_EOL;
-		foreach($this->tables as $table)
+		$output_tables = 'array('.PHP_EOL;
+		foreach ($this->tables as $table)
 		{
-			if(is_a($table, 'QueryTag'))
+			if (is_a($table, 'QueryTag'))
 			{
-				$output_tables .= $table->toString() . PHP_EOL . ',';
+				$output_tables .= $table->toString().PHP_EOL.',';
 			}
 			else
 			{
-				$output_tables .= $table->getTableString() . PHP_EOL . ',';
+				$output_tables .= $table->getTableString().PHP_EOL.',';
 			}
 		}
 		$output_tables = substr($output_tables, 0, -1);
@@ -110,7 +110,7 @@ 
 	function getArguments()
 	{
 		$arguments = array();
-		foreach($this->tables as $table)
+		foreach ($this->tables as $table)
 		{
 			$arguments = array_merge($arguments, $table->getArguments());
 		}

Braces +3 added lines, -6 removed lines

@@ -68,14 +68,12 @@ 
 			if($tag->attrs->query == 'true')
 			{
 				$this->tables[] = new QueryTag($tag, true);
-			}
-			else
+			} else
 			{
 				if(isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])
 				{
 					$this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);
-				}
-				else
+				} else
 				{
 					$this->tables[] = new TableTag($tag);
 				}
@@ -96,8 +94,7 @@ 
 			if(is_a($table, 'QueryTag'))
 			{
 				$output_tables .= $table->toString() . PHP_EOL . ',';
-			}
-			else
+			} else
 			{
 				$output_tables .= $table->getTableString() . PHP_EOL . ',';
 			}

classes/xml/xmlquery/tags/table/HintTableTag.class.php

Spacing +4 added lines, -4 removed lines

@@ -39,13 +39,13 @@ 
 		$result = sprintf('new %sTableWithHint(\'%s\'%s, array('
 				, !strncasecmp($dbType, 'Mysql', 5) ? 'Mysql' : $dbType
 				, $dbParser->escape($this->name)
-				, $this->alias ? ', \'' . $dbParser->escape($this->alias) . '\'' : ', null'
+				, $this->alias ? ', \''.$dbParser->escape($this->alias).'\'' : ', null'
 				//, ', \'' . $dbParser->escape($this->index->name) .'\', \'' . $this->index->type .'\''
 		);
-		foreach($this->index as $indx)
+		foreach ($this->index as $indx)
 		{
 			$result .= "new IndexHint(";
-			$result .= '\'' . $dbParser->escape($indx->name) . '\', \'' . $indx->type . '\'' . ') , ';
+			$result .= '\''.$dbParser->escape($indx->name).'\', \''.$indx->type.'\''.') , ';
 		}
 		$result = substr($result, 0, -2);
 		$result .= '))';
@@ -54,7 +54,7 @@ 
 
 	function getArguments()
 	{
-		if(!isset($this->conditionsTag))
+		if (!isset($this->conditionsTag))
 		{
 			return array();
 		}

classes/xml/xmlquery/tags/table/TableTag.class.php

Spacing +6 added lines, -6 removed lines

@@ -74,7 +74,7 @@ 
 		$this->name = $dbParser->parseTableName($table->attrs->name);
 
 		$this->alias = $table->attrs->alias;
-		if(!$this->alias)
+		if (!$this->alias)
 		{
 			$this->alias = $table->attrs->name;
 		}
@@ -83,7 +83,7 @@ 
 
 		$this->conditions = $table->conditions;
 
-		if($this->isJoinTable())
+		if ($this->isJoinTable())
 		{
 			$this->conditionsTag = new JoinConditionsTag($this->conditions);
 		}
@@ -92,7 +92,7 @@ 
 	function isJoinTable()
 	{
 		$joinList = array('left join' => 1, 'left outer join' => 1, 'right join' => 1, 'right outer join' => 1);
-		if(isset($joinList[$this->join_type]) && count($this->conditions))
+		if (isset($joinList[$this->join_type]) && count($this->conditions))
 		{
 			return true;
 		}
@@ -119,7 +119,7 @@ 
 	{
 		$dbParser = DB::getParser();
 
-		if($this->isJoinTable())
+		if ($this->isJoinTable())
 		{
 			return sprintf('new JoinTable(\'%s\', \'%s\', "%s", %s)'
 							, $dbParser->escape($this->name)
@@ -128,12 +128,12 @@ 
 		}
 		return sprintf('new Table(\'%s\'%s)'
 						, $dbParser->escape($this->name)
-						, $this->alias ? ', \'' . $dbParser->escape($this->alias) . '\'' : '');
+						, $this->alias ? ', \''.$dbParser->escape($this->alias).'\'' : '');
 	}
 
 	function getArguments()
 	{
-		if(!isset($this->conditionsTag))
+		if (!isset($this->conditionsTag))
 		{
 			return array();
 		}