xpressengine / xe-core

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

Spacing +11 added lines, -11 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);

 		}

@@ -78,9 +78,9 @@ 
 	function toString()

 	{

 		$output_columns = 'array(' . PHP_EOL;

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

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

 		{

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

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

 			{

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

 			}

@@ -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

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

Spacing +6 added lines, -6 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) . "'";

 			}

 			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,11 +59,11 @@ 
 				else

 				{

 					$this->default_value = $default_value->toString();

-					if($default_value->isStringFromFunction())

+					if ($default_value->isStringFromFunction())

 					{

 						$this->default_value = '"\'".' . $this->default_value . '."\'"';

 					}

-					if($default_value->isString())

+					if ($default_value->isString())

 					{

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

Spacing +5 added lines, -5 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);

 			}

@@ -54,7 +54,7 @@ 
 	function toString()

 	{

 		$output_columns = 'array(' . PHP_EOL;

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

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

 		{

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

 		}

@@ -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/condition/ConditionGroupTag.class.php

Spacing +4 added lines, -4 removed lines

@@ -33,12 +33,12 @@ 
 	{

 		$this->pipe = $pipe;

 

-		if(!is_array($conditions))

+		if (!is_array($conditions))

 		{

 			$conditions = array($conditions);

 		}

 

-		foreach($conditions as $condition)

+		foreach ($conditions as $condition)

 		{

 			//if($condition->node_name === 'query') $this->conditions[] = new QueryTag($condition, true);

 			$this->conditions[] = new ConditionTag($condition);

@@ -57,7 +57,7 @@ 
 	function getConditionGroupString()

 	{

 		$conditions_string = 'array(' . PHP_EOL;

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

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

 		{

 			$conditions_string .= $condition->getConditionString() . PHP_EOL . ',';

 		}

@@ -70,7 +70,7 @@ 
 	function getArguments()

 	{

 		$arguments = array();

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

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

 		{

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

 		}

classes/xml/xmlquery/tags/condition/ConditionTag.class.php

Spacing +14 added lines, -14 removed lines

@@ -67,32 +67,32 @@ 
 		$this->column_name = $dbParser->parseExpression($condition->attrs->column);

 

 		// If default value is column name, it should be escaped

-		if($isColumnName = (strpos($condition->attrs->default, '.') !== FALSE

+		if ($isColumnName = (strpos($condition->attrs->default, '.') !== FALSE

 				&& strpos($condition->attrs->default, '.') !== 0

-				&& strpos($condition->attrs->default, '%') === FALSE ))

+				&& strpos($condition->attrs->default, '%') === FALSE))

 		{

 			$condition->attrs->default = $dbParser->parseExpression($condition->attrs->default);

 		}

 

-		if($condition->node_name == 'query')

+		if ($condition->node_name == 'query')

 		{

 			$this->query = new QueryTag($condition, TRUE);

 			$this->default_column = $this->query->toString();

 		}

-		else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

+		else if ($condition->attrs->var && !strpos($condition->attrs->var, '.'))

 		{

 			$this->argument = new QueryArgument($condition);

 			$this->argument_name = $this->argument->getArgumentName();

 		}

 		else

 		{

-			if(isset($condition->attrs->default))

+			if (isset($condition->attrs->default))

 			{

 				$operationList = array('in' => 1, 'between' => 1, 'notin' => 1, 'not_in' => 1);

-				if(isset($operationList[$this->operation]))

+				if (isset($operationList[$this->operation]))

 				{

 					$default_value = $condition->attrs->default;

-					if(strpos($default_value, "'") !== FALSE)

+					if (strpos($default_value, "'") !== FALSE)

 					{

 						$default_value = "\"" . $default_value . "\"";

 					}

@@ -106,14 +106,14 @@ 
 					$default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);

 					$default_value = $default_value_object->toString();

 

-					if($default_value_object->isStringFromFunction())

+					if ($default_value_object->isStringFromFunction())

 					{

 						$default_value = '"\'".' . $default_value . '."\'"';

 					}

 

-					if($default_value_object->isString() && !$isColumnName && !is_numeric($condition->attrs->default))

+					if ($default_value_object->isString() && !$isColumnName && !is_numeric($condition->attrs->default))

 					{

-						if(strpos($default_value, "'") !== FALSE)

+						if (strpos($default_value, "'") !== FALSE)

 						{

 							$default_value = "\"" . $default_value . "\"";

 						}

@@ -140,11 +140,11 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		if($this->query)

+		if ($this->query)

 		{

 			$arguments = array_merge($arguments, $this->query->getArguments());

 		}

-		if($this->argument)

+		if ($this->argument)

 		{

 			$arguments[] = $this->argument;

 		}

@@ -153,7 +153,7 @@ 
 

 	function getConditionString()

 	{

-		if($this->query)

+		if ($this->query)

 		{

 			return sprintf("new ConditionSubquery('%s',%s,%s%s)"

 							, $this->column_name

@@ -162,7 +162,7 @@ 
 							, $this->pipe ? ", '" . $this->pipe . "'" : ''

 			);

 		}

-		else if(isset($this->default_column))

+		else if (isset($this->default_column))

 		{

 			return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"

 							, $this->column_name

Braces +8 added lines, -16 removed lines

@@ -78,13 +78,11 @@ 
 		{

 			$this->query = new QueryTag($condition, TRUE);

 			$this->default_column = $this->query->toString();

-		}

-		else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

+		} else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

 		{

 			$this->argument = new QueryArgument($condition);

 			$this->argument_name = $this->argument->getArgumentName();

-		}

-		else

+		} else

 		{

 			if(isset($condition->attrs->default))

 			{

@@ -95,13 +93,11 @@ 
 					if(strpos($default_value, "'") !== FALSE)

 					{

 						$default_value = "\"" . $default_value . "\"";

-					}

-					else

+					} else

 					{

 						$default_value = "'" . $default_value . "'";

 					}

-				}

-				else

+				} else

 				{

 					$default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);

 					$default_value = $default_value_object->toString();

@@ -116,16 +112,14 @@ 
 						if(strpos($default_value, "'") !== FALSE)

 						{

 							$default_value = "\"" . $default_value . "\"";

-						}

-						else

+						} else

 						{

 							$default_value = "'" . $default_value . "'";

 						}

 					}

 				}

 				$this->default_column = $default_value;

-			}

-			else

+			} else

 			{

 				$this->default_column = "'" . $dbParser->parseColumnName($condition->attrs->var) . "'";

 			}

@@ -161,8 +155,7 @@ 
 							, '"' . $this->operation . '"'

 							, $this->pipe ? ", '" . $this->pipe . "'" : ''

 			);

-		}

