xpressengine / xe-core

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

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
 		{

 			parent::ColumnTag(NULL);

 			$this->name = "*";

-		}

-		else

+		} else

 		{

 			parent::ColumnTag($column->attrs->name);

 			$dbParser = DB::getParser();

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

@@ -83,8 +83,7 @@
 			if(is_a($column, 'QueryTag'))

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

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

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

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

classes/xml/xmlquery/tags/column/UpdateColumnsTag.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 +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();

 		}

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

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

Spacing +27 added lines, -27 removed lines

@@ -67,38 +67,38 @@ 
 		$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 . "\"";

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

 					}

 					else

 					{

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

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

 					}

 				}

 				else

@@ -106,20 +106,20 @@ 
 					$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 . '."\'"';

+						$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 . "\"";

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

 						}

 						else

 						{

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

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

 						}

 					}

 				}

@@ -127,7 +127,7 @@ 
 			}

 			else

 			{

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

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

 			}

 		}

 	}

@@ -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,31 +153,31 @@ 
 

 	function getConditionString()

 	{

-		if($this->query)

+		if ($this->query)

 		{

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

 							, $this->column_name

 							, $this->default_column

-							, '"' . $this->operation . '"'

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

+							, '"'.$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

 							, $this->default_column

-							, '"' . $this->operation . '"'

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

+							, '"'.$this->operation.'"'

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

 			);

 		}

 		else

 		{

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

 							, $this->column_name

-							, '$' . $this->argument_name . '_argument'

-							, '"' . $this->operation . '"'

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

+							, '$'.$this->argument_name.'_argument'

+							, '"'.$this->operation.'"'

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

 			);

 		}

 	}

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

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
 			$arg->attrs->default = 'asc';

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

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

-		}

-		else

+		} else

 		{

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

 		}

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;

 		}

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

Braces +1 added lines, -2 removed lines

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

 		{

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

-		}

-		else

+		} else

 		{

 			return "";

 		}

Spacing +14 added lines, -14 removed lines

@@ -49,36 +49,36 @@ 
 	function NavigationTag($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);

 		}

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

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 . ',';

 			}

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

 		}

config/config.inc.php

Braces +6 added lines, -7 removed lines

