xpressengine / xe-core

classes/xml/XmlParser.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -151,7 +151,7 @@ 
 
 	/**
 	 * Start element handler.
-	 * @param resource $parse an instance of parser
+	 * @param resource $parser an instance of parser
 	 * @param string $node_name a name of node
 	 * @param array $attrs attributes to be set
 	 * @return array
@@ -168,7 +168,7 @@ 
 	/**
 	 * Character data handler
 	 * Variable in the last element of this->output
-	 * @param resource $parse an instance of parser
+	 * @param resource $parser an instance of parser
 	 * @param string $body a data to be added
 	 * @return void
 	 */
@@ -180,7 +180,7 @@ 
 
 	/**
 	 * End element handler
-	 * @param resource $parse an instance of parser
+	 * @param resource $parser an instance of parser
 	 * @param string $node_name name of xml node
 	 * @return void
 	 */

Spacing +13 added lines, -13 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	function loadXmlFile($filename)
 	{
-		if(!file_exists($filename))
+		if (!file_exists($filename))
 		{
 			return;
 		}
@@ -89,7 +89,7 @@ 
 	function parse($input = '', $arg1 = NULL, $arg2 = NULL)
 	{
 		// Save the compile starting time for debugging
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -103,13 +103,13 @@ 
 		preg_match_all("/xml:lang=\"([^\"].+)\"/i", $this->input, $matches);
 
 		// extracts the supported lanuage when xml:lang is used
-		if(count($matches[1]) && $supported_lang = array_unique($matches[1]))
+		if (count($matches[1]) && $supported_lang = array_unique($matches[1]))
 		{
 			$tmpLangList = array_flip($supported_lang);
 			// if lang of the first log-in user doesn't exist, apply en by default if exists. Otherwise apply the first lang.
-			if(!isset($tmpLangList[$this->lang]))
+			if (!isset($tmpLangList[$this->lang]))
 			{
-				if(isset($tmpLangList['en']))
+				if (isset($tmpLangList['en']))
 				{
 					$this->lang = 'en';
 				}
@@ -134,14 +134,14 @@ 
 		xml_parse($this->oParser, $this->input);
 		xml_parser_free($this->oParser);
 
-		if(!count($this->output))
+		if (!count($this->output))
 		{
 			return;
 		}
 
 		$output = array_shift($this->output);
 		// Save compile starting time for debugging
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__xmlparse_elapsed__'] += getMicroTime() - $start;
 		}
@@ -189,19 +189,19 @@ 
 		$node_name = strtolower($node_name);
 		$cur_obj = array_pop($this->output);
 		$parent_obj = &$this->output[count($this->output) - 1];
-		if($this->lang && $cur_obj->attrs->{'xml:lang'} && $cur_obj->attrs->{'xml:lang'} != $this->lang)
+		if ($this->lang && $cur_obj->attrs->{'xml:lang'} && $cur_obj->attrs->{'xml:lang'} != $this->lang)
 		{
 			return;
 		}
-		if($this->lang && $parent_obj->{$node_name}->attrs->{'xml:lang'} && $parent_obj->{$node_name}->attrs->{'xml:lang'} != $this->lang)
+		if ($this->lang && $parent_obj->{$node_name}->attrs->{'xml:lang'} && $parent_obj->{$node_name}->attrs->{'xml:lang'} != $this->lang)
 		{
 			return;
 		}
 
-		if(isset($parent_obj->{$node_name}))
+		if (isset($parent_obj->{$node_name}))
 		{
 			$tmp_obj = $parent_obj->{$node_name};
-			if(is_array($tmp_obj))
+			if (is_array($tmp_obj))
 			{
 				$parent_obj->{$node_name}[] = $cur_obj;
 			}
@@ -212,7 +212,7 @@ 
 		}
 		else
 		{
-			if(!is_object($parent_obj))
+			if (!is_object($parent_obj))
 			{
 				$parent_obj = (object) $parent_obj;
 			}
@@ -229,7 +229,7 @@ 
 	function _arrToAttrsObj($arr)
 	{
 		$output = new Xml_Node_();
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			$key = strtolower($key);
 			$output->{$key} = $val;

Braces +4 added lines, -8 removed lines

@@ -112,15 +112,13 @@ 
 				if(isset($tmpLangList['en']))
 				{
 					$this->lang = 'en';
-				}
-				else
+				} else
 				{
 					$this->lang = array_shift($supported_lang);
 				}
 			}
 			// uncheck the language if no specific language is set.
-		}
-		else
+		} else
 		{
 			$this->lang = '';
 		}
@@ -204,13 +202,11 @@ 
 			if(is_array($tmp_obj))
 			{
 				$parent_obj->{$node_name}[] = $cur_obj;
-			}
-			else
+			} else
 			{
 				$parent_obj->{$node_name} = array($tmp_obj, $cur_obj);
 			}
-		}
-		else
+		} else
 		{
 			if(!is_object($parent_obj))
 			{

classes/xml/xmlquery/argument/Argument.class.php

Doc Comments +6 added lines

@@ -90,6 +90,9 @@ 
 		$this->type = $value;
 	}
 
+	/**
+	 * @param string $operation
+	 */
 	function setColumnOperation($operation)
 	{
 		$this->column_operation = $operation;
@@ -282,6 +285,9 @@ 
 		return $this->errorMessage;
 	}
 
+	/**
+	 * @param integer $default_value
+	 */
 	function ensureDefaultValue($default_value)
 	{
 		if($this->value === NULL || $this->value === '')

Braces +4 added lines, -8 removed lines

@@ -180,8 +180,7 @@ 
 			if(!is_array($value))
 			{
 				$value = $this->_escapeStringValue($value);
-			}
-			else
+			} else
 			{
 				foreach($value as $key=>$val)
 				{
@@ -204,8 +203,7 @@ 
 						$value[$key] = (int) $val;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$value = (int) $value;
 			}
@@ -236,8 +234,7 @@ 
 		{
 			// Valid byte sequence. Return unmodified.
 			return $captures[1];
-		}
-		else if(strlen($captures[2]))
+		} else if(strlen($captures[2]))
 		{
 			// Remove user defined area
 			if("\xF3\xB0\x80\x80" <= $captures[2])
@@ -246,8 +243,7 @@ 
 			}
 
 			return $captures[2];
-		}
-		else
+		} else
 		{
 			return;
 		}

Spacing +38 added lines, -38 removed lines