-		else if(isset($this->default_column))

+		} else if(isset($this->default_column))

 		{

 			return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"

 							, $this->column_name

@@ -170,8 +163,7 @@ 
 							, '"' . $this->operation . '"'

 							, $this->pipe ? ", '" . $this->pipe . "'" : ''

 			);

-		}

-		else

+		} else

 		{

 			return sprintf("new ConditionWithArgument('%s',%s,%s%s)"

 							, $this->column_name

classes/xml/xmlquery/tags/condition/ConditionsTag.class.php

Spacing +11 added lines, -11 removed lines

@@ -25,42 +25,42 @@ 
 	function ConditionsTag($xml_conditions)

 	{

 		$this->condition_groups = array();

-		if(!$xml_conditions)

+		if (!$xml_conditions)

 		{

 			return;

 		}

 

 		$xml_condition_list = array();

-		if($xml_conditions->condition)

+		if ($xml_conditions->condition)

 		{

 			$xml_condition_list = $xml_conditions->condition;

 		}

 

-		if($xml_conditions->query)

+		if ($xml_conditions->query)

 		{

-			if(!is_array($xml_condition_list))

+			if (!is_array($xml_condition_list))

 			{

 				$xml_condition_list = array($xml_condition_list);

 			}

-			if(!is_array($xml_conditions->query))

+			if (!is_array($xml_conditions->query))

 			{

 				$xml_conditions->query = array($xml_conditions->query);

 			}

 			$xml_condition_list = array_merge($xml_condition_list, $xml_conditions->query);

 		}

-		if($xml_condition_list)

+		if ($xml_condition_list)

 		{

 			$this->condition_groups[] = new ConditionGroupTag($xml_condition_list);

 		}

 

 		$xml_groups = $xml_conditions->group;

-		if($xml_groups)

+		if ($xml_groups)

 		{

-			if(!is_array($xml_groups))

+			if (!is_array($xml_groups))

 			{

 				$xml_groups = array($xml_groups);

 			}

-			foreach($xml_groups as $group)

+			foreach ($xml_groups as $group)

 			{

 				$this->condition_groups[] = new ConditionGroupTag($group->condition, $group->attrs->pipe);

 			}

@@ -74,7 +74,7 @@ 
 	function toString()

 	{

 		$output_conditions = 'array(' . PHP_EOL;

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

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

 		{

 			$output_conditions .= $condition->getConditionGroupString() . PHP_EOL . ',';

 		}

@@ -86,7 +86,7 @@ 
 	function getArguments()

 	{

 		$arguments = array();

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

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

 		{

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

 		}

classes/xml/xmlquery/tags/group/GroupsTag.class.php

Spacing +5 added lines, -5 removed lines

@@ -26,19 +26,19 @@ 
 	{

 		$this->groups = array();

 

-		if($xml_groups)

+		if ($xml_groups)

 		{

-			if(!is_array($xml_groups))

+			if (!is_array($xml_groups))

 			{

 				$xml_groups = array($xml_groups);

 			}

 

 			$dbParser = &DB::getParser();

-			for($i = 0; $i < count($xml_groups); $i++)

+			for ($i = 0; $i < count($xml_groups); $i++)

 			{

 				$group = $xml_groups[$i];

 				$column = trim($group->attrs->column);

-				if(!$column)

+				if (!$column)

 				{

 					continue;

 				}

@@ -52,7 +52,7 @@ 
 	function toString()

 	{

 		$output = 'array(' . PHP_EOL;

-		foreach($this->groups as $group)

+		foreach ($this->groups as $group)

 		{

 			$output .= "'" . $group . "' ,";

 		}

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

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 		// 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_();

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

 		$arguments = array();

 		$arguments[] = $this->argument;

-		if($this->sort_order_argument)

+		if ($this->sort_order_argument)

 		{

 			$arguments[] = $this->sort_order_argument;

 		}

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

Spacing +5 added lines, -5 removed lines

@@ -42,11 +42,11 @@ 
 	 */

 	function LimitTag($index)

 	{

-		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

+		if ($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

+			if (!isset($index->page->attrs->default))

 				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

+			if (!isset($index->page_count->attrs->default))

 				$index->page_count->attrs->default = 10;

 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

@@ -54,7 +54,7 @@ 
 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

+		if (!isset($index->list_count->attrs->default))

 			$index->list_count->attrs->default = 0;

 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

@@ -62,7 +62,7 @@ 
 

 	function toString()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

 		}

Braces +10 added lines, -8 removed lines

@@ -44,18 +44,21 @@ 
 	{

 		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

-				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

-				$index->page_count->attrs->default = 10;

+			if(!isset($index->page->attrs->default)) {
+							$index->page->attrs->default = 1;
+			}
+			if(!isset($index->page_count->attrs->default)) {
+							$index->page_count->attrs->default = 10;
+			}
 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

 			$this->arguments[] = $this->page;

 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

-			$index->list_count->attrs->default = 0;

+		if(!isset($index->list_count->attrs->default)) {
+					$index->list_count->attrs->default = 0;
+		}
 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

 	}

@@ -65,8 +68,7 @@ 
 		if($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

-		}

-		else

+		} else

 		{

 			return sprintf('new Limit(${\'%s_argument\'})', $this->list_count->getArgumentName());

 		}