xpressengine / xe-core

classes/xml/XmlJsFilter.class.php

Spacing +55 added lines, -55 removed lines

@@ -81,7 +81,7 @@ 
 
 	function __construct($path, $xml_file)
 	{
-		if(substr($path, -1) !== '/')
+		if (substr($path, -1) !== '/')
 		{
 			$path .= '/';
 		}
@@ -95,15 +95,15 @@ 
 	 */
 	function compile()
 	{
-		if(!file_exists($this->xml_file))
+		if (!file_exists($this->xml_file))
 		{
 			return;
 		}
-		if(!file_exists($this->js_file))
+		if (!file_exists($this->js_file))
 		{
 			$this->_compile();
 		}
-		else if(filemtime($this->xml_file) > filemtime($this->js_file))
+		else if (filemtime($this->xml_file) > filemtime($this->js_file))
 		{
 			$this->_compile();
 		}
@@ -136,25 +136,25 @@ 
 
 
 		$field_node = $xml_obj->filter->form->node;
-		if($field_node && !is_array($field_node))
+		if ($field_node && !is_array($field_node))
 		{
 			$field_node = array($field_node);
 		}
 
 		$parameter_param = $xml_obj->filter->parameter->param;
-		if($parameter_param && !is_array($parameter_param))
+		if ($parameter_param && !is_array($parameter_param))
 		{
 			$parameter_param = array($parameter_param);
 		}
 
 		$response_tag = $xml_obj->filter->response->tag;
-		if($response_tag && !is_array($response_tag))
+		if ($response_tag && !is_array($response_tag))
 		{
 			$response_tag = array($response_tag);
 		}
 
 		// If extend_filter exists, result returned by calling the method
-		if($extend_filter)
+		if ($extend_filter)
 		{
 			// If extend_filter exists, it changes the name of cache not to use cache
 			$this->js_file .= '.nocache.js';
@@ -163,24 +163,24 @@ 
 			list($module_name, $method) = explode('.', $extend_filter);
 
 			// contibue if both module_name and methos exist.
-			if($module_name && $method)
+			if ($module_name && $method)
 			{
 				// get model object of the module
 				$oExtendFilter = getModel($module_name);
 
 				// execute if method exists
-				if(method_exists($oExtendFilter, $method))
+				if (method_exists($oExtendFilter, $method))
 				{
 					// get the result
 					$extend_filter_list = $oExtendFilter->{$method}(TRUE);
 					$extend_filter_count = count($extend_filter_list);
 
 					// apply lang_value from the result to the variable
-					for($i = 0; $i < $extend_filter_count; $i++)
+					for ($i = 0; $i < $extend_filter_count; $i++)
 					{
 						$name = $extend_filter_list[$i]->name;
 						$lang_value = $extend_filter_list[$i]->lang;
-						if($lang_value)
+						if ($lang_value)
 						{
 							$lang->{$name} = $lang_value;
 						}
@@ -200,15 +200,15 @@ 
 		$fields = array();
 
 		// create custom rule
-		if($rules && $rules->rule)
+		if ($rules && $rules->rule)
 		{
-			if(!is_array($rules->rule))
+			if (!is_array($rules->rule))
 			{
 				$rules->rule = array($rules->rule);
 			}
-			foreach($rules->rule as $r)
+			foreach ($rules->rule as $r)
 			{
-				if($r->attrs->type == 'regex')
+				if ($r->attrs->type == 'regex')
 				{
 					$js_rules[] = "v.cast('ADD_RULE', ['{$r->attrs->name}', {$r->body}]);";
 				}
@@ -217,14 +217,14 @@ 
 
 		// generates a field, which is a script of the checked item
 		$node_count = count($field_node);
-		if($node_count)
+		if ($node_count)
 		{
-			foreach($field_node as $key => $node)
+			foreach ($field_node as $key => $node)
 			{
 				$attrs = $node->attrs;
 				$target = trim($attrs->target);
 
-				if(!$target)
+				if (!$target)
 				{
 					continue;
 				}
@@ -234,34 +234,34 @@ 
 
 				$field = array();
 
-				if($attrs->required == 'true')
+				if ($attrs->required == 'true')
 				{
 					$field[] = 'required:true';
 				}
-				if($attrs->minlength > 0)
+				if ($attrs->minlength > 0)
 				{
-					$field[] = 'minlength:' . $attrs->minlength;
+					$field[] = 'minlength:'.$attrs->minlength;
 				}
-				if($attrs->maxlength > 0)
+				if ($attrs->maxlength > 0)
 				{
-					$field[] = 'maxlength:' . $attrs->maxlength;
+					$field[] = 'maxlength:'.$attrs->maxlength;
 				}
-				if($equalto)
+				if ($equalto)
 				{
 					$field[] = "equalto:'{$attrs->equalto}'";
 				}
-				if($rule)
+				if ($rule)
 				{
 					$field[] = "rule:'{$rule}'";
 				}
 
-				$fields[] = "'{$target}': {" . implode(',', $field) . "}";
+				$fields[] = "'{$target}': {".implode(',', $field)."}";
 
-				if(!in_array($target, $target_list))
+				if (!in_array($target, $target_list))
 				{
 					$target_list[] = $target;
 				}
-				if(!$target_type_list[$target])
+				if (!$target_type_list[$target])
 				{
 					$target_type_list[$target] = $filter;
 				}
@@ -271,12 +271,12 @@ 
 		// Check extend_filter_item
 		$rule_types = array('homepage' => 'homepage', 'email_address' => 'email');
 
-		for($i = 0; $i < $extend_filter_count; $i++)
+		for ($i = 0; $i < $extend_filter_count; $i++)
 		{
 			$filter_item = $extend_filter_list[$i];
 			$target = trim($filter_item->name);
 
-			if(!$target)
+			if (!$target)
 			{
 				continue;
 			}
@@ -287,21 +287,21 @@ 
 			$required = ($filter_item->required == 'true');
 
 			$field = array();
-			if($required)
+			if ($required)
 			{
 				$field[] = 'required:true';
 			}
-			if($rule)
+			if ($rule)
 			{
 				$field[] = "rule:'{$rule}'";
 			}
-			$fields[] = "\t\t'{$target}' : {" . implode(',', $field) . "}";
+			$fields[] = "\t\t'{$target}' : {".implode(',', $field)."}";
 
-			if(!in_array($target, $target_list))
+			if (!in_array($target, $target_list))
 			{
 				$target_list[] = $target;
 			}
-			if(!$target_type_list[$target])
+			if (!$target_type_list[$target])
 			{
 				$target_type_list[$target] = $type;
 			}
@@ -310,37 +310,37 @@ 
 		// generates parameter script to create dbata
 		$rename_params = array();
 		$parameter_count = count($parameter_param);
-		if($parameter_count)
+		if ($parameter_count)
 		{
 			// contains parameter of the default filter contents
-			foreach($parameter_param as $key => $param)
+			foreach ($parameter_param as $key => $param)
 			{
 				$attrs = $param->attrs;
 				$name = trim($attrs->name);
 				$target = trim($attrs->target);
 
 				//if($name && $target && ($name != $target)) $js_doc[] = "\t\tparams['{$name}'] = params['{$target}']; delete params['{$target}'];";
-				if($name && $target && ($name != $target))
+				if ($name && $target && ($name != $target))
 				{
 					$rename_params[] = "'{$target}':'{$name}'";
 				}
-				if($name && !in_array($name, $target_list))
+				if ($name && !in_array($name, $target_list))
 				{
 					$target_list[] = $name;
 				}
 			}
 
 			// Check extend_filter_item
-			for($i = 0; $i < $extend_filter_count; $i++)
+			for ($i = 0; $i < $extend_filter_count; $i++)
 			{
 				$filter_item = $extend_filter_list[$i];
 				$target = $name = trim($filter_item->name);
-				if(!$name || !$target)
+				if (!$name || !$target)
 				{
 					continue;
 				}
 
-				if(!in_array($name, $target_list))
+				if (!in_array($name, $target_list))
 				{
 					$target_list[] = $name;
 				}
@@ -350,7 +350,7 @@ 
 		// generates the response script
 		$response_count = count($response_tag);
 		$responses = array();
-		for($i = 0; $i < $response_count; $i++)
+		for ($i = 0; $i < $response_count; $i++)
 		{
 			$attrs = $response_tag[$i]->attrs;
 			$name = $attrs->name;
@@ -359,10 +359,10 @@ 
 
 		// writes lang values of the form field
 		$target_count = count($target_list);
-		for($i = 0; $i < $target_count; $i++)
+		for ($i = 0; $i < $target_count; $i++)
 		{
 			$target = $target_list[$i];
-			if(!$lang->{$target})
+			if (!$lang->{$target})
 			{
 				$lang->{$target} = $target;
 			}
@@ -381,9 +381,9 @@ 
 		 */
 
 		// writes error messages
-		foreach($lang->filter as $key => $val)
+		foreach ($lang->filter as $key => $val)
 		{
-			if(!$val)
+			if (!$val)
 			{
 				$val = $key;
 			}
@@ -392,24 +392,24 @@ 
 		}
 
 		$callback_func = $xml_obj->filter->response->attrs->callback_func;
-		if(!$callback_func)
+		if (!$callback_func)
 		{
 			$callback_func = "filterAlertMessage";
 		}
 
 		$confirm_msg = '';
-		if($confirm_msg_code)
+		if ($confirm_msg_code)
 		{
 			$confirm_msg = $lang->{$confirm_msg_code};
 		}
 
 		$jsdoc = array();
-		$jsdoc[] = "function {$filter_name}(form){ return legacy_filter('{$filter_name}', form, '{$module}', '{$act}', {$callback_func}, [" . implode(',', $responses) . "], '" . addslashes($confirm_msg) . "', {" . implode(',', $rename_params) . "}) };";
+		$jsdoc[] = "function {$filter_name}(form){ return legacy_filter('{$filter_name}', form, '{$module}', '{$act}', {$callback_func}, [".implode(',', $responses)."], '".addslashes($confirm_msg)."', {".implode(',', $rename_params)."}) };";
 		$jsdoc[] = '(function($){';
 		$jsdoc[] = "\tvar v=xe.getApp('validator')[0];if(!v)return false;";
-		$jsdoc[] = "\t" . 'v.cast("ADD_FILTER", ["' . $filter_name . '", {' . implode(',', $fields) . '}]);';
-		$jsdoc[] = "\t" . implode("\n\t", $js_rules);
-		$jsdoc[] = "\t" . implode("\n\t", $js_messages);
+		$jsdoc[] = "\t".'v.cast("ADD_FILTER", ["'.$filter_name.'", {'.implode(',', $fields).'}]);';
+		$jsdoc[] = "\t".implode("\n\t", $js_rules);
+		$jsdoc[] = "\t".implode("\n\t", $js_messages);
 		$jsdoc[] = '})(jQuery);';
 		$jsdoc = implode("\n", $jsdoc);
 
@@ -424,7 +424,7 @@ 
 	 */
 	function _getCompiledFileName($xml_file)
 	{
-		return sprintf('%s%s.%s.compiled.js', $this->compiled_path, md5($this->version . $xml_file), Context::getLangType());
+		return sprintf('%s%s.%s.compiled.js', $this->compiled_path, md5($this->version.$xml_file), Context::getLangType());
 	}
 
 }

classes/xml/xmlquery/queryargument/QueryArgument.class.php

Spacing +17 added lines, -17 removed lines

@@ -63,11 +63,11 @@ 
 		static $number_of_arguments = 0;
 
 		$this->argument_name = $tag->attrs->var;
-		if(!$this->argument_name)
+		if (!$this->argument_name)
 		{
 			$this->argument_name = str_replace('.', '_', $tag->attrs->name);
 		}
-		if(!$this->argument_name)
+		if (!$this->argument_name)
 		{
 			$this->argument_name = str_replace('.', '_', $tag->attrs->column);
 		}
@@ -78,11 +78,11 @@ 
 		$this->argument_name .= $number_of_arguments;
 
 		$name = $tag->attrs->name;
-		if(!$name)
+		if (!$name)
 		{
 			$name = $tag->attrs->column;
 		}
-		if(strpos($name, '.') === FALSE)
+		if (strpos($name, '.') === FALSE)
 		{
 			$this->column_name = $name;
 		}
@@ -93,7 +93,7 @@ 
 			$this->table_name = $prefix;
 		}
 
-		if($tag->attrs->operation)
+		if ($tag->attrs->operation)
 		{
 			$this->operation = $tag->attrs->operation;
 		}
@@ -124,7 +124,7 @@ 
 
 	function isConditionArgument()
 	{
-		if($this->operation)
+		if ($this->operation)
 		{
 			return TRUE;
 		}
@@ -137,50 +137,50 @@ 
 	 */
 	function toString()
 	{
-		if($this->isConditionArgument())
+		if ($this->isConditionArgument())
 		{
 			// Instantiation
-			$arg = sprintf("\n" . '${\'%s_argument\'} = new ConditionArgument(\'%s\', %s, \'%s\');' . "\n"
+			$arg = sprintf("\n".'${\'%s_argument\'} = new ConditionArgument(\'%s\', %s, \'%s\');'."\n"
 					, $this->argument_name
 					, $this->variable_name
-					, '$args->' . $this->variable_name
+					, '$args->'.$this->variable_name
 					, $this->operation
 			);
 			// Call methods to validate argument and ensure default value
 			$arg .= $this->argument_validator->toString();
 
 			// Prepare condition string
-			$arg .= sprintf('${\'%s_argument\'}->createConditionValue();' . "\n"
+			$arg .= sprintf('${\'%s_argument\'}->createConditionValue();'."\n"
 					, $this->argument_name
 			);
 
 			// Check that argument passed validation, else return
-			$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();' . "\n"
+			$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();'."\n"
 					, $this->argument_name
 					, $this->argument_name
 			);
 		}
 		else
 		{
-			$arg = sprintf("\n" . '${\'%s_argument\'} = new Argument(\'%s\', %s);' . "\n"
+			$arg = sprintf("\n".'${\'%s_argument\'} = new Argument(\'%s\', %s);'."\n"
 					, $this->argument_name
 					, $this->variable_name
-					, $this->ignore_value ? 'NULL' : '$args->{\'' . $this->variable_name . '\'}');
+					, $this->ignore_value ? 'NULL' : '$args->{\''.$this->variable_name.'\'}');
 
 			$arg .= $this->argument_validator->toString();
 
-			$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();' . "\n"
+			$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();'."\n"
 					, $this->argument_name
 					, $this->argument_name
 			);
 		}
 
 		// If the argument is null, skip it
-		if($this->argument_validator->isIgnorable())
+		if ($this->argument_validator->isIgnorable())
 		{
-			$arg = sprintf("if(isset(%s)) {", '$args->' . $this->variable_name)
+			$arg = sprintf("if(isset(%s)) {", '$args->'.$this->variable_name)
 					. $arg
-					. sprintf("} else\n" . '${\'%s_argument\'} = NULL;', $this->argument_name);
+					. sprintf("} else\n".'${\'%s_argument\'} = NULL;', $this->argument_name);
 		}
 
 		return $arg;

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

classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php

Spacing +14 added lines, -14 removed lines

@@ -73,7 +73,7 @@ 
 
 	function isIgnorable()
 	{
-		if(isset($this->default_value) || isset($this->notnull))
+		if (isset($this->default_value) || isset($this->notnull))
 		{
 			return FALSE;
 		}
@@ -83,47 +83,47 @@ 
 	function toString()
 	{
 		$validator = '';
-		if($this->filter)
+		if ($this->filter)
 		{
-			$validator .= sprintf('${\'%s_argument\'}->checkFilter(\'%s\');' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->checkFilter(\'%s\');'."\n"
 					, $this->argument_name
 					, $this->filter
 			);
 		}
-		if($this->min_length)
+		if ($this->min_length)
 		{
-			$validator .= sprintf('${\'%s_argument\'}->checkMinLength(%s);' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->checkMinLength(%s);'."\n"
 					, $this->argument_name
 					, $this->min_length
 			);
 		}
-		if($this->max_length)
+		if ($this->max_length)
 		{
-			$validator .= sprintf('${\'%s_argument\'}->checkMaxLength(%s);' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->checkMaxLength(%s);'."\n"
 					, $this->argument_name
 					, $this->max_length
 			);
 		}
-		if(isset($this->default_value))
+		if (isset($this->default_value))
 		{
 			$this->default_value = new DefaultValue($this->argument_name, $this->default_value);
-			if($this->default_value->isSequence())
+			if ($this->default_value->isSequence())
 				$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';
-			if($this->default_value->isOperation())
+			if ($this->default_value->isOperation())
 			{
-				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');' . "\n"
+				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');'."\n"
 						, $this->argument_name
 						, $this->default_value->getOperation()
 				);
 			}
-			$validator .= sprintf('${\'%s_argument\'}->ensureDefaultValue(%s);' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->ensureDefaultValue(%s);'."\n"
 					, $this->argument_name
 					, $this->default_value->toString()
 			);
 		}
-		if($this->notnull)
+		if ($this->notnull)
 		{
-			$validator .= sprintf('${\'%s_argument\'}->checkNotNull();' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->checkNotNull();'."\n"
 					, $this->argument_name
 			);
 		}

Braces +3 added lines, -2 removed lines

@@ -107,8 +107,9 @@
 		if(isset($this->default_value))
 		{
 			$this->default_value = new DefaultValue($this->argument_name, $this->default_value);
-			if($this->default_value->isSequence())
-				$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';
+			if($this->default_value->isSequence()) {
+							$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';
+			}
 			if($this->default_value->isOperation())
 			{
 				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');' . "\n"

classes/xml/xmlquery/queryargument/DefaultValue.class.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
 	{
 		return $this->_is_string;
 		$str_pos = strpos($this->value, '(');
-		if($str_pos === false)
+		if ($str_pos === false)
 		{
 			return TRUE;
 		}
@@ -99,31 +99,31 @@ 
 
 	function _setValue()
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			return;
 		}
 
 		// If value contains comma separated values and does not contain paranthesis
 		//  -> default value is an array
-		if(strpos($this->value, ',') !== FALSE && strpos($this->value, '(') === FALSE)
+		if (strpos($this->value, ',') !== FALSE && strpos($this->value, '(') === FALSE)
 		{
 			return sprintf('array(%s)', $this->value);
 		}
 
 		$str_pos = strpos($this->value, '(');
 		// // TODO Replace this with parseExpression
-		if($str_pos === FALSE)
+		if ($str_pos === FALSE)
 		{
 			$this->_is_string = TRUE;
-			return '\'' . $this->value . '\'';
+			return '\''.$this->value.'\'';
 		}
 		//if($str_pos===false) return $this->value;
 
 		$func_name = substr($this->value, 0, $str_pos);
 		$args = substr($this->value, $str_pos + 1, -1);
 
-		switch($func_name)
+		switch ($func_name)
 		{
 			case 'ipaddress' :
 				$val = '$_SERVER[\'REMOTE_ADDR\']';
@@ -159,7 +159,7 @@ 
 				$val = sprintf('%d', $args);
 				break;
 			default :
-				$val = '\'' . $this->value . '\'';
+				$val = '\''.$this->value.'\'';
 			//$val = $this->value;
 		}
 

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

Spacing +7 added lines, -7 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;
 				}
@@ -51,10 +51,10 @@ 
 
 	function toString()
 	{
-		$output = 'array(' . PHP_EOL;
-		foreach($this->groups as $group)
+		$output = 'array('.PHP_EOL;
+		foreach ($this->groups as $group)
 		{
-			$output .= "'" . $group . "' ,";
+			$output .= "'".$group."' ,";
 		}
 		$output = substr($output, 0, -1);
 		$output .= ')';

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

Spacing +7 added lines, -7 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);
@@ -56,21 +56,21 @@ 
 	 */
 	function getConditionGroupString()
 	{
-		$conditions_string = 'array(' . PHP_EOL;
-		foreach($this->conditions as $condition)
+		$conditions_string = 'array('.PHP_EOL;
+		foreach ($this->conditions as $condition)
 		{
-			$conditions_string .= $condition->getConditionString() . PHP_EOL . ',';
+			$conditions_string .= $condition->getConditionString().PHP_EOL.',';
 		}
 		$conditions_string = substr($conditions_string, 0, -2); //remove ','
 		$conditions_string .= ')';
 
-		return sprintf("new ConditionGroup(%s%s)", $conditions_string, $this->pipe ? ',\'' . $this->pipe . '\'' : '');
+		return sprintf("new ConditionGroup(%s%s)", $conditions_string, $this->pipe ? ',\''.$this->pipe.'\'' : '');
 	}
 
 	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 +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."'" : ''
 			);
 		}
 	}

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 +13 added lines, -13 removed lines

@@ -25,42 +25,42 @@ 
 	function __construct($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);
 			}
@@ -73,10 +73,10 @@ 
 	 */
 	function toString()
 	{
-		$output_conditions = 'array(' . PHP_EOL;
-		foreach($this->condition_groups as $condition)
+		$output_conditions = 'array('.PHP_EOL;
+		foreach ($this->condition_groups as $condition)
 		{
-			$output_conditions .= $condition->getConditionGroupString() . PHP_EOL . ',';
+			$output_conditions .= $condition->getConditionGroupString().PHP_EOL.',';
 		}
 		$output_conditions = substr($output_conditions, 0, -1);
 		$output_conditions .= ')';
@@ -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/navigation/IndexTag.class.php

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

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 . '"';
 		}