@@ -73,11 +73,11 @@ 
 
 	function getType()
 	{
-		if(isset($this->type))
+		if (isset($this->type))
 		{
 			return $this->type;
 		}
-		if(is_string($this->value))
+		if (is_string($this->value))
 		{
 			return 'column_name';
 		}
@@ -102,7 +102,7 @@ 
 
 	function getValue()
 	{
-		if(!isset($this->_value))
+		if (!isset($this->_value))
 		{
 			$value = $this->getEscapedValue();
 			$this->_value = $this->toString($value);
@@ -127,7 +127,7 @@ 
 
 	function getUnescapedValue()
 	{
-		if($this->value === 'null')
+		if ($this->value === 'null')
 		{
 			return null;
 		}
@@ -141,17 +141,17 @@ 
 	 */
 	function toString($value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
-			if(count($value) === 0)
+			if (count($value) === 0)
 			{
 				return '';
 			}
-			if(count($value) === 1 && $value[0] === '')
+			if (count($value) === 1 && $value[0] === '')
 			{
 				return '';
 			}
-			return '(' . implode(',', $value) . ')';
+			return '('.implode(',', $value).')';
 		}
 		return $value;
 	}
@@ -164,42 +164,42 @@ 
 	function escapeValue($value)
 	{
 		$column_type = $this->getType();
-		if($column_type == 'column_name')
+		if ($column_type == 'column_name')
 		{
 			$dbParser = DB::getParser();
 			return $dbParser->parseExpression($value);
 		}
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return null;
 		}
 
 		$columnTypeList = array('date' => 1, 'varchar' => 1, 'char' => 1, 'text' => 1, 'bigtext' => 1);
-		if(isset($columnTypeList[$column_type]))
+		if (isset($columnTypeList[$column_type]))
 		{
-			if(!is_array($value))
+			if (!is_array($value))
 			{
 				$value = $this->_escapeStringValue($value);
 			}
 			else
 			{
-				foreach($value as $key=>$val)
+				foreach ($value as $key=>$val)
 				{
 					$value[$key] = $this->_escapeStringValue($val);
 				}
 			}
 		}
-		if($this->uses_default_value)
+		if ($this->uses_default_value)
 		{
 			return $value;
 		}
-		if($column_type == 'number')
+		if ($column_type == 'number')
 		{
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value AS $key => $val)
+				foreach ($value AS $key => $val)
 				{
-					if(isset($val) && $val !== '')
+					if (isset($val) && $val !== '')
 					{
 						$value[$key] = (int) $val;
 					}
@@ -227,20 +227,20 @@ 
 		$value = preg_replace_callback($regex, array($this, 'utf8Replacer'), $value);
 		$db = DB::getInstance();
 		$value = $db->addQuotes($value);
-		return '\'' . $value . '\'';
+		return '\''.$value.'\'';
 	}
 
 	function utf8Replacer($captures)
 	{
-		if(strlen($captures[1]))
+		if (strlen($captures[1]))
 		{
 			// Valid byte sequence. Return unmodified.
 			return $captures[1];
 		}
-		else if(strlen($captures[2]))
+		else if (strlen($captures[2]))
 		{
 			// Remove user defined area
-			if("\xF3\xB0\x80\x80" <= $captures[2])
+			if ("\xF3\xB0\x80\x80" <= $captures[2])
 			{
 				return;
 			}
@@ -262,15 +262,15 @@ 
 	{
 		$type = $this->getType();
 		$value = $this->getUnescapedValue();
-		if($type == 'column_name')
+		if ($type == 'column_name')
 		{
 			return TRUE;
 		}
-		if($type == 'number' && is_null($value))
+		if ($type == 'number' && is_null($value))
 		{
 			return FALSE;
 		}
-		if($type == 'number' && !is_numeric($value) && $this->uses_default_value)
+		if ($type == 'number' && !is_numeric($value) && $this->uses_default_value)
 		{
 			return TRUE;
 		}
@@ -284,7 +284,7 @@ 
 
 	function ensureDefaultValue($default_value)
 	{
-		if($this->value === NULL || $this->value === '')
+		if ($this->value === NULL || $this->value === '')
 		{
 			$this->value = $default_value;
 			$this->uses_default_value = TRUE;
@@ -298,23 +298,23 @@ 
 	 */
 	function checkFilter($filter_type)
 	{
-		if(isset($this->value) && $this->value != '')
+		if (isset($this->value) && $this->value != '')
 		{
 			global $lang;
 			$val = $this->value;
 			$key = $this->name;
-			switch($filter_type)
+			switch ($filter_type)
 			{
 				case 'email' :
 				case 'email_address' :
-					if(!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val))
+					if (!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'homepage' :
-					if(!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val))
+					if (!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_homepage, $lang->{$key} ? $lang->{$key} : $key));
@@ -322,7 +322,7 @@ 
 					break;
 				case 'userid' :
 				case 'user_id' :
-					if(!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val))
+					if (!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_userid, $lang->{$key} ? $lang->{$key} : $key));
@@ -330,25 +330,25 @@ 
 					break;
 				case 'number' :
 				case 'numbers' :
-					if(is_array($val))
+					if (is_array($val))
 					{
 						$val = join(',', $val);
 					}
-					if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val))
+					if (!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha' :
-					if(!preg_match('/^[a-z]+$/is', $val))
+					if (!preg_match('/^[a-z]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_alpha, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha_number' :
-					if(!preg_match('/^[0-9a-z]+$/is', $val))
+					if (!preg_match('/^[0-9a-z]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
@@ -360,7 +360,7 @@ 
 
 	function checkMaxLength($length)
 	{
-		if($this->value && (strlen($this->value) > $length))
+		if ($this->value && (strlen($this->value) > $length))
 		{
 			global $lang;
 			$this->isValid = FALSE;
@@ -371,7 +371,7 @@ 
 
 	function checkMinLength($length)
 	{
-		if($this->value && (strlen($this->value) < $length))
+		if ($this->value && (strlen($this->value) < $length))
 		{
 			global $lang;
 			$this->isValid = FALSE;
@@ -382,7 +382,7 @@ 
 
 	function checkNotNull()
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			global $lang;
 			$this->isValid = FALSE;

classes/xml/xmlquery/argument/ConditionArgument.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 	 * In this case, the column type is retrieved according to argument

 	 * value type (using the PHP function is_numeric).

 	 *

-	 * @return type string

+	 * @return string string

 	 */

 	function getType()

 	{

Braces +5 added lines, -10 removed lines

@@ -56,8 +56,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

 				{

 					$this->value = '^' . str_replace('%', '(.*)', preg_quote($value));

-				}

-				else

+				} else

 				{

 					$this->value = $value . '%';

 				}

@@ -66,8 +65,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

 				{

 					$this->value = str_replace('%', '(.*)', preg_quote($value)) . '$';

-				}

-				else

+				} else

 				{

 					$this->value = '%' . $value;

 				}

@@ -76,8 +74,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

 				{

 					$this->value = str_replace('%', '(.*)', preg_quote($value));

-				}

-				else

+				} else

 				{

 					$this->value = '%' . $value . '%';

 				}

@@ -123,12 +120,10 @@ 
 		if($this->type)

 		{

 			return $this->type;

-		}

-		else if(!is_numeric($this->value))

+		} else if(!is_numeric($this->value))

 		{

 			return 'varchar';

-		}

-		else

+		} else

 		{

 			return '';

 		}

Spacing +20 added lines, -20 removed lines

@@ -26,7 +26,7 @@ 
 	function ConditionArgument($name, $value, $operation)

 	{

 		$operationList = array('in' => 1, 'notin' => 1, 'not_in' => 1, 'between' => 1);

-		if(isset($value) && isset($operationList[$operation]) && !is_array($value) && $value != '')

+		if (isset($value) && isset($operationList[$operation]) && !is_array($value) && $value != '')

 		{

 			$value = str_replace(' ', '', $value);

 			$value = str_replace('\'', '', $value);

@@ -42,7 +42,7 @@ 
 	 */

 	function createConditionValue()

 	{

-		if(!isset($this->value))

+		if (!isset($this->value))

 		{

 			return;

 		}

@@ -50,56 +50,56 @@ 
 		$operation = $this->operation;

 		$value = $this->value;

 

-		switch($operation)

+		switch ($operation)

 		{

 			case 'like_prefix' :

-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

 				{

-					$this->value = '^' . str_replace('%', '(.*)', preg_quote($value));

+					$this->value = '^'.str_replace('%', '(.*)', preg_quote($value));

 				}

 				else

 				{

-					$this->value = $value . '%';

+					$this->value = $value.'%';

 				}

 				break;

 			case 'like_tail' :

-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

 				{

-					$this->value = str_replace('%', '(.*)', preg_quote($value)) . '$';

+					$this->value = str_replace('%', '(.*)', preg_quote($value)).'$';

 				}

 				else

 				{

-					$this->value = '%' . $value;

+					$this->value = '%'.$value;

 				}

 				break;

 			case 'like' :

-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')

 				{

 					$this->value = str_replace('%', '(.*)', preg_quote($value));

 				}

 				else

 				{

-					$this->value = '%' . $value . '%';

+					$this->value = '%'.$value.'%';

 				}

 				break;

 			case 'notlike' :

-				$this->value = '%' . $value . '%';

+				$this->value = '%'.$value.'%';

 				break;

 			case 'notlike_prefix' :

-				$this->value = $value . '%';

+				$this->value = $value.'%';

 				break;

 			case 'notlike_tail' :

-				$this->value = '%' . $value;

+				$this->value = '%'.$value;

 				break;

 			case 'in':

-				if(!is_array($value))

+				if (!is_array($value))

 				{

 					$this->value = array($value);

 				}

 				break;

 			case 'notin':

 			case 'not_in':

-				if(!is_array($value))

+				if (!is_array($value))

 				{

 					$this->value = array($value);

 				}

@@ -120,11 +120,11 @@ 
 	 */

 	function getType()

 	{

-		if($this->type)

+		if ($this->type)

 		{

 			return $this->type;

 		}

-		else if(!is_numeric($this->value))

+		else if (!is_numeric($this->value))

 		{

 			return 'varchar';

 		}

@@ -136,11 +136,11 @@ 
 

 	function setColumnType($column_type)

 	{

-		if(!isset($this->value))

+		if (!isset($this->value))

 		{

 			return;

 		}

-		if($column_type === '')

+		if ($column_type === '')

 		{

 			return;

 		}

classes/xml/xmlquery/QueryParser.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 *

 	 * @param object $query XML object obtained after reading the XML Query file

 	 * @param bool $isSubQuery

-	 * @return void

+	 * @return string

 	 */

 	function QueryParser($query = NULL, $isSubQuery = FALSE)

 	{

Braces +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
 			$target = 'modules';

 			$module = $id_args[0];

 			$id = $id_args[1];

-		}

-		else if(count($id_args) == 3)

+		} else if(count($id_args) == 3)

 		{

 			$target = $id_args[0];

 			$targetList = array('modules' => 1, 'addons' => 1, 'widgets' => 1);

Spacing +12 added lines, -12 removed lines

@@ -32,7 +32,7 @@ 
 	 */

 	function QueryParser($query = NULL, $isSubQuery = FALSE)

 	{

-		if($query)

+		if ($query)

 		{

 			$this->queryTag = new QueryTag($query, $isSubQuery);

 		}

@@ -54,17 +54,17 @@ 
 		$module = '';

 

 		$id_args = explode('.', $query_id);

-		if(count($id_args) == 2)

+		if (count($id_args) == 2)

 		{

 			$target = 'modules';

 			$module = $id_args[0];

 			$id = $id_args[1];

 		}

-		else if(count($id_args) == 3)

+		else if (count($id_args) == 3)

 		{

 			$target = $id_args[0];

 			$targetList = array('modules' => 1, 'addons' => 1, 'widgets' => 1);

-			if(!isset($targetList[$target]))

+			if (!isset($targetList[$target]))

 			{

 				return;

 			}

@@ -74,33 +74,33 @@ 
 

 		// get column properties from the table

 		$table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $module, $table_name);

-		if(!file_exists($table_file))

+		if (!file_exists($table_file))

 		{

-			$searched_list = FileHandler::readDir(_XE_PATH_ . 'modules');

+			$searched_list = FileHandler::readDir(_XE_PATH_.'modules');

 			$searched_count = count($searched_list);

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

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

 			{

 				$table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $searched_list[$i], $table_name);

-				if(file_exists($table_file))

+				if (file_exists($table_file))

 				{

 					break;

 				}

 			}

 		}

 

-		if(file_exists($table_file))

+		if (file_exists($table_file))

 		{

 			$table_xml = FileHandler::readFile($table_file);

 			$xml_parser = new XmlParser();

 			$table_obj = $xml_parser->parse($table_xml);

-			if($table_obj->table)

+			if ($table_obj->table)

 			{

-				if(isset($table_obj->table->column) && !is_array($table_obj->table->column))

+				if (isset($table_obj->table->column) && !is_array($table_obj->table->column))

 				{

 					$table_obj->table->column = array($table_obj->table->column);

 				}

 

-				foreach($table_obj->table->column as $k => $v)

+				foreach ($table_obj->table->column as $k => $v)

 				{

 					$column_type[$v->attrs->name] = $v->attrs->type;

 				}

classes/xml/xmlquery/tags/query/QueryTag.class.php

Doc Comments +3 added lines

@@ -169,6 +169,9 @@
 		return $this->query->attrs->action;

 	}

 

+	/**
+	 * @param TablesTag $tables
+	 */
 	function setTableColumnTypes($tables)

 	{

 		$query_id = $this->getQueryId();

Braces +6 added lines, -12 removed lines

@@ -195,16 +195,13 @@ 
 		if($this->action == 'select')

 		{

 			return $this->columns = new SelectColumnsTag($this->query->columns);

-		}

-		else if($this->action == 'insert' || $this->action == 'insert-select')

+		} else if($this->action == 'insert' || $this->action == 'insert-select')

 		{

 			return $this->columns = new InsertColumnsTag($this->query->columns->column);

-		}

-		else if($this->action == 'update')

+		} else if($this->action == 'update')

 		{

 			return $this->columns = new UpdateColumnsTag($this->query->columns->column);

-		}

-		else if($this->action == 'delete')

+		} else if($this->action == 'delete')

 		{

 			return $this->columns = null;

 		}

@@ -237,8 +234,7 @@ 
 						{

 							$column_type = $this->column_type[$this->getQueryId()][$table_alias][$argument->getColumnName()];

 						}

-					}

-					else

+					} else

 					{

 						$current_tables = $this->column_type[$this->getQueryId()];

 						$column_name = $argument->getColumnName();

@@ -316,8 +312,7 @@ 
 		if($this->query->index_hint && ($this->query->index_hint->attrs->for == 'ALL' || Context::getDBType() == strtolower($this->query->index_hint->attrs->for)))

 		{

 			return $this->tables = new TablesTag($this->query->tables, $this->query->index_hint);

-		}

-		else

+		} else

 		{

 			return $this->tables = new TablesTag($this->query->tables);

 		}

@@ -341,8 +336,7 @@ 
 		if($this->query->groups)

 		{

 			return $this->groups = new GroupsTag($this->query->groups->group);

-		}

-		else

+		} else

 		{

 			return $this->groups = new GroupsTag(NULL);

 		}

Spacing +43 added lines, -43 removed lines

@@ -126,11 +126,11 @@ 
 		$this->priority = $query->attrs->priority;

 		$this->query = $query;

 		$this->isSubQuery = $isSubQuery;

-		if($this->isSubQuery)

+		if ($this->isSubQuery)

 		{

 			$this->action = 'select';

 		}

-		if($query->attrs->alias)

+		if ($query->attrs->alias)

 		{

 			$dbParser = DB::getParser();

 			$this->alias = $dbParser->escape($query->attrs->alias);

@@ -172,13 +172,13 @@ 
 	function setTableColumnTypes($tables)

 	{

 		$query_id = $this->getQueryId();

-		if(!isset($this->column_type[$query_id]))

+		if (!isset($this->column_type[$query_id]))

 		{

 			$table_tags = $tables->getTables();

 			$column_type = array();

-			foreach($table_tags as $table_tag)

+			foreach ($table_tags as $table_tag)

 			{

-				if(is_a($table_tag, 'TableTag'))

+				if (is_a($table_tag, 'TableTag'))

 				{

 					$table_name = $table_tag->getTableName();

 					$table_alias = $table_tag->getTableAlias();

@@ -192,19 +192,19 @@ 
 

 	function getColumns()

 	{

-		if($this->action == 'select')

+		if ($this->action == 'select')

 		{

 			return $this->columns = new SelectColumnsTag($this->query->columns);

 		}

-		else if($this->action == 'insert' || $this->action == 'insert-select')

+		else if ($this->action == 'insert' || $this->action == 'insert-select')

 		{

 			return $this->columns = new InsertColumnsTag($this->query->columns->column);

 		}

-		else if($this->action == 'update')

+		else if ($this->action == 'update')

 		{

 			return $this->columns = new UpdateColumnsTag($this->query->columns->column);

 		}

-		else if($this->action == 'delete')

+		else if ($this->action == 'delete')

 		{

 			return $this->columns = null;

 		}

@@ -212,7 +212,7 @@ 
 

 	function getPrebuff()

 	{

-		if($this->isSubQuery)

+		if ($this->isSubQuery)

 		{

 			return;

 		}

@@ -220,20 +220,20 @@ 
 		$arguments = $this->getArguments();

 

 		$prebuff = '';

-		foreach($arguments as $argument)

+		foreach ($arguments as $argument)

 		{

-			if(isset($argument))

+			if (isset($argument))

 			{

 				$arg_name = $argument->getArgumentName();

-				if($arg_name)

+				if ($arg_name)

 				{

 					unset($column_type);

 					$prebuff .= $argument->toString();

 

 					$table_alias = $argument->getTableName();

-					if(isset($table_alias))

+					if (isset($table_alias))

 					{

-						if(isset($this->column_type[$this->getQueryId()][$table_alias][$argument->getColumnName()]))

+						if (isset($this->column_type[$this->getQueryId()][$table_alias][$argument->getColumnName()]))

 						{

 							$column_type = $this->column_type[$this->getQueryId()][$table_alias][$argument->getColumnName()];

 						}

@@ -242,18 +242,18 @@ 
 					{

 						$current_tables = $this->column_type[$this->getQueryId()];

 						$column_name = $argument->getColumnName();

-						foreach($current_tables as $current_table)

+						foreach ($current_tables as $current_table)

 						{

-							if(isset($current_table[$column_name]))

+							if (isset($current_table[$column_name]))

 							{

 								$column_type = $current_table[$column_name];

 							}

 						}

 					}

 

-					if(isset($column_type))

+					if (isset($column_type))

 					{

-						$prebuff .= sprintf('if(${\'%s_argument\'} !== null) ${\'%s_argument\'}->setColumnType(\'%s\');' . "\n"

+						$prebuff .= sprintf('if(${\'%s_argument\'} !== null) ${\'%s_argument\'}->setColumnType(\'%s\');'."\n"

 								, $arg_name

 								, $arg_name

 								, $column_type);

@@ -269,43 +269,43 @@ 
 	function getBuff()

 	{

 		$buff = '';

-		if($this->isSubQuery)

+		if ($this->isSubQuery)

 		{

 			$buff = 'new Subquery(';

-			$buff .= "'" . $this->alias . '\', ';

-			$buff .= ($this->columns ? $this->columns->toString() : 'null' ) . ', ' . PHP_EOL;

-			$buff .= $this->tables->toString() . ',' . PHP_EOL;

-			$buff .= $this->conditions->toString() . ',' . PHP_EOL;

-			$buff .= $this->groups->toString() . ',' . PHP_EOL;

-			$buff .= $this->navigation->getOrderByString() . ',' . PHP_EOL;

+			$buff .= "'".$this->alias.'\', ';

+			$buff .= ($this->columns ? $this->columns->toString() : 'null').', '.PHP_EOL;

+			$buff .= $this->tables->toString().','.PHP_EOL;

+			$buff .= $this->conditions->toString().','.PHP_EOL;

+			$buff .= $this->groups->toString().','.PHP_EOL;

+			$buff .= $this->navigation->getOrderByString().','.PHP_EOL;

 			$limit = $this->navigation->getLimitString();

-			$buff .= $limit ? $limit : 'null' . PHP_EOL;

-			$buff .= $this->join_type ? "'" . $this->join_type . "'" : '';

+			$buff .= $limit ? $limit : 'null'.PHP_EOL;

+			$buff .= $this->join_type ? "'".$this->join_type."'" : '';

 			$buff .= ')';

 

 			$this->buff = $buff;

 			return $this->buff;

 		}

 

-		$buff .= '$query = new Query();' . PHP_EOL;

+		$buff .= '$query = new Query();'.PHP_EOL;

 		$buff .= sprintf('$query->setQueryId("%s");%s', $this->query_id, "\n");

 		$buff .= sprintf('$query->setAction("%s");%s', $this->action, "\n");

 		$buff .= sprintf('$query->setPriority("%s");%s', $this->priority, "\n");

 		$buff .= $this->preBuff;

-		if($this->columns)

+		if ($this->columns)

 		{

-			$buff .= '$query->setColumns(' . $this->columns->toString() . ');' . PHP_EOL;

+			$buff .= '$query->setColumns('.$this->columns->toString().');'.PHP_EOL;

 		}

 

-		$buff .= '$query->setTables(' . $this->tables->toString() . ');' . PHP_EOL;

-		if($this->action == 'insert-select')

+		$buff .= '$query->setTables('.$this->tables->toString().');'.PHP_EOL;

+		if ($this->action == 'insert-select')

 		{

-			$buff .= '$query->setSubquery(' . $this->subquery->toString() . ');' . PHP_EOL;

+			$buff .= '$query->setSubquery('.$this->subquery->toString().');'.PHP_EOL;

 		}

-		$buff .= '$query->setConditions(' . $this->conditions->toString() . ');' . PHP_EOL;

-		$buff .= '$query->setGroups(' . $this->groups->toString() . ');' . PHP_EOL;

-		$buff .= '$query->setOrder(' . $this->navigation->getOrderByString() . ');' . PHP_EOL;

-		$buff .= '$query->setLimit(' . $this->navigation->getLimitString() . ');' . PHP_EOL;

+		$buff .= '$query->setConditions('.$this->conditions->toString().');'.PHP_EOL;

+		$buff .= '$query->setGroups('.$this->groups->toString().');'.PHP_EOL;

+		$buff .= '$query->setOrder('.$this->navigation->getOrderByString().');'.PHP_EOL;

+		$buff .= '$query->setLimit('.$this->navigation->getLimitString().');'.PHP_EOL;

 

 		$this->buff = $buff;

 		return $this->buff;

@@ -313,7 +313,7 @@ 
 

 	function getTables()

 	{

-		if($this->query->index_hint && ($this->query->index_hint->attrs->for == 'ALL' || Context::getDBType() == strtolower($this->query->index_hint->attrs->for)))

+		if ($this->query->index_hint && ($this->query->index_hint->attrs->for == 'ALL' || Context::getDBType() == strtolower($this->query->index_hint->attrs->for)))

 		{

 			return $this->tables = new TablesTag($this->query->tables, $this->query->index_hint);

 		}

@@ -325,7 +325,7 @@ 
 

 	function getSubquery()

 	{

-		if($this->query->query)

+		if ($this->query->query)

 		{

 			$this->subquery = new QueryTag($this->query->query, true);

 		}

@@ -338,7 +338,7 @@ 
 

 	function getGroups()

 	{

-		if($this->query->groups)

+		if ($this->query->groups)

 		{

 			return $this->groups = new GroupsTag($this->query->groups->group);

 		}

@@ -376,11 +376,11 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		if($this->columns)

+		if ($this->columns)

 		{

 			$arguments = array_merge($arguments, $this->columns->getArguments());

 		}

-		if($this->action == 'insert-select')

+		if ($this->action == 'insert-select')

 		{

 			$arguments = array_merge($arguments, $this->subquery->getArguments());

 		}

classes/xml/XmlQueryParser.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -79,9 +79,9 @@
 	/**
 	 * Override for parent "parse" method
 	 *
-	 * @param null $query_id
-	 * @param null $xml_file
-	 * @param null $cache_file
+	 * @param string $query_id
+	 * @param string $xml_file
+	 * @param string $cache_file
 	 *
 	 * @return void
 	 */

Spacing +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 /**
  * File containing the XE 1.5 XmlQueryParserClass
  */
-if(!defined('__XE_LOADED_XML_CLASS__'))
+if (!defined('__XE_LOADED_XML_CLASS__'))
 {
 	define('__XE_LOADED_XML_CLASS__', 1);
 }
@@ -37,7 +37,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance = NULL;
-		if(!isset($theInstance))
+		if (!isset($theInstance))
 		{
 			$theInstance = new XmlQueryParser();
 		}
@@ -64,7 +64,7 @@ 
 
 		// insert, update, delete, select action
 		$action = strtolower($xml_obj->query->attrs->action);
-		if(!$action)
+		if (!$action)
 		{
 			return;
 		}
@@ -101,7 +101,7 @@ 
 	{
 		$buff = FileHandler::readFile($xml_file);
 		$xml_obj = parent::parse($buff);
-		if(!$xml_obj)
+		if (!$xml_obj)
 		{
 			return;
 		}

config/func.inc.php

Doc Comments +19 added lines, -16 removed lines

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

Braces +53 added lines, -67 removed lines

@@ -296,10 +296,11 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
-		$url = Context::getUrl($num_args, $args_list);
-	else
-		$url = Context::getRequestUri();
+	if($num_args) {
+			$url = Context::getUrl($num_args, $args_list);
+	} else {
+			$url = Context::getRequestUri();
+	}
 
 	return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
 }
@@ -318,8 +319,7 @@ 
 	if($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-	}
-	else
+	} else
 	{
 		$url = Context::getRequestUri();
 	}
@@ -341,8 +341,7 @@ 
 	if($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, TRUE, TRUE);
-	}
-	else
+	} else
 	{
 		$url = Context::getRequestUri();
 	}
@@ -531,13 +530,11 @@ 
 		{
 			$char_width += (int) $chars[$c - 32];
 			$idx++;
-		}
-		else if(191 < $c && $c < 224)
+		} else if(191 < $c && $c < 224)
 		{
 			$char_width += $chars[4];
 			$idx += 2;
-		}
-		else
+		} else
 		{
 			$char_width += $chars[0];
 			$idx += 3;
@@ -564,8 +561,7 @@ 
 	if($time_zone < 0)
 	{
 		$to = -1;
-	}
-	else
+	} else
 	{
 		$to = 1;
 	}
@@ -577,8 +573,7 @@ 
 	if($server_time_zone < 0)
 	{
 		$so = -1;
-	}
-	else
+	} else
 	{
 		$so = 1;
 	}
@@ -615,8 +610,7 @@ 
 	if(strlen($str) <= 8)
 	{
 		$gap = 0;
-	}
-	else
+	} else
 	{
 		$gap = zgap();
 	}
@@ -639,20 +633,16 @@ 
 	if($gap < 60)
 	{
 		$buff = sprintf($lang_time_gap['min'], (int) ($gap / 60) + 1);
-	}
-	elseif($gap < 60 * 60)
+	} elseif($gap < 60 * 60)
 	{
 		$buff = sprintf($lang_time_gap['mins'], (int) ($gap / 60) + 1);
-	}
-	elseif($gap < 60 * 60 * 2)
+	} elseif($gap < 60 * 60 * 2)
 	{
 		$buff = sprintf($lang_time_gap['hour'], (int) ($gap / 60 / 60) + 1);
-	}
-	elseif($gap < 60 * 60 * 24)
+	} elseif($gap < 60 * 60 * 24)
 	{
 		$buff = sprintf($lang_time_gap['hours'], (int) ($gap / 60 / 60) + 1);
-	}
-	else
+	} else
 	{
 		$buff = zdate($date, $format);
 	}
@@ -699,12 +689,10 @@ 
 				if($format == 'Y-m-d')
 				{
 					$format = 'M d, Y';
-				}
-				elseif($format == 'Y-m-d H:i:s')
+				} elseif($format == 'Y-m-d H:i:s')
 				{
 					$format = 'M d, Y H:i:s';
-				}
-				elseif($format == 'Y-m-d H:i')
+				} elseif($format == 'Y-m-d H:i')
 				{
 					$format = 'M d, Y H:i';
 				}
@@ -713,12 +701,10 @@ 
 				if($format == 'Y-m-d')
 				{
 					$format = 'd-m-Y';
-				}
-				elseif($format == 'Y-m-d H:i:s')
+				} elseif($format == 'Y-m-d H:i:s')
 				{
 					$format = 'H:i:s d-m-Y';
-				}
-				elseif($format == 'Y-m-d H:i')
+				} elseif($format == 'Y-m-d H:i')
 				{
 					$format = 'H:i d-m-Y';
 				}
@@ -754,8 +740,7 @@ 
 		);
 
 		$string = strtr($format, $trans);
-	}
-	else
+	} else
 	{
 		// if year value is greater than 1970, get unixtime by using ztime() for date() function's argument. 
 		$string = date($format, ztime($str));
@@ -842,8 +827,7 @@ 
 		}
 
 		$firephp->fb($debug_output, $label, $type);
-	}
-	else
+	} else
 	{
 		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
@@ -855,7 +839,9 @@ 
 		{
 			$debug_file = _XE_PATH_ . 'files/' . $file;
 		}
-		if(!file_exists($debug_file)) $print[] = '<?php exit() ?>';
+		if(!file_exists($debug_file)) {
+			$print[] = '<?php exit() ?>';
+		}
 
 		if($display_option === TRUE || $display_option === 'ERROR')
 		{
@@ -868,13 +854,11 @@ 
 			if($display_option === 'ERROR')
 			{
 				$print[] = 'ERROR : ' . var_export($debug_output, TRUE);
-			}
-			else
+			} else
 			{
 				$print[] = 'DEBUG : ' . $type . '(' . var_export($debug_output, TRUE) . ')';
 			}
-		}
-		else
+		} else
 		{
 			$print[] = 'DEBUG : ' . trim(preg_replace('/\r?\n/', "\n" . '        ', print_r($debug_output, true)));
 		}
@@ -901,7 +885,9 @@ 
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
-	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
+	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) {
+		return;
+	}
 
 	static $log_filename = array(
 		'query' => 'files/_slowlog_query.php',
@@ -921,25 +907,21 @@ 
 	{
 		$buff[] = "\tCaller : " . $obj->caller;
 		$buff[] = "\tCalled : " . $obj->called;
-	}
-	else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
+	} else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
 	{
 		$buff[] = "\tAddon : " . $obj->called;
 		$buff[] = "\tCalled position : " . $obj->caller;
-	}
-	else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
+	} else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
 	{
 		$buff[] = "\tWidget : " . $obj->called;
-	}
-	else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
+	} else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
 	{
 
 		$buff[] = $obj->query;
 		$buff[] = "\tQuery ID   : " . $obj->query_id;
 		$buff[] = "\tCaller     : " . $obj->caller;
 		$buff[] = "\tConnection : " . $obj->connection;
-	}
-	else
+	} else
 	{
 		$write_file = false;
 	}
@@ -1031,8 +1013,11 @@ 
 
 	foreach($del_vars as $var)
 	{
-		if(is_array($vars)) unset($vars[$var]);
-		else if(is_object($vars)) unset($vars->$var);
+		if(is_array($vars)) {
+			unset($vars[$var]);
+		} else if(is_object($vars)) {
+			unset($vars->$var);
+		}
 	}
 
 	return $vars;
@@ -1169,8 +1154,7 @@ 
 		if(($close_xmp = strrpos($content, '</xmp>')) === FALSE)
 		{
 			$content .= '</xmp>';
-		}
-		else if($close_xmp < $start_xmp)
+		} else if($close_xmp < $start_xmp)
 		{
 			$content .= '</xmp>';
 		}
@@ -1227,12 +1211,18 @@ 
 
 	$filter_arrts = array('style', 'src', 'href');
 
-	if($tag === 'object') array_push($filter_arrts, 'data');
-	if($tag === 'param') array_push($filter_arrts, 'value');
+	if($tag === 'object') {
+		array_push($filter_arrts, 'data');
+	}
+	if($tag === 'param') {
+		array_push($filter_arrts, 'value');
+	}
 
 	foreach($filter_arrts as $attr)
 	{
-		if(!isset($attrs[$attr])) continue;
+		if(!isset($attrs[$attr])) {
+			continue;
+		}
 
 		$attr_value = rawurldecode($attrs[$attr]);
 		$attr_value = htmlspecialchars_decode($attr_value, ENT_COMPAT);
@@ -1395,16 +1385,14 @@ 
 				$unicode = hexdec($unicodeHexVal);
 				$decodedStr .= _code2utf($unicode);
 				$pos += 4;
-			}
-			else
+			} else
 			{
 				// we have an escaped ascii character
 				$hexVal = substr($source, $pos, 2);
 				$decodedStr .= chr(hexdec($hexVal));
 				$pos += 2;
 			}
-		}
-		else
+		} else
 		{
 			$decodedStr .= $charAt;
 			$pos++;
@@ -1596,8 +1584,7 @@ 
 	if(version_compare(PHP_VERSION, "5.3.0") < 0)
 	{
 		set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
-	}
-	else
+	} else
 	{
 		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
 	}
