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

Indentation +101 added lines, -101 removed lines

@@ -2,33 +2,33 @@ 
 /* Copyright (C) XEHub <https://www.xpressengine.com> */
 
 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');
-    }
+	}
 }
 

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

Braces +14 added lines, -10 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xpressengine.com> */
 
-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/comment/comment.class.php

Spacing +29 added lines, -29 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xpressengine.com> */
 
-require_once(_XE_PATH_ . 'modules/comment/comment.item.php');
+require_once(_XE_PATH_.'modules/comment/comment.item.php');
 
 /**
  * comment
@@ -36,7 +36,7 @@ 
 		// 2008. 02. 22 add comment setting when a new module added
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -54,63 +54,63 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 			{
 				return TRUE;
 			}
 			// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 			{
 				return TRUE;
 			}
 			// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-			if(!$oDB->isColumnExists("comments", "voted_count"))
+			if (!$oDB->isColumnExists("comments", "voted_count"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("comments", "notify_message"))
+			if (!$oDB->isColumnExists("comments", "notify_message"))
 			{
 				return TRUE;
 			}
 			// 2008. 02. 22 add comment setting when a new module added
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 			{
 				return TRUE;
 			}
 			// 2008. 05. 14 add a column for blamed count
-			if(!$oDB->isColumnExists("comments", "blamed_count"))
+			if (!$oDB->isColumnExists("comments", "blamed_count"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("comment_voted_log", "point"))
+			if (!$oDB->isColumnExists("comment_voted_log", "point"))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+			if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 			{
 				return TRUE;
 			}
 			//2012. 02. 24 add comment published status column and index
-			if(!$oDB->isColumnExists("comments", "status"))
+			if (!$oDB->isColumnExists("comments", "status"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isIndexExists("comments", "idx_status"))
+			if (!$oDB->isIndexExists("comments", "idx_status"))
 			{
 				return TRUE;
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_parent_srl"))
+			if (!$oDB->isIndexExists("comments", "idx_parent_srl"))
 			{
 				return TRUE;
 			}
@@ -131,46 +131,46 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 			{
 				$oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
 			}
 			// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 			{
 				$oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
 			}
 			// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-			if(!$oDB->isColumnExists("comments", "voted_count"))
+			if (!$oDB->isColumnExists("comments", "voted_count"))
 			{
 				$oDB->addColumn("comments", "voted_count", "number", "11");
 				$oDB->addIndex("comments", "idx_voted_count", array("voted_count"));
 			}
 
-			if(!$oDB->isColumnExists("comments", "notify_message"))
+			if (!$oDB->isColumnExists("comments", "notify_message"))
 			{
 				$oDB->addColumn("comments", "notify_message", "char", "1");
 			}
 			// 2008. 02. 22 add comment setting when a new module added
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 			{
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 			}
 			// 2008. 05. 14 add a column for blamed count
-			if(!$oDB->isColumnExists("comments", "blamed_count"))
+			if (!$oDB->isColumnExists("comments", "blamed_count"))
 			{
 				$oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, TRUE);
 				$oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
 			}
-			if(!$oDB->isColumnExists("comment_voted_log", "point"))
+			if (!$oDB->isColumnExists("comment_voted_log", "point"))
 			{
 				$oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, TRUE);
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+			if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 			{
 				$oDB->addIndex(
 						"comments", "idx_module_list_order", array("module_srl", "list_order"), TRUE
@@ -178,11 +178,11 @@ 
 			}
 
 			//2012. 02. 24 add comment published status column and index
-			if(!$oDB->isColumnExists("comments", "status"))
+			if (!$oDB->isColumnExists("comments", "status"))
 			{
 				$oDB->addColumn("comments", "status", "number", 1, 1, TRUE);
 			}
-			if(!$oDB->isIndexExists("comments", "idx_status"))
+			if (!$oDB->isIndexExists("comments", "idx_status"))
 			{
 				$oDB->addIndex(
 						"comments", "idx_status", array("status", "comment_srl", "module_srl", "document_srl"), TRUE
@@ -190,12 +190,12 @@ 
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after');
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_parent_srl"))
+			if (!$oDB->isIndexExists("comments", "idx_parent_srl"))
 			{
 				$oDB->addIndex('comments', 'idx_parent_srl', array('parent_srl'));
 			}
@@ -212,7 +212,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}

modules/autoinstall/autoinstall.admin.controller.php

Spacing +32 added lines, -32 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xpressengine.com> */
 