@@ -10,8 +10,7 @@ 
 if(version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
-}
-else
+} else
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
@@ -56,8 +55,7 @@ 
 if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
 {
 	require _XE_PATH_ . 'config/package.inc.php';
-}
-else
+} else
 {
 	/**
 	 * Package type
@@ -398,12 +396,13 @@ 
 	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
 		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
-	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	} elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
 		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		if(isset($matches[2]) && $matches[2]) {
+			$candidate_filename[] = 'admin';
+		}
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 

Spacing +38 added lines, -38 removed lines

@@ -7,7 +7,7 @@ 
  * @file   config/config.inc.php
  * @author NAVER (developers@xpressengine.com)
  */
-if(version_compare(PHP_VERSION, '5.4.0', '<'))
+if (version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
 }
@@ -16,7 +16,7 @@ 
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -53,9 +53,9 @@ 
 ini_set('session.use_only_cookies', 0);
 
 
-if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
+if (file_exists(_XE_PATH_.'config/package.inc.php'))
 {
-	require _XE_PATH_ . 'config/package.inc.php';
+	require _XE_PATH_.'config/package.inc.php';
 }
 else
 {
@@ -97,12 +97,12 @@ 
  * define('__ENABLE_PHPUNIT_TEST__', 0);
  * define('__PROXY_SERVER__', 'http://domain:port/path');
  */
-if(file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
+if (file_exists(_XE_PATH_.'config/config.user.inc.php'))
 {
-	require _XE_PATH_ . 'config/config.user.inc.php';
+	require _XE_PATH_.'config/config.user.inc.php';
 }
 
-if(!defined('__DEBUG__'))
+if (!defined('__DEBUG__'))
 {
 	/**
 	 * output debug message(bit value)
@@ -117,7 +117,7 @@ 
 	define('__DEBUG__', 0);
 }
 
-if(!defined('__DEBUG_OUTPUT__'))
+if (!defined('__DEBUG_OUTPUT__'))
 {
 	/**
 	 * output location of debug message
@@ -131,7 +131,7 @@ 
 	define('__DEBUG_OUTPUT__', 0);
 }
 
-if(!defined('__DEBUG_PROTECT__'))
+if (!defined('__DEBUG_PROTECT__'))
 {
 	/**
 	 * output comments of the firePHP console and browser
@@ -144,7 +144,7 @@ 
 	define('__DEBUG_PROTECT__', 1);
 }
 
-if(!defined('__DEBUG_PROTECT_IP__'))
+if (!defined('__DEBUG_PROTECT_IP__'))
 {
 	/**
 	 * Set a ip address to allow debug
@@ -152,7 +152,7 @@ 
 	define('__DEBUG_PROTECT_IP__', '127.0.0.1');
 }
 
-if(!defined('__DEBUG_DB_OUTPUT__'))
+if (!defined('__DEBUG_DB_OUTPUT__'))
 {
 	/**
 	 * DB error message definition
@@ -165,7 +165,7 @@ 
 	define('__DEBUG_DB_OUTPUT__', 0);
 }
 
-if(!defined('__LOG_SLOW_QUERY__'))
+if (!defined('__LOG_SLOW_QUERY__'))
 {
 	/**
 	 * Query log for only timeout query among DB queries
@@ -179,7 +179,7 @@ 
 	define('__LOG_SLOW_QUERY__', 0);
 }
 
-if(!defined('__LOG_SLOW_TRIGGER__'))
+if (!defined('__LOG_SLOW_TRIGGER__'))
 {
 	/**
 	 * Trigger excute time log
@@ -193,7 +193,7 @@ 
 	define('__LOG_SLOW_TRIGGER__', 0);
 }
 
-if(!defined('__LOG_SLOW_ADDON__'))
+if (!defined('__LOG_SLOW_ADDON__'))
 {
 	/**
 	 * Addon excute time log
@@ -207,7 +207,7 @@ 
 	define('__LOG_SLOW_ADDON__', 0);
 }
 
-if(!defined('__LOG_SLOW_WIDGET__'))
+if (!defined('__LOG_SLOW_WIDGET__'))
 {
 	/**
 	 * Widget excute time log
@@ -221,7 +221,7 @@ 
 	define('__LOG_SLOW_WIDGET__', 0);
 }
 
-if(!defined('__DEBUG_QUERY__'))
+if (!defined('__DEBUG_QUERY__'))
 {
 	/**
 	 * Leave DB query information
@@ -234,7 +234,7 @@ 
 	define('__DEBUG_QUERY__', 0);
 }
 
-if(!defined('__OB_GZHANDLER_ENABLE__'))
+if (!defined('__OB_GZHANDLER_ENABLE__'))
 {
 	/**
 	 * option to enable/disable a compression feature using ob_gzhandler
@@ -248,7 +248,7 @@ 
 	define('__OB_GZHANDLER_ENABLE__', 1);
 }
 
-if(!defined('__ENABLE_PHPUNIT_TEST__'))
+if (!defined('__ENABLE_PHPUNIT_TEST__'))
 {
 	/**
 	 * decide to use/not use the php unit test (Path/tests/index.php)
@@ -261,7 +261,7 @@ 
 	define('__ENABLE_PHPUNIT_TEST__', 0);
 }
 
-if(!defined('__PROXY_SERVER__'))
+if (!defined('__PROXY_SERVER__'))
 {
 	/**
 	 * __PROXY_SERVER__ has server information to request to the external through the target server
@@ -270,7 +270,7 @@ 
 	define('__PROXY_SERVER__', NULL);
 }
 
-if(!defined('__ERROR_LOG__'))
+if (!defined('__ERROR_LOG__'))
 {
 	/**
 	 * __ERROR_LOG__ 는 PHP의 에러로그를 출력하는 기능입니다. 개발시 워닝에러이상의 에러부터 잡기 시작합니다.
@@ -281,7 +281,7 @@ 
 	define('__ERROR_LOG__', 0);
 }
 
-if(!defined('__DISABLE_DEFAULT_CSS__'))
+if (!defined('__DISABLE_DEFAULT_CSS__'))
 {
 	/**
 	 * XE의 기본 CSS 스타일을 로드하지 않도록 합니다.
@@ -297,25 +297,25 @@ 
 }
 
 // Require specific files when using Firebug console output
-if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
+if ((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
 {
-	require _XE_PATH_ . 'libs/FirePHPCore/FirePHP.class.php';
+	require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
 }
 
 // Set Timezone as server time
-if(version_compare(PHP_VERSION, '5.3.0') >= 0)
+if (version_compare(PHP_VERSION, '5.3.0') >= 0)
 {
 	date_default_timezone_set(@date_default_timezone_get());
 }
 
 // Require a function-defined-file for simple use
-require(_XE_PATH_ . 'config/func.inc.php');
+require(_XE_PATH_.'config/func.inc.php');
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	define('__StartTime__', getMicroTime());
 }
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	$GLOBALS['__elapsed_class_load__'] = 0;
 }
 
@@ -418,38 +418,38 @@ 
 
 function __xe_autoload($class_name)
 {
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$time_at = getMicroTime();
 	}
 
-	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
+	if (isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
-		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
+		require _XE_PATH_.$GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
 	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	elseif (preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
-		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		$candidate_filename[] = 'modules/'.$matches[1].'/'.$matches[1];
+		if (isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 
 		$candidate_filename = implode('.', $candidate_filename);
 
-		if(file_exists(_XE_PATH_ . $candidate_filename))
+		if (file_exists(_XE_PATH_.$candidate_filename))
 		{
-			require _XE_PATH_ . $candidate_filename;
+			require _XE_PATH_.$candidate_filename;
 		}
 	}
 
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
 	}
 }
 spl_autoload_register('__xe_autoload');
 
-if(file_exists(_XE_PATH_  . '/vendor/autoload.php')) {
-	require _XE_PATH_  . '/vendor/autoload.php';
+if (file_exists(_XE_PATH_.'/vendor/autoload.php')) {
+	require _XE_PATH_.'/vendor/autoload.php';
 }
 /* End of file config.inc.php */
 /* Location: ./config/config.inc.php */