@@ -1634,8 +1621,7 @@ 
 		{
 			return FALSE;
 		}
-	}
-	else
+	} else
 	{
 		$virtualSiteInfo = $oModuleModel->getSiteInfo($siteModuleInfo->site_srl);
 		if(strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))

Spacing +182 added lines, -182 removed lines

@@ -6,13 +6,13 @@ 
  *
  * @author NAVER (developers@xpressengine.com)
  */
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
 
 // define an empty function to avoid errors when iconv function doesn't exist
-if(!function_exists('iconv'))
+if (!function_exists('iconv'))
 {
 	eval('
 		function iconv($in_charset, $out_charset, $str)
@@ -220,7 +220,7 @@ 
 {
 	$oDB = DB::getInstance();
 	$output = $oDB->executeQuery($query_id, $args, $arg_columns);
-	if(!is_array($output->data) && count($output->data) > 0)
+	if (!is_array($output->data) && count($output->data) > 0)
 	{
 		$output->data = array($output->data);
 	}
@@ -250,7 +250,7 @@ 
 function setUserSequence($seq)
 {
 	$arr_seq = array();
-	if(isset($_SESSION['seq']))
+	if (isset($_SESSION['seq']))
 	{
 		$arr_seq = $_SESSION['seq'];
 	}
@@ -266,11 +266,11 @@ 
  */
 function checkUserSequence($seq)
 {
-	if(!isset($_SESSION['seq']))
+	if (!isset($_SESSION['seq']))
 	{
 		return false;
 	}
-	if(!in_array($seq, $_SESSION['seq']))
+	if (!in_array($seq, $_SESSION['seq']))
 	{
 		return false;
 	}
@@ -296,7 +296,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 		$url = Context::getUrl($num_args, $args_list);
 	else
 		$url = Context::getRequestUri();
@@ -315,7 +315,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
 	}
@@ -338,7 +338,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, TRUE, TRUE);
 	}
@@ -360,16 +360,16 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -384,17 +384,17 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -410,7 +410,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -432,7 +432,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -454,7 +454,7 @@ 
 	$args_list = func_get_args();
 
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
@@ -463,10 +463,10 @@ 
 	$num_args = count($args_list);
 
 	$url = Context::getUrl($num_args, $args_list, $domain);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -479,7 +479,7 @@ 
 function getCurrentPageUrl()
 {
 	$protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
-	$url = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+	$url = $protocol.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 	return htmlspecialchars($url, ENT_COMPAT, 'UTF-8', FALSE);
 }
 
@@ -504,12 +504,12 @@ 
  */
 function cut_str($string, $cut_size = 0, $tail = '...')
 {
-	if($cut_size < 1 || !$string)
+	if ($cut_size < 1 || !$string)
 	{
 		return $string;
 	}
 
-	if($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
+	if ($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
 	{
 		$GLOBALS['use_mb_strimwidth'] = TRUE;
 		return mb_strimwidth($string, 0, $cut_size + 4, $tail, 'utf-8');
@@ -523,16 +523,16 @@ 
 	$char_count = 0;
 
 	$idx = 0;
-	while($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
+	while ($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
 	{
 		$c = ord(substr($string, $idx, 1));
 		$char_count++;
-		if($c < 128)
+		if ($c < 128)
 		{
 			$char_width += (int) $chars[$c - 32];
 			$idx++;
 		}
-		else if(191 < $c && $c < 224)
+		else if (191 < $c && $c < 224)
 		{
 			$char_width += $chars[4];
 			$idx += 2;
@@ -545,7 +545,7 @@ 
 	}
 
 	$output = substr($string, 0, $idx);
-	if(strlen($output) < $string_length)
+	if (strlen($output) < $string_length)
 	{
 		$output .= $tail;
 	}
@@ -561,7 +561,7 @@ 
 function zgap()
 {
 	$time_zone = $GLOBALS['_time_zone'];
-	if($time_zone < 0)
+	if ($time_zone < 0)
 	{
 		$to = -1;
 	}
@@ -574,7 +574,7 @@ 
 	$t_min = substr($time_zone, 3, 2) * $to;
 
 	$server_time_zone = date("O");
-	if($server_time_zone < 0)
+	if ($server_time_zone < 0)
 	{
 		$so = -1;
 	}
@@ -601,7 +601,7 @@ 
  */
 function ztime($str)
 {
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
@@ -612,7 +612,7 @@ 
 	$year = (int) substr($str, 0, 4);
 	$month = (int) substr($str, 4, 2);
 	$day = (int) substr($str, 6, 2);
-	if(strlen($str) <= 8)
+	if (strlen($str) <= 8)
 	{
 		$gap = 0;
 	}
@@ -636,19 +636,19 @@ 
 	$gap = $_SERVER['REQUEST_TIME'] + zgap() - ztime($date);
 
 	$lang_time_gap = Context::getLang('time_gap');
-	if($gap < 60)
+	if ($gap < 60)
 	{
 		$buff = sprintf($lang_time_gap['min'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60)
+	elseif ($gap < 60 * 60)
 	{
 		$buff = sprintf($lang_time_gap['mins'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 2)
+	elseif ($gap < 60 * 60 * 2)
 	{
 		$buff = sprintf($lang_time_gap['hour'], (int) ($gap / 60 / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 24)
+	elseif ($gap < 60 * 60 * 24)
 	{
 		$buff = sprintf($lang_time_gap['hours'], (int) ($gap / 60 / 60) + 1);
 	}
@@ -685,40 +685,40 @@ 
 function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE)
 {
 	// return null if no target time is specified
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
 	// convert the date format according to the language
-	if($conversion == TRUE)
+	if ($conversion == TRUE)
 	{
-		switch(Context::getLangType())
+		switch (Context::getLangType())
 		{
 			case 'en' :
 			case 'es' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'M d, Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'M d, Y H:i:s';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'M d, Y H:i';
 				}
 				break;
 			case 'vi' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'd-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'H:i:s d-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'H:i d-m-Y';
 				}
@@ -727,7 +727,7 @@ 
 	}
 
 	// If year value is less than 1970, handle it separately.
-	if((int) substr($str, 0, 4) < 1970)
+	if ((int) substr($str, 0, 4) < 1970)
 	{
 		$hour = (int) substr($str, 8, 2);
 		$min = (int) substr($str, 10, 2);
@@ -777,9 +777,9 @@ 
 function getEncodeEmailAddress($email)
 {
 	$return = '';
-	for($i = 0, $c = strlen($email); $i < $c; $i++)
+	for ($i = 0, $c = strlen($email); $i < $c; $i++)
 	{
-		$return .= '&#' . (rand(0, 1) == 0 ? ord($email[$i]) : 'X' . dechex(ord($email[$i]))) . ';';
+		$return .= '&#'.(rand(0, 1) == 0 ? ord($email[$i]) : 'X'.dechex(ord($email[$i]))).';';
 	}
 	return $return;
 }
@@ -799,25 +799,25 @@ 
 {
 	static $debug_file;
 
-	if(!(__DEBUG__ & 1))
+	if (!(__DEBUG__ & 1))
 	{
 		return;
 	}
 
 	static $firephp;
 	$bt = debug_backtrace();
-	if(is_array($bt))
+	if (is_array($bt))
 	{
 		$bt_debug_print = array_shift($bt);
 		$bt_called_function = array_shift($bt);
 	}
 	$file_name = str_replace(_XE_PATH_, '', $bt_debug_print['file']);
 	$line_num = $bt_debug_print['line'];
-	$function = $bt_called_function['class'] . $bt_called_function['type'] . $bt_called_function['function'];
+	$function = $bt_called_function['class'].$bt_called_function['type'].$bt_called_function['function'];
 
-	if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+	if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 	{
-		if(!isset($firephp))
+		if (!isset($firephp))
 		{
 			$firephp = FirePHP::getInstance(TRUE);
 		}
@@ -826,16 +826,16 @@ 
 		$label = sprintf('[%s:%d] %s() (Memory usage: current=%s, peak=%s)', $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()), FileHandler::filesize(memory_get_peak_usage()));
 
 		// Check a FirePHP option
-		if($display_option === 'TABLE')
+		if ($display_option === 'TABLE')
 		{
 			$label = $display_option;
 		}
-		if($display_option === 'ERROR')
+		if ($display_option === 'ERROR')
 		{
 			$type = $display_option;
 		}
 		// Check if the IP specified by __DEBUG_PROTECT__ option is same as the access IP.
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			$debug_output = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
 			$label = NULL;
@@ -845,52 +845,52 @@ 
 	}
 	else
 	{
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			return;
 		}
 
 		$print = array();
-		if(!$debug_file)
+		if (!$debug_file)
 		{
-			$debug_file = _XE_PATH_ . 'files/' . $file;
+			$debug_file = _XE_PATH_.'files/'.$file;
 		}
-		if(!file_exists($debug_file)) $print[] = '<?php exit() ?>';
+		if (!file_exists($debug_file)) $print[] = '<?php exit() ?>';
 
-		if($display_option === TRUE || $display_option === 'ERROR')
+		if ($display_option === TRUE || $display_option === 'ERROR')
 		{
-			$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()));;
+			$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage())); ;
 			$print[] = str_repeat('=', 80);
 		}
 		$type = gettype($debug_output);
-		if(!in_array($type, array('array', 'object', 'resource')))
+		if (!in_array($type, array('array', 'object', 'resource')))
 		{
-			if($display_option === 'ERROR')
+			if ($display_option === 'ERROR')
 			{
-				$print[] = 'ERROR : ' . var_export($debug_output, TRUE);
+				$print[] = 'ERROR : '.var_export($debug_output, TRUE);
 			}
 			else
 			{
-				$print[] = 'DEBUG : ' . $type . '(' . var_export($debug_output, TRUE) . ')';
+				$print[] = 'DEBUG : '.$type.'('.var_export($debug_output, TRUE).')';
 			}
 		}
 		else
 		{
-			$print[] = 'DEBUG : ' . trim(preg_replace('/\r?\n/', "\n" . '        ', print_r($debug_output, true)));
+			$print[] = 'DEBUG : '.trim(preg_replace('/\r?\n/', "\n".'        ', print_r($debug_output, true)));
 		}
 		$backtrace_args = defined('\DEBUG_BACKTRACE_IGNORE_ARGS') ? \DEBUG_BACKTRACE_IGNORE_ARGS : 0;
 		$backtrace = debug_backtrace($backtrace_args);
 
-		if(count($backtrace) > 1 && $backtrace[1]['function'] === 'debugPrint' && !$backtrace[1]['class'])
+		if (count($backtrace) > 1 && $backtrace[1]['function'] === 'debugPrint' && !$backtrace[1]['class'])
 		{
 			array_shift($backtrace);
 		}
-		foreach($backtrace as $val)
+		foreach ($backtrace as $val)
 		{
-			$print[] = '        - ' . $val['file'] . ' : ' . $val['line'];
+			$print[] = '        - '.$val['file'].' : '.$val['line'];
 		}
 		$print[] = PHP_EOL;
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 	}
 }
 
@@ -901,7 +901,7 @@ 
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
-	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
+	if (!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
 
 	static $log_filename = array(
 		'query' => 'files/_slowlog_query.php',
@@ -911,47 +911,47 @@ 
 	);
 	$write_file = true;
 
-	$log_file = _XE_PATH_ . $log_filename[$type];
+	$log_file = _XE_PATH_.$log_filename[$type];
 
 	$buff = array();
 	$buff[] = '<?php exit(); ?>';
 	$buff[] = date('c');
 
-	if($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
+	if ($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
 	{
-		$buff[] = "\tCaller : " . $obj->caller;
-		$buff[] = "\tCalled : " . $obj->called;
+		$buff[] = "\tCaller : ".$obj->caller;
+		$buff[] = "\tCalled : ".$obj->called;
 	}
-	else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
+	else if ($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
 	{
-		$buff[] = "\tAddon : " . $obj->called;
-		$buff[] = "\tCalled position : " . $obj->caller;
+		$buff[] = "\tAddon : ".$obj->called;
+		$buff[] = "\tCalled position : ".$obj->caller;
 	}
-	else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
+	else if ($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
 	{
-		$buff[] = "\tWidget : " . $obj->called;
+		$buff[] = "\tWidget : ".$obj->called;
 	}
-	else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
+	else if ($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
 	{
 
 		$buff[] = $obj->query;
-		$buff[] = "\tQuery ID   : " . $obj->query_id;
-		$buff[] = "\tCaller     : " . $obj->caller;
-		$buff[] = "\tConnection : " . $obj->connection;
+		$buff[] = "\tQuery ID   : ".$obj->query_id;
+		$buff[] = "\tCaller     : ".$obj->caller;
+		$buff[] = "\tConnection : ".$obj->connection;
 	}
 	else
 	{
 		$write_file = false;
 	}
 
-	if($write_file)
+	if ($write_file)
 	{
 		$buff[] = sprintf("\t%0.6f sec", $elapsed_time);
-		$buff[] = PHP_EOL . PHP_EOL;
+		$buff[] = PHP_EOL.PHP_EOL;
 		file_put_contents($log_file, implode(PHP_EOL, $buff), FILE_APPEND);
 	}
 
-	if($type != 'query')
+	if ($type != 'query')
 	{
 		$trigger_args = $obj;
 		$trigger_args->_log_type = $type;
@@ -991,11 +991,11 @@ 
  */
 function delObjectVars($target_obj, $del_obj)
 {
-	if(!is_object($target_obj))
+	if (!is_object($target_obj))
 	{
 		return;
 	}
-	if(!is_object($del_obj))
+	if (!is_object($del_obj))
 	{
 		return;
 	}
@@ -1005,7 +1005,7 @@ 
 
 	$target = array_keys($target_vars);
 	$del = array_keys($del_vars);
-	if(!count($target) || !count($del))
+	if (!count($target) || !count($del))
 	{
 		return $target_obj;
 	}
@@ -1013,10 +1013,10 @@ 
 	$return_obj = new stdClass();
 
 	$target_count = count($target);
-	for($i = 0; $i < $target_count; $i++)
+	for ($i = 0; $i < $target_count; $i++)
 	{
 		$target_key = $target[$i];
-		if(!in_array($target_key, $del))
+		if (!in_array($target_key, $del))
 		{
 			$return_obj->{$target_key} = $target_obj->{$target_key};
 		}
@@ -1029,10 +1029,10 @@ 
 {
 	$del_vars = array('error_return_url', 'success_return_url', 'ruleset', 'xe_validator_id');
 
-	foreach($del_vars as $var)
+	foreach ($del_vars as $var)
 	{
-		if(is_array($vars)) unset($vars[$var]);
-		else if(is_object($vars)) unset($vars->$var);
+		if (is_array($vars)) unset($vars[$var]);
+		else if (is_object($vars)) unset($vars->$var);
 	}
 
 	return $vars;
@@ -1049,12 +1049,12 @@ 
  */
 function handleError($errno, $errstr, $file, $line)
 {
-	if(!__DEBUG__)
+	if (!__DEBUG__)
 	{
 		return;
 	}
 	$errors = array(E_USER_ERROR, E_ERROR, E_PARSE);
-	if(!in_array($errno, $errors))
+	if (!in_array($errno, $errors))
 	{
 		return;
 	}
@@ -1074,8 +1074,8 @@ 
 function getNumberingPath($no, $size = 3)
 {
 	$mod = pow(10, $size);
-	$output = sprintf('%0' . $size . 'd/', $no % $mod);
-	if($no >= $mod)
+	$output = sprintf('%0'.$size.'d/', $no % $mod);
+	if ($no >= $mod)
 	{
 		$output .= getNumberingPath((int) $no / $mod, $size);
 	}
@@ -1095,7 +1095,7 @@ 
 
 function purifierHtml(&$content)
 {
-	require_once(_XE_PATH_ . 'classes/security/Purifier.class.php');
+	require_once(_XE_PATH_.'classes/security/Purifier.class.php');
 	$oPurifier = Purifier::getInstance();
 	$oPurifier->purify($content);
 }
@@ -1108,7 +1108,7 @@ 
  */
 function removeHackTag($content)
 {
-	require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 	$oEmbedFilter = EmbedFilter::getInstance();
 	$oEmbedFilter->check($content);
 
@@ -1150,7 +1150,7 @@ 
  */
 function checkUploadedFile($file)
 {
-	require_once(_XE_PATH_ . 'classes/security/UploadFileFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/UploadFileFilter.class.php');
 	return UploadFileFilter::check($file);
 }
 
@@ -1164,13 +1164,13 @@ 
 {
 	$content = preg_replace('@<(/?)xmp.*?>@i', '<\1xmp>', $content);
 
-	if(($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
+	if (($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
 	{
-		if(($close_xmp = strrpos($content, '</xmp>')) === FALSE)
+		if (($close_xmp = strrpos($content, '</xmp>')) === FALSE)
 		{
 			$content .= '</xmp>';
 		}
-		else if($close_xmp < $start_xmp)
+		else if ($close_xmp < $start_xmp)
 		{
 			$content .= '</xmp>';
 		}
@@ -1190,33 +1190,33 @@ 
 	$tag = strtolower($match[2]);
 
 	// xmp tag ?뺣━
-	if($tag == 'xmp')
+	if ($tag == 'xmp')
 	{
 		return "<{$match[1]}xmp>";
 	}
-	if($match[1])
+	if ($match[1])
 	{
 		return $match[0];
 	}
-	if($match[4])
+	if ($match[4])
 	{
-		$match[4] = ' ' . $match[4];
+		$match[4] = ' '.$match[4];
 	}
 
 	$attrs = array();
-	if(preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
+	if (preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
 	{
-		foreach($m[1] as $idx => $name)
+		foreach ($m[1] as $idx => $name)
 		{
-			if(strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
+			if (strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
 			{
 				continue;
 			}
 
-			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00' . $n[1]) : ($n[2] + 0)); }, $m[3][$idx] . $m[4][$idx]);
+			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00'.$n[1]) : ($n[2] + 0)); }, $m[3][$idx].$m[4][$idx]);
 			$val = preg_replace('/^\s+|[\t\n\r]+/', '', $val);
 
-			if(preg_match('/^[a-z]+script:/i', $val))
+			if (preg_match('/^[a-z]+script:/i', $val))
 			{
 				continue;
 			}
@@ -1227,60 +1227,60 @@ 
 
 	$filter_arrts = array('style', 'src', 'href');
 
-	if($tag === 'object') array_push($filter_arrts, 'data');
-	if($tag === 'param') array_push($filter_arrts, 'value');
+	if ($tag === 'object') array_push($filter_arrts, 'data');
+	if ($tag === 'param') array_push($filter_arrts, 'value');
 
-	foreach($filter_arrts as $attr)
+	foreach ($filter_arrts as $attr)
 	{
-		if(!isset($attrs[$attr])) continue;
+		if (!isset($attrs[$attr])) continue;
 
 		$attr_value = rawurldecode($attrs[$attr]);
 		$attr_value = htmlspecialchars_decode($attr_value, ENT_COMPAT);
 		$attr_value = preg_replace('/\s+|[\t\n\r]+/', '', $attr_value);
-		if(preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
+		if (preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
 		{
 			unset($attrs[$attr]);
 		}
 	}
 
-	if(isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
+	if (isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
 	{
 		unset($attrs['style']);
 	}
 
 	$attr = array();
-	foreach($attrs as $name => $val)
+	foreach ($attrs as $name => $val)
 	{
-		if($tag == 'object' || $tag == 'embed' || $tag == 'a')
+		if ($tag == 'object' || $tag == 'embed' || $tag == 'a')
 		{
 			$attribute = strtolower(trim($name));
-			if($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
+			if ($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
 			{
-				if(stripos($val, 'data:') === 0)
+				if (stripos($val, 'data:') === 0)
 				{
 					continue;
 				}
 			}
 		}
 
-		if($tag == 'img')
+		if ($tag == 'img')
 		{
 			$attribute = strtolower(trim($name));
-			if(stripos($val, 'data:') === 0)
+			if (stripos($val, 'data:') === 0)
 			{
 				continue;
 			}
 		}
 		$val = str_replace('"', '&quot;', $val);
-		$attr[] = $name . "=\"{$val}\"";
+		$attr[] = $name."=\"{$val}\"";
 	}
-	$attr = count($attr) ? ' ' . implode(' ', $attr) : '';
+	$attr = count($attr) ? ' '.implode(' ', $attr) : '';
 
 	return "<{$match[1]}{$tag}{$attr}{$match[4]}>";
 }
 
 // convert hexa value to RGB
-if(!function_exists('hexrgb'))
+if (!function_exists('hexrgb'))
 {
 
 	/**
@@ -1316,9 +1316,9 @@ 
 
 	settype($password, "string");
 
-	for($i = 0; $i < strlen($password); $i++)
+	for ($i = 0; $i < strlen($password); $i++)
 	{
-		if($password[$i] == ' ' || $password[$i] == '\t')
+		if ($password[$i] == ' ' || $password[$i] == '\t')
 		{
 			continue;
 		}
@@ -1330,11 +1330,11 @@ 
 	$result1 = sprintf("%08lx", $nr & ((1 << 31) - 1));
 	$result2 = sprintf("%08lx", $nr2 & ((1 << 31) - 1));
 
-	if($result1 == '80000000')
+	if ($result1 == '80000000')
 	{
 		$nr += 0x80000000;
 	}
-	if($result2 == '80000000')
+	if ($result2 == '80000000')
 	{
 		$nr2 += 0x80000000;
 	}
@@ -1350,7 +1350,7 @@ 
 function getScriptPath()
 {
 	static $url = NULL;
-	if($url == NULL)
+	if ($url == NULL)
 	{
 		$script_path = filter_var($_SERVER['SCRIPT_NAME'], FILTER_SANITIZE_STRING);
 		$url = str_ireplace('/tools/', '/', preg_replace('/index.php.*/i', '', str_replace('\\', '/', $script_path)));
@@ -1381,14 +1381,14 @@ 
 	$decodedStr = '';
 	$pos = 0;
 	$len = strlen($source);
-	while($pos < $len)
+	while ($pos < $len)
 	{
 		$charAt = substr($source, $pos, 1);
-		if($charAt == '%')
+		if ($charAt == '%')
 		{
 			$pos++;
 			$charAt = substr($source, $pos, 1);
-			if($charAt == 'u')
+			if ($charAt == 'u')
 			{
 				// we got a unicode character
 				$pos++;
@@ -1422,21 +1422,21 @@ 
  */
 function _code2utf($num)
 {
-	if($num < 128)
+	if ($num < 128)
 	{
 		return chr($num);
 	}
-	if($num < 2048)
+	if ($num < 2048)
 	{
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		return chr(($num >> 6) + 192).chr(($num & 63) + 128);
 	}
-	if($num < 65536)
+	if ($num < 65536)
 	{
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
-	if($num < 2097152)
+	if ($num < 2097152)
 	{
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
 	return '';
 }
@@ -1451,7 +1451,7 @@ 
  */
 function detectUTF8($string, $return_convert = FALSE, $urldecode = TRUE)
 {
-	if($urldecode)
+	if ($urldecode)
 	{
 		$string = urldecode($string);
 	}
@@ -1459,12 +1459,12 @@ 
 	$sample = iconv('utf-8', 'utf-8', $string);
 	$is_utf8 = (md5($sample) === md5($string));
 
-	if(!$urldecode)
+	if (!$urldecode)
 	{
 		$string = urldecode($string);
 	}
 
-	if($return_convert)
+	if ($return_convert)
 	{
 		return ($is_utf8) ? $string : iconv('euc-kr', 'utf-8', $string);
 	}
@@ -1480,7 +1480,7 @@ 
  */
 function json_encode2($data)
 {
-	switch(gettype($data))
+	switch (gettype($data))
 	{
 		case 'boolean':
 			return $data ? 'true' : 'false';
@@ -1488,15 +1488,15 @@ 
 		case 'double':
 			return $data;
 		case 'string':
-			return '"' . strtr($data, array('\\' => '\\\\', '"' => '\\"')) . '"';
+			return '"'.strtr($data, array('\\' => '\\\\', '"' => '\\"')).'"';
 		case 'object':
 			$data = get_object_vars($data);
 		case 'array':
 			$rel = FALSE; // relative array?
 			$key = array_keys($data);
-			foreach($key as $v)
+			foreach ($key as $v)
 			{
-				if(!is_int($v))
+				if (!is_int($v))
 				{
 					$rel = TRUE;
 					break;
@@ -1504,12 +1504,12 @@ 
 			}
 
 			$arr = array();
-			foreach($data as $k => $v)
+			foreach ($data as $k => $v)
 			{
-				$arr[] = ($rel ? '"' . strtr($k, array('\\' => '\\\\', '"' => '\\"')) . '":' : '') . json_encode2($v);
+				$arr[] = ($rel ? '"'.strtr($k, array('\\' => '\\\\', '"' => '\\"')).'":' : '').json_encode2($v);
 			}
 
-			return $rel ? '{' . join(',', $arr) . '}' : '[' . join(',', $arr) . ']';
+			return $rel ? '{'.join(',', $arr).'}' : '['.join(',', $arr).']';
 		default:
 			return '""';
 	}
@@ -1523,7 +1523,7 @@ 
  */
 function isCrawler($agent = NULL)
 {
-	if(!$agent)
+	if (!$agent)
 	{
 		$agent = $_SERVER['HTTP_USER_AGENT'];
 	}
@@ -1533,9 +1533,9 @@ 
 		/*'211.245.21.110-211.245.21.119' mixsh is closed */
 	);
 
-	foreach($check_agent as $str)
+	foreach ($check_agent as $str)
 	{
-		if(stristr($agent, $str) != FALSE)
+		if (stristr($agent, $str) != FALSE)
 		{
 			return TRUE;
 		}
@@ -1553,7 +1553,7 @@ 
  */
 function stripEmbedTagForAdmin(&$content, $writer_member_srl)
 {
-	if(!Context::get('is_logged'))
+	if (!Context::get('is_logged'))
 	{
 		return;
 	}
@@ -1561,18 +1561,18 @@ 
 	$oModuleModel = getModel('module');
 	$logged_info = Context::get('logged_info');
 
-	if($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
+	if ($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
 	{
-		if($writer_member_srl)
+		if ($writer_member_srl)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($writer_member_srl);
-			if($member_info->is_admin == "Y")
+			if ($member_info->is_admin == "Y")
 			{
 				return;
 			}
 		}
-		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . Context::getLang('security_warning_embed') . "</p></div>";
+		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>".Context::getLang('security_warning_embed')."</p></div>";
 		$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
 		$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
 		$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);
@@ -1589,18 +1589,18 @@ 
 function requirePear()
 {
 	static $required = false;
-	if($required)
+	if ($required)
 	{
 		return;
 	}
 
-	if(version_compare(PHP_VERSION, "5.3.0") < 0)
+	if (version_compare(PHP_VERSION, "5.3.0") < 0)
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR".PATH_SEPARATOR.get_include_path());
 	}
 	else
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR.1.9.5".PATH_SEPARATOR.get_include_path());
 	}
 
 	$required = true;
@@ -1608,7 +1608,7 @@ 
 
 function checkCSRF()
 {
-	if($_SERVER['REQUEST_METHOD'] != 'POST')
+	if ($_SERVER['REQUEST_METHOD'] != 'POST')
 	{
 		return FALSE;
 	}
@@ -1616,9 +1616,9 @@ 
 	$default_url = Context::getDefaultUrl();
 	$referer = $_SERVER["HTTP_REFERER"];
 
-	if(strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
+	if (strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
 	{
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$referer = $IDN->encode($referer);
 	}
@@ -1629,9 +1629,9 @@ 
 	$oModuleModel = getModel('module');
 	$siteModuleInfo = $oModuleModel->getDefaultMid();
 
-	if($siteModuleInfo->site_srl == 0)
+	if ($siteModuleInfo->site_srl == 0)
 	{
-		if($default_url['host'] !== $referer['host'])
+		if ($default_url['host'] !== $referer['host'])
 		{
 			return FALSE;
 		}
@@ -1639,7 +1639,7 @@ 
 	else
 	{
 		$virtualSiteInfo = $oModuleModel->getSiteInfo($siteModuleInfo->site_srl);
-		if(strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
+		if (strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
 		{
 			return FALSE;
 		}
@@ -1655,15 +1655,15 @@ 
  */
 function recurciveExposureCheck(&$menu)
 {
-	if(is_array($menu))
+	if (is_array($menu))
 	{
-		foreach($menu AS $key=>$value)
+		foreach ($menu AS $key=>$value)
 		{
-			if(!$value['isShow'])
+			if (!$value['isShow'])
 			{
 				unset($menu[$key]);
 			}
-			if(is_array($value['list']) && count($value['list']) > 0)
+			if (is_array($value['list']) && count($value['list']) > 0)
 			{
 				recurciveExposureCheck($menu[$key]['list']);
 			}
@@ -1673,14 +1673,14 @@ 
 
 function changeValueInUrl($key, $requestKey, $dbKey, $urlName = 'success_return_url')
 {
-	if($requestKey != $dbKey)
+	if ($requestKey != $dbKey)
 	{
 		$arrayUrl = parse_url(Context::get('success_return_url'));
-		if($arrayUrl['query'])
+		if ($arrayUrl['query'])
 		{
 			parse_str($arrayUrl['query'], $parsedStr);
 
-			if(isset($parsedStr[$key]))
+			if (isset($parsedStr[$key]))
 			{
 				$parsedStr[$key] = $requestKey;
 				$successReturnUrl .= $arrayUrl['path'].'?'.http_build_query($parsedStr);
@@ -1723,14 +1723,14 @@ 
  */
 function alertScript($msg)
 {
-	if(!$msg)
+	if (!$msg)
 	{
 		return;
 	}
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-alert("' . $msg . '");
+alert("' . $msg.'");
 //]]>
 </script>';
 }
@@ -1761,7 +1761,7 @@ 
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-' . $reloadScript . '
+' . $reloadScript.'
 //]]>
 </script>';
 }

libs/FirePHPCore/fb.php

Doc Comments +1 added lines, -3 removed lines

@@ -50,7 +50,6 @@ 
  * "Server" request tab.
  * 
  * @see http://www.firephp.org/Wiki/Reference/Fb
- * @param mixed $Object
  * @return true
  * @throws Exception
  */
@@ -130,7 +129,6 @@ 
    * Log object to firebug
    * 
    * @see http://www.firephp.org/Wiki/Reference/Fb
-   * @param mixed $Object
    * @return true
    * @throws Exception
    */
@@ -150,7 +148,7 @@ 
    *
    * @param string $Name
    * @param array $Options OPTIONAL Instructions on how to log the group
-   * @return true
+   * @return boolean
    */
   public static function group($Name, $Options=null) {
     $instance = FirePHP::getInstance(true);

Indentation +23 added lines, -23 removed lines

@@ -73,8 +73,8 @@ 
    * @return void
    */
   public static function setEnabled($Enabled) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setEnabled($Enabled);
+	$instance = FirePHP::getInstance(true);
+	$instance->setEnabled($Enabled);
   }
   
   /**
@@ -84,8 +84,8 @@ 
    * @return boolean TRUE if enabled
    */
   public static function getEnabled() {
-    $instance = FirePHP::getInstance(true);
-    return $instance->getEnabled();
+	$instance = FirePHP::getInstance(true);
+	return $instance->getEnabled();
   }  
   
   /**
@@ -99,8 +99,8 @@ 
    * @return void
    */
   public static function setObjectFilter($Class, $Filter) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setObjectFilter($Class, $Filter);
+	$instance = FirePHP::getInstance(true);
+	$instance->setObjectFilter($Class, $Filter);
   }
   
   /**
@@ -111,8 +111,8 @@ 
    * @return void
    */
   public static function setOptions($Options) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setOptions($Options);
+	$instance = FirePHP::getInstance(true);
+	$instance->setOptions($Options);
   }
 
   /**
@@ -122,8 +122,8 @@ 
    * @return array The options
    */
   public static function getOptions() {
-    $instance = FirePHP::getInstance(true);
-    return $instance->getOptions();
+	$instance = FirePHP::getInstance(true);
+	return $instance->getOptions();
   }
 
   /**
@@ -136,9 +136,9 @@ 
    */
   public static function send()
   {
-    $instance = FirePHP::getInstance(true);
-    $args = func_get_args();
-    return call_user_func_array(array($instance,'fb'),$args);
+	$instance = FirePHP::getInstance(true);
+	$args = func_get_args();
+	return call_user_func_array(array($instance,'fb'),$args);
   }
 
   /**
@@ -153,8 +153,8 @@ 
    * @return true
    */
   public static function group($Name, $Options=null) {
-    $instance = FirePHP::getInstance(true);
-    return $instance->group($Name, $Options);
+	$instance = FirePHP::getInstance(true);
+	return $instance->group($Name, $Options);
   }
 
   /**
@@ -164,7 +164,7 @@ 
    * @throws Exception
    */
   public static function groupEnd() {
-    return self::send(null, null, FirePHP::GROUP_END);
+	return self::send(null, null, FirePHP::GROUP_END);
   }
 
   /**
@@ -177,7 +177,7 @@ 
    * @throws Exception
    */
   public static function log($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::LOG);
+	return self::send($Object, $Label, FirePHP::LOG);
   } 
 
   /**
@@ -190,7 +190,7 @@ 
    * @throws Exception
    */
   public static function info($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::INFO);
+	return self::send($Object, $Label, FirePHP::INFO);
   } 
 
   /**
@@ -203,7 +203,7 @@ 
    * @throws Exception
    */
   public static function warn($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::WARN);
+	return self::send($Object, $Label, FirePHP::WARN);
   } 
 
   /**
@@ -216,7 +216,7 @@ 
    * @throws Exception
    */
   public static function error($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::ERROR);
+	return self::send($Object, $Label, FirePHP::ERROR);
   } 
 
   /**
@@ -229,7 +229,7 @@ 
    * @throws Exception
    */
   public static function dump($Key, $Variable) {
-    return self::send($Variable, $Key, FirePHP::DUMP);
+	return self::send($Variable, $Key, FirePHP::DUMP);
   } 
 
   /**
@@ -241,7 +241,7 @@ 
    * @throws Exception
    */
   public static function trace($Label) {
-    return self::send($Label, FirePHP::TRACE);
+	return self::send($Label, FirePHP::TRACE);
   } 
 
   /**
@@ -254,7 +254,7 @@ 
    * @throws Exception
    */
   public static function table($Label, $Table) {
-    return self::send($Table, $Label, FirePHP::TABLE);
+	return self::send($Table, $Label, FirePHP::TABLE);
   } 
 
 }

Spacing +7 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
   $instance = FirePHP::getInstance(true);
   
   $args = func_get_args();
-  return call_user_func_array(array($instance,'fb'),$args);
+  return call_user_func_array(array($instance, 'fb'), $args);
 }
 
 
@@ -138,7 +138,7 @@ 
   {
     $instance = FirePHP::getInstance(true);
     $args = func_get_args();
-    return call_user_func_array(array($instance,'fb'),$args);
+    return call_user_func_array(array($instance, 'fb'), $args);
   }
 
   /**
@@ -152,7 +152,7 @@ 
    * @param array $Options OPTIONAL Instructions on how to log the group
    * @return true
    */
-  public static function group($Name, $Options=null) {
+  public static function group($Name, $Options = null) {
     $instance = FirePHP::getInstance(true);
     return $instance->group($Name, $Options);
   }
@@ -176,7 +176,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function log($Object, $Label=null) {
+  public static function log($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::LOG);
   } 
 
@@ -189,7 +189,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function info($Object, $Label=null) {
+  public static function info($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::INFO);
   } 
 
@@ -202,7 +202,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function warn($Object, $Label=null) {
+  public static function warn($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::WARN);
   } 
 
@@ -215,7 +215,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function error($Object, $Label=null) {
+  public static function error($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::ERROR);
   } 
 

libs/ftp.class.php

Doc Comments +25 added lines

@@ -177,6 +177,9 @@ 
             return $response;
         }
 
+        /**
+         * @param string $pathname
+         */
         function ftp_delete($pathname)
         {
             $this->ftp_putcmd("DELE", $pathname);
@@ -187,6 +190,9 @@ 
             return $response;
         }
 
+        /**
+         * @param string $pathname
+         */
         function ftp_rmdir($pathname)
         {
             $this->ftp_putcmd("RMD", $pathname);
@@ -197,6 +203,9 @@ 
             return $response;
         }
 
+        /**
+         * @param string $pathname
+         */
         function ftp_mkdir($pathname)
         {
             $this->ftp_putcmd("MKD", $pathname);
@@ -358,6 +367,10 @@ 
             return $response;
         }
 
+        /**
+         * @param string $remotefile
+         * @param string $localfile
+         */
         function ftp_put($remotefile, $localfile, $mode = 1)
         {
             
@@ -408,6 +421,9 @@ 
             return $response;
         }
 
+        /**
+         * @param string $command
+         */
         function ftp_site($command)
         {
             $this->ftp_putcmd("SITE", $command);
@@ -431,6 +447,9 @@ 
 
         /* Private Functions */
 
+        /**
+         * @param integer $mode
+         */
         function ftp_type($mode)
         {
             if ($mode) {
@@ -468,6 +487,9 @@ 
             return $ip_port;
         }
 
+        /**
+         * @param string $cmd
+         */
         function ftp_putcmd($cmd, $arg = "")
         {
             if ($arg != "") {
@@ -536,6 +558,9 @@ 
             return fclose($sock);
         }
 
+        /**
+         * @param string $ip_port
+         */
         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)) {

Indentation +479 added lines, -479 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    /*********************************************************************
+	/*********************************************************************
      *
      *    PHP FTP Client Class By TOMO ( groove@spencernetwork.org )
 	 *    Modified By NAVER ( 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;
+		}
+	}
 ?>

Braces +9 added lines, -3 removed lines

@@ -489,7 +489,9 @@ 
 			while(($char = fgetc($this->ftp_sock)) !== FALSE)
 			{
 				$line .= $char;
-				if($char === "\n") break;
+				if($char === "\n") {
+					break;
+				}
 			}
 				
 			// 세자리 응답 코드가 나와야 한다.
@@ -512,12 +514,16 @@ 
 					while(($char = fgetc($this->ftp_sock)) !== FALSE)
 					{
 						$line .= $char;
-						if($char === "\n") break;
+						if($char === "\n") {
+							break;
+						}
 					}
 					$this->ftp_resp .= $line;
 
 					// 응답 코드와 같은 코드가 나오고 공백이 있으면 끝
-					if($code . ' ' === substr($line, 0, 4)) break;
+					if($code . ' ' === substr($line, 0, 4)) {
+						break;
+					}
 				}while($line);
 			}
 

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
                 return FALSE;
             }
 
-			if(substr($this->ftp_resp, 0, 3) !== '220')
+			if (substr($this->ftp_resp, 0, 3) !== '220')
 			{
 				return FALSE;
 			}
@@ -486,14 +486,14 @@ 
 
 			// 한줄을 읽는다.
 			$line = '';
-			while(($char = fgetc($this->ftp_sock)) !== FALSE)
+			while (($char = fgetc($this->ftp_sock)) !== FALSE)
 			{
 				$line .= $char;
-				if($char === "\n") break;
+				if ($char === "\n") break;
 			}
 				
 			// 세자리 응답 코드가 나와야 한다.
-			if(!preg_match('@^[0-9]{3}@', $line))
+			if (!preg_match('@^[0-9]{3}@', $line))
 			{
 				return FALSE;
 			}
@@ -501,7 +501,7 @@ 
 			$this->ftp_resp = $line;
 
 			// 4번째 문자가 -이면 여러줄인 응답이다.
-			if($line[3] === '-')
+			if ($line[3] === '-')
 			{
 				$code = substr($line, 0, 3);
 
@@ -509,16 +509,16 @@ 
 				do
 				{
 					$line = '';
-					while(($char = fgetc($this->ftp_sock)) !== FALSE)
+					while (($char = fgetc($this->ftp_sock)) !== FALSE)
 					{
 						$line .= $char;
-						if($char === "\n") break;
+						if ($char === "\n") break;
 					}
 					$this->ftp_resp .= $line;
 
 					// 응답 코드와 같은 코드가 나오고 공백이 있으면 끝
-					if($code . ' ' === substr($line, 0, 4)) break;
-				}while($line);
+					if ($code.' ' === substr($line, 0, 4)) break;
+				} while ($line);
 			}
 
             $this->ftp_debug(str_replace("\r\n", "\n", $this->ftp_resp));
@@ -545,7 +545,7 @@ 
 
             $DATA = explode(",", $ip_port);
             $ipaddr = $DATA[0].".".$DATA[1].".".$DATA[2].".".$DATA[3];
-            $port   = $DATA[4]*256 + $DATA[5];
+            $port   = $DATA[4] * 256 + $DATA[5];
             $this->ftp_debug("Trying to ".$ipaddr.":".$port." ...\n");
             $data_connection = @fsockopen($ipaddr, $port, $errno, $errstr);
             if (!$data_connection) {