-require_once(_XE_PATH_ . 'modules/autoinstall/autoinstall.lib.php');
+require_once(_XE_PATH_.'modules/autoinstall/autoinstall.lib.php');
 
 /**
  * autoinstall module admin controller class
@@ -64,7 +64,7 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$item = $oModel->getLatestPackage();
-		if($item)
+		if ($item)
 		{
 			$params["updatedate"] = $item->updatedate;
 		}
@@ -92,23 +92,23 @@ 
 		executeQuery("autoinstall.deleteInstalledPackage");
 		$oModel = getModel('autoinstall');
 		$packages = $oModel->getPackages();
-		foreach($packages as $package)
+		foreach ($packages as $package)
 		{
 			$real_path = FileHandler::getRealPath($package->path);
-			if(!file_exists($real_path))
+			if (!file_exists($real_path))
 			{
 				continue;
 			}
 
 			$type = $oModel->getTypeFromPath($package->path);
-			if($type == "core")
+			if ($type == "core")
 			{
 				$version = __XE_VERSION__;
 			}
 			else
 			{
 				$config_file = NULL;
-				switch($type)
+				switch ($type)
 				{
 					case "m.layout":
 						$type = "layout";
@@ -138,15 +138,15 @@ 
 						break;
 				}
 
-				if(!$config_file)
+				if (!$config_file)
 				{
 					continue;
 				}
 
 				$xml = new XmlParser();
-				$xmlDoc = $xml->loadXmlFile($real_path . $config_file);
+				$xmlDoc = $xml->loadXmlFile($real_path.$config_file);
 
-				if(!$xmlDoc)
+				if (!$xmlDoc)
 				{
 					continue;
 				}
@@ -158,7 +158,7 @@ 
 			$args->package_srl = $package->package_srl;
 			$args->version = $package->version;
 			$args->current_version = $version;
-			if(version_compare($args->version, $args->current_version, ">"))
+			if (version_compare($args->version, $args->current_version, ">"))
 			{
 				$args->need_update = "Y";
 			}
@@ -184,7 +184,7 @@ 
 		$oAdminModel = getAdminModel('autoinstall');
 		$packages = explode(',', $package_srls);
 		$ftp_info = Context::getFTPInfo();
-		if(!$_SESSION['ftp_password'])
+		if (!$_SESSION['ftp_password'])
 		{
 			$ftp_password = Context::get('ftp_password');
 		}
@@ -194,18 +194,18 @@ 
 		}
 
 		$isSftpSupported = function_exists(ssh2_sftp);
-		foreach($packages as $package_srl)
+		foreach ($packages as $package_srl)
 		{
 			$package = $oModel->getPackage($package_srl);
-			if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
+			if ($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
 			{
 				$oModuleInstaller = new DirectModuleInstaller($package);
 			}
-			else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
+			else if ($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
 			{
 				$oModuleInstaller = new SFTPModuleInstaller($package);
 			}
-			else if(function_exists(ftp_connect))
+			else if (function_exists(ftp_connect))
 			{
 				$oModuleInstaller = new PHPFTPModuleInstaller($package);
 			}
@@ -217,7 +217,7 @@ 
 			$oModuleInstaller->setServerUrl(_XE_DOWNLOAD_SERVER_);
 			$oModuleInstaller->setPassword($ftp_password);
 			$output = $oModuleInstaller->install();
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -227,7 +227,7 @@ 
 
 		$this->setMessage('success_installed', 'update');
 
-		if(Context::get('return_url'))
+		if (Context::get('return_url'))
 		{
 			$this->setRedirectUrl(Context::get('return_url'));
 		}
@@ -246,30 +246,30 @@ 
 	function updatePackages(&$xmlDoc)
 	{
 		$oModel = getModel('autoinstall');
-		if(!$xmlDoc->response->packages->item)
+		if (!$xmlDoc->response->packages->item)
 		{
 			return;
 		}
-		if(!is_array($xmlDoc->response->packages->item))
+		if (!is_array($xmlDoc->response->packages->item))
 		{
 			$xmlDoc->response->packages->item = array($xmlDoc->response->packages->item);
 		}
 		$targets = array('package_srl', 'updatedate', 'latest_item_srl', 'path', 'version', 'category_srl', 'have_instance');
-		foreach($xmlDoc->response->packages->item as $item)
+		foreach ($xmlDoc->response->packages->item as $item)
 		{
 			$args = new stdClass();
-			foreach($targets as $target)
+			foreach ($targets as $target)
 			{
 				$args->{$target} = $item->{$target}->body;
 			}
-			if($oModel->getPackage($args->package_srl))
+			if ($oModel->getPackage($args->package_srl))
 			{
 				$output = executeQuery("autoinstall.updatePackage", $args);
 			}
 			else
 			{
 				$output = executeQuery("autoinstall.insertPackage", $args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$output = executeQuery("autoinstall.deletePackage", $args);
 					$output = executeQuery("autoinstall.insertPackage", $args);
@@ -288,12 +288,12 @@ 
 	{
 		executeQuery("autoinstall.deleteCategory");
 		$oModel = getModel('autoinstall');
-		if(!is_array($xmlDoc->response->categorylist->item))
+		if (!is_array($xmlDoc->response->categorylist->item))
 		{
 			$xmlDoc->response->categorylist->item = array($xmlDoc->response->categorylist->item);
 		}
 		$list_order = 0;
-		foreach($xmlDoc->response->categorylist->item as $item)
+		foreach ($xmlDoc->response->categorylist->item as $item)
 		{
 			$args = new stdClass();
 			$args->category_srl = $item->category_srl->body;
@@ -314,12 +314,12 @@ 
 		$package_srl = Context::get('package_srl');
 
 		$output = $this->uninstallPackageByPackageSrl($package_srl);
-		if($output->toBool()==FALSE)
+		if ($output->toBool() == FALSE)
 		{
 			return $output;
 		}
 
-		if(Context::get('return_url'))
+		if (Context::get('return_url'))
 		{
 			$this->setRedirectUrl(Context::get('return_url'));
 		}
@@ -359,7 +359,7 @@ 
 
 		$oAdminModel = getAdminModel('autoinstall');
 
-		if(!$_SESSION['ftp_password'])
+		if (!$_SESSION['ftp_password'])
 		{
 			$ftp_password = Context::get('ftp_password');
 		}
@@ -370,15 +370,15 @@ 
 		$ftp_info = Context::getFTPInfo();
 
 		$isSftpSupported = function_exists(ssh2_sftp);
-		if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
+		if ($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
 		{
 			$oModuleInstaller = new DirectModuleInstaller($package);
 		}
-		else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
+		else if ($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
 		{
 			$oModuleInstaller = new SFTPModuleInstaller($package);
 		}
-		else if(function_exists('ftp_connect'))
+		else if (function_exists('ftp_connect'))
 		{
 			$oModuleInstaller = new PHPFTPModuleInstaller($package);
 		}
@@ -391,7 +391,7 @@ 
 
 		$oModuleInstaller->setPassword($ftp_password);
 		$output = $oModuleInstaller->uninstall();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}

modules/autoinstall/autoinstall.lib.php

Spacing +122 added lines, -122 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xpressengine.com> */
 
