xpressengine / xe-core

tools/dbxml_validator/tests/xmlQueriesTest.php

Doc Comments +11 added lines

@@ -27,6 +27,11 @@ 
  
     // recursive glob
     // On Windows glob() is case-sensitive.
+
+    /**
+     * @param string $sDir
+     * @param integer $nFlags
+     */
     public function globr($sDir, $sPattern, $nFlags = NULL) 
     { 
 	// Get the list of all matching files currently in the 
@@ -129,6 +134,9 @@ 
 	$this->markTestIncomplete('XML Schema Language files should be fixed first.');
     }
 
+    /**
+     * @param integer $err_code
+     */
     public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')
     {
 	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);
@@ -166,6 +174,9 @@ 
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS);
     }
 
+    /**
+     * @param string $dir_name
+     */
     public function getDirFilesList($dir_name)
     {
 	$output = array();

Spacing +20 added lines, -27 removed lines

@@ -14,15 +14,15 @@ 
     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;
 
     public $validator_cmd;
 
     public function setUp()
     {
-	 $this->validator_cmd = "php " . escapeshellarg(__DIR__ . '/../validate.php') . " ";
+	 $this->validator_cmd = "php ".escapeshellarg(__DIR__.'/../validate.php')." ";
     }
  
     // recursive glob
@@ -53,17 +53,16 @@ 
     } 
 
     /** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */
-    public function invoke_testReleasedXMLLangFiles
-	(
+    public function invoke_testReleasedXMLLangFiles(
 	    $released_files,
 	    $expected_return_code,
 	    $validator_args = ''
 	)
     {
 	// this file is in tools/dbxml_validator/tests
-	$xe_dir = __DIR__ . '/../../..';
+	$xe_dir = __DIR__.'/../../..';
 
-	$this->assertTrue(file_exists($xe_dir . '/index.php'), 'XE directory not found');
+	$this->assertTrue(file_exists($xe_dir.'/index.php'), 'XE directory not found');
 
 	$cnt = 0;
 	$cmd = $this->validator_cmd;
@@ -71,11 +70,9 @@ 
 
 	foreach ($released_files as $released_file_mask)
 	    $xml_files =
-		array_merge
-		(
+		array_merge(
 		    $xml_files,
-		    $this->globr
-			(
+		    $this->globr(
 			    $xe_dir,
 			    $released_file_mask,
 			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR
@@ -84,19 +81,18 @@ 
 
 	while ($cnt < count($xml_files))
 	{
-	    $cmd = $this->validator_cmd . $validator_args;
+	    $cmd = $this->validator_cmd.$validator_args;
 
 	    // Validate 50 files at once
 	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)
-		$cmd .= " " . escapeshellarg($xml_file);
+		$cmd .= " ".escapeshellarg($xml_file);
 
-	    exec($cmd . ' 2>&1', $validator_output, $return_code);
+	    exec($cmd.' 2>&1', $validator_output, $return_code);
 
 	    $output_text = trim(trim(implode("\n", $validator_output)), "\n");
 
 	    // Validator should not crash/exit-with-an-error.
-	    $this->assertLessThanOrEqual
-		(
+	    $this->assertLessThanOrEqual(
 		    $expected_return_code,
 		    $return_code,
 		    "{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."
@@ -108,8 +104,7 @@ 
 
     public function testReleasedXMLQueryLangFiles()
     {
-	$this->invoke_testReleasedXMLLangFiles
-	    (
+	$this->invoke_testReleasedXMLLangFiles(
 		array('queries/*.xml', 'xml_query/*.xml'),
 		self::RETCODE_QUERY_ELEMENT
 	    );
@@ -119,8 +114,7 @@ 
 
     public function testReleasedXMLSchemaLangFiles()
     {
-	$this->invoke_testReleasedXMLLangFiles
-	    (
+	$this->invoke_testReleasedXMLLangFiles(
 		array('schemas/*.xml'),
 		self::RETCODE_BUILTIN_CHECKS,
 		' --schema-language'
@@ -131,17 +125,16 @@ 
 
     public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')
     {
-	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);
+	$cmd = $this->validator_cmd.' '.$args.' '.escapeshellarg($filename);
 	$validator_output = array();
 	$return_code = 0;
 
-	exec($cmd . '2>&1', $validator_output, $return_code);
+	exec($cmd.'2>&1', $validator_output, $return_code);
 
 	$output_text = trim(trim(implode("\n", $validator_output)), "\n");
 
 	// Validator should not crash/exit-with-an-error.
-	$this->assertEquals
-	    (
+	$this->assertEquals(
 		$err_code,
 		$return_code,
 		"{$cmd}\n{$output_text}\nValidator returned code {$return_code}."
@@ -170,7 +163,7 @@ 
     {
 	$output = array();
 
-	$dir = opendir(__DIR__ . '/' . $dir_name);
+	$dir = opendir(__DIR__.'/'.$dir_name);
 
 	if ($dir)
 	{
@@ -178,9 +171,9 @@ 
 
 	    while ($entry !== FALSE)
 	    {
-		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;
+		$fname = __DIR__.'/'.$dir_name.'/'.$entry;
 
-		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')
+		if (!is_dir($fname) && $entry != 'wrongQueryId.xml')
 		    $output[] = array($fname);
 
 		$entry = readdir($dir);

Indentation +101 added lines, -101 removed lines

@@ -2,33 +2,33 @@ 
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
 if (!defined('__DIR__'))
-    define('__DIR__', realpath(dirname(__FILE__))); 
+	define('__DIR__', realpath(dirname(__FILE__))); 
 
 /** The tests here are meant only for the built-in checks in validator.php, 
     and not for the entire syntax expressed by the .xsd files. */
 class XmlQueriesTest extends PHPUnit_Framework_TestCase
 {
-    // taken from validator.php
+	// taken from validator.php
 
-    const RETCODE_VALIDATOR_INTERNAL = 60;
-    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_SUCCESS = 0;
+	const RETCODE_VALIDATOR_INTERNAL = 60;
+	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_SUCCESS = 0;
 
-    public $validator_cmd;
+	public $validator_cmd;
 
-    public function setUp()
-    {
+	public function setUp()
+	{
 	 $this->validator_cmd = "php " . escapeshellarg(__DIR__ . '/../validate.php') . " ";
-    }
+	}
  
-    // recursive glob
-    // On Windows glob() is case-sensitive.
-    public function globr($sDir, $sPattern, $nFlags = NULL) 
-    { 
+	// recursive glob
+	// On Windows glob() is case-sensitive.
+	public function globr($sDir, $sPattern, $nFlags = NULL) 
+	{ 
 	// Get the list of all matching files currently in the 
 	// directory. 
 
@@ -41,25 +41,25 @@ 
 
 	foreach ($aDirs as $sSubDir) 
 	{ 
-	    if ($sSubDir != '.' && $sSubDir != '..')
-	    {
+		if ($sSubDir != '.' && $sSubDir != '..')
+		{
 		$aSubFiles = $this->globr($sSubDir, $sPattern, $nFlags); 
 		$aFiles = array_merge($aFiles, $aSubFiles); 
-	    }
+		}
 	} 
 
 	// return merged array with all (recursive) files
 	return $aFiles; 
-    } 
+	} 
 
-    /** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */
-    public function invoke_testReleasedXMLLangFiles
+	/** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */
+	public function invoke_testReleasedXMLLangFiles
 	(
-	    $released_files,
-	    $expected_return_code,
-	    $validator_args = ''
+		$released_files,
+		$expected_return_code,
+		$validator_args = ''
 	)
-    {
+	{
 	// this file is in tools/dbxml_validator/tests
 	$xe_dir = __DIR__ . '/../../..';
 
@@ -70,67 +70,67 @@ 
 	$xml_files = array();
 
 	foreach ($released_files as $released_file_mask)
-	    $xml_files =
+		$xml_files =
 		array_merge
 		(
-		    $xml_files,
-		    $this->globr
+			$xml_files,
+			$this->globr
 			(
-			    $xe_dir,
-			    $released_file_mask,
-			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR
+				$xe_dir,
+				$released_file_mask,
+				GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR
 			)
 		);
 
 	while ($cnt < count($xml_files))
 	{
-	    $cmd = $this->validator_cmd . $validator_args;
+		$cmd = $this->validator_cmd . $validator_args;
 
-	    // Validate 50 files at once
-	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)
+		// Validate 50 files at once
+		foreach (array_slice($xml_files, $cnt, 50) as $xml_file)
 		$cmd .= " " . escapeshellarg($xml_file);
 
-	    exec($cmd . ' 2>&1', $validator_output, $return_code);
+		exec($cmd . ' 2>&1', $validator_output, $return_code);
 
-	    $output_text = trim(trim(implode("\n", $validator_output)), "\n");
+		$output_text = trim(trim(implode("\n", $validator_output)), "\n");
 
-	    // Validator should not crash/exit-with-an-error.
-	    $this->assertLessThanOrEqual
+		// Validator should not crash/exit-with-an-error.
+		$this->assertLessThanOrEqual
 		(
-		    $expected_return_code,
-		    $return_code,
-		    "{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."
+			$expected_return_code,
+			$return_code,
+			"{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."
 		);
 
-	    $cnt += 50;
+		$cnt += 50;
+	}
 	}
-    }
 
-    public function testReleasedXMLQueryLangFiles()
-    {
+	public function testReleasedXMLQueryLangFiles()
+	{
 	$this->invoke_testReleasedXMLLangFiles
-	    (
+		(
 		array('queries/*.xml', 'xml_query/*.xml'),
 		self::RETCODE_QUERY_ELEMENT
-	    );
+		);
 
 	$this->markTestIncomplete('XML Query Language files should be fixed first.');
-    }
+	}
 
-    public function testReleasedXMLSchemaLangFiles()
-    {
+	public function testReleasedXMLSchemaLangFiles()
+	{
 	$this->invoke_testReleasedXMLLangFiles
-	    (
+		(
 		array('schemas/*.xml'),
 		self::RETCODE_BUILTIN_CHECKS,
 		' --schema-language'
-	    );
+		);
 
 	$this->markTestIncomplete('XML Schema Language files should be fixed first.');
-    }
+	}
 
-    public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')
-    {
+	public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')
+	{
 	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);
 	$validator_output = array();
 	$return_code = 0;
@@ -141,88 +141,88 @@ 
 
 	// Validator should not crash/exit-with-an-error.
 	$this->assertEquals
-	    (
+		(
 		$err_code,
 		$return_code,
 		"{$cmd}\n{$output_text}\nValidator returned code {$return_code}."
-	    );
+		);
 
 	// Validator should output some error on the test files
 	$basefilename = basename($filename);
 	$this->assertNotEmpty($output_text, "Error reporting failed for {$basefilename} validation.");
 
-    }
+	}
 
-    public function testInvalidQueryId()
-    {
+	public function testInvalidQueryId()
+	{
 	return $this->invoke_testInvalidXmlFiles(__DIR__.'/data/wrongQueryId.xml', self::RETCODE_QUERY_ELEMENT);
-    }
+	}
 
-    /**
-     * @dataProvider getFilesList
-     */
-    public function testInvalidXMLQueryFiles($filename)
-    {
+	/**
+	 * @dataProvider getFilesList
+	 */
+	public function testInvalidXMLQueryFiles($filename)
+	{
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS);
-    }
+	}
 
-    public function getDirFilesList($dir_name)
-    {
+	public function getDirFilesList($dir_name)
+	{
 	$output = array();
 
 	$dir = opendir(__DIR__ . '/' . $dir_name);
 
 	if ($dir)
 	{
-	    $entry = readdir($dir);
+		$entry = readdir($dir);
 
-	    while ($entry !== FALSE)
-	    {
+		while ($entry !== FALSE)
+		{
 		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;
 
 		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')
-		    $output[] = array($fname);
+			$output[] = array($fname);
 
 		$entry = readdir($dir);
-	    }
+		}
 
-	    closedir($dir);
+		closedir($dir);
 	}
 	else
-	    $this->assertFalse(TRUE);
+		$this->assertFalse(TRUE);
 
-        return $output;
-    }
+		return $output;
+	}
 
-    public function getFilesList()
-    {
+	public function getFilesList()
+	{
 	return $this->getDirFilesList('data');
-    }
+	}
 
-    public function getSchemaFilesList()
-    {
+	public function getSchemaFilesList()
+	{
 	return $this->getDirFilesList('data/schema');
-    }
+	}
 
-    public function getSchemaWarningFilesList()
-    {
+	public function getSchemaWarningFilesList()
+	{
 	return $this->getDirFilesList('data/schema/warnings');
-    }
+	}
 
-    /**
-     * @dataProvider getSchemaFilesList
-     */
-    public function testInvalidXMLSchemaFiles($filename)
-    {
+	/**
+	 * @dataProvider getSchemaFilesList
+	 */
+	public function testInvalidXMLSchemaFiles($filename)
+	{
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS, '--schema-language');
-    }
+	}
 
-    /**
-     * @dataProvider getSchemaWarningFilesList
-     */
-    public function testWarningXMLSchemaFiles($filename)
-    {
+	/**
+	 * @dataProvider getSchemaWarningFilesList
+	 */
+	public function testWarningXMLSchemaFiles($filename)
+	{
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_SUCCESS, '--schema-language');
-    }
+	}
 }
 

Braces +14 added lines, -10 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-if (!defined('__DIR__'))
-    define('__DIR__', realpath(dirname(__FILE__))); 
+if (!defined('__DIR__')) {
+    define('__DIR__', realpath(dirname(__FILE__)));
+}
 
 /** The tests here are meant only for the built-in checks in validator.php, 
     and not for the entire syntax expressed by the .xsd files. */
@@ -69,8 +70,8 @@ 
 	$cmd = $this->validator_cmd;
 	$xml_files = array();
 
-	foreach ($released_files as $released_file_mask)
-	    $xml_files =
+	foreach ($released_files as $released_file_mask) {
+		    $xml_files =
 		array_merge
 		(
 		    $xml_files,
@@ -81,14 +82,16 @@ 
 			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR
 			)
 		);
+	}
 
 	while ($cnt < count($xml_files))
 	{
 	    $cmd = $this->validator_cmd . $validator_args;
 
 	    // Validate 50 files at once
-	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)
-		$cmd .= " " . escapeshellarg($xml_file);
+	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file) {
+	    		$cmd .= " " . escapeshellarg($xml_file);
+	    }
 
 	    exec($cmd . ' 2>&1', $validator_output, $return_code);
 
@@ -180,16 +183,17 @@ 
 	    {
 		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;
 
-		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')
-		    $output[] = array($fname);
+		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml') {
+				    $output[] = array($fname);
+		}
 
 		$entry = readdir($dir);
 	    }
 
 	    closedir($dir);
+	} else {
+		    $this->assertFalse(TRUE);
 	}
-	else
-	    $this->assertFalse(TRUE);
 
         return $output;
     }

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

libs/ftp.class.php

Indentation +479 added lines, -479 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    /*********************************************************************
+	/*********************************************************************
      *
      *    PHP FTP Client Class By TOMO ( groove@spencernetwork.org )
 	 *    Modified By XEHub ( developers@xpressengine.com )
@@ -18,7 +18,7 @@ 
      *
      ********************************************************************/
 
-    /*********************************************************************
+	/*********************************************************************
      * List of available functions
      * ftp_connect($server, $port = 21)
      * ftp_login($user, $pass)
@@ -41,448 +41,448 @@ 
      * ftp_quit()
      *********************************************************************/
 
-    class ftp
-    {
-        /* Public variables */
-        var $debug;
-        var $umask;
-        var $timeout;
-
-        /* Private variables */
-        var $ftp_sock;
-        var $ftp_resp;
-
-        /* Constractor */
-        function ftp()
-        {
-            $this->debug = false;
-            $this->umask = 0022;
-            $this->timeout = 30;
-
-            if (!defined("FTP_BINARY")) {
-                define("FTP_BINARY", 1);
-            }
-            if (!defined("FTP_ASCII")) {
-                define("FTP_ASCII", 0);
-            }
-
-            $this->ftp_resp = "";
-        }
-
-        /* Public functions */
-        function ftp_connect($server, $port = 21)
-        {
-            $this->ftp_debug("Trying to ".$server.":".$port." ...\n");
-            $this->ftp_sock = @fsockopen($server, $port, $errno, $errstr, $this->timeout);
-
-            if (!$this->ftp_sock || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host \"".$server.":".$port."\"\n");
-                $this->ftp_debug("Error : fsockopen() ".$errstr." (".$errno.")\n");
-                return FALSE;
-            }
+	class ftp
+	{
+		/* Public variables */
+		var $debug;
+		var $umask;
+		var $timeout;
+
+		/* Private variables */
+		var $ftp_sock;
+		var $ftp_resp;
+
+		/* Constractor */
+		function ftp()
+		{
+			$this->debug = false;
+			$this->umask = 0022;
+			$this->timeout = 30;
+
+			if (!defined("FTP_BINARY")) {
+				define("FTP_BINARY", 1);
+			}
+			if (!defined("FTP_ASCII")) {
+				define("FTP_ASCII", 0);
+			}
+
+			$this->ftp_resp = "";
+		}
+
+		/* Public functions */
+		function ftp_connect($server, $port = 21)
+		{
+			$this->ftp_debug("Trying to ".$server.":".$port." ...\n");
+			$this->ftp_sock = @fsockopen($server, $port, $errno, $errstr, $this->timeout);
+
+			if (!$this->ftp_sock || !$this->ftp_ok()) {
+				$this->ftp_debug("Error : Cannot connect to remote host \"".$server.":".$port."\"\n");
+				$this->ftp_debug("Error : fsockopen() ".$errstr." (".$errno.")\n");
+				return FALSE;
+			}
 
 			if(substr($this->ftp_resp, 0, 3) !== '220')
 			{
 				return FALSE;
 			}
 
-            $this->ftp_debug("Connected to remote host \"".$server.":".$port."\"\n");
-
-            return TRUE;
-        }
-
-        function ftp_login($user, $pass)
-        {
-            $this->ftp_putcmd("USER", $user);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : USER command failed\n");
-                return FALSE;
-            }
-
-            $this->ftp_putcmd("PASS", $pass);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : PASS command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Authentication succeeded\n");
-
-            return TRUE;
-        }
-
-        function ftp_pwd()
-        {
-            $this->ftp_putcmd("PWD");
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : PWD command failed\n");
-                return FALSE;
-            }
-
-            return preg_replace("@^[0-9]{3} \"(.+)\" .+\r\n@", "\\1", $this->ftp_resp);
-        }
-
-        function ftp_size($pathname)
-        {
-            $this->ftp_putcmd("SIZE", $pathname);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : SIZE command failed\n");
-                return -1;
-            }
-
-            return preg_replace("@^[0-9]{3} ([0-9]+)\r\n@", "\\1", $this->ftp_resp);
-        }
-
-        function ftp_mdtm($pathname)
-        {
-            $this->ftp_putcmd("MDTM", $pathname);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : MDTM command failed\n");
-                return -1;
-            }
-            $mdtm = preg_replace("@^[0-9]{3} ([0-9]+)\r\n@", "\\1", $this->ftp_resp);
-            $date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
-            $timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
-
-            return $timestamp;
-        }
-
-        function ftp_systype()
-        {
-            $this->ftp_putcmd("SYST");
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : SYST command failed\n");
-                return FALSE;
-            }
-            $DATA = explode(" ", $this->ftp_resp);
-
-            return $DATA[1];
-        }
-
-        function ftp_cdup()
-        {
-            $this->ftp_putcmd("CDUP");
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : CDUP command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_chdir($pathname)
-        {
-            $this->ftp_putcmd("CWD", $pathname);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : CWD command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_delete($pathname)
-        {
-            $this->ftp_putcmd("DELE", $pathname);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : DELE command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_rmdir($pathname)
-        {
-            $this->ftp_putcmd("RMD", $pathname);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : RMD command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_mkdir($pathname)
-        {
-            $this->ftp_putcmd("MKD", $pathname);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : MKD command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_file_exists($pathname)
-        {
-            if (!($remote_list = $this->ftp_nlist("-a"))) {
-                $this->ftp_debug("Error : Cannot get remote file list\n");
-                return -1;
-            }
+			$this->ftp_debug("Connected to remote host \"".$server.":".$port."\"\n");
+
+			return TRUE;
+		}
+
+		function ftp_login($user, $pass)
+		{
+			$this->ftp_putcmd("USER", $user);
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : USER command failed\n");
+				return FALSE;
+			}
+
+			$this->ftp_putcmd("PASS", $pass);
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : PASS command failed\n");
+				return FALSE;
+			}
+			$this->ftp_debug("Authentication succeeded\n");
+
+			return TRUE;
+		}
+
+		function ftp_pwd()
+		{
+			$this->ftp_putcmd("PWD");
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : PWD command failed\n");
+				return FALSE;
+			}
+
+			return preg_replace("@^[0-9]{3} \"(.+)\" .+\r\n@", "\\1", $this->ftp_resp);
+		}
+
+		function ftp_size($pathname)
+		{
+			$this->ftp_putcmd("SIZE", $pathname);
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : SIZE command failed\n");
+				return -1;
+			}
+
+			return preg_replace("@^[0-9]{3} ([0-9]+)\r\n@", "\\1", $this->ftp_resp);
+		}
+
+		function ftp_mdtm($pathname)
+		{
+			$this->ftp_putcmd("MDTM", $pathname);
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : MDTM command failed\n");
+				return -1;
+			}
+			$mdtm = preg_replace("@^[0-9]{3} ([0-9]+)\r\n@", "\\1", $this->ftp_resp);
+			$date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
+			$timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
+
+			return $timestamp;
+		}
+
+		function ftp_systype()
+		{
+			$this->ftp_putcmd("SYST");
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : SYST command failed\n");
+				return FALSE;
+			}
+			$DATA = explode(" ", $this->ftp_resp);
+
+			return $DATA[1];
+		}
+
+		function ftp_cdup()
+		{
+			$this->ftp_putcmd("CDUP");
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : CDUP command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_chdir($pathname)
+		{
+			$this->ftp_putcmd("CWD", $pathname);
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : CWD command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_delete($pathname)
+		{
+			$this->ftp_putcmd("DELE", $pathname);
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : DELE command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_rmdir($pathname)
+		{
+			$this->ftp_putcmd("RMD", $pathname);
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : RMD command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_mkdir($pathname)
+		{
+			$this->ftp_putcmd("MKD", $pathname);
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : MKD command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_file_exists($pathname)
+		{
+			if (!($remote_list = $this->ftp_nlist("-a"))) {
+				$this->ftp_debug("Error : Cannot get remote file list\n");
+				return -1;
+			}
             
-            reset($remote_list);
-            while (list(,$value) = each($remote_list)) {
-                if ($value == $pathname) {
-                    $this->ftp_debug("Remote file ".$pathname." exists\n");
-                    return 1;
-                }
-            }
-            $this->ftp_debug("Remote file ".$pathname." does not exist\n");
-
-            return 0;
-        }
-
-        function ftp_rename($from, $to)
-        {
-            $this->ftp_putcmd("RNFR", $from);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : RNFR command failed\n");
-                return FALSE;
-            }
-            $this->ftp_putcmd("RNTO", $to);
-
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : RNTO command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_nlist($arg = "", $pathname = "")
-        {
-            if (!($string = $this->ftp_pasv())) {
-                return FALSE;
-            }
-
-            if ($arg == "") {
-                $nlst = "NLST";
-            } else {
-                $nlst = "NLST ".$arg;
-            }
-            $this->ftp_putcmd($nlst, $pathname);
-
-            $sock_data = $this->ftp_open_data_connection($string);
-            if (!$sock_data || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host\n");
-                $this->ftp_debug("Error : NLST command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Connected to remote host\n");
+			reset($remote_list);
+			while (list(,$value) = each($remote_list)) {
+				if ($value == $pathname) {
+					$this->ftp_debug("Remote file ".$pathname." exists\n");
+					return 1;
+				}
+			}
+			$this->ftp_debug("Remote file ".$pathname." does not exist\n");
+
+			return 0;
+		}
+
+		function ftp_rename($from, $to)
+		{
+			$this->ftp_putcmd("RNFR", $from);
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : RNFR command failed\n");
+				return FALSE;
+			}
+			$this->ftp_putcmd("RNTO", $to);
+
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : RNTO command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_nlist($arg = "", $pathname = "")
+		{
+			if (!($string = $this->ftp_pasv())) {
+				return FALSE;
+			}
+
+			if ($arg == "") {
+				$nlst = "NLST";
+			} else {
+				$nlst = "NLST ".$arg;
+			}
+			$this->ftp_putcmd($nlst, $pathname);
+
+			$sock_data = $this->ftp_open_data_connection($string);
+			if (!$sock_data || !$this->ftp_ok()) {
+				$this->ftp_debug("Error : Cannot connect to remote host\n");
+				$this->ftp_debug("Error : NLST command failed\n");
+				return FALSE;
+			}
+			$this->ftp_debug("Connected to remote host\n");
 
 			$list = array();
-            while (!feof($sock_data)) {
-                $list[] = preg_replace("@[\r\n]@", "", fgets($sock_data, 512));
-            }
-            $this->ftp_close_data_connection($sock_data);
-            $this->ftp_debug(implode("\n", $list));
-
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : NLST command failed\n");
-                return FALSE;
-            }
-
-            return $list;
-        }
-
-        function ftp_rawlist($pathname = "")
-        {
-            if (!($string = $this->ftp_pasv())) {
-                return FALSE;
-            }
-
-            $this->ftp_putcmd("LIST", $pathname);
-
-            $sock_data = $this->ftp_open_data_connection($string);
-            if (!$sock_data || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host\n");
-                $this->ftp_debug("Error : LIST command failed\n");
-                return FALSE;
-            }
-
-            $this->ftp_debug("Connected to remote host\n");
-
-            while (!feof($sock_data)) {
-                $list[] = preg_replace("@[\r\n]@", "", fgets($sock_data, 512));
-            }
-            $this->ftp_debug(implode("\n", $list));
-            $this->ftp_close_data_connection($sock_data);
-
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : LIST command failed\n");
-                return FALSE;
-            }
-
-            return $list;
-        }
-
-        function ftp_get($localfile, $remotefile, $mode = 1)
-        {
-            umask($this->umask);
-
-            if (@file_exists($localfile)) {
-                $this->ftp_debug("Warning : local file will be overwritten\n");
-            }
-
-            $fp = @fopen($localfile, "w");
-            if (!$fp) {
-                $this->ftp_debug("Error : Cannot create \"".$localfile."\"");
-                $this->ftp_debug("Error : GET command failed\n");
-                return FALSE;
-            }
-
-            if (!$this->ftp_type($mode)) {
-                $this->ftp_debug("Error : GET command failed\n");
-                return FALSE;
-            }
-
-            if (!($string = $this->ftp_pasv())) {
-                $this->ftp_debug("Error : GET command failed\n");
-                return FALSE;
-            }
-
-            $this->ftp_putcmd("RETR", $remotefile);
-
-            $sock_data = $this->ftp_open_data_connection($string);
-            if (!$sock_data || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host\n");
-                $this->ftp_debug("Error : GET command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Connected to remote host\n");
-            $this->ftp_debug("Retrieving remote file \"".$remotefile."\" to local file \"".$localfile."\"\n");
-            while (!feof($sock_data)) {
-                fputs($fp, fread($sock_data, 4096));
-            }
-            fclose($fp);
-
-            $this->ftp_close_data_connection($sock_data);
-
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : GET command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_put($remotefile, $localfile, $mode = 1)
-        {
+			while (!feof($sock_data)) {
+				$list[] = preg_replace("@[\r\n]@", "", fgets($sock_data, 512));
+			}
+			$this->ftp_close_data_connection($sock_data);
+			$this->ftp_debug(implode("\n", $list));
+
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : NLST command failed\n");
+				return FALSE;
+			}
+
+			return $list;
+		}
+
+		function ftp_rawlist($pathname = "")
+		{
+			if (!($string = $this->ftp_pasv())) {
+				return FALSE;
+			}
+
+			$this->ftp_putcmd("LIST", $pathname);
+
+			$sock_data = $this->ftp_open_data_connection($string);
+			if (!$sock_data || !$this->ftp_ok()) {
+				$this->ftp_debug("Error : Cannot connect to remote host\n");
+				$this->ftp_debug("Error : LIST command failed\n");
+				return FALSE;
+			}
+
+			$this->ftp_debug("Connected to remote host\n");
+
+			while (!feof($sock_data)) {
+				$list[] = preg_replace("@[\r\n]@", "", fgets($sock_data, 512));
+			}
+			$this->ftp_debug(implode("\n", $list));
+			$this->ftp_close_data_connection($sock_data);
+
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : LIST command failed\n");
+				return FALSE;
+			}
+
+			return $list;
+		}
+
+		function ftp_get($localfile, $remotefile, $mode = 1)
+		{
+			umask($this->umask);
+
+			if (@file_exists($localfile)) {
+				$this->ftp_debug("Warning : local file will be overwritten\n");
+			}
+
+			$fp = @fopen($localfile, "w");
+			if (!$fp) {
+				$this->ftp_debug("Error : Cannot create \"".$localfile."\"");
+				$this->ftp_debug("Error : GET command failed\n");
+				return FALSE;
+			}
+
+			if (!$this->ftp_type($mode)) {
+				$this->ftp_debug("Error : GET command failed\n");
+				return FALSE;
+			}
+
+			if (!($string = $this->ftp_pasv())) {
+				$this->ftp_debug("Error : GET command failed\n");
+				return FALSE;
+			}
+
+			$this->ftp_putcmd("RETR", $remotefile);
+
+			$sock_data = $this->ftp_open_data_connection($string);
+			if (!$sock_data || !$this->ftp_ok()) {
+				$this->ftp_debug("Error : Cannot connect to remote host\n");
+				$this->ftp_debug("Error : GET command failed\n");
+				return FALSE;
+			}
+			$this->ftp_debug("Connected to remote host\n");
+			$this->ftp_debug("Retrieving remote file \"".$remotefile."\" to local file \"".$localfile."\"\n");
+			while (!feof($sock_data)) {
+				fputs($fp, fread($sock_data, 4096));
+			}
+			fclose($fp);
+
+			$this->ftp_close_data_connection($sock_data);
+
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : GET command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_put($remotefile, $localfile, $mode = 1)
+		{
             
-            if (!@file_exists($localfile)) {
-                $this->ftp_debug("Error : No such file or directory \"".$localfile."\"\n");
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-
-            $fp = @fopen($localfile, "r");
-            if (!$fp) {
-                $this->ftp_debug("Error : Cannot read file \"".$localfile."\"\n");
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-
-            if (!$this->ftp_type($mode)) {
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-
-            if (!($string = $this->ftp_pasv())) {
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-
-            $this->ftp_putcmd("STOR", $remotefile);
-
-            $sock_data = $this->ftp_open_data_connection($string);
-            if (!$sock_data || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host\n");
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Connected to remote host\n");
-            $this->ftp_debug("Storing local file \"".$localfile."\" to remote file \"".$remotefile."\"\n");
-            while (!feof($fp)) {
-                fputs($sock_data, fread($fp, 4096));
-            }
-            fclose($fp);
-
-            $this->ftp_close_data_connection($sock_data);
-
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : PUT command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_site($command)
-        {
-            $this->ftp_putcmd("SITE", $command);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : SITE command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_quit()
-        {
-            $this->ftp_putcmd("QUIT");
-            if (!$this->ftp_ok() || !fclose($this->ftp_sock)) {
-                $this->ftp_debug("Error : QUIT command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Disconnected from remote host\n");
-            return TRUE;
-        }
-
-        /* Private Functions */
-
-        function ftp_type($mode)
-        {
-            if ($mode) {
-                $type = "I"; //Binary mode
-            } else {
-                $type = "A"; //ASCII mode
-            }
-            $this->ftp_putcmd("TYPE", $type);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : TYPE command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_port($ip_port)
-        {
-            $this->ftp_putcmd("PORT", $ip_port);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : PORT command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_pasv()
-        {
-            $this->ftp_putcmd("PASV");
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : PASV command failed\n");
-                return FALSE;
-            }
-
-            $ip_port = preg_replace("@^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*\r\n$@", "\\1", $this->ftp_resp);
-            return $ip_port;
-        }
-
-        function ftp_putcmd($cmd, $arg = "")
-        {
-            if ($arg != "") {
-                $cmd = $cmd." ".$arg;
-            }
-
-            fputs($this->ftp_sock, $cmd."\r\n");
-            $this->ftp_debug("> ".$cmd."\n");
-
-            return TRUE;
-        }
-
-        function ftp_ok()
-        {
-            $this->ftp_resp = "";
+			if (!@file_exists($localfile)) {
+				$this->ftp_debug("Error : No such file or directory \"".$localfile."\"\n");
+				$this->ftp_debug("Error : PUT command failed\n");
+				return FALSE;
+			}
+
+			$fp = @fopen($localfile, "r");
+			if (!$fp) {
+				$this->ftp_debug("Error : Cannot read file \"".$localfile."\"\n");
+				$this->ftp_debug("Error : PUT command failed\n");
+				return FALSE;
+			}
+
+			if (!$this->ftp_type($mode)) {
+				$this->ftp_debug("Error : PUT command failed\n");
+				return FALSE;
+			}
+
+			if (!($string = $this->ftp_pasv())) {
+				$this->ftp_debug("Error : PUT command failed\n");
+				return FALSE;
+			}
+
+			$this->ftp_putcmd("STOR", $remotefile);
+
+			$sock_data = $this->ftp_open_data_connection($string);
+			if (!$sock_data || !$this->ftp_ok()) {
+				$this->ftp_debug("Error : Cannot connect to remote host\n");
+				$this->ftp_debug("Error : PUT command failed\n");
+				return FALSE;
+			}
+			$this->ftp_debug("Connected to remote host\n");
+			$this->ftp_debug("Storing local file \"".$localfile."\" to remote file \"".$remotefile."\"\n");
+			while (!feof($fp)) {
+				fputs($sock_data, fread($fp, 4096));
+			}
+			fclose($fp);
+
+			$this->ftp_close_data_connection($sock_data);
+
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : PUT command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_site($command)
+		{
+			$this->ftp_putcmd("SITE", $command);
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : SITE command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_quit()
+		{
+			$this->ftp_putcmd("QUIT");
+			if (!$this->ftp_ok() || !fclose($this->ftp_sock)) {
+				$this->ftp_debug("Error : QUIT command failed\n");
+				return FALSE;
+			}
+			$this->ftp_debug("Disconnected from remote host\n");
+			return TRUE;
+		}
+
+		/* Private Functions */
+
+		function ftp_type($mode)
+		{
+			if ($mode) {
+				$type = "I"; //Binary mode
+			} else {
+				$type = "A"; //ASCII mode
+			}
+			$this->ftp_putcmd("TYPE", $type);
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : TYPE command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_port($ip_port)
+		{
+			$this->ftp_putcmd("PORT", $ip_port);
+			$response = $this->ftp_ok();
+			if (!$response) {
+				$this->ftp_debug("Error : PORT command failed\n");
+			}
+			return $response;
+		}
+
+		function ftp_pasv()
+		{
+			$this->ftp_putcmd("PASV");
+			if (!$this->ftp_ok()) {
+				$this->ftp_debug("Error : PASV command failed\n");
+				return FALSE;
+			}
+
+			$ip_port = preg_replace("@^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*\r\n$@", "\\1", $this->ftp_resp);
+			return $ip_port;
+		}
+
+		function ftp_putcmd($cmd, $arg = "")
+		{
+			if ($arg != "") {
+				$cmd = $cmd." ".$arg;
+			}
+
+			fputs($this->ftp_sock, $cmd."\r\n");
+			$this->ftp_debug("> ".$cmd."\n");
+
+			return TRUE;
+		}
+
+		function ftp_ok()
+		{
+			$this->ftp_resp = "";
 
 			// 한줄을 읽는다.
 			$line = '';
@@ -521,49 +521,49 @@ 
 				}while($line);
 			}
 
-            $this->ftp_debug(str_replace("\r\n", "\n", $this->ftp_resp));
-
-            if (!preg_match("@^[123]@", $this->ftp_resp)) {
-                return FALSE;
-            }
-
-            return TRUE;
-        }
-
-        function ftp_close_data_connection($sock)
-        {
-            $this->ftp_debug("Disconnected from remote host\n");
-            return fclose($sock);
-        }
-
-        function ftp_open_data_connection($ip_port)
-        {
-            if (!preg_match("@[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+@", $ip_port)) {
-                $this->ftp_debug("Error : Illegal ip-port format(".$ip_port.")\n");
-                return FALSE;
-            }
-
-            $DATA = explode(",", $ip_port);
-            $ipaddr = $DATA[0].".".$DATA[1].".".$DATA[2].".".$DATA[3];
-            $port   = $DATA[4]*256 + $DATA[5];
-            $this->ftp_debug("Trying to ".$ipaddr.":".$port." ...\n");
-            $data_connection = @fsockopen($ipaddr, $port, $errno, $errstr);
-            if (!$data_connection) {
-                $this->ftp_debug("Error : Cannot open data connection to ".$ipaddr.":".$port."\n");
-                $this->ftp_debug("Error : ".$errstr." (".$errno.")\n");
-                return FALSE;
-            }
-
-            return $data_connection;
-        }
-
-        function ftp_debug($message = "")
-        {
-            if ($this->debug) {
-                echo $message;
-            }
-
-            return TRUE;
-        }
-    }
+			$this->ftp_debug(str_replace("\r\n", "\n", $this->ftp_resp));
+
+			if (!preg_match("@^[123]@", $this->ftp_resp)) {
+				return FALSE;
+			}
+
+			return TRUE;
+		}
+
+		function ftp_close_data_connection($sock)
+		{
+			$this->ftp_debug("Disconnected from remote host\n");
+			return fclose($sock);
+		}
+
+		function ftp_open_data_connection($ip_port)
+		{
+			if (!preg_match("@[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+@", $ip_port)) {
+				$this->ftp_debug("Error : Illegal ip-port format(".$ip_port.")\n");
+				return FALSE;
+			}
+
+			$DATA = explode(",", $ip_port);
+			$ipaddr = $DATA[0].".".$DATA[1].".".$DATA[2].".".$DATA[3];
+			$port   = $DATA[4]*256 + $DATA[5];
+			$this->ftp_debug("Trying to ".$ipaddr.":".$port." ...\n");
+			$data_connection = @fsockopen($ipaddr, $port, $errno, $errstr);
+			if (!$data_connection) {
+				$this->ftp_debug("Error : Cannot open data connection to ".$ipaddr.":".$port."\n");
+				$this->ftp_debug("Error : ".$errstr." (".$errno.")\n");
+				return FALSE;
+			}
+
+			return $data_connection;
+		}
+
+		function ftp_debug($message = "")
+		{
+			if ($this->debug) {
+				echo $message;
+			}
+
+			return TRUE;
+		}
+	}
 ?>

tools/dbxml_validator/connect_wrapper.php

Indentation +82 added lines, -82 removed lines

@@ -12,7 +12,7 @@ 
 /**
   @brief
   @developer
-  */
+ */
 class DBMysqlConnectWrapper extends DBMysql
 {
 	public $queries = '';
@@ -22,7 +22,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function __construct()
 	{
 		$this->db_type = 'mysql';
@@ -34,7 +34,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function create()
 	{
 		return new DBMysqlConnectWrapper();
@@ -45,7 +45,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actDBClassStart()
 	{
 	}
@@ -56,7 +56,7 @@ 
 		@return
 		@access
 		@param $query
-		*/
+	 */
 	public function actStart($query)
 	{
 	}
@@ -66,7 +66,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actFinish()
 	{
 	}
@@ -76,7 +76,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actDBClassFinish()
 	{
 	}
@@ -86,7 +86,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function isSupported()
 	{
 		// No need to actually check for 'mysql_connect' function
@@ -99,7 +99,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function __connect($connection)
 	{
 		return TRUE;
@@ -111,7 +111,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function _afterConnect($connection)
 	{
 	}
@@ -122,7 +122,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function _close($connection)
 	{
 	}
@@ -134,7 +134,7 @@ 
 		@access
 		@param $type
 		@param $indx
-		*/
+	 */
 	public function close($type = 'master', $indx = NULL)
 	{
 	}
@@ -144,7 +144,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _begin()
 	{
 		return TRUE;
@@ -155,7 +155,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _rollback()
 	{
 		return TRUE;
@@ -166,7 +166,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _commit()
 	{
 		return TRUE;
@@ -179,7 +179,7 @@ 
 		@access
 		@param $query
 		@param $connection
-		*/
+	 */
 	public function __query($query, $connection)
 	{
 		$this->queries .= "\n" . $query;
@@ -194,7 +194,7 @@ 
 		@access
 		@param $result
 		@param $arrayIndexEndValue
-		*/
+	 */
 	public function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		return new Any_prop_obj_base();
@@ -206,7 +206,7 @@ 
 		@return
 		@access
 		@param $target_name
-		*/
+	 */
 	public function isTableExists($target_name)
 	{
 		parent::isTableExists($target_name);
@@ -219,7 +219,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function db_insert_id()
 	{
 		return NULL;
@@ -231,7 +231,7 @@ 
 		@return
 		@access
 		@param $result
-		*/
+	 */
 	public function db_fetch_object(&$result)
 	{
 		return new Any_prop_obj_base();
@@ -241,7 +241,7 @@ 
 /**
   @brief
   @developer
-  */
+ */
 class DBMysqliConnectWrapper extends DBMysqli
 {
 	public $queries = '';
@@ -251,7 +251,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function __construct()
 	{
 		$this->db_type = 'mysqli';
@@ -263,7 +263,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function create()
 	{
 		return new DBMysqlConnectWrapper();
@@ -274,7 +274,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actDBClassStart()
 	{
 	}
@@ -285,7 +285,7 @@ 
 		@return
 		@access
 		@param $query
-		*/
+	 */
 	public function actStart($query)
 	{
 	}
@@ -295,7 +295,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actFinish()
 	{
 	}
@@ -305,7 +305,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actDBClassFinish()
 	{
 	}
@@ -315,7 +315,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function isSupported()
 	{
 		// No need to actually check for 'mysql_connect' function
@@ -328,7 +328,7 @@ 
 		@return
 		@access
 		@param $target_name
-		*/
+	 */
 	public function isTableExists($target_name)
 	{
 		parent::isTableExists($target_name);
@@ -344,7 +344,7 @@ 
 		@return
 		@access
 		@param $string
-		*/
+	 */
 	public function addQuotes($string)
 	{
 		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
@@ -366,7 +366,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function __connect($connection)
 	{
 		return TRUE;
@@ -378,7 +378,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function _afterConnect($connection)
 	{
 	}
@@ -389,7 +389,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function _close($connection)
 	{
 	}
@@ -401,7 +401,7 @@ 
 		@access
 		@param $type
 		@param $indx
-		*/
+	 */
 	public function close($type = 'master', $indx = NULL)
 	{
 	}
@@ -411,7 +411,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _begin()
 	{
 		return TRUE;
@@ -422,7 +422,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _rollback()
 	{
 		return TRUE;
@@ -433,7 +433,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _commit()
 	{
 		return TRUE;
@@ -446,7 +446,7 @@ 
 		@access
 		@param $query
 		@param $connection
-		*/
+	 */
 	public function __query($query, $connection)
 	{
 		$this->queries .= "\n" . $query;
@@ -461,7 +461,7 @@ 
 		@access
 		@param $result
 		@param $arrayIndexEndValue
-		*/
+	 */
 	public function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		return new Any_prop_obj_base();
@@ -472,7 +472,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function db_insert_id()
 	{
 		return NULL;
@@ -484,7 +484,7 @@ 
 		@return
 		@access
 		@param $result
-		*/
+	 */
 	public function db_fetch_object(&$result)
 	{
 		return new Any_prop_obj_base();
@@ -494,7 +494,7 @@ 
 /**
   @brief
   @developer
-  */
+ */
 class DBCubridConnectWrapper extends DBCubrid
 {
 	public $queries = '';
@@ -504,7 +504,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function __construct()
 	{
 		$this->db_type = 'cubrid';
@@ -516,7 +516,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function create()
 	{
 		return new DBMysqlConnectWrapper();
@@ -527,7 +527,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actDBClassStart()
 	{
 	}
@@ -538,7 +538,7 @@ 
 		@return
 		@access
 		@param $query
-		*/
+	 */
 	public function actStart($query)
 	{
 	}
@@ -548,7 +548,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _makeSequence()
 	{
 		return TRUE;
@@ -559,7 +559,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actFinish()
 	{
 	}
@@ -569,7 +569,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actDBClassFinish()
 	{
 	}
@@ -579,7 +579,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function isSupported()
 	{
 		// No need to actually check for 'cubrid_connect' function
@@ -592,7 +592,7 @@ 
 		@return
 		@access
 		@param $target_name
-		*/
+	 */
 	public function isTableExists($target_name)
 	{
 		try
@@ -612,7 +612,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function __connect($connection)
 	{
 		return TRUE;
@@ -624,7 +624,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function _afterConnect($connection)
 	{
 	}
@@ -635,7 +635,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function _close($connection)
 	{
 	}
@@ -647,7 +647,7 @@ 
 		@access
 		@param $type
 		@param $indx
-		*/
+	 */
 	public function close($type = 'master', $indx = NULL)
 	{
 	}
@@ -657,7 +657,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _begin()
 	{
 		return TRUE;
@@ -668,7 +668,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _rollback()
 	{
 		return TRUE;
@@ -679,7 +679,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _commit()
 	{
 		return TRUE;
@@ -692,7 +692,7 @@ 
 		@access
 		@param $query
 		@param $connection
-		*/
+	 */
 	public function __query($query, $connection)
 	{
 		$this->queries .= "\n" . $query;
@@ -707,7 +707,7 @@ 
 		@access
 		@param $result
 		@param $arrayIndexEndValue
-		*/
+	 */
 	public function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		return new Any_prop_obj_base();
@@ -718,7 +718,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function db_insert_id()
 	{
 		return NULL;
@@ -729,7 +729,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function &db_fetch_object()
 	{
 		return new Any_prop_obj_base();
@@ -739,7 +739,7 @@ 
 /**
   @brief
   @developer
-  */
+ */
 class DBMssqlConnectWrapper extends DBMssql
 {
 	public $queries = '';
@@ -749,7 +749,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function __construct()
 	{
 		$this->db_type = 'mssql';
@@ -761,7 +761,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function create()
 	{
 		return new DBMssqlConnectWrapper();
@@ -772,7 +772,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actDBClassStart()
 	{
 	}
@@ -783,7 +783,7 @@ 
 		@return
 		@access
 		@param $query
-		*/
+	 */
 	public function actStart($query)
 	{
 	}
@@ -793,7 +793,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actFinish()
 	{
 	}
@@ -803,7 +803,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function actDBClassFinish()
 	{
 	}
@@ -813,7 +813,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function isSupported()
 	{
 		// No need to actually check for 'mssql_connect' function
@@ -826,7 +826,7 @@ 
 		@return
 		@access
 		@param $target_name
-		*/
+	 */
 	public function isTableExists($target_name)
 	{
 		parent::isTableExists($target_name);
@@ -840,7 +840,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function __connect($connection)
 	{
 		return TRUE;
@@ -852,7 +852,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function _afterConnect($connection)
 	{
 	}
@@ -863,7 +863,7 @@ 
 		@return
 		@access
 		@param $connection
-		*/
+	 */
 	public function _close($connection)
 	{
 	}
@@ -875,7 +875,7 @@ 
 		@access
 		@param $type
 		@param $indx
-		*/
+	 */
 	public function close($type = 'master', $indx = NULL)
 	{
 	}
@@ -885,7 +885,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _begin()
 	{
 		return TRUE;
@@ -896,7 +896,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _rollback()
 	{
 		return TRUE;
@@ -907,7 +907,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function _commit()
 	{
 		return TRUE;
@@ -920,7 +920,7 @@ 
 		@access
 		@param $query
 		@param $connection
-		*/
+	 */
 	public function __query($query, $connection)
 	{
 		if($this->queries)
@@ -940,7 +940,7 @@ 
 		@access
 		@param $result
 		@param $arrayIndexEndValue
-		*/
+	 */
 	public function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		return new Any_prop_obj_base();
@@ -951,7 +951,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function db_insert_id()
 	{
 		return NULL;
@@ -962,7 +962,7 @@ 
 		@developer
 		@return
 		@access
-		*/
+	 */
 	public function &db_fetch_object()
 	{
 		return new Any_prop_obj_base();

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 	public function __construct()
 	{
 		$this->db_type = 'mysql';
-		$this->_setDBInfo();	// Context::get() should indicate a mysql db
+		$this->_setDBInfo(); // Context::get() should indicate a mysql db
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 		*/
 	public function __query($query, $connection)
 	{
-		$this->queries .= "\n" . $query;
+		$this->queries .= "\n".$query;
 
 		return TRUE;
 	}
@@ -255,7 +255,7 @@ 
 	public function __construct()
 	{
 		$this->db_type = 'mysqli';
-		$this->_setDBInfo();	// Context::get() should indicate a mysqli db
+		$this->_setDBInfo(); // Context::get() should indicate a mysqli db
 	}
 
 	/**
@@ -347,12 +347,12 @@ 
 		*/
 	public function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
 
-		if(!is_numeric($string))
+		if (!is_numeric($string))
 		{
 			$string = @mysql_real_escape_string($string);
 		}
@@ -449,7 +449,7 @@ 
 		*/
 	public function __query($query, $connection)
 	{
-		$this->queries .= "\n" . $query;
+		$this->queries .= "\n".$query;
 
 		return TRUE;
 	}
@@ -508,7 +508,7 @@ 
 	public function __construct()
 	{
 		$this->db_type = 'cubrid';
-		$this->_setDBInfo();	// Context::get() should indicate a CUBRID db
+		$this->_setDBInfo(); // Context::get() should indicate a CUBRID db
 	}
 
 	/**
@@ -695,7 +695,7 @@ 
 		*/
 	public function __query($query, $connection)
 	{
-		$this->queries .= "\n" . $query;
+		$this->queries .= "\n".$query;
 
 		return TRUE;
 	}
@@ -753,7 +753,7 @@ 
 	public function __construct()
 	{
 		$this->db_type = 'mssql';
-		$this->_setDBInfo();	// Context::get() should indicate a MS Sql db
+		$this->_setDBInfo(); // Context::get() should indicate a MS Sql db
 	}
 
 	/**
@@ -923,7 +923,7 @@ 
 		*/
 	public function __query($query, $connection)
 	{
-		if($this->queries)
+		if ($this->queries)
 		{
 			$this->queries .= ";\n";
 		}

Braces +1 added lines, -2 removed lines

@@ -598,8 +598,7 @@
 		try
 		{
 			parent::isTableExists($target_name);
-		}
-		catch (Exception $ex)
+		} catch (Exception $ex)
 		{
 		}
 

modules/board/board.wap.php

Spacing +28 added lines, -28 removed lines

@@ -15,7 +15,7 @@ 
 	function procWAP(&$oMobile)
 	{
 		// check grant
-		if(!$this->grant->list || $this->module_info->consultation == 'Y')
+		if (!$this->grant->list || $this->module_info->consultation == 'Y')
 		{
 			return $oMobile->setContent(Context::getLang('msg_not_permitted'));
 		}
@@ -25,13 +25,13 @@ 
 
 		// if the doument is existed
 		$document_srl = Context::get('document_srl');
-		if($document_srl)
+		if ($document_srl)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				// check the grant
-				if(!$this->grant->view)
+				if (!$this->grant->view)
 				{
 					return $oMobile->setContent(Context::getLang('msg_not_permitted'));
 				}
@@ -40,48 +40,48 @@ 
 				Context::setBrowserTitle($oDocument->getTitleText());
 
 				// if the act is display comment list
-				if($this->act=='dispBoardContentCommentList')
+				if ($this->act == 'dispBoardContentCommentList')
 				{
 
 					$oCommentModel = getModel('comment');
 					$output = $oCommentModel->getCommentList($oDocument->document_srl, 0, false, $oDocument->getCommentCount());
 
 					$content = '';
-					if(count($output->data))
+					if (count($output->data))
 					{
-						foreach($output->data as $key => $val)
+						foreach ($output->data as $key => $val)
 						{
 							$oComment = new commentItem();
 							$oComment->setAttribute($val);
 
-							if(!$oComment->isAccessible()) continue;
+							if (!$oComment->isAccessible()) continue;
 
-							$content .= "<b>".$oComment->getNickName()."</b> (".$oComment->getRegdate("Y-m-d").")<br>\r\n".$oComment->getContent(false,false)."<br>\r\n";
+							$content .= "<b>".$oComment->getNickName()."</b> (".$oComment->getRegdate("Y-m-d").")<br>\r\n".$oComment->getContent(false, false)."<br>\r\n";
 						}
 					}
 
 					// setup mobile contents
-					$oMobile->setContent( $content );
+					$oMobile->setContent($content);
 
 					// setup upper URL
-					$oMobile->setUpperUrl( getUrl('act',''), Context::getLang('cmd_go_upper') );
+					$oMobile->setUpperUrl(getUrl('act', ''), Context::getLang('cmd_go_upper'));
 
 				// display the document if the act is not display the comment list
 				} else {
 
 					// setup contents (strip all html tags)
-					$content = strip_tags(str_replace('<p>','<br>&nbsp;&nbsp;&nbsp;',$oDocument->getContent(false,false,false)),'<br><b><i><u><em><small><strong><big>');
+					$content = strip_tags(str_replace('<p>', '<br>&nbsp;&nbsp;&nbsp;', $oDocument->getContent(false, false, false)), '<br><b><i><u><em><small><strong><big>');
 
 
 					// setup content information(include the comments link)
-					$content = Context::getLang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;
+					$content = Context::getLang('replies').' : <a href="'.getUrl('act', 'dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;
 					$content = '<b>'.$oDocument->getNickName().'</b> ('.$oDocument->getRegdate("Y-m-d").")<br>\r\n".$content;
 
 					// setup mobile contents
-					$oMobile->setContent( $content );
+					$oMobile->setContent($content);
 
 					// setup upper URL
-					$oMobile->setUpperUrl( getUrl('document_srl',''), Context::getLang('cmd_list') );
+					$oMobile->setUpperUrl(getUrl('document_srl', ''), Context::getLang('cmd_list'));
 
 				}
 
@@ -92,25 +92,25 @@ 
 		// board index
 		$args = new stdClass;
 		$args->module_srl = $this->module_srl;
-		$args->page = Context::get('page');;
+		$args->page = Context::get('page'); ;
 		$args->list_count = 9;
-		$args->sort_index = $this->module_info->order_target?$this->module_info->order_target:'list_order';
-		$args->order_type = $this->module_info->order_type?$this->module_info->order_type:'asc';
+		$args->sort_index = $this->module_info->order_target ? $this->module_info->order_target : 'list_order';
+		$args->order_type = $this->module_info->order_type ? $this->module_info->order_type : 'asc';
 		$output = $oDocumentModel->getDocumentList($args, $this->except_notice);
 		$document_list = $output->data;
 		$page_navigation = $output->page_navigation;
 
 		$childs = array();
-		if($document_list && count($document_list))
+		if ($document_list && count($document_list))
 		{
-			foreach($document_list as $key => $val)
+			foreach ($document_list as $key => $val)
 			{
-				$href = getUrl('mid',$_GET['mid'],'document_srl',$val->document_srl);
+				$href = getUrl('mid', $_GET['mid'], 'document_srl', $val->document_srl);
 				$obj = null;
 				$obj['href'] = $val->getPermanentUrl();
 
 				$title = htmlspecialchars($val->getTitleText());
-				if($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';
+				if ($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';
 				$obj['link'] = $obj['text'] = '['.$val->getNickName().'] '.$title;
 				$childs[] = $obj;
 			}
@@ -118,18 +118,18 @@ 
 		}
 
 		$totalPage = $page_navigation->last_page;
-		$page = (int)Context::get('page');
-		if(!$page) $page = 1;
+		$page = (int) Context::get('page');
+		if (!$page) $page = 1;
 
 		// next/prevUrl specification
-		if($page > 1)
+		if ($page > 1)
 		{
-			$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page-1, $totalPage));
+			$oMobile->setPrevUrl(getUrl('mid', $_GET['mid'], 'page', $page - 1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page - 1, $totalPage));
 		}
 
-		if($page < $totalPage)
+		if ($page < $totalPage)
 		{
-			$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page+1, $totalPage));
+			$oMobile->setNextUrl(getUrl('mid', $_GET['mid'], 'page', $page + 1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page + 1, $totalPage));
 		}
 
 		$oMobile->mobilePage = $page;

Braces +9 added lines, -3 removed lines

@@ -54,7 +54,9 @@ 
 							$oComment = new commentItem();
 							$oComment->setAttribute($val);
 
-							if(!$oComment->isAccessible()) continue;
+							if(!$oComment->isAccessible()) {
+								continue;
+							}
 
 							$content .= "<b>".$oComment->getNickName()."</b> (".$oComment->getRegdate("Y-m-d").")<br>\r\n".$oComment->getContent(false,false)."<br>\r\n";
 						}
@@ -110,7 +112,9 @@ 
 				$obj['href'] = $val->getPermanentUrl();
 
 				$title = htmlspecialchars($val->getTitleText());
-				if($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';
+				if($val->getCommentCount()) {
+					$title .= ' ['.$val->getCommentCount().']';
+				}
 				$obj['link'] = $obj['text'] = '['.$val->getNickName().'] '.$title;
 				$childs[] = $obj;
 			}
@@ -119,7 +123,9 @@ 
 
 		$totalPage = $page_navigation->last_page;
 		$page = (int)Context::get('page');
-		if(!$page) $page = 1;
+		if(!$page) {
+			$page = 1;
+		}
 
 		// next/prevUrl specification
 		if($page > 1)

modules/board/board.mobile.php

Spacing +20 added lines, -20 removed lines

@@ -10,32 +10,32 @@ 
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');
 
-		if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;
-		if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;
-		if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;
-		if($this->module_info->mobile_search_list_count) $this->search_list_count = $this->module_info->mobile_search_list_count;
-		if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;
-		if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;
+		if ($this->module_info->list_count) $this->list_count = $this->module_info->list_count;
+		if ($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;
+		if ($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;
+		if ($this->module_info->mobile_search_list_count) $this->search_list_count = $this->module_info->mobile_search_list_count;
+		if ($this->module_info->page_count) $this->page_count = $this->module_info->page_count;
+		if ($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;
 		$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;
 
 		// $this->_getStatusNameListecret option backward compatibility
 		$oDocumentModel = getModel('document');
 
 		$statusList = $this->_getStatusNameList($oDocumentModel);
-		if(isset($statusList['SECRET']))
+		if (isset($statusList['SECRET']))
 		{
 			$this->module_info->secret = 'Y';
 		}
 
 		// use_category <=1.5.x, hide_category >=1.7.x
 		$count_category = count($oDocumentModel->getCategoryList($this->module_info->module_srl));
-		if($count_category)
+		if ($count_category)
 		{
-			if($this->module_info->hide_category)
+			if ($this->module_info->hide_category)
 			{
 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';
 			}
-			else if($this->module_info->use_category)
+			else if ($this->module_info->use_category)
 			{
 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';
 			}
@@ -55,10 +55,10 @@ 
 		 * check the consultation function, if the user is admin then swich off consultation function
 		 * if the user is not logged, then disppear write document/write comment./ view document
 		 **/
-		if($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)
+		if ($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)
 		{
 			$this->consultation = true;
-			if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;
+			if (!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;
 		} else {
 			$this->consultation = false;
 		}
@@ -67,11 +67,11 @@ 
 		$extra_keys = $oDocumentModel->getExtraKeys($this->module_info->module_srl);
 		Context::set('extra_keys', $extra_keys);
 
-		$template_path = sprintf("%sm.skins/%s/",$this->module_path, $this->module_info->mskin);
-		if(!is_dir($template_path)||!$this->module_info->mskin)
+		$template_path = sprintf("%sm.skins/%s/", $this->module_path, $this->module_info->mskin);
+		if (!is_dir($template_path) || !$this->module_info->mskin)
 		{
 			$this->module_info->mskin = 'default';
-			$template_path = sprintf("%sm.skins/%s/",$this->module_path, $this->module_info->mskin);
+			$template_path = sprintf("%sm.skins/%s/", $this->module_path, $this->module_info->mskin);
 		}
 		$this->setTemplatePath($template_path);
 		Context::addJsFilter($this->module_path.'tpl/filter', 'input_password.xml');
@@ -87,19 +87,19 @@ 
 	function getBoardCommentPage()
 	{
 		$document_srl = Context::get('document_srl');
-		$oDocumentModel =& getModel('document');
-		if(!$document_srl)
+		$oDocumentModel = & getModel('document');
+		if (!$document_srl)
 		{
 			return new BaseObject(-1, "msg_invalid_request");
 		}
 		
-		if($this->grant->view == false || ($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read))
+		if ($this->grant->view == false || ($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read))
 		{
 			return new BaseObject(-1, "msg_not_permitted");
 		}
 		
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			return new BaseObject(-1, "msg_invalid_request");
 		}
@@ -112,7 +112,7 @@ 
 	function dispBoardMessage($msg_code)
 	{
 		$msg = Context::getLang($msg_code);
-		$oMessageObject = &ModuleHandler::getModuleInstance('message','mobile');
+		$oMessageObject = &ModuleHandler::getModuleInstance('message', 'mobile');
 		$oMessageObject->setError(-1);
 		$oMessageObject->setMessage($msg);
 		$oMessageObject->dispMessage();

Braces +24 added lines, -13 removed lines

@@ -10,12 +10,24 @@ 
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');
 
-		if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;
-		if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;
-		if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;
-		if($this->module_info->mobile_search_list_count) $this->search_list_count = $this->module_info->mobile_search_list_count;
-		if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;
-		if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;
+		if($this->module_info->list_count) {
+			$this->list_count = $this->module_info->list_count;
+		}
+		if($this->module_info->mobile_list_count) {
+			$this->list_count = $this->module_info->mobile_list_count;
+		}
+		if($this->module_info->search_list_count) {
+			$this->search_list_count = $this->module_info->search_list_count;
+		}
+		if($this->module_info->mobile_search_list_count) {
+			$this->search_list_count = $this->module_info->mobile_search_list_count;
+		}
+		if($this->module_info->page_count) {
+			$this->page_count = $this->module_info->page_count;
+		}
+		if($this->module_info->mobile_page_count) {
+			$this->page_count = $this->module_info->mobile_page_count;
+		}
 		$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;
 
 		// $this->_getStatusNameListecret option backward compatibility
@@ -34,18 +46,15 @@ 
 			if($this->module_info->hide_category)
 			{
 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';
-			}
-			else if($this->module_info->use_category)
+			} else if($this->module_info->use_category)
 			{
 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$this->module_info->hide_category = 'N';
 				$this->module_info->use_category = 'Y';
 			}
-		}
-		else
+		} else
 		{
 			$this->module_info->hide_category = 'Y';
 			$this->module_info->use_category = 'N';
@@ -58,7 +67,9 @@ 
 		if($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)
 		{
 			$this->consultation = true;
-			if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;
+			if(!Context::get('is_logged')) {
+				$this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;
+			}
 		} else {
 			$this->consultation = false;
 		}

modules/board/board.model.php

Spacing +9 added lines, -9 removed lines

@@ -25,19 +25,19 @@ 
 
 		// get the list config value, if it is not exitsted then setup the default value
 		$list_config = $oModuleModel->getModulePartConfig('board', $module_srl);
-		if(!$list_config || count($list_config) <= 0)
+		if (!$list_config || count($list_config) <= 0)
 		{
-			$list_config = array( 'no', 'title', 'nick_name','regdate','readed_count');
+			$list_config = array('no', 'title', 'nick_name', 'regdate', 'readed_count');
 		}
 
 		// get the extra variables
 		$inserted_extra_vars = $oDocumentModel->getExtraKeys($module_srl);
 
-		foreach($list_config as $key)
+		foreach ($list_config as $key)
 		{
-			if(preg_match('/^([0-9]+)$/',$key))
+			if (preg_match('/^([0-9]+)$/', $key))
 			{
-				if($inserted_extra_vars[$key])
+				if ($inserted_extra_vars[$key])
 				{
 					$output['extra_vars'.$key] = $inserted_extra_vars[$key];
 				}
@@ -60,9 +60,9 @@ 
 	function getDefaultListConfig($module_srl)
 	{
 		// add virtual srl, title, registered date, update date, nickname, ID, name, readed count, voted count etc.
-		$virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'last_post', 'nick_name',
+		$virtual_vars = array('no', 'title', 'regdate', 'last_update', 'last_post', 'nick_name',
 				'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status');
-		foreach($virtual_vars as $key)
+		foreach ($virtual_vars as $key)
 		{
 			$extra_vars[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
 		}
@@ -71,9 +71,9 @@ 
 		$oDocumentModel = getModel('document');
 		$inserted_extra_vars = $oDocumentModel->getExtraKeys($module_srl);
 
-		if(count($inserted_extra_vars))
+		if (count($inserted_extra_vars))
 		{
-			foreach($inserted_extra_vars as $obj)
+			foreach ($inserted_extra_vars as $obj)
 			{
 				$extra_vars['extra_vars'.$obj->idx] = $obj;
 			}

Braces +2 added lines, -4 removed lines

@@ -40,13 +40,11 @@
 				if($inserted_extra_vars[$key])
 				{
 					$output['extra_vars'.$key] = $inserted_extra_vars[$key];
-				}
-				else
+				} else
 				{
 					continue;
 				}
-			}
-			else
+			} else
 			{
 				$output[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
 			}

config/config.inc.php

Spacing +45 added lines, -45 removed lines

@@ -7,7 +7,7 @@ 
  * @file   config/config.inc.php
  * @author XEHub (developers@xpressengine.com)
  */
-if(version_compare(PHP_VERSION, '5.4.0', '<'))
+if (version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
 }
@@ -16,7 +16,7 @@ 
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -52,9 +52,9 @@ 
 // Set can use other method instead cookie to store session id(for file upload)
 ini_set('session.use_only_cookies', 0);
 
-if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
+if (file_exists(_XE_PATH_.'config/package.inc.php'))
 {
-	require _XE_PATH_ . 'config/package.inc.php';
+	require _XE_PATH_.'config/package.inc.php';
 }
 else
 {
@@ -96,12 +96,12 @@ 
  * define('__ENABLE_PHPUNIT_TEST__', 0);
  * define('__PROXY_SERVER__', 'http://domain:port/path');
  */
-if(file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
+if (file_exists(_XE_PATH_.'config/config.user.inc.php'))
 {
-	require _XE_PATH_ . 'config/config.user.inc.php';
+	require _XE_PATH_.'config/config.user.inc.php';
 }
 
-if(!defined('__DEBUG__'))
+if (!defined('__DEBUG__'))
 {
 	/**
 	 * output debug message(bit value)
@@ -116,7 +116,7 @@ 
 	define('__DEBUG__', 0);
 }
 
-if(!defined('__DEBUG_OUTPUT__'))
+if (!defined('__DEBUG_OUTPUT__'))
 {
 	/**
 	 * output location of debug message
@@ -130,7 +130,7 @@ 
 	define('__DEBUG_OUTPUT__', 0);
 }
 
-if(!defined('__DEBUG_PROTECT__'))
+if (!defined('__DEBUG_PROTECT__'))
 {
 	/**
 	 * output comments of the firePHP console and browser
@@ -143,7 +143,7 @@ 
 	define('__DEBUG_PROTECT__', 1);
 }
 
-if(!defined('__DEBUG_PROTECT_IP__'))
+if (!defined('__DEBUG_PROTECT_IP__'))
 {
 	/**
 	 * Set a ip address to allow debug
@@ -151,7 +151,7 @@ 
 	define('__DEBUG_PROTECT_IP__', '127.0.0.1');
 }
 
-if(!defined('__DEBUG_DB_OUTPUT__'))
+if (!defined('__DEBUG_DB_OUTPUT__'))
 {
 	/**
 	 * DB error message definition
@@ -164,7 +164,7 @@ 
 	define('__DEBUG_DB_OUTPUT__', 0);
 }
 
-if(!defined('__LOG_SLOW_QUERY__'))
+if (!defined('__LOG_SLOW_QUERY__'))
 {
 	/**
 	 * Query log for only timeout query among DB queries
@@ -178,7 +178,7 @@ 
 	define('__LOG_SLOW_QUERY__', 0);
 }
 
-if(!defined('__LOG_SLOW_TRIGGER__'))
+if (!defined('__LOG_SLOW_TRIGGER__'))
 {
 	/**
 	 * Trigger excute time log
@@ -192,7 +192,7 @@ 
 	define('__LOG_SLOW_TRIGGER__', 0);
 }
 
-if(!defined('__LOG_SLOW_ADDON__'))
+if (!defined('__LOG_SLOW_ADDON__'))
 {
 	/**
 	 * Addon excute time log
@@ -206,7 +206,7 @@ 
 	define('__LOG_SLOW_ADDON__', 0);
 }
 
-if(!defined('__LOG_SLOW_WIDGET__'))
+if (!defined('__LOG_SLOW_WIDGET__'))
 {
 	/**
 	 * Widget excute time log
@@ -220,7 +220,7 @@ 
 	define('__LOG_SLOW_WIDGET__', 0);
 }
 
-if(!defined('__DEBUG_QUERY__'))
+if (!defined('__DEBUG_QUERY__'))
 {
 	/**
 	 * Leave DB query information
@@ -233,7 +233,7 @@ 
 	define('__DEBUG_QUERY__', 0);
 }
 
-if(!defined('__OB_GZHANDLER_ENABLE__'))
+if (!defined('__OB_GZHANDLER_ENABLE__'))
 {
 	/**
 	 * option to enable/disable a compression feature using ob_gzhandler
@@ -247,7 +247,7 @@ 
 	define('__OB_GZHANDLER_ENABLE__', 1);
 }
 
-if(!defined('__ENABLE_PHPUNIT_TEST__'))
+if (!defined('__ENABLE_PHPUNIT_TEST__'))
 {
 	/**
 	 * decide to use/not use the php unit test (Path/tests/index.php)
@@ -260,7 +260,7 @@ 
 	define('__ENABLE_PHPUNIT_TEST__', 0);
 }
 
-if(!defined('__PROXY_SERVER__'))
+if (!defined('__PROXY_SERVER__'))
 {
 	/**
 	 * __PROXY_SERVER__ has server information to request to the external through the target server
@@ -269,7 +269,7 @@ 
 	define('__PROXY_SERVER__', NULL);
 }
 
-if(!defined('__ERROR_LOG__'))
+if (!defined('__ERROR_LOG__'))
 {
 	/**
 	 * __ERROR_LOG__ 는 PHP의 에러로그를 출력하는 기능입니다. 개발시 워닝에러이상의 에러부터 잡기 시작합니다.
@@ -280,7 +280,7 @@ 
 	define('__ERROR_LOG__', 0);
 }
 
-if(!defined('__DISABLE_DEFAULT_CSS__'))
+if (!defined('__DISABLE_DEFAULT_CSS__'))
 {
 	/**
 	 * XE의 기본 CSS 스타일을 로드하지 않도록 합니다.
@@ -295,7 +295,7 @@ 
 	define('__DISABLE_DEFAULT_CSS__', 0);
 }
 
-if(!defined('__AUTO_OPCACHE_INVALIDATE__'))
+if (!defined('__AUTO_OPCACHE_INVALIDATE__'))
 {
 	/**
 	 * 업데이트 시 주요 파일의 OPcache를 자동 초기화 옵션
@@ -310,13 +310,13 @@ 
 }
 
 // Require specific files when using Firebug console output
-if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
+if ((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
 {
-	require _XE_PATH_ . 'libs/FirePHPCore/FirePHP.class.php';
+	require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
 }
 
 // Set Timezone as server time
-if(version_compare(PHP_VERSION, '5.3.0') >= 0)
+if (version_compare(PHP_VERSION, '5.3.0') >= 0)
 {
 	date_default_timezone_set(@date_default_timezone_get());
 }
@@ -422,8 +422,8 @@ 
  * Invalidates a cached script of OPcache when version is changed.
  * @see https://github.com/xpressengine/xe-core/issues/2189
  **/
-$cache_path = _XE_PATH_ . 'files/cache/store/' . __XE_VERSION__;
-if(
+$cache_path = _XE_PATH_.'files/cache/store/'.__XE_VERSION__;
+if (
 	__AUTO_OPCACHE_INVALIDATE__ === 1
 	&& !is_dir($cache_path)
 	&& function_exists('opcache_get_status')
@@ -433,62 +433,62 @@ 
 	@mkdir($cache_path, 0755, TRUE);
 	@chmod($cache_path, 0755);
 
-	foreach($GLOBALS['__xe_autoload_file_map'] as $script) {
-		opcache_invalidate(_XE_PATH_ . $script, true);
+	foreach ($GLOBALS['__xe_autoload_file_map'] as $script) {
+		opcache_invalidate(_XE_PATH_.$script, true);
 	}
-	opcache_invalidate(_XE_PATH_ . 'config/func.inc.php', true);
+	opcache_invalidate(_XE_PATH_.'config/func.inc.php', true);
 }
 
 // Require a function-defined-file for simple use
-require(_XE_PATH_ . 'config/func.inc.php');
+require(_XE_PATH_.'config/func.inc.php');
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	define('__StartTime__', getMicroTime());
 }
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	$GLOBALS['__elapsed_class_load__'] = 0;
 }
 
 function __xe_autoload($class_name)
 {
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$time_at = getMicroTime();
 	}
 
-	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
+	if (isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
-		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
+		require _XE_PATH_.$GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
 	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	elseif (preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
-		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		$candidate_filename[] = 'modules/'.$matches[1].'/'.$matches[1];
+		if (isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 
 		$candidate_filename = implode('.', $candidate_filename);
 
-		if(file_exists(_XE_PATH_ . $candidate_filename))
+		if (file_exists(_XE_PATH_.$candidate_filename))
 		{
-			require _XE_PATH_ . $candidate_filename;
+			require _XE_PATH_.$candidate_filename;
 		}
 	}
 
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
 	}
 }
 spl_autoload_register('__xe_autoload');
 
-if(version_compare(PHP_VERSION, '7.2', '<'))
+if (version_compare(PHP_VERSION, '7.2', '<'))
 {
 	class_alias('BaseObject', 'Object', true);
 }
 
-if(file_exists(_XE_PATH_  . '/vendor/autoload.php')) {
-	require _XE_PATH_  . '/vendor/autoload.php';
+if (file_exists(_XE_PATH_.'/vendor/autoload.php')) {
+	require _XE_PATH_.'/vendor/autoload.php';
 }
 /* End of file config.inc.php */
 /* Location: ./config/config.inc.php */

config/func.inc.php

Spacing +188 added lines, -188 removed lines

@@ -6,13 +6,13 @@ 
  *
  * @author XEHub (developers@xpressengine.com)
  */
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
 
 // define an empty function to avoid errors when iconv function doesn't exist
-if(!function_exists('iconv'))
+if (!function_exists('iconv'))
 {
 	eval('
 		function iconv($in_charset, $out_charset, $str)
@@ -220,7 +220,7 @@ 
 {
 	$oDB = DB::getInstance();
 	$output = $oDB->executeQuery($query_id, $args, $arg_columns);
-	if(!is_array($output->data) && count($output->data) > 0)
+	if (!is_array($output->data) && count($output->data) > 0)
 	{
 		$output->data = array($output->data);
 	}
@@ -250,9 +250,9 @@ 
 function setUserSequence($seq)
 {
 	$arr_seq = array();
-	if(isset($_SESSION['seq']))
+	if (isset($_SESSION['seq']))
 	{
-		if(!is_array($_SESSION['seq'])) {
+		if (!is_array($_SESSION['seq'])) {
 			$_SESSION['seq'] = array($_SESSION['seq']);
 		}
 		$arr_seq = $_SESSION['seq'];
@@ -269,11 +269,11 @@ 
  */
 function checkUserSequence($seq)
 {
-	if(!isset($_SESSION['seq']))
+	if (!isset($_SESSION['seq']))
 	{
 		return false;
 	}
-	if(!in_array($seq, $_SESSION['seq']))
+	if (!in_array($seq, $_SESSION['seq']))
 	{
 		return false;
 	}
@@ -299,7 +299,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 		$url = Context::getUrl($num_args, $args_list);
 	else
 		$url = Context::getRequestUri();
@@ -318,7 +318,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
 	}
@@ -341,7 +341,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, TRUE, TRUE);
 	}
@@ -363,16 +363,16 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -387,17 +387,17 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -413,7 +413,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -435,7 +435,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -457,7 +457,7 @@ 
 	$args_list = func_get_args();
 
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
@@ -466,10 +466,10 @@ 
 	$num_args = count($args_list);
 
 	$url = Context::getUrl($num_args, $args_list, $domain);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -482,7 +482,7 @@ 
 function getCurrentPageUrl()
 {
 	$protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
-	$url = $protocol . $_SERVER['HTTP_HOST'] . preg_replace('/[<>"]/', '', $_SERVER['REQUEST_URI']);
+	$url = $protocol.$_SERVER['HTTP_HOST'].preg_replace('/[<>"]/', '', $_SERVER['REQUEST_URI']);
 	return htmlspecialchars($url, ENT_COMPAT, 'UTF-8', FALSE);
 }
 
@@ -507,12 +507,12 @@ 
  */
 function cut_str($string, $cut_size = 0, $tail = '...')
 {
-	if($cut_size < 1 || !$string)
+	if ($cut_size < 1 || !$string)
 	{
 		return $string;
 	}
 
-	if($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
+	if ($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
 	{
 		$GLOBALS['use_mb_strimwidth'] = TRUE;
 		return mb_strimwidth($string, 0, $cut_size + 4, $tail, 'utf-8');
@@ -526,16 +526,16 @@ 
 	$char_count = 0;
 
 	$idx = 0;
-	while($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
+	while ($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
 	{
 		$c = ord(substr($string, $idx, 1));
 		$char_count++;
-		if($c < 128)
+		if ($c < 128)
 		{
 			$char_width += (int) $chars[$c - 32];
 			$idx++;
 		}
-		else if(191 < $c && $c < 224)
+		else if (191 < $c && $c < 224)
 		{
 			$char_width += $chars[4];
 			$idx += 2;
@@ -548,7 +548,7 @@ 
 	}
 
 	$output = substr($string, 0, $idx);
-	if(strlen($output) < $string_length)
+	if (strlen($output) < $string_length)
 	{
 		$output .= $tail;
 	}
@@ -564,7 +564,7 @@ 
 function zgap()
 {
 	$time_zone = $GLOBALS['_time_zone'];
-	if($time_zone < 0)
+	if ($time_zone < 0)
 	{
 		$to = -1;
 	}
@@ -577,7 +577,7 @@ 
 	$t_min = substr($time_zone, 3, 2) * $to;
 
 	$server_time_zone = date("O");
-	if($server_time_zone < 0)
+	if ($server_time_zone < 0)
 	{
 		$so = -1;
 	}
@@ -604,7 +604,7 @@ 
  */
 function ztime($str)
 {
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
@@ -619,7 +619,7 @@ 
 	$year = (int) substr($str, 0, 4);
 	$month = (int) substr($str, 4, 2);
 	$day = (int) substr($str, 6, 2);
-	if(strlen($str) <= 8)
+	if (strlen($str) <= 8)
 	{
 		$gap = 0;
 	}
@@ -643,19 +643,19 @@ 
 	$gap = $_SERVER['REQUEST_TIME'] + zgap() - ztime($date);
 
 	$lang_time_gap = Context::getLang('time_gap');
-	if($gap < 60)
+	if ($gap < 60)
 	{
 		$buff = sprintf($lang_time_gap['min'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60)
+	elseif ($gap < 60 * 60)
 	{
 		$buff = sprintf($lang_time_gap['mins'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 2)
+	elseif ($gap < 60 * 60 * 2)
 	{
 		$buff = sprintf($lang_time_gap['hour'], (int) ($gap / 60 / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 24)
+	elseif ($gap < 60 * 60 * 24)
 	{
 		$buff = sprintf($lang_time_gap['hours'], (int) ($gap / 60 / 60) + 1);
 	}
@@ -692,40 +692,40 @@ 
 function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE)
 {
 	// return null if no target time is specified
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
 	// convert the date format according to the language
-	if($conversion == TRUE)
+	if ($conversion == TRUE)
 	{
-		switch(Context::getLangType())
+		switch (Context::getLangType())
 		{
 			case 'en' :
 			case 'es' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'M d, Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'M d, Y H:i:s';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'M d, Y H:i';
 				}
 				break;
 			case 'vi' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'd-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'H:i:s d-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'H:i d-m-Y';
 				}
@@ -734,7 +734,7 @@ 
 	}
 
 	// If year value is less than 1970, handle it separately.
-	if((int) substr($str, 0, 4) < 1970)
+	if ((int) substr($str, 0, 4) < 1970)
 	{
 		$hour = (int) substr($str, 8, 2);
 		$min = (int) substr($str, 10, 2);
@@ -784,9 +784,9 @@ 
 function getEncodeEmailAddress($email)
 {
 	$return = '';
-	for($i = 0, $c = strlen($email); $i < $c; $i++)
+	for ($i = 0, $c = strlen($email); $i < $c; $i++)
 	{
-		$return .= '&#' . (rand(0, 1) == 0 ? ord($email[$i]) : 'X' . dechex(ord($email[$i]))) . ';';
+		$return .= '&#'.(rand(0, 1) == 0 ? ord($email[$i]) : 'X'.dechex(ord($email[$i]))).';';
 	}
 	return $return;
 }
@@ -806,25 +806,25 @@ 
 {
 	static $debug_file;
 
-	if(!(__DEBUG__ & 1))
+	if (!(__DEBUG__ & 1))
 	{
 		return;
 	}
 
 	static $firephp;
 	$bt = debug_backtrace();
-	if(is_array($bt))
+	if (is_array($bt))
 	{
 		$bt_debug_print = array_shift($bt);
 		$bt_called_function = array_shift($bt);
 	}
 	$file_name = str_replace(_XE_PATH_, '', $bt_debug_print['file']);
 	$line_num = $bt_debug_print['line'];
-	$function = $bt_called_function['class'] . $bt_called_function['type'] . $bt_called_function['function'];
+	$function = $bt_called_function['class'].$bt_called_function['type'].$bt_called_function['function'];
 
-	if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+	if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 	{
-		if(!isset($firephp))
+		if (!isset($firephp))
 		{
 			$firephp = FirePHP::getInstance(TRUE);
 		}
@@ -833,16 +833,16 @@ 
 		$label = sprintf('[%s:%d] %s() (Memory usage: current=%s, peak=%s)', $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()), FileHandler::filesize(memory_get_peak_usage()));
 
 		// Check a FirePHP option
-		if($display_option === 'TABLE')
+		if ($display_option === 'TABLE')
 		{
 			$label = $display_option;
 		}
-		if($display_option === 'ERROR')
+		if ($display_option === 'ERROR')
 		{
 			$type = $display_option;
 		}
 		// Check if the IP specified by __DEBUG_PROTECT__ option is same as the access IP.
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			$debug_output = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
 			$label = NULL;
@@ -852,52 +852,52 @@ 
 	}
 	else
 	{
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			return;
 		}
 
 		$print = array();
-		if(!$debug_file)
+		if (!$debug_file)
 		{
-			$debug_file = _XE_PATH_ . 'files/' . $file;
+			$debug_file = _XE_PATH_.'files/'.$file;
 		}
-		if(!file_exists($debug_file)) $print[] = '<?php exit() ?>';
+		if (!file_exists($debug_file)) $print[] = '<?php exit() ?>';
 
-		if($display_option === TRUE || $display_option === 'ERROR')
+		if ($display_option === TRUE || $display_option === 'ERROR')
 		{
-			$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()));;
+			$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage())); ;
 			$print[] = str_repeat('=', 80);
 		}
 		$type = gettype($debug_output);
-		if(!in_array($type, array('array', 'object', 'resource')))
+		if (!in_array($type, array('array', 'object', 'resource')))
 		{
-			if($display_option === 'ERROR')
+			if ($display_option === 'ERROR')
 			{
-				$print[] = 'ERROR : ' . var_export($debug_output, TRUE);
+				$print[] = 'ERROR : '.var_export($debug_output, TRUE);
 			}
 			else
 			{
-				$print[] = 'DEBUG : ' . $type . '(' . var_export($debug_output, TRUE) . ')';
+				$print[] = 'DEBUG : '.$type.'('.var_export($debug_output, TRUE).')';
 			}
 		}
 		else
 		{
-			$print[] = 'DEBUG : ' . trim(preg_replace('/\r?\n/', "\n" . '        ', print_r($debug_output, true)));
+			$print[] = 'DEBUG : '.trim(preg_replace('/\r?\n/', "\n".'        ', print_r($debug_output, true)));
 		}
 		$backtrace_args = defined('\DEBUG_BACKTRACE_IGNORE_ARGS') ? \DEBUG_BACKTRACE_IGNORE_ARGS : 0;
 		$backtrace = debug_backtrace($backtrace_args);
 
-		if(count($backtrace) > 1 && $backtrace[1]['function'] === 'debugPrint' && !$backtrace[1]['class'])
+		if (count($backtrace) > 1 && $backtrace[1]['function'] === 'debugPrint' && !$backtrace[1]['class'])
 		{
 			array_shift($backtrace);
 		}
-		foreach($backtrace as $val)
+		foreach ($backtrace as $val)
 		{
-			$print[] = '        - ' . $val['file'] . ' : ' . $val['line'];
+			$print[] = '        - '.$val['file'].' : '.$val['line'];
 		}
 		$print[] = PHP_EOL;
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 	}
 }
 
@@ -908,7 +908,7 @@ 
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
-	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
+	if (!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
 
 	static $log_filename = array(
 		'query' => 'files/_slowlog_query.php',
@@ -918,47 +918,47 @@ 
 	);
 	$write_file = true;
 
-	$log_file = _XE_PATH_ . $log_filename[$type];
+	$log_file = _XE_PATH_.$log_filename[$type];
 
 	$buff = array();
 	$buff[] = '<?php exit(); ?>';
 	$buff[] = date('c');
 
-	if($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
+	if ($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
 	{
-		$buff[] = "\tCaller : " . $obj->caller;
-		$buff[] = "\tCalled : " . $obj->called;
+		$buff[] = "\tCaller : ".$obj->caller;
+		$buff[] = "\tCalled : ".$obj->called;
 	}
-	else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
+	else if ($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
 	{
-		$buff[] = "\tAddon : " . $obj->called;
-		$buff[] = "\tCalled position : " . $obj->caller;
+		$buff[] = "\tAddon : ".$obj->called;
+		$buff[] = "\tCalled position : ".$obj->caller;
 	}
-	else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
+	else if ($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
 	{
-		$buff[] = "\tWidget : " . $obj->called;
+		$buff[] = "\tWidget : ".$obj->called;
 	}
-	else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
+	else if ($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
 	{
 
 		$buff[] = $obj->query;
-		$buff[] = "\tQuery ID   : " . $obj->query_id;
-		$buff[] = "\tCaller     : " . $obj->caller;
-		$buff[] = "\tConnection : " . $obj->connection;
+		$buff[] = "\tQuery ID   : ".$obj->query_id;
+		$buff[] = "\tCaller     : ".$obj->caller;
+		$buff[] = "\tConnection : ".$obj->connection;
 	}
 	else
 	{
 		$write_file = false;
 	}
 
-	if($write_file)
+	if ($write_file)
 	{
 		$buff[] = sprintf("\t%0.6f sec", $elapsed_time);
-		$buff[] = PHP_EOL . PHP_EOL;
+		$buff[] = PHP_EOL.PHP_EOL;
 		file_put_contents($log_file, implode(PHP_EOL, $buff), FILE_APPEND);
 	}
 
-	if($type != 'query')
+	if ($type != 'query')
 	{
 		$trigger_args = $obj;
 		$trigger_args->_log_type = $type;
@@ -998,11 +998,11 @@ 
  */
 function delObjectVars($target_obj, $del_obj)
 {
-	if(!is_object($target_obj))
+	if (!is_object($target_obj))
 	{
 		return;
 	}
-	if(!is_object($del_obj))
+	if (!is_object($del_obj))
 	{
 		return;
 	}
@@ -1012,7 +1012,7 @@ 
 
 	$target = array_keys($target_vars);
 	$del = array_keys($del_vars);
-	if(!count($target) || !count($del))
+	if (!count($target) || !count($del))
 	{
 		return $target_obj;
 	}
@@ -1020,10 +1020,10 @@ 
 	$return_obj = new stdClass();
 
 	$target_count = count($target);
-	for($i = 0; $i < $target_count; $i++)
+	for ($i = 0; $i < $target_count; $i++)
 	{
 		$target_key = $target[$i];
-		if(!in_array($target_key, $del))
+		if (!in_array($target_key, $del))
 		{
 			$return_obj->{$target_key} = $target_obj->{$target_key};
 		}
@@ -1036,10 +1036,10 @@ 
 {
 	$del_vars = array('error_return_url', 'success_return_url', 'ruleset', 'xe_validator_id');
 
-	foreach($del_vars as $var)
+	foreach ($del_vars as $var)
 	{
-		if(is_array($vars)) unset($vars[$var]);
-		else if(is_object($vars)) unset($vars->$var);
+		if (is_array($vars)) unset($vars[$var]);
+		else if (is_object($vars)) unset($vars->$var);
 	}
 
 	return $vars;
@@ -1056,12 +1056,12 @@ 
  */
 function handleError($errno, $errstr, $file, $line)
 {
-	if(!__DEBUG__)
+	if (!__DEBUG__)
 	{
 		return;
 	}
 	$errors = array(E_USER_ERROR, E_ERROR, E_PARSE);
-	if(!in_array($errno, $errors))
+	if (!in_array($errno, $errors))
 	{
 		return;
 	}
@@ -1081,8 +1081,8 @@ 
 function getNumberingPath($no, $size = 3)
 {
 	$mod = pow(10, $size);
-	$output = sprintf('%0' . $size . 'd/', $no % $mod);
-	if($no >= $mod)
+	$output = sprintf('%0'.$size.'d/', $no % $mod);
+	if ($no >= $mod)
 	{
 		$output .= getNumberingPath((int) $no / $mod, $size);
 	}
@@ -1102,12 +1102,12 @@ 
 
 function purifierHtml(&$content)
 {
-	require_once(_XE_PATH_ . 'classes/security/Purifier.class.php');
+	require_once(_XE_PATH_.'classes/security/Purifier.class.php');
 	$oPurifier = Purifier::getInstance();
 
 	// @see https://github.com/xpressengine/xe-core/issues/2278
 	$logged_info = Context::get('logged_info');
-	if($logged_info->is_admin !== 'Y') {
+	if ($logged_info->is_admin !== 'Y') {
 		$oPurifier->setConfig('HTML.Nofollow', true);
 	}
 
@@ -1122,7 +1122,7 @@ 
  */
 function removeHackTag($content)
 {
-	require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 	$oEmbedFilter = EmbedFilter::getInstance();
 	$oEmbedFilter->check($content);
 
@@ -1164,7 +1164,7 @@ 
  */
 function checkUploadedFile($file, $filename = null)
 {
-	require_once(_XE_PATH_ . 'classes/security/UploadFileFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/UploadFileFilter.class.php');
 	return UploadFileFilter::check($file, $filename);
 }
 
@@ -1178,13 +1178,13 @@ 
 {
 	$content = preg_replace('@<(/?)xmp.*?>@i', '<\1xmp>', $content);
 
-	if(($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
+	if (($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
 	{
-		if(($close_xmp = strrpos($content, '</xmp>')) === FALSE)
+		if (($close_xmp = strrpos($content, '</xmp>')) === FALSE)
 		{
 			$content .= '</xmp>';
 		}
-		else if($close_xmp < $start_xmp)
+		else if ($close_xmp < $start_xmp)
 		{
 			$content .= '</xmp>';
 		}
@@ -1204,33 +1204,33 @@ 
 	$tag = strtolower($match[2]);
 
 	// xmp tag ?뺣━
-	if($tag == 'xmp')
+	if ($tag == 'xmp')
 	{
 		return "<{$match[1]}xmp>";
 	}
-	if($match[1])
+	if ($match[1])
 	{
 		return $match[0];
 	}
-	if($match[4])
+	if ($match[4])
 	{
-		$match[4] = ' ' . $match[4];
+		$match[4] = ' '.$match[4];
 	}
 
 	$attrs = array();
-	if(preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
+	if (preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
 	{
-		foreach($m[1] as $idx => $name)
+		foreach ($m[1] as $idx => $name)
 		{
-			if(strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
+			if (strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
 			{
 				continue;
 			}
 
-			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00' . $n[1]) : ($n[2] + 0)); }, $m[3][$idx] . $m[4][$idx]);
+			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00'.$n[1]) : ($n[2] + 0)); }, $m[3][$idx].$m[4][$idx]);
 			$val = preg_replace('/^\s+|[\t\n\r]+/', '', $val);
 
-			if(preg_match('/^[a-z]+script:/i', $val))
+			if (preg_match('/^[a-z]+script:/i', $val))
 			{
 				continue;
 			}
@@ -1241,60 +1241,60 @@ 
 
 	$filter_arrts = array('style', 'src', 'href');
 
-	if($tag === 'object') array_push($filter_arrts, 'data');
-	if($tag === 'param') array_push($filter_arrts, 'value');
+	if ($tag === 'object') array_push($filter_arrts, 'data');
+	if ($tag === 'param') array_push($filter_arrts, 'value');
 
-	foreach($filter_arrts as $attr)
+	foreach ($filter_arrts as $attr)
 	{
-		if(!isset($attrs[$attr])) continue;
+		if (!isset($attrs[$attr])) continue;
 
 		$attr_value = rawurldecode($attrs[$attr]);
 		$attr_value = htmlspecialchars_decode($attr_value, ENT_COMPAT);
 		$attr_value = preg_replace('/\s+|[\t\n\r]+/', '', $attr_value);
-		if(preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
+		if (preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
 		{
 			unset($attrs[$attr]);
 		}
 	}
 
-	if(isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
+	if (isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
 	{
 		unset($attrs['style']);
 	}
 
 	$attr = array();
-	foreach($attrs as $name => $val)
+	foreach ($attrs as $name => $val)
 	{
-		if($tag == 'object' || $tag == 'embed' || $tag == 'a')
+		if ($tag == 'object' || $tag == 'embed' || $tag == 'a')
 		{
 			$attribute = strtolower(trim($name));
-			if($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
+			if ($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
 			{
-				if(stripos($val, 'data:') === 0)
+				if (stripos($val, 'data:') === 0)
 				{
 					continue;
 				}
 			}
 		}
 
-		if($tag == 'img')
+		if ($tag == 'img')
 		{
 			$attribute = strtolower(trim($name));
-			if(stripos($val, 'data:') === 0)
+			if (stripos($val, 'data:') === 0)
 			{
 				continue;
 			}
 		}
 		$val = str_replace('"', '&quot;', $val);
-		$attr[] = $name . "=\"{$val}\"";
+		$attr[] = $name."=\"{$val}\"";
 	}
-	$attr = count($attr) ? ' ' . implode(' ', $attr) : '';
+	$attr = count($attr) ? ' '.implode(' ', $attr) : '';
 
 	return "<{$match[1]}{$tag}{$attr}{$match[4]}>";
 }
 
 // convert hexa value to RGB
-if(!function_exists('hexrgb'))
+if (!function_exists('hexrgb'))
 {
 
 	/**
@@ -1330,9 +1330,9 @@ 
 
 	settype($password, "string");
 
-	for($i = 0; $i < strlen($password); $i++)
+	for ($i = 0; $i < strlen($password); $i++)
 	{
-		if($password[$i] == ' ' || $password[$i] == '\t')
+		if ($password[$i] == ' ' || $password[$i] == '\t')
 		{
 			continue;
 		}
@@ -1344,11 +1344,11 @@ 
 	$result1 = sprintf("%08lx", $nr & ((1 << 31) - 1));
 	$result2 = sprintf("%08lx", $nr2 & ((1 << 31) - 1));
 
-	if($result1 == '80000000')
+	if ($result1 == '80000000')
 	{
 		$nr += 0x80000000;
 	}
-	if($result2 == '80000000')
+	if ($result2 == '80000000')
 	{
 		$nr2 += 0x80000000;
 	}
@@ -1364,7 +1364,7 @@ 
 function getScriptPath()
 {
 	static $url = NULL;
-	if($url == NULL)
+	if ($url == NULL)
 	{
 		$script_path = filter_var($_SERVER['SCRIPT_NAME'], FILTER_SANITIZE_STRING);
 		$url = str_ireplace('/tools/', '/', preg_replace('/index.php.*/i', '', str_replace('\\', '/', $script_path)));
@@ -1395,14 +1395,14 @@ 
 	$decodedStr = '';
 	$pos = 0;
 	$len = strlen($source);
-	while($pos < $len)
+	while ($pos < $len)
 	{
 		$charAt = substr($source, $pos, 1);
-		if($charAt == '%')
+		if ($charAt == '%')
 		{
 			$pos++;
 			$charAt = substr($source, $pos, 1);
-			if($charAt == 'u')
+			if ($charAt == 'u')
 			{
 				// we got a unicode character
 				$pos++;
@@ -1436,21 +1436,21 @@ 
  */
 function _code2utf($num)
 {
-	if($num < 128)
+	if ($num < 128)
 	{
 		return chr($num);
 	}
-	if($num < 2048)
+	if ($num < 2048)
 	{
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		return chr(($num >> 6) + 192).chr(($num & 63) + 128);
 	}
-	if($num < 65536)
+	if ($num < 65536)
 	{
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
-	if($num < 2097152)
+	if ($num < 2097152)
 	{
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
 	return '';
 }
@@ -1465,7 +1465,7 @@ 
  */
 function detectUTF8($string, $return_convert = FALSE, $urldecode = TRUE)
 {
-	if($urldecode)
+	if ($urldecode)
 	{
 		$string = urldecode($string);
 	}
@@ -1473,12 +1473,12 @@ 
 	$sample = iconv('utf-8', 'utf-8', $string);
 	$is_utf8 = (md5($sample) === md5($string));
 
-	if(!$urldecode)
+	if (!$urldecode)
 	{
 		$string = urldecode($string);
 	}
 
-	if($return_convert)
+	if ($return_convert)
 	{
 		return ($is_utf8) ? $string : iconv('euc-kr', 'utf-8', $string);
 	}
@@ -1494,7 +1494,7 @@ 
  */
 function json_encode2($data)
 {
-	switch(gettype($data))
+	switch (gettype($data))
 	{
 		case 'boolean':
 			return $data ? 'true' : 'false';
@@ -1502,15 +1502,15 @@ 
 		case 'double':
 			return $data;
 		case 'string':
-			return '"' . strtr($data, array('\\' => '\\\\', '"' => '\\"')) . '"';
+			return '"'.strtr($data, array('\\' => '\\\\', '"' => '\\"')).'"';
 		case 'object':
 			$data = get_object_vars($data);
 		case 'array':
 			$rel = FALSE; // relative array?
 			$key = array_keys($data);
-			foreach($key as $v)
+			foreach ($key as $v)
 			{
-				if(!is_int($v))
+				if (!is_int($v))
 				{
 					$rel = TRUE;
 					break;
@@ -1518,12 +1518,12 @@ 
 			}
 
 			$arr = array();
-			foreach($data as $k => $v)
+			foreach ($data as $k => $v)
 			{
-				$arr[] = ($rel ? '"' . strtr($k, array('\\' => '\\\\', '"' => '\\"')) . '":' : '') . json_encode2($v);
+				$arr[] = ($rel ? '"'.strtr($k, array('\\' => '\\\\', '"' => '\\"')).'":' : '').json_encode2($v);
 			}
 
-			return $rel ? '{' . join(',', $arr) . '}' : '[' . join(',', $arr) . ']';
+			return $rel ? '{'.join(',', $arr).'}' : '['.join(',', $arr).']';
 		default:
 			return '""';
 	}
@@ -1537,7 +1537,7 @@ 
  */
 function isCrawler($agent = NULL)
 {
-	if(!$agent)
+	if (!$agent)
 	{
 		$agent = $_SERVER['HTTP_USER_AGENT'];
 	}
@@ -1547,9 +1547,9 @@ 
 		/*'211.245.21.110-211.245.21.119' mixsh is closed */
 	);
 
-	foreach($check_agent as $str)
+	foreach ($check_agent as $str)
 	{
-		if(stristr($agent, $str) != FALSE)
+		if (stristr($agent, $str) != FALSE)
 		{
 			return TRUE;
 		}
@@ -1567,7 +1567,7 @@ 
  */
 function stripEmbedTagForAdmin(&$content, $writer_member_srl)
 {
-	if(!Context::get('is_logged'))
+	if (!Context::get('is_logged'))
 	{
 		return;
 	}
@@ -1575,18 +1575,18 @@ 
 	$oModuleModel = getModel('module');
 	$logged_info = Context::get('logged_info');
 
-	if($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
+	if ($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
 	{
-		if($writer_member_srl)
+		if ($writer_member_srl)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($writer_member_srl);
-			if($member_info->is_admin == "Y")
+			if ($member_info->is_admin == "Y")
 			{
 				return;
 			}
 		}
-		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . Context::getLang('security_warning_embed') . "</p></div>";
+		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>".Context::getLang('security_warning_embed')."</p></div>";
 		$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
 		$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
 		$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);
@@ -1603,18 +1603,18 @@ 
 function requirePear()
 {
 	static $required = false;
-	if($required)
+	if ($required)
 	{
 		return;
 	}
 
-	if(version_compare(PHP_VERSION, "5.3.0") < 0)
+	if (version_compare(PHP_VERSION, "5.3.0") < 0)
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR".PATH_SEPARATOR.get_include_path());
 	}
 	else
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR.1.9.5".PATH_SEPARATOR.get_include_path());
 	}
 
 	$required = true;
@@ -1622,7 +1622,7 @@ 
 
 function checkCSRF()
 {
-	if($_SERVER['REQUEST_METHOD'] != 'POST')
+	if ($_SERVER['REQUEST_METHOD'] != 'POST')
 	{
 		return FALSE;
 	}
@@ -1630,9 +1630,9 @@ 
 	$default_url = Context::getDefaultUrl();
 	$referer = $_SERVER["HTTP_REFERER"];
 
-	if(strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
+	if (strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
 	{
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$referer = $IDN->encode($referer);
 	}
@@ -1643,9 +1643,9 @@ 
 	$oModuleModel = getModel('module');
 	$siteModuleInfo = $oModuleModel->getDefaultMid();
 
-	if($siteModuleInfo->site_srl == 0)
+	if ($siteModuleInfo->site_srl == 0)
 	{
-		if($default_url['host'] !== $referer['host'])
+		if ($default_url['host'] !== $referer['host'])
 		{
 			return FALSE;
 		}
@@ -1653,7 +1653,7 @@ 
 	else
 	{
 		$virtualSiteInfo = $oModuleModel->getSiteInfo($siteModuleInfo->site_srl);
-		if(strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
+		if (strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
 		{
 			return FALSE;
 		}
@@ -1669,15 +1669,15 @@ 
  */
 function recurciveExposureCheck(&$menu)
 {
-	if(is_array($menu))
+	if (is_array($menu))
 	{
-		foreach($menu AS $key=>$value)
+		foreach ($menu AS $key=>$value)
 		{
-			if(!$value['isShow'])
+			if (!$value['isShow'])
 			{
 				unset($menu[$key]);
 			}
-			if(is_array($value['list']) && count($value['list']) > 0)
+			if (is_array($value['list']) && count($value['list']) > 0)
 			{
 				recurciveExposureCheck($menu[$key]['list']);
 			}
@@ -1687,14 +1687,14 @@ 
 
 function changeValueInUrl($key, $requestKey, $dbKey, $urlName = 'success_return_url')
 {
-	if($requestKey != $dbKey)
+	if ($requestKey != $dbKey)
 	{
 		$arrayUrl = parse_url(Context::get('success_return_url'));
-		if($arrayUrl['query'])
+		if ($arrayUrl['query'])
 		{
 			parse_str($arrayUrl['query'], $parsedStr);
 
-			if(isset($parsedStr[$key]))
+			if (isset($parsedStr[$key]))
 			{
 				$parsedStr[$key] = $requestKey;
 				$successReturnUrl .= $arrayUrl['path'].'?'.http_build_query($parsedStr);
@@ -1737,14 +1737,14 @@ 
  */
 function alertScript($msg)
 {
-	if(!$msg)
+	if (!$msg)
 	{
 		return;
 	}
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-alert("' . $msg . '");
+alert("' . $msg.'");
 //]]>
 </script>';
 }
@@ -1775,7 +1775,7 @@ 
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-' . $reloadScript . '
+' . $reloadScript.'
 //]]>
 </script>';
 }
@@ -1798,7 +1798,7 @@ 
  */
 function escape($str, $double_escape = true, $escape_defined_lang_code = false)
 {
-	if(!$escape_defined_lang_code && isDefinedLangCode($str)) return $str;
+	if (!$escape_defined_lang_code && isDefinedLangCode($str)) return $str;
 
 	$flags = ENT_QUOTES | ENT_SUBSTITUTE;
 	return htmlspecialchars($str, $flags, 'UTF-8', $double_escape);
@@ -1830,7 +1830,7 @@ 
 function escape_js($str)
 {
 	$flags = JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE;
-	$str = json_encode((string)$str, $flags);
+	$str = json_encode((string) $str, $flags);
 	return substr($str, 1, strlen($str) - 2);
 }
 
@@ -1882,12 +1882,12 @@ 
 {
 	if ($limit < 1) $limit = null;
 	$result = array();
-	$split = preg_split('/(?<!' . preg_quote($escape_char, '/') . ')' . preg_quote($delimiter, '/') . '/', $str, $limit);
+	$split = preg_split('/(?<!'.preg_quote($escape_char, '/').')'.preg_quote($delimiter, '/').'/', $str, $limit);
 	foreach ($split as $piece)
 	{
 		if (trim($piece) !== '')
 		{
-			$result[] = trim(str_replace($escape_char . $delimiter, $delimiter, $piece));
+			$result[] = trim(str_replace($escape_char.$delimiter, $delimiter, $piece));
 		}
 	}
 	return $result;

Doc Comments +21 added lines, -15 removed lines

@@ -74,7 +74,7 @@ 
  * @param string $module_name The module name to get a instance
  * @param string $type disp, proc, controller, class
  * @param string $kind admin, null
- * @return mixed Module instance
+ * @return ModuleObject Module instance
  */
 function getModule($module_name, $type = 'view', $kind = '')
 {
@@ -85,7 +85,7 @@ 
  * Create a controller instance of the module
  *
  * @param string $module_name The module name to get a controller instance
- * @return mixed Module controller instance
+ * @return ModuleObject Module controller instance
  */
 function getController($module_name)
 {
@@ -96,7 +96,7 @@ 
  * Create a admin controller instance of the module
  *
  * @param string $module_name The module name to get a admin controller instance
- * @return mixed Module admin controller instance
+ * @return ModuleObject Module admin controller instance
  */
 function getAdminController($module_name)
 {
@@ -107,7 +107,7 @@ 
  * Create a view instance of the module
  *
  * @param string $module_name The module name to get a view instance
- * @return mixed Module view instance
+ * @return ModuleObject Module view instance
  */
 function getView($module_name)
 {
@@ -118,7 +118,7 @@ 
  * Create a mobile instance of the module
  *
  * @param string $module_name The module name to get a mobile instance
- * @return mixed Module mobile instance
+ * @return ModuleObject Module mobile instance
  */
 function &getMobile($module_name)
 {
@@ -129,7 +129,7 @@ 
  * Create a admin view instance of the module
  *
  * @param string $module_name The module name to get a admin view instance
- * @return mixed Module admin view instance
+ * @return ModuleObject Module admin view instance
  */
 function getAdminView($module_name)
 {
@@ -140,7 +140,7 @@ 
  * Create a model instance of the module
  *
  * @param string $module_name The module name to get a model instance
- * @return mixed Module model instance
+ * @return ModuleObject Module model instance
  */
 function getModel($module_name)
 {
@@ -151,7 +151,7 @@ 
  * Create an admin model instance of the module
  *
  * @param string $module_name The module name to get a admin model instance
- * @return mixed Module admin model instance
+ * @return ModuleObject Module admin model instance
  */
 function getAdminModel($module_name)
 {
@@ -162,7 +162,7 @@ 
  * Create an api instance of the module
  *
  * @param string $module_name The module name to get a api instance
- * @return mixed Module api class instance
+ * @return ModuleObject Module api class instance
  */
 function getAPI($module_name)
 {
@@ -173,7 +173,7 @@ 
  * Create a wap instance of the module
  *
  * @param string $module_name The module name to get a wap instance
- * @return mixed Module wap class instance
+ * @return ModuleObject Module wap class instance
  */
 function getWAP($module_name)
 {
@@ -184,7 +184,7 @@ 
  * Create a class instance of the module
  *
  * @param string $module_name The module name to get a class instance
- * @return mixed Module class instance
+ * @return ModuleObject Module class instance
  */
 function getClass($module_name)
 {
@@ -490,7 +490,7 @@ 
  * Return if domain of the virtual site is url type or id type
  *
  * @param string $domain
- * @return bool
+ * @return integer
  */
 function isSiteID($domain)
 {
@@ -559,7 +559,7 @@ 
 /**
  * Get a time gap between server's timezone and XE's timezone
  *
- * @return int
+ * @return double
  */
 function zgap()
 {
@@ -797,7 +797,7 @@ 
  * Display $buff contents into the file ./files/_debug_message.php.
  * You can see the file on your prompt by command: tail-f./files/_debug_message.php
  *
- * @param mixed $debug_output Target object to be printed
+ * @param string $debug_output Target object to be printed
  * @param bool $display_option boolean Flag whether to print seperator (default:true)
  * @param string $file Target file name
  * @return void
@@ -904,7 +904,7 @@ 
 /**
  * @param string $type query, trigger
  * @param float $elapsed_time
- * @param object $obj
+ * @param stdClass $obj
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
@@ -1685,6 +1685,9 @@ 
 	}
 }
 
+/**
+ * @param string $key
+ */
 function changeValueInUrl($key, $requestKey, $dbKey, $urlName = 'success_return_url')
 {
 	if($requestKey != $dbKey)
@@ -1781,6 +1784,9 @@ 
 }
 
 
+/**
+ * @param string $str
+ */
 function isDefinedLangCode($str)
 {
 	return preg_match('!^\$user_lang->([a-z0-9\_]+)$!is', trim($str));