xpressengine / xe-core

tools/dbxml_validator/validate.php

Doc Comments +5 added lines, -5 removed lines

@@ -173,7 +173,7 @@ 
  @return

  @param $xml_file

  @param $node

- @param $child_tag

+ @param string $child_tag

  */

 function checkDuplicateDescendants($xml_file, $node, $child_tag)

 {

@@ -199,13 +199,13 @@ 
 	messages.

  @param $node

 	The XML node with the children to be checked.

- @param $child_tags

+ @param string[] $child_tags

 	Array with tag names for the children elements

- @param $attr_tags

+ @param string[] $attr_tags

 	Array with names of attributes to be checked. If multiple attributes

 	are given, than the first one that is present on a child is included

 	in the check.

- @param $key

+ @param boolean $key

 	True if child elements are required to expose at least one of the 

 	attribute. False if only the child nodes with some of the

 	attributes present are to be checked.

@@ -489,7 +489,7 @@ 
 	@return

 	@param $xml_file

 	@param $container_element

-	@param $child_tag

+	@param string $child_tag

 */

 function checkVarContentsValidation

 	(

Indentation +28 added lines, -29 removed lines

@@ -90,7 +90,7 @@ 
 		@param $line_no

 		@param $message

 		@access

-	*/

+	 */

 	public function __construct($file, $line_no, $message)

 	{

 		parent::__construct("{$file}({$line_no}):\n\t$message");

@@ -112,7 +112,7 @@ 
 	@developer

 	@return

 	@access

-	*/

+	 */

 	public function __destruct()

 	{

 		libxml_clear_errors();

@@ -834,8 +834,7 @@ 
 

 	@brief

 	@developer

-

-	*/

+	 */

 	class RestoreWorkDir

 	{

 		protected $dirname;

@@ -845,7 +844,7 @@ 
 			@developer

 			@return

 			@access

-			*/

+		 */

 		public function __destruct()

 		{

 			try

@@ -868,7 +867,7 @@ 
 			@developer

 			@return

 			@access

-			*/

+		 */

 		public function __construct()

 		{

 			$this->dirname = getcwd();

@@ -1113,7 +1112,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function code($val = -1)

 	{

 		if($val == -1)

@@ -1135,7 +1134,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function push($val)

 	{

 		$this->save = $this->exit_code;

@@ -1147,7 +1146,7 @@ 
 		@developer

 		@access

 		@return

-	*/

+	 */

 	public function pop()

 	{

 		$this->exit_code = $this->save;

@@ -1160,7 +1159,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function __construct($val = 0)

 	{

 		$this->save = self::RETCODE_VALIDATOR_INTERNAL;

@@ -1181,7 +1180,7 @@ 
 		@developer

 		@access

 		@return

-	*/

+	 */

 	public function __destruct()

 	{

 		if($this->file_name)

@@ -1196,7 +1195,7 @@ 
 		@access

 		@return

 		@param $file_name

-	*/

+	 */

 	public function __construct($file_name)

 	{

 		$this->file_name = $file_name;

@@ -1439,7 +1438,7 @@ 
 

 			@brief

 			@developer

-		*/

+		 */

 		class Context

 		{

 			protected static $db_info = NULL;

@@ -1449,7 +1448,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function isInstalled()

 			{

 				return TRUE;

@@ -1460,7 +1459,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getLangType()

 			{

 				return 'en';

@@ -1471,7 +1470,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getLang()

 			{

 				return 'en';

@@ -1482,7 +1481,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getDBType()

 			{

 				if(self::$db_info)

@@ -1501,7 +1500,7 @@ 
 				@return

 				@access

 				@param $db_info

-			*/

+			 */

 			public static function setDBInfo($db_info)

 			{

 				self::$db_info = $db_info;

@@ -1512,7 +1511,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getDBInfo()

 			{

 				return self::$db_info;

@@ -1524,7 +1523,7 @@ 
 				@return

 				@access

 				@param $str

-			*/

+			 */

 			public static function convertEncodingStr($str)

 			{

 				return $str;

@@ -1535,7 +1534,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setNoDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1562,7 +1561,7 @@ 
 				@developer

 				@access

 				@return

-			*/

+			 */

 			public static function setMysqlDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1604,7 +1603,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setMysqliDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1646,7 +1645,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setCubridDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1688,7 +1687,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setMssqlDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1729,7 +1728,7 @@ 
 		/**

 			@brief

 			@developer

-		*/

+		 */

 		class Any_prop_obj_base

 		{

 			/**

@@ -1738,7 +1737,7 @@ 
 				@return

 				@param $property

 				@access

-			*/

+			 */

 			public function __get($property)

 			{

 				return NULL;

@@ -1748,7 +1747,7 @@ 
 		/**

 			@brief

 			@developer

-			*/

+		 */

 		class LangArgFilterErrorMessage

 		{

 			/**

@@ -1757,7 +1756,7 @@ 
 				@return

 				@param $property

 				@access

-			*/

+			 */

 			public function __get($property)

 			{

 				return 'Argument filter error';

Spacing +267 added lines, -286 removed lines

@@ -95,7 +95,7 @@ 
 	{

 		parent::__construct("{$file}({$line_no}):\n\t$message");

 

-		$this->xml_file	= $file;

+		$this->xml_file = $file;

 		$this->xml_line_no = $line_no;

 		$this->xml_message = $message;

 	}

@@ -133,32 +133,32 @@ 
 

 	$libXmlErrors = libxml_get_errors();

 

-	if(count($libXmlErrors))

+	if (count($libXmlErrors))

 	{

-		if(!$filename)

+		if (!$filename)

 		{

 			$filename = $libXmlErrors[0]->file;

 		}

 

 		$msg = '';

 

-		foreach($libXmlErrors as $libXmlError)

+		foreach ($libXmlErrors as $libXmlError)

 		{

 			$msg .= "{$libXmlError->file}({$libXmlError->line}):\n\t {$libXmlError->message}";

 		}

 

-		if($throw_error)

+		if ($throw_error)

 		{

 			throw new ErrorMessage($msg);

 		}

 		else

 		{

-			fwrite(STDERR, $msg . "\n");

+			fwrite(STDERR, $msg."\n");

 		}

 	}

 	else

 	{

-		if($throw_error)

+		if ($throw_error)

 		{

 			throw new ErrorMessage('Schema validation failed.');

 		}

@@ -179,7 +179,7 @@ 
 {

 	$children = $node->getElementsByTagName($child_tag);

 

-	if($children->length > 1)

+	if ($children->length > 1)

 	{

 		throw 

 			new XmlSchemaError(

@@ -217,21 +217,21 @@ 
 {

 	$key_values = array();

 

-	foreach($node->childNodes as $child_node)

+	foreach ($node->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE

+		if ($child_node->nodeType == XML_ELEMENT_NODE

 					&&

 				in_array($child_node->tagName, $child_tags))

 		{

 			$key_value = NULL;

 

-			foreach($attr_tags as $attr_tag)

+			foreach ($attr_tags as $attr_tag)

 			{

-				if($child_node->hasAttribute($attr_tag))

+				if ($child_node->hasAttribute($attr_tag))

 				{

 					$key_value = $child_node->getAttribute($attr_tag);

 

-					if(array_key_exists($key_value, $key_values))

+					if (array_key_exists($key_value, $key_values))

 					{

 						throw

 							new XmlSchemaError(

@@ -246,7 +246,7 @@ 
 				}

 			}

 

-			if(!$key_value && $key)

+			if (!$key_value && $key)

 			{

 				throw

 					new XmlSchemaError(

@@ -254,7 +254,7 @@ 
 						$child_node->getLineNo(),

 						"<{$child_node->tagName}>: at least one of the following attributes is expected: "

 							.

-						implode(', ', $attr_tags) . '.'

+						implode(', ', $attr_tags).'.'

 					);

 			}

 		}

@@ -282,19 +282,19 @@ 
 	$table_name = NULL;

 	$join_type = NULL;

 

-	if($table_element->hasAttribute('name'))

+	if ($table_element->hasAttribute('name'))

 	{

 		$table_name = $table_element->getAttribute('name');

 	}

 

-	if($table_element->hasAttribute('type'))

+	if ($table_element->hasAttribute('type'))

 	{

 		$join_type = $table_element->getAttribute('type');

 	}

 

-	if($table_element->getAttribute('query') == 'true')

+	if ($table_element->getAttribute('query') == 'true')

 	{

-		if($table_name !== NULL)

+		if ($table_name !== NULL)

 		{

 			throw

 				new XmlSchemaError(

@@ -304,7 +304,7 @@ 
 				);

 		}

 

-		if($join_type !== NULL)

+		if ($join_type !== NULL)

 		{

 			throw

 				new XmlSchemaError(

@@ -322,9 +322,9 @@ 
 		// check contents for a select list or a table-specification

 		$has_query_clauses = FALSE;

 

-		foreach($table_element->childNodes as $query_clause)

+		foreach ($table_element->childNodes as $query_clause)

 		{

-			if($query_clause->nodeType == XML_ELEMENT_NODE

+			if ($query_clause->nodeType == XML_ELEMENT_NODE

 						&&

 					(

 						$query_clause->tagName == 'columns' 

@@ -335,7 +335,7 @@ 
 			}

 		}

 

-		if(!$has_query_clauses)

+		if (!$has_query_clauses)

 		{

 			throw

 				new XmlSchemaError(

@@ -351,17 +351,17 @@ 
 	{

 		// base table or view

 

-		if($join_type !== NULL)

+		if ($join_type !== NULL)

 		{

 			$has_conditions_element = FALSE;

 

-			foreach($table_element->childNodes as $child_node)

+			foreach ($table_element->childNodes as $child_node)

 			{

-				if($child_node->nodeType == XML_ELEMENT_NODE)

+				if ($child_node->nodeType == XML_ELEMENT_NODE)

 				{

-					if($child_node->tagName == 'conditions')

+					if ($child_node->tagName == 'conditions')

 					{

-						if($has_conditions_element)

+						if ($has_conditions_element)

 						{

 							throw

 								new XmlSchemaError(

@@ -387,7 +387,7 @@ 
 				}

 			}

 

-			if(!$has_conditions_element)

+			if (!$has_conditions_element)

 			{

 				throw

 					new XmlSchemaError(

@@ -399,9 +399,9 @@ 
 		}

 		else

 		{

-			foreach($table_element->childNodes as $child_node)

+			foreach ($table_element->childNodes as $child_node)

 			{

-				if($child_node->nodeType == XML_ELEMENT_NODE)

+				if ($child_node->nodeType == XML_ELEMENT_NODE)

 				{

 					throw

 						new XmlSchemaError(

@@ -429,26 +429,25 @@ 
  */

 function checkTablesClause($xml_file, $tables_element)

 {

-	checkUniqueKey

-		(

+	checkUniqueKey(

 			$xml_file,

 			$tables_element,

-			array('table'),				// child elements to be checked

-			array('alias', 'name'),		// attributes to be checked

+			array('table'), // child elements to be checked

+			array('alias', 'name'), // attributes to be checked

 			TRUE						// attributes are required

 		);

 

-	foreach($tables_element->childNodes as $table)

+	foreach ($tables_element->childNodes as $table)

 	{

-		if($table->nodeType == XML_ELEMENT_NODE

+		if ($table->nodeType == XML_ELEMENT_NODE

 					&&

 				$table->tagName == 'table')

 		{

 			checkTableExpression($xml_file, $table);

 

-			if($table->getAttribute('query') == 'true')

+			if ($table->getAttribute('query') == 'true')

 			{

-				validate_select_query($xml_file, $table);		// recursive call

+				validate_select_query($xml_file, $table); // recursive call

 			}

 		}

 	}

@@ -470,12 +469,11 @@ 
  */

 function checkSelectListClause($xml_file, $columns_element)

 {

-	checkUniqueKey

-		(

+	checkUniqueKey(

 			$xml_file,

 			$columns_element,

-			array('column', 'query'),	// child elements

-			array('alias', 'name'),		// attributes

+			array('column', 'query'), // child elements

+			array('alias', 'name'), // attributes

 			FALSE						// ignore if no attributes present

 		);

 }

@@ -491,8 +489,7 @@ 
 	@param $container_element

 	@param $child_tag

 */

-function checkVarContentsValidation

-	(

+function checkVarContentsValidation(

 		$xml_file,

 		$container_element,

 		$child_tag

@@ -503,23 +500,22 @@ 
 

 	static

 		$var_attrs =

-			array

-			(

+			array(

 				'filter', 'notnull', 'minlength',

 				'maxlength'

 			);

 

-	foreach($container_element->childNodes as $child_node)

+	foreach ($container_element->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE

+		if ($child_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$child_node->tagName == $child_tag)

 		{

-			if(!$child_node->hasAttribute($key_attr))

+			if (!$child_node->hasAttribute($key_attr))

 			{

-				foreach($var_attrs as $var_attr)

+				foreach ($var_attrs as $var_attr)

 				{

-					if($child_node->hasAttribute($var_attr))

+					if ($child_node->hasAttribute($var_attr))

 					{

 						throw

 							new XmlSchemaError(

@@ -551,9 +547,9 @@ 
 	$has_var_attribute = $condition->hasAttribute('var') || $condition->hasAttribute('default');

 	$query_line_no = -1;

 

-	foreach($condition->childNodes as $query_node)

+	foreach ($condition->childNodes as $query_node)

 	{

-		if($query_node->nodeType == XML_ELEMENT_NODE

+		if ($query_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$query_node->tagName == 'query')

 		{

@@ -564,7 +560,7 @@ 
 		}

 	}

 

-	if($child_query_node && $has_var_attribute)

+	if ($child_query_node && $has_var_attribute)

 	{

 		throw 

 			new XmlSchemaError(

@@ -574,7 +570,7 @@ 
 			);

 	}

 

-	if(!($child_query_node || $has_var_attribute))

+	if (!($child_query_node || $has_var_attribute))

 	{

 		throw

 			new XmlSchemaError(

@@ -601,18 +597,18 @@ 
 {

 	$first_child = TRUE;

 

-	foreach($conditions->childNodes as $child_node)

+	foreach ($conditions->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE)

+		if ($child_node->nodeType == XML_ELEMENT_NODE)

 		{

 			// check for 'pipe' attribute

-			if($first_child)

+			if ($first_child)

 			{

 				$first_child = FALSE;

 			}

 			else

 			{

-				if(!$child_node->hasAttribute('pipe'))

+				if (!$child_node->hasAttribute('pipe'))

 				{

 					throw

 						new XmlSchemaError(

@@ -626,19 +622,19 @@ 
 			}

 

 			// recurse in condition groups/queries

-			if($child_node->tagName == 'group')

+			if ($child_node->tagName == 'group')

 			{

 				checkConditionsGroup($xml_file, $child_node);

 			}

 			else

 			{

-				if($child_node->tagName == 'query')

+				if ($child_node->tagName == 'query')

 				{

 					validate_select_query($xml_file, $child_node);

 				}

 				else

 				{

-					if($child_node->tagName == 'condition')

+					if ($child_node->tagName == 'condition')

 					{

 						checkConditionElement($xml_file, $child_node);

 					}

@@ -664,12 +660,11 @@ 
  */

 function checkNavigationClauses($xml_file, $navigation_element)

 {

-	foreach(array('list_count', 'page_count', 'page')

+	foreach (array('list_count', 'page_count', 'page')

 				as

 			$navigation_el)

 	{

-		checkDuplicateDescendants

-			(

+		checkDuplicateDescendants(

 				$xml_file,

 				$navigation_element,

 				$navigation_el

@@ -693,11 +688,11 @@ 
  */

 function validate_select_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $select_clause)

+	foreach ($query_element->childNodes as $select_clause)

 	{

-		if($select_clause->nodeType == XML_ELEMENT_NODE)

+		if ($select_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($select_clause->tagName)

+			switch ($select_clause->tagName)

 			{

 				case 'columns':

 					checkSelectListClause($xml_file, $select_clause);

@@ -728,11 +723,11 @@ 
  */

 function validate_update_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $update_clause)

+	foreach ($query_element->childNodes as $update_clause)

 	{

-		if($update_clause->nodeType == XML_ELEMENT_NODE)

+		if ($update_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($update_clause->tagName)

+			switch ($update_clause->tagName)

 			{

 				case 'tables':

 					checkTablesClause($xml_file, $update_clause);

@@ -755,11 +750,11 @@ 
  */

 function validate_delete_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $delete_clause)

+	foreach ($query_element->childNodes as $delete_clause)

 	{

-		if($delete_clause->nodeType == XML_ELEMENT_NODE)

+		if ($delete_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($delete_clause->tagName)

+			switch ($delete_clause->tagName)

 			{

 				case 'conditions':

 					checkConditionsGroup($xml_file, $delete_clause);

@@ -778,11 +773,11 @@ 
  */

 function validate_insert_select_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $statement_clause)

+	foreach ($query_element->childNodes as $statement_clause)

 	{

-		if($statement_clause->nodeType == XML_ELEMENT_NODE)

+		if ($statement_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($statement_clause->tagName)

+			switch ($statement_clause->tagName)

 			{

 				case 'query':

 					validate_select_query($xml_file, $statement_clause);

@@ -793,8 +788,7 @@ 
 }

 

 $validate_query_type = 

-	array

-		(

+	array(

 			// 'insert' =>		

 							// there is currently nothing special to check

 							// for a plain insert, all the needed checks

@@ -818,13 +812,13 @@ 
 

 	$action = $query_element->getAttribute('action');

 

-	if(array_key_exists($action, $validate_query_type))

+	if (array_key_exists($action, $validate_query_type))

 	{

 		$validate_query_type[$action]($xml_file, $query_element);

 	}

 }

 

-if(strpos(PHP_SAPI, 'cli') !== FALSE

+if (strpos(PHP_SAPI, 'cli') !== FALSE

 			|| 

 		strpos(PHP_SAPI, 'cgi') !== FALSE)

 {

@@ -857,7 +851,7 @@ 
 				print "Failed to restore working dir {$this->dirname}.";

 			}

 

-			if(!$success)

+			if (!$success)

 			{

 				print "Failed to restore working dir {$this->dirname}.";

 			}

@@ -873,7 +867,7 @@ 
 		{

 			$this->dirname = getcwd();

 

-			if(!$this->dirname)

+			if (!$this->dirname)

 			{

 				throw new ErrorMessage("Failed to get current directory.");

 			}

@@ -903,7 +897,7 @@ 
 	$lowercase_name = strtolower($xml_path_info['basename']);

 	$uppercase_name = strtoupper($xml_path_info['basename']);

 

-	if(strlen($lowercase_name) != $filename_len

+	if (strlen($lowercase_name) != $filename_len

 				||

 			strlen($uppercase_name) != $filename_len)

 	{

@@ -916,9 +910,9 @@ 
 

 	$varing_case_filename = '';

 

-	for($i = 0; $i < $filename_len; $i++)

+	for ($i = 0; $i < $filename_len; $i++)

 	{

-		if($lowercase_name[$i] != $uppercase_name[$i])

+		if ($lowercase_name[$i] != $uppercase_name[$i])

 		{

 			$varing_case_filename .= "[{$lowercase_name[$i]}{$uppercase_name[$i]}]";

 		}

@@ -932,13 +926,13 @@ 
 

 	$restoreWorkDir = new RestoreWorkDir();

 

-	if($glob_pattern)

+	if ($glob_pattern)

 	{

 		// change current dir to the xml file directory to keep

 		// glob pattern shorter (maximum 260 chars).

 		$success = chdir($glob_pattern);

 

-		if(!$success)

+		if (!$success)

 		{

 			throw new ErrorMessage("Failed to change work dir to {$glob_pattern}.");

 		}

@@ -950,14 +944,14 @@ 
 	// realpath() would have the same effect, but it is not documented as such

 	$matched_files = glob($glob_pattern, GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR);

 

-	unset($RestoreWorkDir);		// restore work dir after call to glob()

+	unset($RestoreWorkDir); // restore work dir after call to glob()

 

-	if($matched_files === FALSE || !is_array($matched_files))

+	if ($matched_files === FALSE || !is_array($matched_files))

 	{

 		throw new ErrorMessage("Directory listing for $xml_file failed.");

 	}

 

-	switch(count($matched_files))

+	switch (count($matched_files))

 	{

 		case 0:

 			throw new ErrorMessage("Directory listing for $xml_file failed.");

@@ -968,9 +962,9 @@ 
 		default:

 			// more than one files with the same name and different case

 			// case-sensitive file system

-			foreach($mached_files as $matched_file)

+			foreach ($mached_files as $matched_file)

 			{

-				if(pathinfo($matched_file, PATHINFO_BASENAME) == $xml_path_info['basename'])

+				if (pathinfo($matched_file, PATHINFO_BASENAME) == $xml_path_info['basename'])

 				{

 					return ($xml_path_info['filename'] == $query_id);

 				}

@@ -979,7 +973,7 @@ 
 

 	}

 

-	throw new ErrorMessage("Internal application error.");  // unreachable

+	throw new ErrorMessage("Internal application error."); // unreachable

 }

 

 /**

@@ -1000,9 +994,9 @@ 
 */

 function validate_schema_doc($xml_file, $table_element)

 {

-	foreach($table_element->childNodes as $col_node)

+	foreach ($table_element->childNodes as $col_node)

 	{

-		if($col_node->nodeType == XML_ELEMENT_NODE

+		if ($col_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$col_node->tagName == 'column')

 		{

@@ -1010,12 +1004,11 @@ 
 			$col_size = NULL;

 

 			// check auto-increment column

-			if($col_node->hasAttribute('auto_increment'))

+			if ($col_node->hasAttribute('auto_increment'))

 			{

-				fwrite

-					(

+				fwrite(

 						fopen('php://stdout', 'wt'), 

-						$xml_file . '(' . $col_node->getLineNo() . ")\n\t"

+						$xml_file.'('.$col_node->getLineNo().")\n\t"

 							.

 						"<column>: attribute 'auto_increment' is currently supported only by SQL Server and mysql backends.\n"

 					);

@@ -1023,7 +1016,7 @@ 
 				static

 					$autoinc_types = array('number', 'bignumber');

 

-				if(!in_array($col_type, $autoinc_types))

+				if (!in_array($col_type, $autoinc_types))

 				{

 					throw

 						new XmlSchemaError(

@@ -1031,30 +1024,29 @@ 
 							$col_node->getLineNo(),

 							"<column>: attribute 'auto_increment' only expected for one of the following types: "

 								.

-							implode(', ', $autoinc_types) . '.'

+							implode(', ', $autoinc_types).'.'

 						);

 				}

 			}

 

 			// check tinytext

-			if($col_type == 'tinytext')

+			if ($col_type == 'tinytext')

 			{

-				fwrite

-					(

+				fwrite(

 						fopen('php://stdout', 'wt'), 

-						$xml_file . '(' . $col_node->getLineNo() . ")\n\t"

+						$xml_file.'('.$col_node->getLineNo().")\n\t"

 							.

 						"<column>: type \"tinytext\" is supported only by CUBRID.\n"

 					);

 			}

 

 			// check size attribute

-			if($col_node->hasAttribute('size'))

+			if ($col_node->hasAttribute('size'))

 			{

 				$col_size = $col_node->getAttribute('size');

 			}

 

-			if($col_type == 'varchar' && $col_size === NULL)

+			if ($col_type == 'varchar' && $col_size === NULL)

 			{

 				throw 

 					new XmlSchemaError(

@@ -1068,7 +1060,7 @@ 
 				$varsize_types = array('char', 'varchar', 'float');

 					

 

-			if($col_size !== NULL  && !in_array($col_type, $varsize_types))

+			if ($col_size !== NULL && !in_array($col_type, $varsize_types))

 			{

 				throw 

 					new XmlSchemaError(

@@ -1076,7 +1068,7 @@ 
 							$col_node->getLineNo(),

 							"<column>: 'size' attribute only expected for the following types: "

 								.

-							implode(', ', $varsize_types) . "."

+							implode(', ', $varsize_types)."."

 						);

 			}

 		}

@@ -1102,8 +1094,8 @@ 
 	const RETCODE_GENERIC_XML_SYNTAX = 50;

 	const RETCODE_QUERY_ELEMENT = 40;

 	const RETCODE_XSD_VALIDATION = 30;

-	const RETCODE_BUILTIN_CHECKS =	20;

-	const RETCODE_DB_SCHEMA_MATCH = 10;	// no schema match is currently implemented.

+	const RETCODE_BUILTIN_CHECKS = 20;

+	const RETCODE_DB_SCHEMA_MATCH = 10; // no schema match is currently implemented.

 	const RETCODE_SUCCESS = 0;

 

 

@@ -1116,13 +1108,13 @@ 
 	*/

 	public function code($val = -1)

 	{

-		if($val == -1)

+		if ($val == -1)

 		{

 			return $this->exit_code;

 		}

 		else

 		{

-			if($this->exit_code < $val)

+			if ($this->exit_code < $val)

 			{

 				$this->exit_code = $val;

 			}

@@ -1184,7 +1176,7 @@ 
 	*/

 	public function __destruct()

 	{

-		if($this->file_name)

+		if ($this->file_name)

 		{

 			unlink($this->file_name);

 			$this->file_name = NULL;

@@ -1214,12 +1206,12 @@ 
 	$cmdname = CMD_NAME;

 

 	// php manual says resources should not normally be declared constant

-	if(!defined('STDERR'))

+	if (!defined('STDERR'))

 	{

 		define('STDERR', fopen('php://stderr', 'wt'));

 	}

 

-	if(!defined('__DIR__'))

+	if (!defined('__DIR__'))

 	{

 		define('__DIR__', dirname(__FILE__)); 

 	}

@@ -1234,7 +1226,7 @@ 
 	$query_args = NULL;

 	$query_args_file = NULL;

 

-	while($argc >= 2 && $argv[1][0] == '-')

+	while ($argc >= 2 && $argv[1][0] == '-')

 	{

 		$option = $argv[1];

 

@@ -1242,17 +1234,17 @@ 
 		$argv = array_values($argv);

 		$argc = count($argv);

 

-		switch($option)

+		switch ($option)

 		{

 			case '-s':

 			case '--schema':

 			case '--schema-language':

-				if($query_args !== NULL)

+				if ($query_args !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --schema-language options given.");

 				}

 

-				if($query_args_file !== NULL)

+				if ($query_args_file !== NULL)

 				{

 					throw new SyntaxError("Both --args-file and --schema-language options given.");

 				}

@@ -1272,7 +1264,7 @@ 
 

 			case '--xe-path':

 			case '--xe':

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1290,17 +1282,17 @@ 
 			case '--args-string':

 			case '--arguments':

 			case '--args':

-				if($schema_language !== NULL)

+				if ($schema_language !== NULL)

 				{

 					throw new SyntaxError("Both --schema-language and --args-string options given.");

 				}

 

-				if($query_args_file !== NULL)

+				if ($query_args_file !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --args-file options given.");

 				}

 

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1316,17 +1308,17 @@ 
 

 			case '--arguments-file':

 			case '--args-file':

-				if($schema_language !== NULL)

+				if ($schema_language !== NULL)

 				{

 					throw new SyntaxError("Both --schema-language and --args-file options given.");

 				}

 

-				if($query_args !== NULL)

+				if ($query_args !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --args-file options given.");

 				}

 

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1357,7 +1349,7 @@ 
 		}

 	}

 

-	if($argc < 2 ||

+	if ($argc < 2 ||

 			(

 				$argc == 2

 					&&

@@ -1366,48 +1358,48 @@ 
 	{

 		throw

 			new SyntaxError(

-				"Validates an XML document against a given schema definition (XSD), using the standard php library.\n" .

-				"Syntax:\n" .

-				"	{$cmdname} schema.xsd document.xml...\n" .

-				"	{$cmdname} [ --schema-language ] [--skip-query-id] ... [--] document.xml...\n" .

-				"Where:\n" .

-				"	--schema-language\n" .

-				"	--schema\n" .

-				"	-s\n" .

-				"		If given, the document(s) are validated against XE XML Schema Language,\n" .

-				"		otherwise document(s) are validated against XE XML Query Language.\n" .

-				"\n" .

-				"	--skip-query-id\n" .

-				"		Do not check the query id, which should normally match the file name.\n" .

-				"\n" .

-				"	--xe-path\n" .

-				"	--xe\n" .

-				"		Path to XE installation. Used to load the database-specific parsers to generate\n" .

-				"		SQL from the XML language files.\n" .

-				"\n" .

-				"	--validate-only\n" .

-				"		Only check XML schemas, no SQL generated with the database-specific parsers.\n" .

-				"\n" .

-				"	--args-string   \" 'name' => 'val..', 'name' => 'val...' \"\n" .

-				"	--args-file		args/file/name.php\n" .

-				"		Variables and values for the query, if it has any (only for XML Query Language).\n" .

-				"		Use a comma-separated 'var-name' => 'var_value...' pairs, in php syntax for an\n" .

-				"		array constructor. The validator script will directly eval()/include() this content.\n" .

-				"		The file named with --args-file should include an array() constructor around the\n" .

-				"		name-value list, and should immediately return it, without a named array variable.\n" .

-				"		E.g.:\n" .

-				"			return \n" .

-				"				array\n" .

-				"					(\n" .

-				"						'name' => 'val',\n" .

-				"						'name' => 'val',\n" .

-				"						...\n" .

-				"					);\n" .

-				"\n" .

-				"	schema.xsd		if given, is the file name for the schema definition to validate the\n" .

-				"					document against\n" .

-				"\n" .

-				"	document.xml	is the file name for the XML document to be validated against the schema.\n" .

+				"Validates an XML document against a given schema definition (XSD), using the standard php library.\n".

+				"Syntax:\n".

+				"	{$cmdname} schema.xsd document.xml...\n".

+				"	{$cmdname} [ --schema-language ] [--skip-query-id] ... [--] document.xml...\n".

+				"Where:\n".

+				"	--schema-language\n".

+				"	--schema\n".

+				"	-s\n".

+				"		If given, the document(s) are validated against XE XML Schema Language,\n".

+				"		otherwise document(s) are validated against XE XML Query Language.\n".

+				"\n".

+				"	--skip-query-id\n".

+				"		Do not check the query id, which should normally match the file name.\n".

+				"\n".

+				"	--xe-path\n".

+				"	--xe\n".

+				"		Path to XE installation. Used to load the database-specific parsers to generate\n".

+				"		SQL from the XML language files.\n".

+				"\n".

+				"	--validate-only\n".

+				"		Only check XML schemas, no SQL generated with the database-specific parsers.\n".

+				"\n".

+				"	--args-string   \" 'name' => 'val..', 'name' => 'val...' \"\n".

+				"	--args-file		args/file/name.php\n".

+				"		Variables and values for the query, if it has any (only for XML Query Language).\n".

+				"		Use a comma-separated 'var-name' => 'var_value...' pairs, in php syntax for an\n".

+				"		array constructor. The validator script will directly eval()/include() this content.\n".

+				"		The file named with --args-file should include an array() constructor around the\n".

+				"		name-value list, and should immediately return it, without a named array variable.\n".

+				"		E.g.:\n".

+				"			return \n".

+				"				array\n".

+				"					(\n".

+				"						'name' => 'val',\n".

+				"						'name' => 'val',\n".

+				"						...\n".

+				"					);\n".

+				"\n".

+				"	schema.xsd		if given, is the file name for the schema definition to validate the\n".

+				"					document against\n".

+				"\n".

+				"	document.xml	is the file name for the XML document to be validated against the schema.\n".

 				"					Multiple .xml files can be given.\n"

 			);

 	}

@@ -1415,23 +1407,23 @@ 
 	$query_user_args = array();

 

 	// check $xe_path, $query_args

-	if(!$validate_only)

+	if (!$validate_only)

 	{

-		if($xe_path == NULL)

+		if ($xe_path == NULL)

 		{

 			// assume validator.php is in directory .../xe/tools/dbxml_validator/ in an XE installation

 			$xe_path = dirname(dirname(realpath(__DIR__)));

 		}

 

-		if(!file_exists($xe_path . '/index.php'))

+		if (!file_exists($xe_path.'/index.php'))

 		{

 			throw

 				new ErrorMessage("File index.php not found in {$xe_path}.");

 		}

 

-		if(!defined('_XE_PATH_'))

+		if (!defined('_XE_PATH_'))

 		{

-			define('_XE_PATH_', $xe_path . '/');

+			define('_XE_PATH_', $xe_path.'/');

 		}

 

 		/**

@@ -1485,7 +1477,7 @@ 
 			*/

 			public static function getDBType()

 			{

-				if(self::$db_info)

+				if (self::$db_info)

 				{

 					return self::$db_info->master_db['db_type'];

 				}

@@ -1538,10 +1530,9 @@ 
 			*/

 			public static function setNoDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => NULL,

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1565,10 +1556,9 @@ 
 			*/

 			public static function setMysqlDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mysql',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1584,7 +1574,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1607,10 +1597,9 @@ 
 			*/

 			public static function setMysqliDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mysqli',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1626,7 +1615,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1649,10 +1638,9 @@ 
 			*/

 			public static function setCubridDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'cubrid',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1668,7 +1656,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1691,10 +1679,9 @@ 
 			*/

 			public static function setMssqlDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mssql',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1710,7 +1697,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1765,49 +1752,49 @@ 
 		}

 

 		global $lang;

-		$lang = new Any_prop_obj_base();	// to return NULL on non-existent properties

+		$lang = new Any_prop_obj_base(); // to return NULL on non-existent properties

 		$lang->filter = New LangArgFilterErrorMessage();

 

-		if(!defined('__XE__'))

+		if (!defined('__XE__'))

 		{

 			define('__XE__', TRUE);

 		}

 

-		if(!defined('__ZBXE__'))

+		if (!defined('__ZBXE__'))

 		{

 			define('__ZBXE__', TRUE);

 		}

 

-		if(!defined('__DEBUG__'))

+		if (!defined('__DEBUG__'))

 		{

 			define('__DEBUG__', 0);

 		}

 

-		if(!defined('__DEBUG_QUERY__'))

+		if (!defined('__DEBUG_QUERY__'))

 		{

 			define('__DEBUG_QUERY__', 0);

 		}

 

-		include(_XE_PATH_ . 'classes/object/BaseObject.class.php');

-		include(_XE_PATH_ . 'classes/handler/Handler.class.php');

-		include(_XE_PATH_ . 'classes/file/FileHandler.class.php');

-		include(_XE_PATH_ . 'classes/page/PageHandler.class.php');

+		include(_XE_PATH_.'classes/object/BaseObject.class.php');

+		include(_XE_PATH_.'classes/handler/Handler.class.php');

+		include(_XE_PATH_.'classes/file/FileHandler.class.php');

+		include(_XE_PATH_.'classes/page/PageHandler.class.php');

 

 		Context::setNoDBInfo();

 

-		require_once(_XE_PATH_ . 'classes/db/DB.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBMysql.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBMysqli.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBMysql_innodb.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBCubrid.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBMssql.class.php');

-		require_once(_XE_PATH_ . 'classes/xml/XmlParser.class.php');

-		require_once(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php');

+		require_once(_XE_PATH_.'classes/db/DB.class.php');

+		require_once(_XE_PATH_.'classes/db/DBMysql.class.php');

+		require_once(_XE_PATH_.'classes/db/DBMysqli.class.php');

+		require_once(_XE_PATH_.'classes/db/DBMysql_innodb.class.php');

+		require_once(_XE_PATH_.'classes/db/DBCubrid.class.php');

+		require_once(_XE_PATH_.'classes/db/DBMssql.class.php');

+		require_once(_XE_PATH_.'classes/xml/XmlParser.class.php');

+		require_once(_XE_PATH_.'classes/xml/XmlQueryParser.class.php');

 

-		require_once(__DIR__ . '/connect_wrapper.php');

+		require_once(__DIR__.'/connect_wrapper.php');

 

 		// check $query_args, $query_args_file

-		if($query_args_file)

+		if ($query_args_file)

 		{

 			try

 			{

@@ -1821,11 +1808,11 @@ 
 		}

 		else

 		{

-			if($query_args)

+			if ($query_args)

 			{

 				try

 				{

-					eval('$query_user_args = array(' . $query_args . ');');

+					eval('$query_user_args = array('.$query_args.');');

 				}

 				catch (Exception $exc)

 				{

@@ -1841,26 +1828,25 @@ 
 

 	$schema_file = NULL;

 	$schemas_set =

-		array

-			(

-				'delete' => __DIR__ . '/xml_delete.xsd',

-				'update' => __DIR__ . '/xml_update.xsd',

-				'select' => __DIR__ . '/xml_select.xsd',

-				'insert' => __DIR__ . '/xml_insert.xsd',

-				'insert-select' => __DIR__ . '/xml_insert_select.xsd'

+		array(

+				'delete' => __DIR__.'/xml_delete.xsd',

+				'update' => __DIR__.'/xml_update.xsd',

+				'select' => __DIR__.'/xml_select.xsd',

+				'insert' => __DIR__.'/xml_insert.xsd',

+				'insert-select' => __DIR__.'/xml_insert_select.xsd'

 			);

-	$table_schema = __DIR__ . '/xml_create_table.xsd';

+	$table_schema = __DIR__.'/xml_create_table.xsd';

 

 	$domDocument = new DOMDocument();

 

 	$i = 1;

 

-	if(pathinfo($argv[1], PATHINFO_EXTENSION) == 'xsd')

+	if (pathinfo($argv[1], PATHINFO_EXTENSION) == 'xsd')

 	{

 		$schema_file = $argv[$i++];

 	}

 	

-	for(; $i < count($argv); $i++)

+	for (; $i < count($argv); $i++)

 	{

 		try

 		{

@@ -1869,7 +1855,7 @@ 
 			$use_schema_language = $schema_language;

 

 			$retcode->push(ReturnCode::RETCODE_GENERIC_XML_SYNTAX);

-			if($domDocument->load($argv[$i]))

+			if ($domDocument->load($argv[$i]))

 			{

 				$retcode->pop();

 

@@ -1883,7 +1869,7 @@ 
 					}

 				}

 

-				if(!$schema_file && !$use_schema_language

+				if (!$schema_file && !$use_schema_language

 							&&

 						(

 							$queryElement->tagName != 'query'

@@ -1895,15 +1881,15 @@ 
 

 					throw

 						new ErrorMessage(

-								"{$argv[$i]}:" .

-								"		Root element should be <query> and should have an action attribute of:" .

-								"		insert, insert-select, select, update or delete." .

-								"		Otherwise an explicit schema, to validate the document with, should be" .

+								"{$argv[$i]}:".

+								"		Root element should be <query> and should have an action attribute of:".

+								"		insert, insert-select, select, update or delete.".

+								"		Otherwise an explicit schema, to validate the document with, should be".

 								"		specified as first argument on the command line."

 							);

 				}

 

-				if(!$schema_file && !$use_schema_language && !$skip_query_id

+				if (!$schema_file && !$use_schema_language && !$skip_query_id

 							&&

 						!validate_query_id($argv[$i], $queryElement->getAttribute('id')))

 				{

@@ -1912,28 +1898,28 @@ 
 

 					throw

 						new ErrorMessage(

-							"{$argv[$i]}(" . $queryElement->getLineNo() . "):\n\tQuery 'id' attribute value \"{$query_id}\" should match file name."

+							"{$argv[$i]}(".$queryElement->getLineNo()."):\n\tQuery 'id' attribute value \"{$query_id}\" should match file name."

 						);

 				}

 

-				if($use_schema_language)

+				if ($use_schema_language)

 				{

 					$document_schema = $table_schema;

 				}

 				else

 				{

-					if(!$document_schema)

+					if (!$document_schema)

 					{

 						$document_schema = $schemas_set[$queryElement->getAttribute('action')];

 					}

 				}

 

 				$retcode->push(ReturnCode::RETCODE_XSD_VALIDATION);

-				if($domDocument->schemaValidate($document_schema))

+				if ($domDocument->schemaValidate($document_schema))

 				{

 					$retcode->pop();

 

-					if($use_schema_language)

+					if ($use_schema_language)

 					{

 						validate_schema_doc($argv[$i], $domDocument->documentElement);

 					}

@@ -1944,22 +1930,22 @@ 
 					$success = TRUE;

 				}

 

-				if(!$validate_only)

+				if (!$validate_only)

 				{

 					// Generate SQL with the db provider back-ends

 

-					if(function_exists('sys_get_temp_dir'))

+					if (function_exists('sys_get_temp_dir'))

 					{

 						$tmpdir = sys_get_temp_dir();

 					}

 					else

 					{

 						$tmpdir = getenv('TEMP');

-						if(!$tmpdir)

+						if (!$tmpdir)

 						{

 							$tmpdir = getenv('TMP');

 						}

-						if(!$tmpdir)

+						if (!$tmpdir)

 						{

 							$tmpdir = '/tmp';

 						}

@@ -1968,30 +1954,29 @@ 
 

 					global $_SERVER;

 

-					if(!is_array($_SERVER))

+					if (!is_array($_SERVER))

 					{

 						$_SERVER = array();

 					}

 

-					if(!array_key_exists('REMOTE_ADDR', $_SERVER))

+					if (!array_key_exists('REMOTE_ADDR', $_SERVER))

 					{

 						$_SERVER['REMOTE_ADDR'] = '127.0.0.1';

 					}

 

 					$set_db_info_methods =

-						array

-							(

+						array(

 								'mysql'		=> 'setMysqlDBInfo',

 								'mysqli'	=> 'setMysqliDBInfo',

 								'cubrid'	=> 'setCubridDBInfo',

 								'mssql'		=> 'setMssqlDBInfo'

 							);

 

-					foreach($set_db_info_methods as $db_type => $set_info_method)

+					foreach ($set_db_info_methods as $db_type => $set_info_method)

 					{

 						Context::$set_info_method(); // calls setMysqlDBInfo()/setCubridDBInfo()/...

 

-						if($use_schema_language)

+						if ($use_schema_language)

 						{

 							$GLOBALS['__DB__'][$db_type]->queries = '';

 							$GLOBALS['__DB__'][$db_type]->createTableByXmlFile($argv[$i]);

@@ -2010,39 +1995,38 @@ 
 							// copied from classes/db/DB.class.php

 							$oParser = new XmlQueryParser();

 							$args_array =

-								$oParser->parse_xml_query

-									(

+								$oParser->parse_xml_query(

 										pathinfo($argv[$i], PATHINFO_FILENAME), // query id

-										$argv[$i],								// xml file

+										$argv[$i], // xml file

 										$unlink_tmpfile->file_name				// cache file

 									);

 							$args_array = $args_array->queryTag->getArguments();

 

 							$GLOBALS['__DB__'][$db_type]->queries = '';

 							$k = 1;

-							foreach($args_array as $arg)

+							foreach ($args_array as $arg)

 							{

-								if(// why would there be a query arg without a var name ?

+								if (// why would there be a query arg without a var name ?

 										isset($arg->variable_name)

 											&&

 										!array_key_exists($arg->variable_name, $query_user_args))

 								{

-									if(isset($arg->argument_validator))

+									if (isset($arg->argument_validator))

 									{

-										if(FALSE	// some default values are to be parsed by php, some are not...

+										if (FALSE	// some default values are to be parsed by php, some are not...

 													&&

 												isset($arg->argument_validator->default_value)

 													&&

 												isset($arg->argument_validator->default_value->value))

 										{

 											$query_user_args[$arg->variable_name] =

-												eval('return ' . $arg->argument_validator->default_value->toString() . ';');

+												eval('return '.$arg->argument_validator->default_value->toString().';');

 										}

 										else

 										{

-											if($arg->argument_validator->filter)

+											if ($arg->argument_validator->filter)

 											{

-												switch($arg->argument_validator->filter)

+												switch ($arg->argument_validator->filter)

 												{

 													case 'email':

 													case 'email_address':

@@ -2081,18 +2065,17 @@ 
 										}

 									}

 

-									if(!array_key_exists($arg->variable_name, $query_user_args))

+									if (!array_key_exists($arg->variable_name, $query_user_args))

 									{

 										$query_user_args[$arg->variable_name] = sprintf('%06d', $k);

 									}

 

-									if(isset($arg->argument_validator))

+									if (isset($arg->argument_validator))

 									{

-										if(isset($arg->argument_validator->min_length))

+										if (isset($arg->argument_validator->min_length))

 										{

 											$query_user_args[$arg->variable_name] =

-												str_pad

-													(

+												str_pad(

 														$query_user_args[$arg->variable_name],

 														$arg->argument_validator->min_length,

 														isset($arg->argument_validator->filter) &&

@@ -2105,11 +2088,10 @@ 
 													);

 										}

 

-										if(isset($arg->argument_validator->max_length))

+										if (isset($arg->argument_validator->max_length))

 										{

 											$query_user_args[$arg->variable_name] =

-												substr

-													(

+												substr(

 														$query_user_args[$arg->variable_name],

 														0, 

 														$arg->argument_validator->max_length

@@ -2122,15 +2104,14 @@ 
 							}

 

 							$resultset = 

-								$GLOBALS['__DB__'][$db_type]->_executeQuery

-									(

-										$unlink_tmpfile->file_name,		// cache_file

-										(object)$query_user_args,		// source_args

-										basename($argv[$i]),			// query_id

+								$GLOBALS['__DB__'][$db_type]->_executeQuery(

+										$unlink_tmpfile->file_name, // cache_file

+										(object) $query_user_args, // source_args

+										basename($argv[$i]), // query_id

 										array()							// arg_columns

 									);

 

-							if(is_a($resultset, 'BaseObject') && !$resultset->toBool())

+							if (is_a($resultset, 'BaseObject') && !$resultset->toBool())

 							{

 								throw new XmlSchemaError($argv[$i], -1, 'mysql SQL query generation failed');

 							}

@@ -2147,7 +2128,7 @@ 
 				}

 			}

 

-			if(!$success)

+			if (!$success)

 			{

 				libXmlDisplayError($argv[$i], TRUE);

 			}

@@ -2156,21 +2137,21 @@ 
 		{

 			$retcode->code(ReturnCode::RETCODE_BUILTIN_CHECKS);

 

-			fwrite(STDERR, $exc->getMessage() . "\n");

+			fwrite(STDERR, $exc->getMessage()."\n");

 		}

 		catch (ErrorMessage $exc)

 		{

-			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

+			if ($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

 				$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 			}

 

-			fwrite(STDERR, $exc->getMessage() . "\n");

+			fwrite(STDERR, $exc->getMessage()."\n");

 			libXmlDisplayError($argv[$i]);

 		}

 		catch (ErrorException $exc)

 		{

-			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

+			if ($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

 				$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 			}

@@ -2183,7 +2164,7 @@ 
 		{

 			$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 

-			fwrite(STDERR, $exc->getMessage() . "\n");

+			fwrite(STDERR, $exc->getMessage()."\n");

 			fwrite(STDERR, $exc->getTraceAsString());

 			libXmlDisplayError($argv[$i]);

 		}

@@ -2193,22 +2174,22 @@ 
 }

 catch (SyntaxError $syntax)

 {

-	fwrite(STDERR, $syntax->getMessage() . "\n");

-	exit(254);	// wrong command line

+	fwrite(STDERR, $syntax->getMessage()."\n");

+	exit(254); // wrong command line

 				// 255 is reserved by php (for parse errors, etc.)

 }

 catch (ErrorMessage $exc)

 {

-	fwrite(STDERR, $exc->getMessage() . "\n");

+	fwrite(STDERR, $exc->getMessage()."\n");

 	libXmlDisplayError();

-	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

+	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL); // internal validator error

 }

 catch (Exception $exc)

 {

-	fwrite(STDERR, $exc->getFile() . '(' . $exc->getLine() . ")\n\t" . $exc->getMessage() . "\n");

+	fwrite(STDERR, $exc->getFile().'('.$exc->getLine().")\n\t".$exc->getMessage()."\n");

 	fwrite(STDERR, $exc->getTraceAsString());

 	libXmlDisplayError();

-	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

+	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL); // internal validator error

 }

 

 /* End of file validate.php */

Braces +33 added lines, -66 removed lines

@@ -150,13 +150,11 @@ 
 		if($throw_error)

 		{

 			throw new ErrorMessage($msg);

-		}

-		else

+		} else

 		{

 			fwrite(STDERR, $msg . "\n");

 		}

-	}

-	else

+	} else

 	{

 		if($throw_error)

 		{

@@ -346,8 +344,7 @@ 
 					"\nANSI SQL-99 declares the table specification as required."

 				);

 		}

-	}

-	else

+	} else

 	{

 		// base table or view

 

@@ -369,13 +366,11 @@ 
 									$child_node->getLineNo(),

 									'Duplicate <conditions> elements.'

 								);

-						}

-						else

+						} else

 						{

 							$has_conditions_element = TRUE;

 						}

-					}

-					else

+					} else

 					{

 						throw

 							new XmlSchemaError(

@@ -396,8 +391,7 @@ 
 						'Expected <conditions> element as content.'

 					);

 			}

-		}

-		else

+		} else

 		{

 			foreach($table_element->childNodes as $child_node)

 			{

@@ -609,8 +603,7 @@ 
 			if($first_child)

 			{

 				$first_child = FALSE;

-			}

-			else

+			} else

 			{

 				if(!$child_node->hasAttribute('pipe'))

 				{

@@ -629,14 +622,12 @@ 
 			if($child_node->tagName == 'group')

 			{

 				checkConditionsGroup($xml_file, $child_node);

-			}

-			else

+			} else

 			{

 				if($child_node->tagName == 'query')

 				{

 					validate_select_query($xml_file, $child_node);

-				}

-				else

+				} else

 				{

 					if($child_node->tagName == 'condition')

 					{

@@ -851,8 +842,7 @@ 
 			try

 			{

 				$success = chdir($this->dirname);

-			}

-			catch (Exception $e)

+			} catch (Exception $e)

 			{

 				print "Failed to restore working dir {$this->dirname}.";

 			}

@@ -921,8 +911,7 @@ 
 		if($lowercase_name[$i] != $uppercase_name[$i])

 		{

 			$varing_case_filename .= "[{$lowercase_name[$i]}{$uppercase_name[$i]}]";

-		}

-		else

+		} else

 		{

 			$varing_case_filename .= $lowercase_name[$i];

 		}

@@ -1119,8 +1108,7 @@ 
 		if($val == -1)

 		{

 			return $this->exit_code;

-		}

-		else

+		} else

 		{

 			if($this->exit_code < $val)

 			{

@@ -1488,8 +1476,7 @@ 
 				if(self::$db_info)

 				{

 					return self::$db_info->master_db['db_type'];

-				}

-				else

+				} else

 				{

 					return NULL;

 				}

@@ -1588,8 +1575,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMysqlConnectWrapper();

@@ -1630,8 +1616,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMysqliConnectWrapper();

@@ -1672,8 +1657,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBCubridConnectWrapper();

@@ -1714,8 +1698,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMssqlConnectWrapper();

@@ -1812,22 +1795,19 @@ 
 			try

 			{

 				$query_user_args = require($query_args_file);

-			}

-			catch (Exception $exc)

+			} catch (Exception $exc)

 			{

 				fwrite(STDERR, "Error in arguments file.\n");

 				throw $exc;

 			}

-		}

-		else

+		} else

 		{

 			if($query_args)

 			{

 				try

 				{

 					eval('$query_user_args = array(' . $query_args . ');');

-				}

-				catch (Exception $exc)

+				} catch (Exception $exc)

 				{

 					fwrite(STDERR, "Error in arguments string.\n");

 					throw $exc;

@@ -1919,8 +1899,7 @@ 
 				if($use_schema_language)

 				{

 					$document_schema = $table_schema;

-				}

-				else

+				} else

 				{

 					if(!$document_schema)

 					{

@@ -1936,8 +1915,7 @@ 
 					if($use_schema_language)

 					{

 						validate_schema_doc($argv[$i], $domDocument->documentElement);

-					}

-					else

+					} else

 					{

 						validate_xml_query($argv[$i], $domDocument->documentElement);

 					}

@@ -1951,8 +1929,7 @@ 
 					if(function_exists('sys_get_temp_dir'))

 					{

 						$tmpdir = sys_get_temp_dir();

-					}

-					else

+					} else

 					{

 						$tmpdir = getenv('TEMP');

 						if(!$tmpdir)

@@ -2001,8 +1978,7 @@ 
 							print " {$db_type} query:\n";

 							print $GLOBALS['__DB__'][$db_type]->queries;

 							print "\n";

-						}

-						else

+						} else

 						{

 							$unlink_tmpfile =

 								new UnlinkFile(tempnam($tmpdir, 'xe_'));

@@ -2037,8 +2013,7 @@ 
 										{

 											$query_user_args[$arg->variable_name] =

 												eval('return ' . $arg->argument_validator->default_value->toString() . ';');

-										}

-										else

+										} else

 										{

 											if($arg->argument_validator->filter)

 											{

@@ -2133,8 +2108,7 @@ 
 							if(is_a($resultset, 'BaseObject') && !$resultset->toBool())

 							{

 								throw new XmlSchemaError($argv[$i], -1, 'mysql SQL query generation failed');

-							}

-							else

+							} else

 							{

 								print "\n";

 								print pathinfo($argv[$i], PATHINFO_FILENAME);

@@ -2151,14 +2125,12 @@ 
 			{

 				libXmlDisplayError($argv[$i], TRUE);

 			}

-		}

-		catch (XmlSchemaError $exc)

+		} catch (XmlSchemaError $exc)

 		{

 			$retcode->code(ReturnCode::RETCODE_BUILTIN_CHECKS);

 

 			fwrite(STDERR, $exc->getMessage() . "\n");

-		}

-		catch (ErrorMessage $exc)

+		} catch (ErrorMessage $exc)

 		{

 			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

@@ -2167,8 +2139,7 @@ 
 

 			fwrite(STDERR, $exc->getMessage() . "\n");

 			libXmlDisplayError($argv[$i]);

-		}

-		catch (ErrorException $exc)

+		} catch (ErrorException $exc)

 		{

 			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

@@ -2178,8 +2149,7 @@ 
 			fwrite(STDERR, "{$exc->getFile()}({$exc->getLine()}):\n\t{$exc->getMessage()}.\n");

 			fwrite(STDERR, $exc->getTraceAsString());

 			libXmlDisplayError($argv[$i]);

-		}

-		catch (Exception $exc)

+		} catch (Exception $exc)

 		{

 			$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 

@@ -2190,20 +2160,17 @@ 
 	}

 

 	exit($retcode->code());

-}

-catch (SyntaxError $syntax)

+} catch (SyntaxError $syntax)

 {

 	fwrite(STDERR, $syntax->getMessage() . "\n");

 	exit(254);	// wrong command line

 				// 255 is reserved by php (for parse errors, etc.)

-}

-catch (ErrorMessage $exc)

+} catch (ErrorMessage $exc)

 {

 	fwrite(STDERR, $exc->getMessage() . "\n");

 	libXmlDisplayError();

 	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

-}

-catch (Exception $exc)

+} catch (Exception $exc)

 {

 	fwrite(STDERR, $exc->getFile() . '(' . $exc->getLine() . ")\n\t" . $exc->getMessage() . "\n");

 	fwrite(STDERR, $exc->getTraceAsString());

addons/adminlogging/adminlogging.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -10,7 +10,7 @@ 
  * @brief admin log
  */
 $logged_info = Context::get('logged_info');
-if($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
+if ($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
 {
 	$oAdminloggingController = getController('adminlogging');
 	$oAdminloggingController->insertLog($this->module, $this->act);

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file adminlogging.addon.php

addons/autolink/autolink.addon.php

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file autolink.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -9,7 +9,7 @@ 
  * @author NAVER (developers@xpressengine.com)
  * @brief Automatic link add-on
  */
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")
+if ($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")
 {
 	Context::loadFile(array('./addons/autolink/autolink.js', 'body', '', null), true);
 }

addons/captcha_member/captcha_member.addon.php

Braces +8 added lines, -6 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined("__XE__")) exit();
+if(!defined("__XE__")) {
+	exit();
+}
 
 /**
  * @file captcha.addon.php
@@ -85,8 +87,7 @@ 
 						$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
 						$ModuleHandler->_setInputValueToSession();
 					}
-				}
-				else
+				} else
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
@@ -216,8 +217,7 @@ 
 
 					$background_color = imagecolorallocate($im[$i + 1], 255, 255, 255);
 					imagecolortransparent($im[$i + 1], $background_color);
-				}
-				else
+				} else
 				{
 					imagestring($im[$i + 1], (array_pop($ran) % 3) + 3, 2, (array_pop($ran) % 4), $str, $text_color);
 				}
@@ -315,7 +315,9 @@ 
 
 		function compareCaptcha()
 		{
-			if(!in_array(Context::get('act'), $this->target_acts)) return true;
+			if(!in_array(Context::get('act'), $this->target_acts)) {
+				return true;
+			}
 
 			if($_SESSION['member_captcha_authed'])
 			{

Doc Comments +3 added lines

@@ -275,6 +275,9 @@
 			exit();
 		}
 
+		/**
+		 * @param string $string
+		 */
 		function createCaptchaAudio($string)
 		{
 			$data = '';

Spacing +44 added lines, -44 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined("__XE__")) exit();
+if (!defined("__XE__")) exit();
 
 /**
  * @file captcha.addon.php
@@ -9,7 +9,7 @@ 
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonMemberCaptcha', false))
+if (!class_exists('AddonMemberCaptcha', false))
 {
 	class AddonMemberCaptcha
 	{
@@ -32,7 +32,7 @@ 
 		function before_module_init(&$ModuleHandler)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
+			if ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
 			{
 				return false;
 			}
@@ -40,11 +40,11 @@ 
 			// {
 			// 	return false;
 			// }
-			if($_SESSION['XE_VALIDATOR_ERROR'] == -1)
+			if ($_SESSION['XE_VALIDATOR_ERROR'] == -1)
 			{
 				$_SESSION['member_captcha_authed'] = false;
 			}
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
@@ -52,26 +52,26 @@ 
 			$type = Context::get('captchaType');
 
 			$this->target_acts = array();
-			if($this->addon_info->apply_find_account == 'apply')
+			if ($this->addon_info->apply_find_account == 'apply')
 			{
 				$this->target_acts[] = 'procMemberFindAccount';
 			}
-			if($this->addon_info->apply_resend_auth_mail == 'apply')
+			if ($this->addon_info->apply_resend_auth_mail == 'apply')
 			{
 				$this->target_acts[] = 'procMemberResendAuthMail';
 			}
-			if($this->addon_info->apply_signup == 'apply')
+			if ($this->addon_info->apply_signup == 'apply')
 			{
 				$this->target_acts[] = 'procMemberInsert';
 			}
 
-			if(Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() !== 'JSON')
+			if (Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() !== 'JSON')
 			{
-				if($type == 'inline')
+				if ($type == 'inline')
 				{
-					if(!$this->compareCaptcha())
+					if (!$this->compareCaptcha())
 					{
-						Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
+						Context::loadLang(_XE_PATH_.'addons/captcha_member/lang');
 						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
 						$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
 						$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
@@ -83,16 +83,16 @@ 
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
-						captchaTargetAct.push("' . implode('","', $this->target_acts) . '");
+						captchaTargetAct.push("' . implode('","', $this->target_acts).'");
 						</script>');
 					Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true);
 				}
 			}
 
 			// compare session when calling actions such as writing a post or a comment on the board/issue tracker module
-			if(!$_SESSION['member_captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
+			if (!$_SESSION['member_captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
 			{
-				Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
+				Context::loadLang(_XE_PATH_.'addons/captcha_member/lang');
 				$ModuleHandler->error = "captcha_denied";
 			}
 
@@ -102,7 +102,7 @@ 
 		function createKeyword()
 		{
 			$type = Context::get('captchaType');
-			if($type == 'inline' && $_SESSION['captcha_keyword'])
+			if ($type == 'inline' && $_SESSION['captcha_keyword'])
 			{
 				return;
 			}
@@ -115,19 +115,19 @@ 
 
 		function before_module_init_setCaptchaSession()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
 			// Load language files
-			Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
+			Context::loadLang(_XE_PATH_.'addons/captcha_member/lang');
 			// Generate keywords
 			$this->createKeyword();
 
 			$target = Context::getLang('target_captcha');
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
@@ -144,11 +144,11 @@ 
 
 		function before_module_init_captchaImage()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
-			if(Context::get('renew'))
+			if (Context::get('renew'))
 			{
 				$this->createKeyword();
 			}
@@ -170,7 +170,7 @@ 
 		function createCaptchaImage($string)
 		{
 			$arr = array();
-			for($i = 0, $c = strlen($string); $i < $c; $i++)
+			for ($i = 0, $c = strlen($string); $i < $c; $i++)
 			{
 				$arr[] = $string{$i};
 			}
@@ -192,7 +192,7 @@ 
 			shuffle($deg);
 
 			// Create an image for each letter
-			foreach($arr as $i => $str)
+			foreach ($arr as $i => $str)
 			{
 				$im[$i + 1] = @imagecreate($w, $h);
 				$background_color = imagecolorallocate($im[$i + 1], 255, 255, 255);
@@ -202,7 +202,7 @@ 
 				$ran = range(1, 20);
 				shuffle($ran);
 
-				if(function_exists('imagerotate'))
+				if (function_exists('imagerotate'))
 				{
 					imagestring($im[$i + 1], (array_pop($ran) % 3) + 3, 2, (array_pop($ran) % 8), $str, $text_color);
 					$im[$i + 1] = imagerotate($im[$i + 1], array_pop($deg), 0);
@@ -217,7 +217,7 @@ 
 			}
 
 			// Combine images of each character
-			for($i = 1; $i < count($im); $i++)
+			for ($i = 1; $i < count($im); $i++)
 			{
 				imagecopy($im[0], $im[$i], (($w + 2) * ($i - 1)), 0, 0, 0, $w, $h);
 				imagedestroy($im[$i]);
@@ -229,7 +229,7 @@ 
 			imagecopyresized($big, $im[0], 0, 0, 0, 0, ($w + 2) * $big_count * $c, $h * $big_count, ($w + 2) * $c, $h);
 			imagedestroy($im[0]);
 
-			if(function_exists('imageantialias'))
+			if (function_exists('imageantialias'))
 			{
 				imageantialias($big, true);
 			}
@@ -241,7 +241,7 @@ 
 			$h = $h * $big_count;
 			$d = array_pop($deg);
 
-			for($i = -abs($d); $i < $h + abs($d); $i = $i + 7)
+			for ($i = -abs($d); $i < $h + abs($d); $i = $i + 7)
 			{
 				imageline($big, 0, $i + $d, $w, $i, $line_color);
 			}
@@ -249,7 +249,7 @@ 
 			$x = range(0, ($w - 10));
 			shuffle($x);
 
-			for($i = 0; $i < 200; $i++)
+			for ($i = 0; $i < 200; $i++)
 			{
 				imagesetpixel($big, $x[$i] % $w, $x[$i + 1] % $h, $line_color);
 			}
@@ -259,7 +259,7 @@ 
 
 		function before_module_init_captchaAudio()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
@@ -271,8 +271,8 @@ 
 			header("Content-Disposition: attachment; filename=\"captcha_audio.mp3\"");
 			header('Cache-Control: no-store, no-cache, must-revalidate');
 			header('Expires: Sun, 1 Jan 2000 12:00:00 GMT');
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT');
-			header('Content-Length: ' . strlen($data));
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s').'GMT');
+			header('Content-Length: '.strlen($data));
 
 			echo $data;
 			Context::close();
@@ -283,17 +283,17 @@ 
 		{
 			$data = '';
 			$_audio = './addons/captcha/audio/F_%s.mp3';
-			for($i = 0, $c = strlen($string); $i < $c; $i++)
+			for ($i = 0, $c = strlen($string); $i < $c; $i++)
 			{
 				$_data = FileHandler::readFile(sprintf($_audio, $string{$i}));
 
 				$start = rand(5, 68); // Random start in 4-byte header and 64 byte data
 				$datalen = strlen($_data) - $start - 256; // Last unchanged 256 bytes
 
-				for($j = $start; $j < $datalen; $j+=64)
+				for ($j = $start; $j < $datalen; $j += 64)
 				{
 					$ch = ord($_data{$j});
-					if($ch < 9 || $ch > 119)
+					if ($ch < 9 || $ch > 119)
 					{
 						continue;
 					}
@@ -308,14 +308,14 @@ 
 
 		function compareCaptcha()
 		{
-			if(!in_array(Context::get('act'), $this->target_acts)) return true;
+			if (!in_array(Context::get('act'), $this->target_acts)) return true;
 
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return true;
 			}
 
-			if(strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text')))
+			if (strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text')))
 			{
 				$_SESSION['member_captcha_authed'] = true;
 				return true;
@@ -328,14 +328,14 @@ 
 
 		function before_module_init_captchaCompare()
 		{
-			if(!$this->compareCaptcha())
+			if (!$this->compareCaptcha())
 			{
 				return false;
 			}
 
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
@@ -350,7 +350,7 @@ 
 			unset($_SESSION['member_captcha_authed']);
 			$this->createKeyword();
 
-			$swfURL = getUrl() . 'addons/captcha/swf/play.swf';
+			$swfURL = getUrl().'addons/captcha/swf/play.swf';
 			Context::unloadFile('./addons/captcha/captcha.min.js');
 			Context::loadFile(array('./addons/captcha/inline_captcha.js', 'body'));
 
@@ -388,18 +388,18 @@ 
 
 $oAddonMemberCaptcha = &$GLOBALS['__AddonMemberCaptcha__'];
 
-if(method_exists($oAddonMemberCaptcha, $called_position))
+if (method_exists($oAddonMemberCaptcha, $called_position))
 {
-	if(!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position), array(&$this)))
 	{
 		return false;
 	}
 }
 
 $addon_act = Context::get('captcha_action');
-if($addon_act && method_exists($oAddonMemberCaptcha, $called_position . '_' . $addon_act))
+if ($addon_act && method_exists($oAddonMemberCaptcha, $called_position.'_'.$addon_act))
 {
-	if(!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position . '_' . $addon_act), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position.'_'.$addon_act), array(&$this)))
 	{
 		return false;
 	}

addons/counter/counter.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -10,7 +10,7 @@ 
  * @brief Counter add-on
  */
 // Execute if called_position is before_display_content
-if($called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled() && !isCrawler())
+if ($called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled() && !isCrawler())
 {
 	$oCounterController = getController('counter');
 	$oCounterController->counterExecute();

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file counter.addon.php

addons/member_communication/member_communication.addon.php

Braces +10 added lines, -9 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file member_communication.addon.php
@@ -44,8 +45,7 @@ 
 		$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
 		Context::addHtmlFooter("<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
 	}
-}
-elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
+} elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
 {
 	$member_srl = Context::get('target_srl');
 	$oCommunicationModel = getModel('communication');
@@ -60,8 +60,7 @@ 
 		// Display a list of friends
 		$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationFriend'), 'cmd_view_friend', '', 'self');
 		// If not, Add menus to send message and to add friends
-	}
-	else
+	} else
 	{
 		// Get member information
 		$oMemberModel = getModel('member');
@@ -73,11 +72,13 @@ 
 
 		$oMemberController = getController('member');
 		// Add a menu for sending message
-		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
-			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
+		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl))) {
+					$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
+		}
 		// Add a menu for listing friends (if a friend is new)
-		if(!$oCommunicationModel->isAddedFriend($member_srl))
-			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
+		if(!$oCommunicationModel->isAddedFriend($member_srl)) {
+					$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
+		}
 	}
 }
 /* End of file member_communication.addon.php */

Spacing +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -15,7 +15,7 @@ 
  */
 // Stop if non-logged-in user is
 $logged_info = Context::get('logged_info');
-if(!$logged_info|| isCrawler())
+if (!$logged_info || isCrawler())
 {
 	return;
 }
@@ -23,35 +23,35 @@ 
 /**
  * Message/Friend munus are added on the pop-up window and member profile. Check if a new message is received
  * */
-if($this->module != 'member' && $called_position == 'before_module_init')
+if ($this->module != 'member' && $called_position == 'before_module_init')
 {
 	// Load a language file from the communication module
-	Context::loadLang(_XE_PATH_ . 'modules/communication/lang');
+	Context::loadLang(_XE_PATH_.'modules/communication/lang');
 	// Add menus on the member login information
 	$oMemberController = getController('member');
 	$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
 	$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
 
-	$flag_file = _XE_PATH_ . 'files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl) . $logged_info->member_srl;
-	if($addon_info->use_alarm != 'N' && file_exists($flag_file))
+	$flag_file = _XE_PATH_.'files/member_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl).$logged_info->member_srl;
+	if ($addon_info->use_alarm != 'N' && file_exists($flag_file))
 	{
 		// Pop-up to display messages if a flag on new message is set
 		$new_message_count = (int) trim(FileHandler::readFile($flag_file));
 		FileHandler::removeFile($flag_file);
-		Context::loadLang(_XE_PATH_ . 'addons/member_communication/lang');
+		Context::loadLang(_XE_PATH_.'addons/member_communication/lang');
 		Context::loadFile(array('./addons/member_communication/tpl/member_communication.js'), true);
 
 		$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
 		Context::addHtmlFooter("<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
 	}
 }
-elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
+elseif ($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
 {
 	$member_srl = Context::get('target_srl');
 	$oCommunicationModel = getModel('communication');
 
 	// Add a feature to display own message box.
-	if($logged_info->member_srl == $member_srl)
+	if ($logged_info->member_srl == $member_srl)
 	{
 		$mid = Context::get('cur_mid');
 		$oMemberController = getController('member');
@@ -66,17 +66,17 @@ 
 		// Get member information
 		$oMemberModel = getModel('member');
 		$target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-		if(!$target_member_info->member_srl)
+		if (!$target_member_info->member_srl)
 		{
 			return;
 		}
 
 		$oMemberController = getController('member');
 		// Add a menu for sending message
-		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
+		if ($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
 			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
 		// Add a menu for listing friends (if a friend is new)
-		if(!$oCommunicationModel->isAddedFriend($member_srl))
+		if (!$oCommunicationModel->isAddedFriend($member_srl))
 			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
 	}
 }

addons/member_extra_info/member_extra_info.addon.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -17,7 +17,7 @@ 
 /**
  * Just before displaying, change image name/ image mark
  */
-if($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
+if ($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
 {
 	return;
 }
@@ -25,7 +25,7 @@ 
 require_once('./addons/member_extra_info/member_extra_info.lib.php');
 // 1. Find a part <div class="member_MemberSerialNumber"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName()
 $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
-if($temp_output)
+if ($temp_output)
 {
 	$output = $temp_output;
 }

addons/oembed/oembed.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
 
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
+if ($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
 {
 	Context::loadFile('./addons/oembed/jquery.oembed.css');
 	Context::loadFile(array('./addons/oembed/jquery.oembed.js', 'body', '', null), true);

addons/point_level_icon/point_level_icon.addon.php

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file point.addon.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -12,15 +12,15 @@ 
  * Display point level icon before user name when point system is enabled.
  * */
 // return unless before_display_content
-if($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
+if ($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify' || Context::getResponseMethod() != 'HTML' || isCrawler())
 {
 	return;
 }
 
-require_once(_XE_PATH_ . 'addons/point_level_icon/point_level_icon.lib.php');
+require_once(_XE_PATH_.'addons/point_level_icon/point_level_icon.lib.php');
 
 $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
-if($temp_output)
+if ($temp_output)
 {
 	$output = $temp_output;
 }