-require_once(_XE_PATH_ . 'libs/ftp.class.php');
+require_once(_XE_PATH_.'libs/ftp.class.php');
 
 /**
  * Module installer
@@ -78,17 +78,17 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$type = $oModel->getTypeFromPath($this->package->path);
-		if($type == "module")
+		if ($type == "module")
 		{
 			$output = $this->uninstallModule();
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -116,19 +116,19 @@ 
 	 */
 	function _download()
 	{
-		if($this->package->path == ".")
+		if ($this->package->path == ".")
 		{
-			$this->download_file = $this->temp_dir . "xe.tar";
+			$this->download_file = $this->temp_dir."xe.tar";
 			$this->target_path = "";
 			$this->download_path = $this->temp_dir;
 		}
 		else
 		{
 			$subpath = trim(substr($this->package->path, 2), '/');
-			$this->download_file = $this->temp_dir . $subpath . ".tar";
+			$this->download_file = $this->temp_dir.$subpath.".tar";
 			$subpatharr = explode("/", $subpath);
 			array_pop($subpatharr);
-			$this->download_path = $this->temp_dir . implode("/", $subpatharr);
+			$this->download_path = $this->temp_dir.implode("/", $subpatharr);
 			$this->target_path = implode("/", $subpatharr);
 		}
 
@@ -152,17 +152,17 @@ 
 		$path_array = explode("/", $this->package->path);
 		$target_name = array_pop($path_array);
 		$oModule = getModule($target_name, "class");
-		if(!$oModule)
+		if (!$oModule)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
-		if(!method_exists($oModule, "moduleUninstall"))
+		if (!method_exists($oModule, "moduleUninstall"))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$output = $oModule->moduleUninstall();
-		if(is_subclass_of($output, 'BaseObject') && !$output->toBool())
+		if (is_subclass_of($output, 'BaseObject') && !$output->toBool())
 		{
 			return $output;
 		}
@@ -170,9 +170,9 @@ 
 		$schema_dir = sprintf('%s/schemas/', $this->package->path);
 		$schema_files = FileHandler::readDir($schema_dir);
 		$oDB = DB::getInstance();
-		if(is_array($schema_files))
+		if (is_array($schema_files))
 		{
-			foreach($schema_files as $file)
+			foreach ($schema_files as $file)
 			{
 				$filename_arr = explode(".", $file);
 				$filename = array_shift($filename_arr);
@@ -192,26 +192,26 @@ 
 	function installModule()
 	{
 		$path = $this->package->path;
-		if($path != ".")
+		if ($path != ".")
 		{
 			$path_array = explode("/", $path);
 			$target_name = array_pop($path_array);
 			$type = substr(array_pop($path_array), 0, -1);
 		}
 
-		if($type == "module")
+		if ($type == "module")
 		{
 			$oModuleModel = getModel('module');
 			$oInstallController = getController('install');
 			$module_path = ModuleHandler::getModulePath($target_name);
-			if($oModuleModel->checkNeedInstall($target_name))
+			if ($oModuleModel->checkNeedInstall($target_name))
 			{
 				$oInstallController->installModule($target_name, $module_path);
 			}
-			if($oModuleModel->checkNeedUpdate($target_name))
+			if ($oModuleModel->checkNeedUpdate($target_name))
 			{
 				$oModule = getModule($target_name, 'class');
-				if(method_exists($oModule, 'moduleUpdate'))
+				if (method_exists($oModule, 'moduleUpdate'))
 				{
 					$oModule->moduleUpdate();
 				}
@@ -231,7 +231,7 @@ 
 		$this->_download();
 		$file_list = $this->_unPack();
 		$output = $this->_copyDir($file_list);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			FileHandler::removeDir($this->temp_dir);
 			return $output;
@@ -249,18 +249,18 @@ 
 	 */
 	function _unPack()
 	{
-		require_once(_XE_PATH_ . 'libs/tar.class.php');
+		require_once(_XE_PATH_.'libs/tar.class.php');
 
 		$oTar = new tar();
 		$oTar->openTAR($this->download_file);
 
 		$_files = $oTar->files;
 		$file_list = array();
-		if(is_array($_files))
+		if (is_array($_files))
 		{
-			foreach($_files as $key => $info)
+			foreach ($_files as $key => $info)
 			{
-				FileHandler::writeFile($this->download_path . "/" . $info['name'], $info['file']);
+				FileHandler::writeFile($this->download_path."/".$info['name'], $info['file']);
 				$file_list[] = $info['name'];
 			}
 		}
@@ -278,22 +278,22 @@ 
 		$real_path = FileHandler::getRealPath($path);
 		$oDir = dir($path);
 		$files = array();
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file == "." || $file == "..")
+			if ($file == "." || $file == "..")
 			{
 				continue;
 			}
 			$files[] = $file;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			$file_path = $path . "/" . $file;
-			if(is_dir(FileHandler::getRealPath($file_path)))
+			$file_path = $path."/".$file;
+			if (is_dir(FileHandler::getRealPath($file_path)))
 			{
 				$output = $this->_removeDir($file_path);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -301,7 +301,7 @@ 
 			else
 			{
 				$output = $this->_removeFile($file_path);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -357,17 +357,17 @@ 
 	 */
 	function _connect()
 	{
-		if(!function_exists('ssh2_connect'))
+		if (!function_exists('ssh2_connect'))
 		{
 			return new BaseObject(-1, 'msg_sftp_not_supported');
 		}
 
-		if(!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y')
+		if (!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y')
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -376,7 +376,7 @@ 
 			$ftp_host = "127.0.0.1";
 		}
 		$this->connection = ssh2_connect($ftp_host, $this->ftp_info->ftp_port);
-		if(!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password))
+		if (!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password))
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -403,13 +403,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ssh2_sftp_unlink($this->sftp, $target_path))
+		if (!@ssh2_sftp_unlink($this->sftp, $target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -424,13 +424,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ssh2_sftp_rmdir($this->sftp, $target_path))
+		if (!@ssh2_sftp_rmdir($this->sftp, $target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
 		}
@@ -445,37 +445,37 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$pathname = dirname($target_dir . "/" . $file);
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$pathname = dirname($target_dir."/".$file);
 
-				if(!file_exists(FileHandler::getRealPath($real_path)))
+				if (!file_exists(FileHandler::getRealPath($real_path)))
 				{
 					ssh2_sftp_mkdir($this->sftp, $pathname, 0755, TRUE);
 				}
 
-				ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path . "/" . $org_file), $target_dir . "/" . $file);
+				ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path."/".$org_file), $target_dir."/".$file);
 				$copied[] = $path;
 			}
 		}
@@ -526,7 +526,7 @@ 
 	 */
 	function _connect()
 	{
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -536,20 +536,20 @@ 
 		}
 
 		$this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port);
-		if(!$this->connection)
+		if (!$this->connection)
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
 		$login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password);
-		if(!$login_result)
+		if (!$login_result)
 		{
 			$this->_close();
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$_SESSION['ftp_password'] = $this->ftp_password;
-		if($this->ftp_info->ftp_pasv != "N")
+		if ($this->ftp_info->ftp_pasv != "N")
 		{
 			ftp_pasv($this->connection, TRUE);
 		}
@@ -564,15 +564,15 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ftp_delete($this->connection, $target_path))
+		if (!@ftp_delete($this->connection, $target_path))
 		{
-			return new BaseObject(-1, "failed to delete file " . $path);
+			return new BaseObject(-1, "failed to delete file ".$path);
 		}
 		return new BaseObject();
 	}
@@ -585,15 +585,15 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ftp_rmdir($this->connection, $target_path))
+		if (!@ftp_rmdir($this->connection, $target_path))
 		{
-			return new BaseObject(-1, "failed to delete directory " . $path);
+			return new BaseObject(-1, "failed to delete directory ".$path);
 		}
 		return new BaseObject();
 	}
@@ -616,74 +616,74 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
-		if(!$this->target_path)
+		if (!$this->target_path)
 		{
 			$this->target_path = '.';
 		}
-		if(substr($this->download_path, -1) == '/')
+		if (substr($this->download_path, -1) == '/')
 		{
 			$this->download_path = substr($this->download_path, 0, -1);
 		}
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
-				if(!$file)
+				if (!$file)
 				{
 					continue;
 				}
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 
 				$real_path = "./";
 				$ftp_path = $this->ftp_info->ftp_root_path;
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					$ftp_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					$ftp_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
-						if(!@ftp_mkdir($this->connection, $ftp_path))
+						if (!@ftp_mkdir($this->connection, $ftp_path))
 						{
 							return new BaseObject(-1, "msg_make_directory_failed");
 						}
 
-						if(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
+						if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
 						{
-							if(function_exists('ftp_chmod'))
+							if (function_exists('ftp_chmod'))
 							{
-								if(!ftp_chmod($this->connection, 0755, $ftp_path))
+								if (!ftp_chmod($this->connection, 0755, $ftp_path))
 								{
 									return new BaseObject(-1, "msg_permission_adjust_failed");
 								}
 							}
 							else
 							{
-								if(!ftp_site($this->connection, "CHMOD 755 " . $ftp_path))
+								if (!ftp_site($this->connection, "CHMOD 755 ".$ftp_path))
 								{
 									return new BaseObject(-1, "msg_permission_adjust_failed");
 								}
@@ -691,7 +691,7 @@ 
 						}
 					}
 				}
-				if(!ftp_put($this->connection, $target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file), FTP_BINARY))
+				if (!ftp_put($this->connection, $target_dir.'/'.$file, FileHandler::getRealPath($this->download_path."/".$org_file), FTP_BINARY))
 				{
 					return new BaseObject(-1, "msg_ftp_upload_failed");
 				}
@@ -745,7 +745,7 @@ 
 	 */
 	function _connect()
 	{
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -755,11 +755,11 @@ 
 		}
 
 		$this->oFtp = new ftp();
-		if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
+		if (!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
-		if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
+		if (!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
 		{
 			$this->_close();
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
@@ -776,13 +776,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!$this->oFtp->ftp_delete($target_path))
+		if (!$this->oFtp->ftp_delete($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -796,13 +796,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!$this->oFtp->ftp_rmdir($target_path))
+		if (!$this->oFtp->ftp_rmdir($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
 		}
@@ -827,52 +827,52 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$oFtp = &$this->oFtp;
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 
 				$real_path = "./";
 				$ftp_path = $this->ftp_info->ftp_root_path;
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					$ftp_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					$ftp_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						$oFtp->ftp_mkdir($ftp_path);
-						$oFtp->ftp_site("CHMOD 755 " . $ftp_path);
+						$oFtp->ftp_site("CHMOD 755 ".$ftp_path);
 					}
 				}
-				$oFtp->ftp_put($target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file));
+				$oFtp->ftp_put($target_dir.'/'.$file, FileHandler::getRealPath($this->download_path."/".$org_file));
 				$copied[] = $path;
 			}
 		}
@@ -921,13 +921,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = FileHandler::getRealPath($path);
 
-		if(!FileHandler::removeFile($target_path))
+		if (!FileHandler::removeFile($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -941,7 +941,7 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
@@ -970,39 +970,39 @@ 
 	function _copyDir(&$file_list)
 	{
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 		$target_dir = $this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 				$real_path = "./";
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						FileHandler::makeDir($real_path);
 					}
 				}
-				FileHandler::copyFile( FileHandler::getRealPath($this->download_path . "/" . $org_file), FileHandler::getRealPath("./" . $target_dir . '/' . $file));
+				FileHandler::copyFile(FileHandler::getRealPath($this->download_path."/".$org_file), FileHandler::getRealPath("./".$target_dir.'/'.$file));
 				$copied[] = $path;
 			}
 		}

modules/addon/addon.admin.controller.php

Spacing +28 added lines, -28 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xpressengine.com> */
 
-require_once(_XE_PATH_ . 'modules/addon/addon.controller.php');
+require_once(_XE_PATH_.'modules/addon/addon.controller.php');
 
 /**
  * Admin controller class of addon modules
@@ -33,7 +33,7 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 
-		if($site_module_info->site_srl)
+		if ($site_module_info->site_srl)
 		{
 			$site_srl = $site_module_info->site_srl;
 		}
@@ -42,28 +42,28 @@ 
 			$site_srl = 0;
 		}
 
-		if(!$pcOnList)
+		if (!$pcOnList)
 		{
 			$pcOnList = array();
 		}
-		if(!$mobileOnList)
+		if (!$mobileOnList)
 		{
 			$mobileOnList = array();
 		}
-		if(!$fixed)
+		if (!$fixed)
 		{
 			$fixed = array();
 		}
 
-		if(!is_array($pcOnList))
+		if (!is_array($pcOnList))
 		{
 			$pcOnList = array($pcOnList);
 		}
-		if(!is_array($mobileOnList))
+		if (!is_array($mobileOnList))
 		{
 			$pcOnList = array($mobileOnList);
 		}
-		if(!is_array($fixed))
+		if (!is_array($fixed))
 		{
 			$pcOnList = array($fixed);
 		}
@@ -74,21 +74,21 @@ 
 
 		// get need update addon list
 		$updateList = array();
-		foreach($currentAddonList as $addon)
+		foreach ($currentAddonList as $addon)
 		{
-			if($addon->activated !== in_array($addon->addon_name, $pcOnList))
+			if ($addon->activated !== in_array($addon->addon_name, $pcOnList))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
 			}
 
-			if($addon->mactivated !== in_array($addon->addon_name, $mobileOnList))
+			if ($addon->mactivated !== in_array($addon->addon_name, $mobileOnList))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
 			}
 
-			if($addon->fixed !== in_array($addon->addon_name, $fixed))
+			if ($addon->fixed !== in_array($addon->addon_name, $fixed))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
@@ -96,11 +96,11 @@ 
 		}
 
 		// update
-		foreach($updateList as $targetAddon)
+		foreach ($updateList as $targetAddon)
 		{
 			$args = new stdClass();
 
-			if(in_array($targetAddon, $pcOnList))
+			if (in_array($targetAddon, $pcOnList))
 			{
 				$args->is_used = 'Y';
 			}
@@ -109,7 +109,7 @@ 
 				$args->is_used = 'N';
 			}
 
-			if(in_array($targetAddon, $mobileOnList))
+			if (in_array($targetAddon, $mobileOnList))
 			{
 				$args->is_used_m = 'Y';
 			}
@@ -118,7 +118,7 @@ 
 				$args->is_used_m = 'N';
 			}
 
-			if(in_array($targetAddon, $fixed))
+			if (in_array($targetAddon, $fixed))
 			{
 				$args->fixed = 'Y';
 			}
@@ -131,20 +131,20 @@ 
 			$args->site_srl = $site_srl;
 
 			$output = executeQuery('addon.updateSiteAddon', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
 		}
 
-		if(count($updateList))
+		if (count($updateList))
 		{
 			$this->makeCacheFile($site_srl, 'pc', 'site');
 			$this->makeCacheFile($site_srl, 'mobile', 'site');
 		}
 
 		$this->setMessage('success_updated', 'info');
-		if(Context::get('success_return_url'))
+		if (Context::get('success_return_url'))
 		{
 			$this->setRedirectUrl(Context::get('success_return_url'));
 		}
@@ -167,14 +167,14 @@ 
 		// batahom addon values
 		$addon = Context::get('addon');
 		$type = Context::get('type');
-		if(!$type)
+		if (!$type)
 		{
 			$type = "pc";
 		}
-		if($addon)
+		if ($addon)
 		{
 			// If enabled Disables
-			if($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type))
+			if ($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type))
 			{
 				$this->doDeactivate($addon, $site_module_info->site_srl, $type);
 			}
@@ -207,7 +207,7 @@ 
 		$site_module_info = Context::get('site_module_info');
 
 		$output = $this->doSetup($addon_name, $args, $site_module_info->site_srl, 'site');
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -232,7 +232,7 @@ 
 		$args = new stdClass;
 		$args->addon = $addon;
 		$args->is_used = $isUsed;
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.insertAddon', $args);
 		}
@@ -253,7 +253,7 @@ 
 	{
 		$args = new stdClass();
 		$args->addon = $addon;
-		if($type == "pc")
+		if ($type == "pc")
 		{
 			$args->is_used = 'Y';
 		}
@@ -261,7 +261,7 @@ 
 		{
 			$args->is_used_m = "Y";
 		}
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.updateAddon', $args);
 		}
@@ -281,7 +281,7 @@ 
 	{
 		$args = new stdClass();
 		$args->addon = $addon;
-		if($type == "pc")
+		if ($type == "pc")
 		{
 			$args->is_used = 'N';
 		}
@@ -289,7 +289,7 @@ 
 		{
 			$args->is_used_m = 'N';
 		}
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.updateAddon', $args);
 		}

modules/communication/communication.mobile.php

Spacing +19 added lines, -19 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xpressengine.com> */
 
-require_once(_XE_PATH_ . 'modules/communication/communication.view.php');
+require_once(_XE_PATH_.'modules/communication/communication.view.php');
 
 /**
  * @class  communicationMobile
@@ -25,7 +25,7 @@ 
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($this->communication_config->mlayout_srl);
-		if($layout_info)
+		if ($layout_info)
 		{
 			$this->module_info->mlayout_srl = $this->communication_config->mlayout_srl;
 			$this->setLayoutPath($layout_info->path);
@@ -39,13 +39,13 @@ 
 	function dispCommunicationMessages()
 	{
 		// Error appears if not logged-in
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
 
 		$logged_info = Context::get('logged_info');
-		if(!array_key_exists('dispCommunicationMessages', $logged_info->menu_list))
+		if (!array_key_exists('dispCommunicationMessages', $logged_info->menu_list))
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -53,7 +53,7 @@ 
 		// Set the variables
 		$message_srl = Context::get('message_srl');
 		$message_type = Context::get('message_type');
-		if(!in_array($message_type, array('R', 'S', 'T')))
+		if (!in_array($message_type, array('R', 'S', 'T')))
 		{
 			$message_type = 'R';
 			Context::set('message_type', $message_type);
@@ -61,37 +61,37 @@ 
 		$oCommunicationModel = getModel('communication');
 
 		// extract contents if message_srl exists
-		if($message_srl)
+		if ($message_srl)
 		{
 			$templateFile = 'read_message';
 			$columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate');
 			$message = $oCommunicationModel->getSelectedMessage($message_srl, $columnList);
 
-			switch($message->message_type)
+			switch ($message->message_type)
 			{
 				case 'R':
-					if($message->receiver_srl != $logged_info->member_srl)
+					if ($message->receiver_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 
 				case 'S':
-					if($message->sender_srl != $logged_info->member_srl)
+					if ($message->sender_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 
 				case 'T':
-					if($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl)
+					if ($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 			}
 
-			if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl))
+			if ($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl))
 			{
 				stripEmbedTagForAdmin($message->content, $message->sender_srl);
 				Context::set('message', $message);
@@ -138,7 +138,7 @@ 
 		$oMemberModel = getModel('member');
 
 		// Error appears if not logged-in
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
@@ -148,32 +148,32 @@ 
 		// get receipient's information
 		// check inalid request
 		$receiver_srl = Context::get('receiver_srl');
-		if(!$receiver_srl)
+		if (!$receiver_srl)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		// check receiver and sender are same
-		if($logged_info->member_srl == $receiver_srl)
+		if ($logged_info->member_srl == $receiver_srl)
 		{
 			return $this->stop('msg_cannot_send_to_yourself');
 		}
 
 		// get message_srl of the original message if it is a reply
 		$message_srl = Context::get('message_srl');
-		if($message_srl)
+		if ($message_srl)
 		{
 			$source_message = $oCommunicationModel->getSelectedMessage($message_srl);
-			if($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl)
+			if ($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl)
 			{
-				$source_message->title = "[re] " . $source_message->title;
-				$source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">" . trim($source_message->content) . "</div>";
+				$source_message->title = "[re] ".$source_message->title;
+				$source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">".trim($source_message->content)."</div>";
 				Context::set('source_message', $source_message);
 			}
 		}
 
 		$receiver_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
-		if(!$receiver_info)
+		if (!$receiver_info)
 		{
 			return $this->stop('msg_invalid_request');
 		}