xpressengine / xe-core

classes/db/DBMysqli_innodb.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -441,7 +441,7 @@ 
 	 * @param Object $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return Object|null
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
@@ -494,7 +494,7 @@ 
 	 * opt : notnull, default, size\n
 	 * index : primary key, index, unique\n
 	 * @param string $xml_doc xml schema contents
-	 * @return void|object
+	 * @return null|false
 	 */
 	function _createTable($xml_doc)
 	{

Spacing +51 added lines, -51 removed lines

@@ -44,7 +44,7 @@ 
 	function __connect($connection)
 	{
 		// Attempt to connect
-		if($connection["db_port"])
+		if ($connection["db_port"])
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -60,7 +60,7 @@ 
 							, $connection["db_database"]);
 		}
 		$error = mysqli_connect_errno();
-		if($error)
+		if ($error)
 		{
 			$this->setError($error, mysqli_connect_error());
 			return;
@@ -89,7 +89,7 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
 			$this->_query("begin");
 		}
@@ -111,14 +111,14 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
 		}
 		else
 		{
 			mysqli_rollback($connection);
-			$this->setQueryLog( array("query"=>"rollback") );
+			$this->setQueryLog(array("query"=>"rollback"));
 		}
 		return true;
 	}
@@ -132,7 +132,7 @@ 
 	{
 		$connection = $this->_getConnection('master');
 		mysqli_commit($connection);
-		$this->setQueryLog( array("query"=>"commit") );
+		$this->setQueryLog(array("query"=>"commit"));
 		return true;
 	}
 
@@ -145,11 +145,11 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
-		if(!is_numeric($string))
+		if (!is_numeric($string))
 		{
 			$connection = $this->_getConnection('master');
 			$string = mysqli_escape_string($connection, $string);
@@ -166,23 +166,23 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			// 1. Prepare query
 			$stmt = mysqli_prepare($connection, $query);
-			if($stmt)
+			if ($stmt)
 			{
 				$types = '';
 				$params = array();
 				$this->_prepareQueryParameters($types, $params);
 
-				if(!empty($params))
+				if (!empty($params))
 				{
 					$args[0] = $stmt;
 					$args[1] = $types;
 
 					$i = 2;
-					foreach($params as $key => $param)
+					foreach ($params as $key => $param)
 					{
 						$copy[$key] = $param;
 						$args[$i++] = &$copy[$key];
@@ -190,7 +190,7 @@ 
 
 					// 2. Bind parameters
 					$status = call_user_func_array('mysqli_stmt_bind_param', $args);
-					if(!$status)
+					if (!$status)
 					{
 						$this->setError(-1, "Invalid arguments: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
 					}
@@ -199,7 +199,7 @@ 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
 					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
 				}
@@ -213,7 +213,7 @@ 
 		$result = mysqli_query($connection, $query);
 		// Error Check
 		$error = mysqli_error($connection);
-		if($error)
+		if ($error)
 		{
 			$this->setError(mysqli_errno($connection), $error);
 		}
@@ -232,23 +232,23 @@ 
 	{
 		$types = '';
 		$params = array();
-		if(!$this->param)
+		if (!$this->param)
 		{
 			return;
 		}
 
-		foreach($this->param as $k => $o)
+		foreach ($this->param as $k => $o)
 		{
 			$value = $o->getUnescapedValue();
 			$type = $o->getType();
 
 			// Skip column names -> this should be concatenated to query string
-			if($o->isColumnName())
+			if ($o->isColumnName())
 			{
 				continue;
 			}
 
-			switch($type)
+			switch ($type)
 			{
 				case 'number' :
 					$type = 'i';
@@ -260,9 +260,9 @@ 
 					$type = 's';
 			}
 
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
 					$params[] = $v;
 					$types .= $type;
@@ -284,12 +284,12 @@ 
 	 */
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_fetch($result, $arrayIndexEndValue);
 		}
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
@@ -305,9 +305,9 @@ 
 		 * MYSQLI_TYPE for longtext is 252
 		 */
 		$longtext_exists = false;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if (isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
 				$field->name = 'repeat_' . $field->name;
 			}
@@ -316,14 +316,14 @@ 
 			$row[$field->name] = "";
 			$resultArray[$field->name] = &$row[$field->name];
 
-			if($field->type == 252)
+			if ($field->type == 252)
 			{
 				$longtext_exists = true;
 			}
 		}
 		$resultArray = array_merge(array($stmt), $resultArray);
 
-		if($longtext_exists)
+		if ($longtext_exists)
 		{
 			mysqli_stmt_store_result($stmt);
 		}
@@ -331,17 +331,17 @@ 
 		call_user_func_array('mysqli_stmt_bind_result', $resultArray);
 
 		$rows = array();
-		while(mysqli_stmt_fetch($stmt))
+		while (mysqli_stmt_fetch($stmt))
 		{
 			$resultObject = new stdClass();
 
-			foreach($resultArray as $key => $value)
+			foreach ($resultArray as $key => $value)
 			{
-				if($key === 0)
+				if ($key === 0)
 				{
 					continue; // Skip stmt object
 				}
-				if(strpos($key, 'repeat_'))
+				if (strpos($key, 'repeat_'))
 				{
 					$key = substr($key, 6);
 				}
@@ -353,9 +353,9 @@ 
 
 		mysqli_stmt_close($stmt);
 
-		if($arrayIndexEndValue)
+		if ($arrayIndexEndValue)
 		{
-			foreach($rows as $row)
+			foreach ($rows as $row)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -365,9 +365,9 @@ 
 			$output = $rows;
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -388,7 +388,7 @@ 
 	 */
 	function _executeInsertAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeInsertAct($queryObject);
 		}
@@ -406,7 +406,7 @@ 
 	 */
 	function _executeUpdateAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeUpdateAct($queryObject);
 		}
@@ -424,7 +424,7 @@ 
 	 */
 	function _executeDeleteAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeDeleteAct($queryObject);
 		}
@@ -445,7 +445,7 @@ 
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeSelectAct($queryObject, $connection);
 		}
@@ -503,13 +503,13 @@ 
 		$xml_obj = $oXml->parse($xml_doc);
 		// Create a table schema
 		$table_name = $xml_obj->table->attrs->name;
-		if($this->isTableExists($table_name))
+		if ($this->isTableExists($table_name))
 		{
 			return;
 		}
 		$table_name = $this->prefix . $table_name;
 
-		if(!is_array($xml_obj->table->column))
+		if (!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
 		}
@@ -518,7 +518,7 @@ 
 			$columns = $xml_obj->table->column;
 		}
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -532,36 +532,36 @@ 
 
 			$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
 
-			if($primary_key)
+			if ($primary_key)
 			{
 				$primary_list[] = $name;
 			}
-			else if($unique)
+			else if ($unique)
 			{
 				$unique_list[$unique][] = $name;
 			}
-			else if($index)
+			else if ($index)
 			{
 				$index_list[$index][] = $name;
 			}
 		}
 
-		if(count($primary_list))
+		if (count($primary_list))
 		{
 			$column_schema[] = sprintf("primary key (%s)", '`' . implode($primary_list, '`,`') . '`');
 		}
 
-		if(count($unique_list))
+		if (count($unique_list))
 		{
-			foreach($unique_list as $key => $val)
+			foreach ($unique_list as $key => $val)
 			{
 				$column_schema[] = sprintf("unique %s (%s)", $key, '`' . implode($val, '`,`') . '`');
 			}
 		}
 
-		if(count($index_list))
+		if (count($index_list))
 		{
-			foreach($index_list as $key => $val)
+			foreach ($index_list as $key => $val)
 			{
 				$column_schema[] = sprintf("index %s (%s)", $key, '`' . implode($val, '`,`') . '`');
 			}
@@ -570,7 +570,7 @@ 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
+		if (!$output)
 		{
 			return false;
 		}

Braces +12 added lines, -19 removed lines

@@ -51,8 +51,7 @@ 
 							, $connection["db_password"]
 							, $connection["db_database"]
 							, $connection["db_port"]);
-		}
-		else
+		} else
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -92,8 +91,7 @@ 
 		if(!$transactionLevel)
 		{
 			$this->_query("begin");
-		}
-		else
+		} else
 		{
 			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
 		}
@@ -114,8 +112,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			mysqli_rollback($connection);
 			$this->setQueryLog( array("query"=>"rollback") );
@@ -267,8 +264,7 @@ 
 					$params[] = $v;
 					$types .= $type;
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $value;
 				$types .= $type;
@@ -307,10 +303,12 @@ 
 		$longtext_exists = false;
 		foreach($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if(isset($resultArray[$field->name])) {
+				// When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
 				$field->name = 'repeat_' . $field->name;
 			}
+			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
@@ -359,8 +357,7 @@ 
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
-		}
-		else
+		} else
 		{
 			$output = $rows;
 		}
@@ -370,8 +367,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -512,8 +508,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -535,12 +530,10 @@ 
 			if($primary_key)
 			{
 				$primary_list[] = $name;
-			}
-			else if($unique)
+			} else if($unique)
 			{
 				$unique_list[$unique][] = $name;
-			}
-			else if($index)
+			} else if($index)
 			{
 				$index_list[$index][] = $name;
 			}

classes/db/queryparts/condition/Condition.class.php

Doc Comments +3 added lines

@@ -97,6 +97,9 @@
 		return $this->pipe . ' ' . $this->getConditionPart($this->_value);

 	}

 

+	/**
+	 * @param string $pipe
+	 */
 	function setPipe($pipe)

 	{

 		$this->pipe = $pipe;

Spacing +13 added lines, -13 removed lines

@@ -61,13 +61,13 @@ 
 	 */

 	function toString($withValue = true)

 	{

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

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

 		{

-			if(!$this->show())

+			if (!$this->show())

 			{

 				$this->_value_to_string = '';

 			}

-			else if($withValue)

+			else if ($withValue)

 			{

 				$this->_value_to_string = $this->toStringWithValue();

 			}

@@ -107,16 +107,16 @@ 
 	 */

 	function show()

 	{

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

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

 		{

-			if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')

+			if (is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')

 			{

 				$this->_show = false;

 			}

 			else

 			{

 				$this->_show = true;

-				switch($this->operation)

+				switch ($this->operation)

 				{

 					case 'equal' :

 					case 'more' :

@@ -138,30 +138,30 @@ 
 					case 'not':

 					case 'notequal' :

 						// if variable is not set or is not string or number, return

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

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

 						{

 							$this->_show = false;

 							break;

 						}

-						if($this->_value === '')

+						if ($this->_value === '')

 						{

 							$this->_show = false;

 							break;

 						}

 						$tmpArray = array('string' => 1, 'integer' => 1);

-						if(!isset($tmpArray[gettype($this->_value)]))

+						if (!isset($tmpArray[gettype($this->_value)]))

 						{

 							$this->_show = false;

 							break;

 						}

 						break;

 					case 'between' :

-						if(!is_array($this->_value))

+						if (!is_array($this->_value))

 						{

 							$this->_show = false;

 							break;

 						}

-						if(count($this->_value) != 2)

+						if (count($this->_value) != 2)

 						{

 							$this->_show = false;

 							break;

@@ -188,7 +188,7 @@ 
 		$name = $this->column_name;

 		$operation = $this->operation;

 

-		switch($operation)

+		switch ($operation)

 		{

 			case 'equal' :

 				return $name . ' = ' . $value;

@@ -208,7 +208,7 @@ 
 			case 'like_tail' :

 			case 'like_prefix' :

 			case 'like' :

-				if(defined('__CUBRID_VERSION__')

+				if (defined('__CUBRID_VERSION__')

 						&& __CUBRID_VERSION__ >= '8.4.1')

 					return $name . ' rlike ' . $value;

 				else

Braces +8 added lines, -10 removed lines

@@ -66,12 +66,10 @@ 
 			if(!$this->show())

 			{

 				$this->_value_to_string = '';

-			}

-			else if($withValue)

+			} else if($withValue)

 			{

 				$this->_value_to_string = $this->toStringWithValue();

-			}

-			else

+			} else

 			{

 				$this->_value_to_string = $this->toStringWithoutValue();

 			}

@@ -112,8 +110,7 @@ 
 			if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')

 			{

 				$this->_show = false;

-			}

-			else

+			} else

 			{

 				$this->_show = true;

 				switch($this->operation)

@@ -209,10 +206,11 @@ 
 			case 'like_prefix' :

 			case 'like' :

 				if(defined('__CUBRID_VERSION__')

-						&& __CUBRID_VERSION__ >= '8.4.1')

-					return $name . ' rlike ' . $value;

-				else

-					return $name . ' like ' . $value;

+						&& __CUBRID_VERSION__ >= '8.4.1') {
+									return $name . ' rlike ' . $value;
+				} else {
+									return $name . ' like ' . $value;
+				}
 				break;

 			case 'notlike_tail' :

 			case 'notlike_prefix' :

classes/db/queryparts/condition/ConditionWithoutArgument.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
 	/**

 	 * constructor

 	 * @param string $column_name

-	 * @param mixed $argument

+	 * @param integer $argument

 	 * @param string $operation

 	 * @param string $pipe

-	 * @return void

+	 * @return boolean

 	 */

 	function ConditionWithoutArgument($column_name, $argument, $operation, $pipe = "")

 	{

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
 	{

 		parent::Condition($column_name, $argument, $operation, $pipe);

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

-		if(isset($tmpArray[$operation]))

+		if (isset($tmpArray[$operation]))

 		{

-			if(is_array($argument))

+			if (is_array($argument))

 			{

 				$argument = implode($argument, ',');

 			}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}

classes/db/queryparts/expression/UpdateExpression.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	/**

 	 * constructor

 	 * @param string $column_name

-	 * @param object $argument

+	 * @param Argument $argument

 	 * @return void

 	 */

 	function UpdateExpression($column_name, $argument)

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
 	 */

 	function getExpression($with_value = true)

 	{

-		if($with_value)

+		if ($with_value)

 		{

 			return $this->getExpressionWithValue();

 		}

@@ -50,7 +50,7 @@ 
 	{

 		$value = $this->argument->getValue();

 		$operation = $this->argument->getColumnOperation();

-		if(isset($operation))

+		if (isset($operation))

 		{

 			return "$this->column_name = $this->column_name $operation $value";

 		}

@@ -65,7 +65,7 @@ 
 	function getExpressionWithoutValue()

 	{

 		$operation = $this->argument->getColumnOperation();

-		if(isset($operation))

+		if (isset($operation))

 		{

 			return "$this->column_name = $this->column_name $operation ?";

 		}

@@ -76,7 +76,7 @@ 
 	{

 		// TODO Escape value according to column type instead of variable type

 		$value = $this->argument->getValue();

-		if(!is_numeric($value))

+		if (!is_numeric($value))

 		{

 			return "'" . $value . "'";

 		}

@@ -85,12 +85,12 @@ 
 

 	function show()

 	{

-		if(!$this->argument)

+		if (!$this->argument)

 		{

 			return false;

 		}

 		$value = $this->argument->getValue();

-		if(!isset($value))

+		if (!isset($value))

 		{

 			return false;

 		}

@@ -104,7 +104,7 @@ 
 

 	function getArguments()

 	{

-		if($this->argument)

+		if ($this->argument)

 		{

 			return array($this->argument);

 		}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}

classes/db/queryparts/Query.class.php

Doc Comments +3 added lines

@@ -251,6 +251,9 @@
 		return $this->orderby;
 	}
 
+	/**
+	 * @param integer $limit
+	 */
 	function setLimit($limit = NULL)
 	{
 		if(!isset($limit))

Spacing +60 added lines, -60 removed lines

@@ -108,7 +108,7 @@ 
 		$this->action = $action;
 		$this->priority = $priority;
 
-		if(!isset($tables))
+		if (!isset($tables))
 		{
 			return;
 		}
@@ -144,12 +144,12 @@ 
 	function setColumnList($columnList)
 	{
 		$this->columnList = $columnList;
-		if(count($this->columnList) > 0)
+		if (count($this->columnList) > 0)
 		{
 			$selectColumns = array();
 			$dbParser = DB::getParser();
 
-			foreach($this->columnList as $columnName)
+			foreach ($this->columnList as $columnName)
 			{
 				$columnName = $dbParser->escapeColumn($columnName);
 				$selectColumns[] = new SelectExpression($columnName);
@@ -161,13 +161,13 @@ 
 
 	function setColumns($columns)
 	{
-		if(!isset($columns) || count($columns) === 0)
+		if (!isset($columns) || count($columns) === 0)
 		{
 			$this->columns = array(new StarExpression());
 			return;
 		}
 
-		if(!is_array($columns))
+		if (!is_array($columns))
 		{
 			$columns = array($columns);
 		}
@@ -177,14 +177,14 @@ 
 
 	function setTables($tables)
 	{
-		if(!isset($tables) || count($tables) === 0)
+		if (!isset($tables) || count($tables) === 0)
 		{
 			$this->setError(TRUE);
 			$this->setMessage("You must provide at least one table for the query.");
 			return;
 		}
 
-		if(!is_array($tables))
+		if (!is_array($tables))
 		{
 			$tables = array($tables);
 		}
@@ -200,18 +200,18 @@ 
 	function setConditions($conditions)
 	{
 		$this->conditions = array();
-		if(!isset($conditions) || count($conditions) === 0)
+		if (!isset($conditions) || count($conditions) === 0)
 		{
 			return;
 		}
-		if(!is_array($conditions))
+		if (!is_array($conditions))
 		{
 			$conditions = array($conditions);
 		}
 
-		foreach($conditions as $conditionGroup)
+		foreach ($conditions as $conditionGroup)
 		{
-			if($conditionGroup->show())
+			if ($conditionGroup->show())
 			{
 				$this->conditions[] = $conditionGroup;
 			}
@@ -220,11 +220,11 @@ 
 
 	function setGroups($groups)
 	{
-		if(!isset($groups) || count($groups) === 0)
+		if (!isset($groups) || count($groups) === 0)
 		{
 			return;
 		}
-		if(!is_array($groups))
+		if (!is_array($groups))
 		{
 			$groups = array($groups);
 		}
@@ -234,11 +234,11 @@ 
 
 	function setOrder($order)
 	{
-		if(!isset($order) || count($order) === 0)
+		if (!isset($order) || count($order) === 0)
 		{
 			return;
 		}
-		if(!is_array($order))
+		if (!is_array($order))
 		{
 			$order = array($order);
 		}
@@ -253,7 +253,7 @@ 
 
 	function setLimit($limit = NULL)
 	{
-		if(!isset($limit))
+		if (!isset($limit))
 		{
 			return;
 		}
@@ -354,9 +354,9 @@ 
 	function getClickCountColumns()
 	{
 		$click_count_columns = array();
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
-			if($column->show() && is_a($column, 'ClickCountExpression'))
+			if ($column->show() && is_a($column, 'ClickCountExpression'))
 			{
 				$click_count_columns[] = $column;
 			}
@@ -371,11 +371,11 @@ 
 	 */
 	function getSelectString($with_values = TRUE)
 	{
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
-			if($column->show())
+			if ($column->show())
 			{
-				if($column->isSubquery())
+				if ($column->isSubquery())
 				{
 					$select[] = $column->toString($with_values) . ' as ' . $column->getAlias();
 				}
@@ -395,15 +395,15 @@ 
 	 */
 	function getUpdateString($with_values = TRUE)
 	{
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
-			if($column->show())
+			if ($column->show())
 			{
 				$update[] = $column->getExpression($with_values);
 			}
 		}
 
-		if(!$update) return;
+		if (!$update) return;
 		return trim(implode($update, ', '));
 	}
 
@@ -416,9 +416,9 @@ 
 	{
 		$columnsList = '';
 		// means we have insert-select
-		if($this->subquery)
+		if ($this->subquery)
 		{
-			foreach($this->columns as $column)
+			foreach ($this->columns as $column)
 			{
 				$columnsList .= $column->getColumnName() . ', ';
 			}
@@ -429,9 +429,9 @@ 
 		}
 
 		$valuesList = '';
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
-			if($column->show())
+			if ($column->show())
 			{
 				$columnsList .= $column->getColumnName() . ', ';
 				$valuesList .= $column->getValue($with_values) . ', ';
@@ -460,9 +460,9 @@ 
 	{
 		$from = '';
 		$simple_table_count = 0;
-		foreach($this->tables as $table)
+		foreach ($this->tables as $table)
 		{
-			if($table->isJoinTable() || !$simple_table_count)
+			if ($table->isJoinTable() || !$simple_table_count)
 			{
 				$from .= $table->toString($with_values) . ' ';
 			}
@@ -471,14 +471,14 @@ 
 				$from .= ', ' . $table->toString($with_values) . ' ';
 			}
 
-			if(is_a($table, 'Subquery'))
+			if (is_a($table, 'Subquery'))
 			{
 				$from .= $table->getAlias() ? ' as ' . $table->getAlias() . ' ' : ' ';
 			}
 
 			$simple_table_count++;
 		}
-		if(trim($from) == '')
+		if (trim($from) == '')
 		{
 			return '';
 		}
@@ -496,9 +496,9 @@ 
 		$where = '';
 		$condition_count = 0;
 
-		foreach($this->conditions as $conditionGroup)
+		foreach ($this->conditions as $conditionGroup)
 		{
-			if($condition_count === 0)
+			if ($condition_count === 0)
 			{
 				$conditionGroup->setPipe("");
 			}
@@ -507,22 +507,22 @@ 
 			$condition_count++;
 		}
 
-		if($with_optimization &&
+		if ($with_optimization &&
 				(strstr($this->getOrderByString(), 'list_order') || strstr($this->getOrderByString(), 'update_order')))
 		{
 
-			if($condition_count !== 0)
+			if ($condition_count !== 0)
 			{
 				$where = '(' . $where . ') ';
 			}
 
-			foreach($this->orderby as $order)
+			foreach ($this->orderby as $order)
 			{
 				$colName = $order->getColumnName();
-				if(strstr($colName, 'list_order') || strstr($colName, 'update_order'))
+				if (strstr($colName, 'list_order') || strstr($colName, 'update_order'))
 				{
 					$opt_condition = new ConditionWithoutArgument($colName, 2100000000, 'less', 'and');
-					if($condition_count === 0)
+					if ($condition_count === 0)
 					{
 						$opt_condition->setPipe("");
 					}
@@ -542,9 +542,9 @@ 
 	function getGroupByString()
 	{
 		$groupBy = '';
-		if($this->groups)
+		if ($this->groups)
 		{
-			if($this->groups[0] !== "")
+			if ($this->groups[0] !== "")
 			{
 				$groupBy = implode(', ', $this->groups);
 			}
@@ -558,14 +558,14 @@ 
 	 */
 	function getOrderByString()
 	{
-		if(!$this->_orderByString)
+		if (!$this->_orderByString)
 		{
-			if(count($this->orderby) === 0)
+			if (count($this->orderby) === 0)
 			{
 				return '';
 			}
 			$orderBy = '';
-			foreach($this->orderby as $order)
+			foreach ($this->orderby as $order)
 			{
 				$orderBy .= $order->toString() . ', ';
 			}
@@ -587,7 +587,7 @@ 
 	function getLimitString()
 	{
 		$limit = '';
-		if(count($this->limit) > 0)
+		if (count($this->limit) > 0)
 		{
 			$limit = '';
 			$limit .= $this->limit->toString();
@@ -606,19 +606,19 @@ 
 	 */
 	function getArguments()
 	{
-		if(!isset($this->arguments))
+		if (!isset($this->arguments))
 		{
 			$this->arguments = array();
 
 			// Join table arguments
-			if(count($this->tables) > 0)
+			if (count($this->tables) > 0)
 			{
-				foreach($this->tables as $table)
+				foreach ($this->tables as $table)
 				{
-					if($table->isJoinTable() || is_a($table, 'Subquery'))
+					if ($table->isJoinTable() || is_a($table, 'Subquery'))
 					{
 						$args = $table->getArguments();
-						if($args)
+						if ($args)
 						{
 							$this->arguments = array_merge($this->arguments, $args);
 						}
@@ -628,14 +628,14 @@ 
 
 			// Column arguments
 			// The if is for delete statements, all others must have columns
-			if(count($this->columns) > 0)
+			if (count($this->columns) > 0)
 			{
-				foreach($this->columns as $column)
+				foreach ($this->columns as $column)
 				{
-					if($column->show())
+					if ($column->show())
 					{
 						$args = $column->getArguments();
-						if($args)
+						if ($args)
 						{
 							$this->arguments = array_merge($this->arguments, $args);
 						}
@@ -644,12 +644,12 @@ 
 			}
 
 			// Condition arguments
-			if(count($this->conditions) > 0)
+			if (count($this->conditions) > 0)
 			{
-				foreach($this->conditions as $conditionGroup)
+				foreach ($this->conditions as $conditionGroup)
 				{
 					$args = $conditionGroup->getArguments();
-					if(count($args) > 0)
+					if (count($args) > 0)
 					{
 						$this->arguments = array_merge($this->arguments, $args);
 					}
@@ -657,12 +657,12 @@ 
 			}
 
 			// Navigation arguments
-			if(count($this->orderby) > 0)
+			if (count($this->orderby) > 0)
 			{
-				foreach($this->orderby as $order)
+				foreach ($this->orderby as $order)
 				{
 					$args = $order->getArguments();
-					if(count($args) > 0)
+					if (count($args) > 0)
 					{
 						$this->arguments = array_merge($this->arguments, $args);
 					}

Braces +5 added lines, -5 removed lines

@@ -378,8 +378,7 @@ 
 				if($column->isSubquery())
 				{
 					$select[] = $column->toString($with_values) . ' as ' . $column->getAlias();
-				}
-				else
+				} else
 				{
 					$select[] = $column->getExpression($with_values);
 				}
@@ -403,7 +402,9 @@ 
 			}
 		}
 
-		if(!$update) return;
+		if(!$update) {
+			return;
+		}
 		return trim(implode($update, ', '));
 	}
 
@@ -465,8 +466,7 @@ 
 			if($table->isJoinTable() || !$simple_table_count)
 			{
 				$from .= $table->toString($with_values) . ' ';
-			}
-			else
+			} else
 			{
 				$from .= ', ' . $table->toString($with_values) . ' ';
 			}

classes/display/DisplayHandler.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -133,7 +133,7 @@ 
 	 * Print debugging message to designated output source depending on the value set to __DEBUG_OUTPUT_. \n
 	 * This method only functions when __DEBUG__ variable is set to 1.
 	 * __DEBUG_OUTPUT__ == 0, messages are written in ./files/_debug_message.php
-	 * @return void
+	 * @return null|string
 	 */
 	function _debugOutput()
 	{
@@ -358,6 +358,7 @@ 
 
 	/**
 	 * print a HTTP HEADER for HTML, which is encoded in UTF-8
+	 * @param integer $code
 	 * @return void
 	 */
 	function _printHttpStatusCode($code)

Spacing +32 added lines, -32 removed lines

@@ -25,7 +25,7 @@ 
 	function printContent(&$oModule)
 	{
 		// Check if the gzip encoding supported
-		if(
+		if (
 				(defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
 				strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE &&
 				function_exists('ob_gzhandler') &&
@@ -37,23 +37,23 @@ 
 		}
 
 		// Extract contents to display by the request method
-		if(Context::get('xeVirtualRequestMethod') == 'xml')
+		if (Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
 		}
-		else if(Context::getRequestMethod() == 'XMLRPC')
+		else if (Context::getRequestMethod() == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
-			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
 				$this->gz_enabled = FALSE;
 			}
 		}
-		else if(Context::getRequestMethod() == 'JSON')
+		else if (Context::getRequestMethod() == 'JSON')
 		{
 			$handler = new JSONDisplayHandler();
 		}
-		else if(Context::getRequestMethod() == 'JS_CALLBACK')
+		else if (Context::getRequestMethod() == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
 		}
@@ -71,9 +71,9 @@ 
 		$called_position = 'before_display_content';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(file_exists($addon_file)) include($addon_file);
+		if (file_exists($addon_file)) include($addon_file);
 
-		if(method_exists($handler, "prepareToPrint"))
+		if (method_exists($handler, "prepareToPrint"))
 		{
 			$handler->prepareToPrint($output);
 		}
@@ -81,17 +81,17 @@ 
 		// header output
 
 		$httpStatusCode = $oModule->getHttpStatusCode();
-		if($httpStatusCode && $httpStatusCode != 200)
+		if ($httpStatusCode && $httpStatusCode != 200)
 		{
 			$this->_printHttpStatusCode($httpStatusCode);
 		}
 		else
 		{
-			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
+			if (Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
 			{
 				$this->_printJSONHeader();
 			}
-			else if(Context::getResponseMethod() != 'HTML')
+			else if (Context::getResponseMethod() != 'HTML')
 			{
 				$this->_printXMLHeader();
 			}
@@ -107,13 +107,13 @@ 
 
 		// disable gzip if output already exists
 		ob_flush();
-		if(headers_sent())
+		if (headers_sent())
 		{
 			$this->gz_enabled = FALSE;
 		}
 
 		// results directly output
-		if($this->gz_enabled)
+		if ($this->gz_enabled)
 		{
 			header("Content-Encoding: gzip");
 			print ob_gzhandler($output, 5);
@@ -137,7 +137,7 @@ 
 	 */
 	function _debugOutput()
 	{
-		if(!__DEBUG__)
+		if (!__DEBUG__)
 		{
 			return;
 		}
@@ -145,21 +145,21 @@ 
 		$end = getMicroTime();
 
 		// Firebug console output
-		if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+		if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 		{
 			static $firephp;
-			if(!isset($firephp))
+			if (!isset($firephp))
 			{
 				$firephp = FirePHP::getInstance(true);
 			}
 
-			if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+			if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 			{
 				$firephp->fb('Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php', 'The IP address is not allowed.');
 				return;
 			}
 			// display total execution time and Request/Response info
-			if(__DEBUG__ & 2)
+			if (__DEBUG__ & 2)
 			{
 				$firephp->fb(
 						array(
@@ -197,10 +197,10 @@ 
 			}
 
 			// display DB query history
-			if((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
+			if ((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
 			{
-				$queries_output = array(array('Result/'.PHP_EOL.'Elapsed time', 'Query ID', 'Query'));
-				foreach($GLOBALS['__db_queries__'] as $query)
+				$queries_output = array(array('Result/' . PHP_EOL . 'Elapsed time', 'Query ID', 'Query'));
+				foreach ($GLOBALS['__db_queries__'] as $query)
 				{
 					$queries_output[] = array($query['result'] . PHP_EOL . sprintf('%0.5f', $query['elapsed_time']), str_replace(_XE_PATH_, '', $query['called_file']) . PHP_EOL . $query['called_method'] . '()' . PHP_EOL . $query['query_id'], $query['query']);
 				}
@@ -219,9 +219,9 @@ 
 
 			$buff = array();
 			// display total execution time and Request/Response info
-			if(__DEBUG__ & 2)
+			if (__DEBUG__ & 2)
 			{
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					return;
 				}
@@ -252,21 +252,21 @@ 
 				$buff[] = sprintf("\tTrans Content \t\t\t\t\t: %0.5f sec", $GLOBALS['__trans_content_elapsed__']);
 			}
 			// DB Logging
-			if(__DEBUG__ & 4)
+			if (__DEBUG__ & 4)
 			{
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					return;
 				}
 
-				if($GLOBALS['__db_queries__'])
+				if ($GLOBALS['__db_queries__'])
 				{
 					$buff[] = sprintf("\n- DB Queries : %d Queries. %0.5f sec", count($GLOBALS['__db_queries__']), $GLOBALS['__db_elapsed_time__']);
 					$num = 0;
 
-					foreach($GLOBALS['__db_queries__'] as $query)
+					foreach ($GLOBALS['__db_queries__'] as $query)
 					{
-						if($query['result'] == 'Success')
+						if ($query['result'] == 'Success')
 						{
 							$query_result = "Query Success";
 						}
@@ -283,12 +283,12 @@ 
 			}
 
 			// Output in HTML comments
-			if($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML')
+			if ($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML')
 			{
 				$buff = implode("\r\n", $buff);
 				$buff = sprintf("[%s %s:%d]\r\n%s", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
 
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					$buff = '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';
 				}
@@ -297,7 +297,7 @@ 
 			}
 
 			// Output to a file
-			if($buff && __DEBUG_OUTPUT__ == 0)
+			if ($buff && __DEBUG_OUTPUT__ == 0)
 			{
 				$debug_file = _XE_PATH_ . 'files/_debug_message.php';
 				$buff = implode(PHP_EOL, $buff);
@@ -306,7 +306,7 @@ 
 				$buff = str_repeat('=', 80) . "\n" . $buff . "\n" . str_repeat('-', 80);
 				$buff = "\n<?php\n/*" . $buff . "*/\n?>\n";
 
-				if (!@file_put_contents($debug_file, $buff, FILE_APPEND|LOCK_EX))
+				if (!@file_put_contents($debug_file, $buff, FILE_APPEND | LOCK_EX))
 				{
 					return;
 				}

Braces +13 added lines, -21 removed lines

@@ -40,24 +40,20 @@ 
 		if(Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
-		}
-		else if(Context::getRequestMethod() == 'XMLRPC')
+		} else if(Context::getRequestMethod() == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
 			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
 				$this->gz_enabled = FALSE;
 			}
-		}
-		else if(Context::getRequestMethod() == 'JSON')
+		} else if(Context::getRequestMethod() == 'JSON')
 		{
 			$handler = new JSONDisplayHandler();
-		}
-		else if(Context::getRequestMethod() == 'JS_CALLBACK')
+		} else if(Context::getRequestMethod() == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
-		}
-		else
+		} else
 		{
 			$handler = new HTMLDisplayHandler();
 		}
@@ -71,7 +67,9 @@ 
 		$called_position = 'before_display_content';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(file_exists($addon_file)) include($addon_file);
+		if(file_exists($addon_file)) {
+			include($addon_file);
+		}
 
 		if(method_exists($handler, "prepareToPrint"))
 		{
@@ -84,18 +82,15 @@ 
 		if($httpStatusCode && $httpStatusCode != 200)
 		{
 			$this->_printHttpStatusCode($httpStatusCode);
-		}
-		else
+		} else
 		{
 			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
 			{
 				$this->_printJSONHeader();
-			}
-			else if(Context::getResponseMethod() != 'HTML')
+			} else if(Context::getResponseMethod() != 'HTML')
 			{
 				$this->_printXMLHeader();
-			}
-			else
+			} else
 			{
 				$this->_printHTMLHeader();
 			}
@@ -117,8 +112,7 @@ 
 		{
 			header("Content-Encoding: gzip");
 			print ob_gzhandler($output, 5);
-		}
-		else
+		} else
 		{
 			print $output;
 		}
@@ -213,8 +207,7 @@ 
 				);
 			}
 			// dislpay the file and HTML comments
-		}
-		else
+		} else
 		{
 
 			$buff = array();
@@ -269,8 +262,7 @@ 
 						if($query['result'] == 'Success')
 						{
 							$query_result = "Query Success";
-						}
-						else
+						} else
 						{
 							$query_result = sprintf("Query $s : %d\n\t\t\t   %s", $query['result'], $query['errno'], $query['errstr']);
 						}

classes/file/FileHandler.class.php

Doc Comments +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param string $target_dir Path of target dir
 	 * @param string $filter Regex to filter files. If file matches this regex, the file is not copied.
 	 * @param string $type If set as 'force'. Even if the file exists in target, the file is copied.
-	 * @return void
+	 * @return false|null
 	 */
 	function copyDir($source_dir, $target_dir, $filter = null, $type = null)
 	{
@@ -275,7 +275,7 @@ 
 	 * This function creates directories recursively, which means that if ancestors of the target directory does not exist, they will be created too.
 	 *
 	 * @param string $path_string Path of target directory
-	 * @return bool TRUE if success. It might return nothing when ftp is used and connection to the ftp address failed.
+	 * @return boolean|null TRUE if success. It might return nothing when ftp is used and connection to the ftp address failed.
 	 */
 	function makeDir($path_string)
 	{
@@ -615,7 +615,7 @@ 
 	 * @param string $url The address of the target file
 	 * @param string $target_filename The location to store
 	 * @param string $body HTTP request body
-	 * @param string $timeout Connection timeout
+	 * @param integer $timeout Connection timeout
 	 * @param string $method GET/POST
 	 * @param string $content_type Content type header of HTTP request
 	 * @param string[] $headers Headers key value array.
@@ -636,8 +636,8 @@ 
 	 * Convert size in string into numeric value
 	 *
 	 * @see self::filesize()
-	 * @param $val Size in string (ex., 10, 10K, 10M, 10G )
-	 * @return int converted size
+	 * @param string $val Size in string (ex., 10, 10K, 10M, 10G )
+	 * @return double converted size
 	 */
 	function returnBytes($val)
 	{
@@ -687,7 +687,7 @@ 
 	 * @param int $resize_height Height to resize
 	 * @param string $target_type If $target_type is set (gif, jpg, png, bmp), result image will be saved as target type
 	 * @param string $thumbnail_type Thumbnail type(crop, ratio)
-	 * @return bool TRUE: success, FALSE: failed
+	 * @return null|boolean TRUE: success, FALSE: failed
 	 */
 	function createImageFile($source_file, $target_file, $resize_width = 0, $resize_height = 0, $target_type = '', $thumbnail_type = 'crop')
 	{
@@ -1000,7 +1000,7 @@ 
 	 * Check file exists.
 	 *
 	 * @param string $filename Target file name
-	 * @return bool Returns FALSE if the file does not exists, or Returns full path file(string).
+	 * @return string|false Returns FALSE if the file does not exists, or Returns full path file(string).
 	 */
 	function exists($filename)
 	{
@@ -1011,8 +1011,8 @@ 
 	/**
 	 * Check it is dir
 	 *
-	 * @param string $dir Target dir path
-	 * @return bool Returns FALSE if the dir is not dir, or Returns full path of dir(string).
+	 * @param string $path
+	 * @return string|false Returns FALSE if the dir is not dir, or Returns full path of dir(string).
 	 */
 	function isDir($path)
 	{

Spacing +109 added lines, -109 removed lines

@@ -17,7 +17,7 @@ 
 	 */
 	function getRealPath($source)
 	{
-		if(strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
+		if (strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
 		{
 			return _XE_PATH_ . substr($source, 2);
 		}
@@ -40,7 +40,7 @@ 
 	{
 		$source_dir = self::getRealPath($source_dir);
 		$target_dir = self::getRealPath($target_dir);
-		if(!is_dir($source_dir))
+		if (!is_dir($source_dir))
 		{
 			return FALSE;
 		}
@@ -48,42 +48,42 @@ 
 		// generate when no target exists
 		self::makeDir($target_dir);
 
-		if(substr($source_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($source_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$source_dir .= DIRECTORY_SEPARATOR;
 		}
 
-		if(substr($target_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($target_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$target_dir .= DIRECTORY_SEPARATOR;
 		}
 
 		$oDir = dir($source_dir);
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file{0} == '.')
+			if ($file{0} == '.')
 			{
 				continue;
 			}
 
-			if($filter && preg_match($filter, $file))
+			if ($filter && preg_match($filter, $file))
 			{
 				continue;
 			}
 
-			if(is_dir($source_dir . $file))
+			if (is_dir($source_dir . $file))
 			{
 				self::copyDir($source_dir . $file, $target_dir . $file, $type);
 			}
 			else
 			{
-				if($type == 'force')
+				if ($type == 'force')
 				{
 					@unlink($target_dir . $file);
 				}
 				else
 				{
-					if(!file_exists($target_dir . $file))
+					if (!file_exists($target_dir . $file))
 					{
 						@copy($source_dir . $file, $target_dir . $file);
 					}
@@ -110,7 +110,7 @@ 
 
 		self::makeDir($target_dir);
 
-		if($force == 'Y')
+		if ($force == 'Y')
 		{
 			@unlink($target_dir . DIRECTORY_SEPARATOR . $target);
 		}
@@ -126,7 +126,7 @@ 
 	 */
 	function readFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
+		if (($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
 		{
 			return;
 		}
@@ -149,12 +149,12 @@ 
 		self::makeDir($pathinfo['dirname']);
 
 		$flags = 0;
-		if(strtolower($mode) == 'a')
+		if (strtolower($mode) == 'a')
 		{
 			$flags = FILE_APPEND;
 		}
 
-		@file_put_contents($filename, $buff, $flags|LOCK_EX);
+		@file_put_contents($filename, $buff, $flags | LOCK_EX);
 		@chmod($filename, 0644);
 	}
 
@@ -192,7 +192,7 @@ 
 	 */
 	function moveFile($source, $target)
 	{
-		if(($source = self::exists($source)) !== FALSE)
+		if (($source = self::exists($source)) !== FALSE)
 		{
 			self::removeFile($target);
 			return self::rename($source, $target);
@@ -230,35 +230,35 @@ 
 		$path = self::getRealPath($path);
 		$output = array();
 
-		if(substr($path, -1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			$path .= '/';
 		}
 
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			return $output;
 		}
 
 		$files = scandir($path);
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if($file{0} == '.' || ($filter && !preg_match($filter, $file)))
+			if ($file{0} == '.' || ($filter && !preg_match($filter, $file)))
 			{
 				continue;
 			}
 
-			if($to_lower)
+			if ($to_lower)
 			{
 				$file = strtolower($file);
 			}
 
-			if($filter)
+			if ($filter)
 			{
 				$file = preg_replace($filter, '$1', $file);
 			}
 
-			if($concat_prefix)
+			if ($concat_prefix)
 			{
 				$file = sprintf('%s%s', str_replace(_XE_PATH_, '', $path), $file);
 			}
@@ -279,12 +279,12 @@ 
 	 */
 	function makeDir($path_string)
 	{
-		if(self::exists($path_string) !== FALSE)
+		if (self::exists($path_string) !== FALSE)
 		{
 			return TRUE;
 		}
 
-		if(!ini_get('safe_mode'))
+		if (!ini_get('safe_mode'))
 		{
 			@mkdir($path_string, 0755, TRUE);
 			@chmod($path_string, 0755);
@@ -295,35 +295,35 @@ 
 			static $oFtp = NULL;
 
 			$ftp_info = Context::getFTPInfo();
-			if($oFtp == NULL)
+			if ($oFtp == NULL)
 			{
-				if(!Context::isFTPRegisted())
+				if (!Context::isFTPRegisted())
 				{
 					return;
 				}
 
 				require_once(_XE_PATH_ . 'libs/ftp.class.php');
 				$oFtp = new ftp();
-				if(!$ftp_info->ftp_host)
+				if (!$ftp_info->ftp_host)
 				{
 					$ftp_info->ftp_host = "127.0.0.1";
 				}
-				if(!$ftp_info->ftp_port)
+				if (!$ftp_info->ftp_port)
 				{
 					$ftp_info->ftp_port = 21;
 				}
-				if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+				if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 				{
 					return;
 				}
-				if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+				if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 				{
 					$oFtp->ftp_quit();
 					return;
 				}
 			}
 
-			if(!($ftp_path = $ftp_info->ftp_root_path))
+			if (!($ftp_path = $ftp_info->ftp_root_path))
 			{
 				$ftp_path = DIRECTORY_SEPARATOR;
 			}
@@ -332,16 +332,16 @@ 
 			$path_list = explode(DIRECTORY_SEPARATOR, $path_string);
 
 			$path = _XE_PATH_;
-			for($i = 0, $c = count($path_list); $i < $c; $i++)
+			for ($i = 0, $c = count($path_list); $i < $c; $i++)
 			{
-				if(!$path_list[$i])
+				if (!$path_list[$i])
 				{
 					continue;
 				}
 
 				$path .= $path_list[$i] . DIRECTORY_SEPARATOR;
 				$ftp_path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				if(!is_dir($path))
+				if (!is_dir($path))
 				{
 					$oFtp->ftp_mkdir($ftp_path);
 					$oFtp->ftp_site("CHMOD 777 " . $ftp_path);
@@ -360,23 +360,23 @@ 
 	 */
 	function removeDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(self::isDir($path))
+		if (self::isDir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeDir($target);
 				}
@@ -401,22 +401,22 @@ 
 	 */
 	function removeBlankDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
 		$files = array_diff(scandir($path), array('..', '.'));
 
-		if(count($files) < 1)
+		if (count($files) < 1)
 		{
 			rmdir($path);
 			return;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(($target = self::isDir($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+			if (($target = self::isDir($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
 			{
 				continue;
 			}
@@ -435,23 +435,23 @@ 
 	 */
 	function removeFilesInDir($path)
 	{
-		if(($path = self::getRealPath($path)) === FALSE)
+		if (($path = self::getRealPath($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(is_dir($path))
+		if (is_dir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeFilesInDir($target);
 				}
@@ -463,7 +463,7 @@ 
 		}
 		else
 		{
-			if(self::exists($path)) unlink($path);
+			if (self::exists($path)) unlink($path);
 		}
 
 	}
@@ -477,22 +477,22 @@ 
 	 */
 	function filesize($size)
 	{
-		if(!$size)
+		if (!$size)
 		{
 			return '0Byte';
 		}
 
-		if($size === 1)
+		if ($size === 1)
 		{
 			return '1Byte';
 		}
 
-		if($size < 1024)
+		if ($size < 1024)
 		{
 			return $size . 'Bytes';
 		}
 
-		if($size >= 1024 && $size < 1024 * 1024)
+		if ($size >= 1024 && $size < 1024 * 1024)
 		{
 			return sprintf("%0.1fKB", $size / 1024);
 		}
@@ -523,7 +523,7 @@ 
 			require_once('HTTP/Request.php');
 
 			$parsed_url = parse_url(__PROXY_SERVER__);
-			if($parsed_url["host"])
+			if ($parsed_url["host"])
 			{
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
 				$oRequest->setMethod('POST');
@@ -533,49 +533,49 @@ 
 			{
 				$oRequest = new HTTP_Request($url);
 
-				if(count($request_config) && method_exists($oRequest, 'setConfig'))
+				if (count($request_config) && method_exists($oRequest, 'setConfig'))
 				{
-					foreach($request_config as $key=>$val)
+					foreach ($request_config as $key=>$val)
 					{
 						$oRequest->setConfig($key, $val);
 					}
 				}
 
-				if(count($headers) > 0)
+				if (count($headers) > 0)
 				{
-					foreach($headers as $key => $val)
+					foreach ($headers as $key => $val)
 					{
 						$oRequest->addHeader($key, $val);
 					}
 				}
-				if($cookies[$host])
+				if ($cookies[$host])
 				{
-					foreach($cookies[$host] as $key => $val)
+					foreach ($cookies[$host] as $key => $val)
 					{
 						$oRequest->addCookie($key, $val);
 					}
 				}
-				if(count($post_data) > 0)
+				if (count($post_data) > 0)
 				{
-					foreach($post_data as $key => $val)
+					foreach ($post_data as $key => $val)
 					{
 						$oRequest->addPostData($key, $val);
 					}
 				}
-				if(!$content_type)
+				if (!$content_type)
 					$oRequest->addHeader('Content-Type', 'text/html');
 				else
 					$oRequest->addHeader('Content-Type', $content_type);
 				$oRequest->setMethod($method);
-				if($body)
+				if ($body)
 					$oRequest->setBody($body);
 			}
 			
-			if(method_exists($oRequest, 'setConfig'))
+			if (method_exists($oRequest, 'setConfig'))
 			{
 				$oRequest->setConfig('timeout', $timeout);
 			}
-			elseif(property_exists($oRequest, '_timeout'))
+			elseif (property_exists($oRequest, '_timeout'))
 			{
 				$oRequest->_timeout = $timeout;
 			}
@@ -585,25 +585,25 @@ 
 			$code = $oRequest->getResponseCode();
 			$header = $oRequest->getResponseHeader();
 			$response = $oRequest->getResponseBody();
-			if($c = $oRequest->getResponseCookies())
+			if ($c = $oRequest->getResponseCookies())
 			{
-				foreach($c as $k => $v)
+				foreach ($c as $k => $v)
 				{
 					$cookies[$host][$v['name']] = $v['value'];
 				}
 			}
 
-			if($code > 300 && $code < 399 && $header['location'])
+			if ($code > 300 && $code < 399 && $header['location'])
 			{
 				return self::getRemoteResource($header['location'], $body, $timeout, $method, $content_type, $headers, $cookies, $post_data);
 			}
 
-			if($code != 200)
+			if ($code != 200)
 				return;
 
 			return $response;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return NULL;
 		}
@@ -623,7 +623,7 @@ 
 	 */
 	function getRemoteFile($url, $target_filename, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array(), $request_config = array())
 	{
-		if(!($body = self::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers,$cookies,$post_data,$request_config)))
+		if (!($body = self::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers, $cookies, $post_data, $request_config)))
 		{
 			return FALSE;
 		}
@@ -642,7 +642,7 @@ 
 	function returnBytes($val)
 	{
 		$unit = strtoupper(substr($val, -1));
-		$val = (float)$val;
+		$val = (float) $val;
 
 		switch ($unit)
 		{
@@ -665,13 +665,13 @@ 
 		$K64 = 65536;
 		$TWEAKFACTOR = 2.0;
 		$channels = $imageInfo['channels'];
-		if(!$channels)
+		if (!$channels)
 		{
 			$channels = 6; //for png
 		}
-		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64 ) * $TWEAKFACTOR);
+		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64) * $TWEAKFACTOR);
 		$availableMemory = self::returnBytes(ini_get('memory_limit')) - memory_get_usage();
-		if($availableMemory < $memoryNeeded)
+		if ($availableMemory < $memoryNeeded)
 		{
 			return FALSE;
 		}
@@ -698,30 +698,30 @@ 
 		}
 
 		$target_file = self::getRealPath($target_file);
-		if(!$resize_width)
+		if (!$resize_width)
 		{
 			$resize_width = 100;
 		}
 
-		if(!$resize_height)
+		if (!$resize_height)
 		{
 			$resize_height = $resize_width;
 		}
 
 		// retrieve source image's information
 		$imageInfo = getimagesize($source_file);
-		if(!self::checkMemoryLoadImage($imageInfo))
+		if (!self::checkMemoryLoadImage($imageInfo))
 		{
 			return FALSE;
 		}
 
 		list($width, $height, $type, $attrs) = $imageInfo;
-		if($width < 1 || $height < 1)
+		if ($width < 1 || $height < 1)
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case '1' :
 				$type = 'gif';
@@ -739,7 +739,7 @@ 
 				return;
 		}
 
-		if(!$target_type)
+		if (!$target_type)
 		{
 			$target_type = $type;
 		}
@@ -750,7 +750,7 @@ 
 		$height_per = ($resize_height > 0 && $height >= $resize_height) ? $resize_height / $height : 1;
 
 		$per = NULL;
-		if($thumbnail_type == 'ratio')
+		if ($thumbnail_type == 'ratio')
 		{
 			$per = ($width_per > $height_per) ? $height_per : $width_per;
 			$resize_width = $width * $per;
@@ -763,16 +763,16 @@ 
 
 		// create temporary image with target size
 		$thumb = NULL;
-		if(function_exists('imagecreateTRUEcolor'))
+		if (function_exists('imagecreateTRUEcolor'))
 		{
 			$thumb = imagecreateTRUEcolor($resize_width, $resize_height);
 		}
-		else if(function_exists('imagecreate'))
+		else if (function_exists('imagecreate'))
 		{
 			$thumb = imagecreate($resize_width, $resize_height);
 		}
 
-		if(!$thumb)
+		if (!$thumb)
 		{
 			return FALSE;
 		}
@@ -781,37 +781,37 @@ 
 
 		// create temporary image having original type
 		$source = NULL;
-		switch($type)
+		switch ($type)
 		{
 			case 'gif' :
-				if(function_exists('imagecreatefromgif'))
+				if (function_exists('imagecreatefromgif'))
 				{
 					$source = @imagecreatefromgif($source_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagecreatefromjpeg'))
+				if (function_exists('imagecreatefromjpeg'))
 				{
 					$source = @imagecreatefromjpeg($source_file);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagecreatefrompng'))
+				if (function_exists('imagecreatefrompng'))
 				{
 					$source = @imagecreatefrompng($source_file);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagecreatefromwbmp'))
+				if (function_exists('imagecreatefromwbmp'))
 				{
 					$source = @imagecreatefromwbmp($source_file);
 				}
 				break;
 		}
 
-		if(!$source)
+		if (!$source)
 		{
 			imagedestroy($thumb);
 			return FALSE;
@@ -823,13 +823,13 @@ 
 
 		$x = 0;
 		$y = 0;
-		if($thumbnail_type == 'crop')
+		if ($thumbnail_type == 'crop')
 		{
 			$x = (int) ($resize_width / 2 - $new_width / 2);
 			$y = (int) ($resize_height / 2 - $new_height / 2);
 		}
 
-		if(function_exists('imagecopyresampled'))
+		if (function_exists('imagecopyresampled'))
 		{
 			imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
 		}
@@ -843,30 +843,30 @@ 
 
 		// write into the file
 		$output = NULL;
-		switch($target_type)
+		switch ($target_type)
 		{
 			case 'gif' :
-				if(function_exists('imagegif'))
+				if (function_exists('imagegif'))
 				{
 					$output = imagegif($thumb, $target_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagejpeg'))
+				if (function_exists('imagejpeg'))
 				{
 					$output = imagejpeg($thumb, $target_file, 100);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagepng'))
+				if (function_exists('imagepng'))
 				{
 					$output = imagepng($thumb, $target_file, 9);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagewbmp'))
+				if (function_exists('imagewbmp'))
 				{
 					$output = imagewbmp($thumb, $target_file, 100);
 				}
@@ -876,7 +876,7 @@ 
 		imagedestroy($thumb);
 		imagedestroy($source);
 
-		if(!$output)
+		if (!$output)
 		{
 			return FALSE;
 		}
@@ -894,12 +894,12 @@ 
 	 */
 	function readIniFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE)
+		if (($filename = self::exists($filename)) === FALSE)
 		{
 			return FALSE;
 		}
 		$arr = parse_ini_file($filename, TRUE);
-		if(is_array($arr) && count($arr) > 0)
+		if (is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
 		}
@@ -925,7 +925,7 @@ 
 	 */
 	function writeIniFile($filename, $arr)
 	{
-		if(!is_array($arr) || count($arr) == 0)
+		if (!is_array($arr) || count($arr) == 0)
 		{
 			return FALSE;
 		}
@@ -942,19 +942,19 @@ 
 	function _makeIniBuff($arr)
 	{
 		$return = array();
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			// section
-			if(is_array($val))
+			if (is_array($val))
 			{
 				$return[] = sprintf("[%s]", $key);
-				foreach($val as $k => $v)
+				foreach ($val as $k => $v)
 				{
 					$return[] = sprintf("%s=\"%s\"", $k, $v);
 				}
 				// value
 			}
-			else if(is_object($val))
+			else if (is_object($val))
 			{
 				continue;
 			}
@@ -1029,7 +1029,7 @@ 
 	function isWritableDir($path)
 	{
 		$path = self::getRealPath($path);
-		if(is_dir($path)==FALSE)
+		if (is_dir($path) == FALSE)
 		{
 			return FALSE;
 		}
@@ -1037,7 +1037,7 @@ 
 		$checkFile = $path . '/_CheckWritableDir';
 
 		$fp = fopen($checkFile, 'w');
-		if(!is_resource($fp))
+		if (!is_resource($fp))
 		{
 			return FALSE;
 		}

Braces +29 added lines, -39 removed lines

@@ -74,14 +74,12 @@ 
 			if(is_dir($source_dir . $file))
 			{
 				self::copyDir($source_dir . $file, $target_dir . $file, $type);
-			}
-			else
+			} else
 			{
 				if($type == 'force')
 				{
 					@unlink($target_dir . $file);
-				}
-				else
+				} else
 				{
 					if(!file_exists($target_dir . $file))
 					{
@@ -379,15 +377,13 @@ 
 				if(is_dir($target))
 				{
 					self::removeDir($target);
-				}
-				else
+				} else
 				{
 					unlink($target);
 				}
 			}
 			rmdir($path);
-		}
-		else
+		} else
 		{
 			unlink($path);
 		}
@@ -454,16 +450,16 @@ 
 				if(is_dir($target))
 				{
 					self::removeFilesInDir($target);
-				}
-				else
+				} else
 				{
 					unlink($target);
 				}
 			}
-		}
-		else
+		} else
 		{
-			if(self::exists($path)) unlink($path);
+			if(self::exists($path)) {
+				unlink($path);
+			}
 		}
 
 	}
@@ -528,8 +524,7 @@ 
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
 				$oRequest->setMethod('POST');
 				$oRequest->addPostData('arg', serialize(array('Destination' => $url, 'method' => $method, 'body' => $body, 'content_type' => $content_type, "headers" => $headers, "post_data" => $post_data)));
-			}
-			else
+			} else
 			{
 				$oRequest = new HTTP_Request($url);
 
@@ -562,20 +557,21 @@ 
 						$oRequest->addPostData($key, $val);
 					}
 				}
-				if(!$content_type)
-					$oRequest->addHeader('Content-Type', 'text/html');
-				else
-					$oRequest->addHeader('Content-Type', $content_type);
+				if(!$content_type) {
+									$oRequest->addHeader('Content-Type', 'text/html');
+				} else {
+									$oRequest->addHeader('Content-Type', $content_type);
+				}
 				$oRequest->setMethod($method);
-				if($body)
-					$oRequest->setBody($body);
+				if($body) {
+									$oRequest->setBody($body);
+				}
 			}
 			
 			if(method_exists($oRequest, 'setConfig'))
 			{
 				$oRequest->setConfig('timeout', $timeout);
-			}
-			elseif(property_exists($oRequest, '_timeout'))
+			} elseif(property_exists($oRequest, '_timeout'))
 			{
 				$oRequest->_timeout = $timeout;
 			}
@@ -598,12 +594,12 @@ 
 				return self::getRemoteResource($header['location'], $body, $timeout, $method, $content_type, $headers, $cookies, $post_data);
 			}
 
-			if($code != 200)
-				return;
+			if($code != 200) {
+							return;
+			}
 
 			return $response;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return NULL;
 		}
@@ -755,8 +751,7 @@ 
 			$per = ($width_per > $height_per) ? $height_per : $width_per;
 			$resize_width = $width * $per;
 			$resize_height = $height * $per;
-		}
-		else
+		} else
 		{
 			$per = ($width_per < $height_per) ? $height_per : $width_per;
 		}
@@ -766,8 +761,7 @@ 
 		if(function_exists('imagecreateTRUEcolor'))
 		{
 			$thumb = imagecreateTRUEcolor($resize_width, $resize_height);
-		}
-		else if(function_exists('imagecreate'))
+		} else if(function_exists('imagecreate'))
 		{
 			$thumb = imagecreate($resize_width, $resize_height);
 		}
@@ -832,8 +826,7 @@ 
 		if(function_exists('imagecopyresampled'))
 		{
 			imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
-		}
-		else
+		} else
 		{
 			imagecopyresized($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
 		}
@@ -902,8 +895,7 @@ 
 		if(is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -953,12 +945,10 @@ 
 					$return[] = sprintf("%s=\"%s\"", $k, $v);
 				}
 				// value
-			}
-			else if(is_object($val))
+			} else if(is_object($val))
 			{
 				continue;
-			}
-			else
+			} else
 			{
 				$return[] = sprintf("%s=\"%s\"", $key, $val);
 			}

classes/frontendfile/FrontEndFileHandler.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
 	 * Arrage css index

 	 *

 	 * @param string $dirName First directory  name of css path

-	 * @param array $file file info.

+	 * @param stdClass $file file info.

 	 * @return void

 	 */

 	function _arrangeCssIndex($dirName, &$file)

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * Check SSL

 	 *

 	 * @return bool If using ssl returns true, otherwise returns false.

-     * @deprecated

+	 * @deprecated

 	 */

 	function isSsl()

 	{

Spacing +33 added lines, -33 removed lines

@@ -54,7 +54,7 @@ 
 	 */

 	function isSsl()

 	{

-		if(!is_null(self::$isSSL))

+		if (!is_null(self::$isSSL))

 		{

 			return self::$isSSL;

 		}

@@ -88,30 +88,30 @@ 
 	 * */

 	function loadFile($args)

 	{

-		if(!is_array($args))

+		if (!is_array($args))

 		{

 			$args = array($args);

 		}

 		$file = $this->getFileInfo($args[0], $args[2], $args[1]);

 

 		$availableExtension = array('css' => 1, 'js' => 1);

-		if(!isset($availableExtension[$file->fileExtension]))

+		if (!isset($availableExtension[$file->fileExtension]))

 		{

 			return;

 		}

 

 		$file->index = (int) $args[3];

 

-		if($file->fileExtension == 'css')

+		if ($file->fileExtension == 'css')

 		{

 			$map = &$this->cssMap;

 			$mapIndex = &$this->cssMapIndex;

 

 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);

 		}

-		else if($file->fileExtension == 'js')

+		else if ($file->fileExtension == 'js')

 		{

-			if($args[1] == 'body')

+			if ($args[1] == 'body')

 			{

 				$map = &$this->jsBodyMap;

 				$mapIndex = &$this->jsBodyMapIndex;

@@ -124,7 +124,7 @@ 
 		}

 

 		(is_null($file->index)) ? $file->index = 0 : $file->index = $file->index;

-		if(!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)

+		if (!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)

 		{

 			$this->unloadFile($args[0], $args[2], $args[1]);

 			$map[$file->index][$file->key] = $file;

@@ -144,7 +144,7 @@ 
 	{

 		static $existsInfo = array();

 

-		if(isset($existsInfo[$existsKey]))

+		if (isset($existsInfo[$existsKey]))

 		{

 			return $existsInfo[$existsKey];

 		}

@@ -159,14 +159,14 @@ 
 		$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));

 		$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);

 

-		if(strpos($file->filePath, '://') === FALSE)

+		if (strpos($file->filePath, '://') === FALSE)

 		{

-			if(!__DEBUG__ && __XE_VERSION_STABLE__)

+			if (!__DEBUG__ && __XE_VERSION_STABLE__)

 			{

 				// if no debug mode, load minifed file

 				$minifiedFileName = implode('.', array($file->fileNameNoExt, 'min', $file->fileExtension));

 				$minifiedRealPath = implode('/', array($file->fileRealPath, $minifiedFileName));

-				if(file_exists($minifiedRealPath))

+				if (file_exists($minifiedRealPath))

 				{

 					$file->fileName = $minifiedFileName;

 				}

@@ -174,7 +174,7 @@ 
 			else

 			{

 				// Remove .min

-				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))

+				if (file_exists(implode('/', array($file->fileRealPath, $file->keyName))))

 				{

 					$file->fileName = $file->keyName;

 				}

@@ -183,16 +183,16 @@ 
 

 		$file->targetIe = $targetIe;

 

-		if($file->fileExtension == 'css')

+		if ($file->fileExtension == 'css')

 		{

 			$file->media = $media;

-			if(!$file->media)

+			if (!$file->media)

 			{

 				$file->media = 'all';

 			}

 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;

 		}

-		else if($file->fileExtension == 'js')

+		else if ($file->fileExtension == 'js')

 		{

 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;

 		}

@@ -212,9 +212,9 @@ 
 	{

 		$file = $this->getFileInfo($fileName, $targetIe, $media);

 

-		if($file->fileExtension == 'css')

+		if ($file->fileExtension == 'css')

 		{

-			if(isset($this->cssMapIndex[$file->key]))

+			if (isset($this->cssMapIndex[$file->key]))

 			{

 				$index = $this->cssMapIndex[$file->key];

 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);

@@ -222,12 +222,12 @@ 
 		}

 		else

 		{

-			if(isset($this->jsHeadMapIndex[$file->key]))

+			if (isset($this->jsHeadMapIndex[$file->key]))

 			{

 				$index = $this->jsHeadMapIndex[$file->key];

 				unset($this->jsHeadMap[$index][$file->key], $this->jsHeadMapIndex[$file->key]);

 			}

-			if(isset($this->jsBodyMapIndex[$file->key]))

+			if (isset($this->jsBodyMapIndex[$file->key]))

 			{

 				$index = $this->jsBodyMapIndex[$file->key];

 				unset($this->jsBodyMap[$index][$file->key], $this->jsBodyMapIndex[$file->key]);

@@ -243,13 +243,13 @@ 
 	 */

 	function unloadAllFiles($type = 'all')

 	{

-		if($type == 'css' || $type == 'all')

+		if ($type == 'css' || $type == 'all')

 		{

 			$this->cssMap = array();

 			$this->cssMapIndex = array();

 		}

 

-		if($type == 'js' || $type == 'all')

+		if ($type == 'js' || $type == 'all')

 		{

 			$this->jsHeadMap = array();

 			$this->jsBodyMap = array();

@@ -271,9 +271,9 @@ 
 		$this->_sortMap($map, $mapIndex);

 

 		$result = array();

-		foreach($map as $indexedMap)

+		foreach ($map as $indexedMap)

 		{

-			foreach($indexedMap as $file)

+			foreach ($indexedMap as $file)

 			{

 				$noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : '';

 				$fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache;

@@ -293,7 +293,7 @@ 
 	 */

 	function getJsFileList($type = 'head')

 	{

-		if($type == 'head')

+		if ($type == 'head')

 		{

 			$map = &$this->jsHeadMap;

 			$mapIndex = &$this->jsHeadMapIndex;

@@ -307,9 +307,9 @@ 
 		$this->_sortMap($map, $mapIndex);

 

 		$result = array();

-		foreach($map as $indexedMap)

+		foreach ($map as $indexedMap)

 		{

-			foreach($indexedMap as $file)

+			foreach ($indexedMap as $file)

 			{

 				$noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : '';

 				$fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache;

@@ -341,18 +341,18 @@ 
 	 */

 	function _normalizeFilePath($path)

 	{

-		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')

+		if (strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')

 		{

 			$path = './' . $path;

 		}

-		elseif(!strncmp($path, '//', 2))

+		elseif (!strncmp($path, '//', 2))

 		{

 			return preg_replace('#^//+#', '//', $path);

 		}

 

 		$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);

 

-		while(strpos($path, '/../'))

+		while (strpos($path, '/../'))

 		{

 			$path = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $path, 1);

 		}

@@ -370,9 +370,9 @@ 
 	{

 		$path = $this->_normalizeFilePath($path);

 

-		if(strpos($path, './') === 0)

+		if (strpos($path, './') === 0)

 		{

-			if(dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\')

+			if (dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\')

 			{

 				$path = '/' . substr($path, 2);

 			}

@@ -381,7 +381,7 @@ 
 				$path = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($path, 2);

 			}

 		}

-		else if(strpos($file, '../') === 0)

+		else if (strpos($file, '../') === 0)

 		{

 			$path = $this->_normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$path}");

 		}

@@ -398,7 +398,7 @@ 
 	 */

 	function _arrangeCssIndex($dirName, &$file)

 	{

-		if($file->index !== 0)

+		if ($file->index !== 0)

 		{

 			return;

 		}

Braces +9 added lines, -18 removed lines

@@ -108,15 +108,13 @@ 
 			$mapIndex = &$this->cssMapIndex;

 

 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);

-		}

-		else if($file->fileExtension == 'js')

+		} else if($file->fileExtension == 'js')

 		{

 			if($args[1] == 'body')

 			{

 				$map = &$this->jsBodyMap;

 				$mapIndex = &$this->jsBodyMapIndex;

-			}

-			else

+			} else

 			{

 				$map = &$this->jsHeadMap;

 				$mapIndex = &$this->jsHeadMapIndex;

@@ -170,8 +168,7 @@ 
 				{

 					$file->fileName = $minifiedFileName;

 				}

-			}

-			else

+			} else

 			{

 				// Remove .min

 				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))

@@ -191,8 +188,7 @@ 
 				$file->media = 'all';

 			}

 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;

-		}

-		else if($file->fileExtension == 'js')

+		} else if($file->fileExtension == 'js')

 		{

 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;

 		}

@@ -219,8 +215,7 @@ 
 				$index = $this->cssMapIndex[$file->key];

 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);

 			}

-		}

-		else

+		} else

 		{

 			if(isset($this->jsHeadMapIndex[$file->key]))

 			{

@@ -297,8 +292,7 @@ 
 		{

 			$map = &$this->jsHeadMap;

 			$mapIndex = &$this->jsHeadMapIndex;

-		}

-		else

+		} else

 		{

 			$map = &$this->jsBodyMap;

 			$mapIndex = &$this->jsBodyMapIndex;

@@ -344,8 +338,7 @@ 
 		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')

 		{

 			$path = './' . $path;

-		}

-		elseif(!strncmp($path, '//', 2))

+		} elseif(!strncmp($path, '//', 2))

 		{

 			return preg_replace('#^//+#', '//', $path);

 		}

@@ -375,13 +368,11 @@ 
 			if(dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\')

 			{

 				$path = '/' . substr($path, 2);

-			}

-			else

+			} else

 			{

 				$path = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($path, 2);

 			}

-		}

-		else if(strpos($file, '../') === 0)

+		} else if(strpos($file, '../') === 0)

 		{

 			$path = $this->_normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$path}");

 		}

classes/httprequest/XEHttpRequest.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
 	/**
 	 * Mether to add key/value pair to the HTTP request header
-	 * @param int|string $key HTTP header element
+	 * @param string $key HTTP header element
 	 * @param string $value value string for HTTP header element
 	 * @return void
 	 */

Spacing +20 added lines, -20 removed lines

@@ -41,7 +41,7 @@ 
 	 * constructor
 	 * @return void
 	 */
-	function XEHttpRequest($host, $port, $scheme='')
+	function XEHttpRequest($host, $port, $scheme = '')
 	{
 		$this->m_host = $host;
 		$this->m_port = $port;
@@ -76,11 +76,11 @@ 
 		$this->addToHeader('Connection', 'close');
 
 		$method = strtoupper($method);
-		if(!$allow_methods)
+		if (!$allow_methods)
 		{
 			$allow_methods = explode(' ', 'GET POST PUT');
 		}
-		if(!in_array($method, $allow_methods))
+		if (!in_array($method, $allow_methods))
 		{
 			$method = $allow_methods[0];
 		}
@@ -89,12 +89,12 @@ 
 		$timout = max((int) $timeout, 0);
 
 		// list of post variables
-		if(!is_array($post_vars))
+		if (!is_array($post_vars))
 		{
 			$post_vars = array();
 		}
 
-		if(FALSE && is_callable('curl_init'))
+		if (FALSE && is_callable('curl_init'))
 		{
 			return $this->sendWithCurl($target, $method, $timeout, $post_vars);
 		}
@@ -117,28 +117,28 @@ 
 		static $crlf = "\r\n";
 
 		$scheme = '';
-		if($this->m_scheme=='https')
+		if ($this->m_scheme == 'https')
 		{
 			$scheme = 'ssl://';
 		}
 
 		$sock = @fsockopen($scheme . $this->m_host, $this->m_port, $errno, $errstr, $timeout);
-		if(!$sock)
+		if (!$sock)
 		{
 			return new Object(-1, 'socket_connect_failed');
 		}
 
 		$headers = $this->m_headers + array();
-		if(!isset($headers['Accept-Encoding']))
+		if (!isset($headers['Accept-Encoding']))
 		{
 			$headers['Accept-Encoding'] = 'identity';
 		}
 
 		// post body
 		$post_body = '';
-		if($method == 'POST' && count($post_vars))
+		if ($method == 'POST' && count($post_vars))
 		{
-			foreach($post_vars as $key => $value)
+			foreach ($post_vars as $key => $value)
 			{
 				$post_body .= urlencode($key) . '=' . urlencode($value) . '&';
 			}
@@ -149,7 +149,7 @@ 
 		}
 
 		$request = "$method $target HTTP/1.1$crlf";
-		foreach($headers as $equiv => $content)
+		foreach ($headers as $equiv => $content)
 		{
 			$request .= "$equiv: $content$crlf";
 		}
@@ -160,24 +160,24 @@ 
 
 		// read response headers
 		$is_chunked = FALSE;
-		while(strlen(trim($line = fgets($sock))))
+		while (strlen(trim($line = fgets($sock))))
 		{
 			list($equiv, $content) = preg_split('/ *: */', rtrim($line), 2);
-			if(!strcasecmp($equiv, 'Transfer-Encoding') && $content == 'chunked')
+			if (!strcasecmp($equiv, 'Transfer-Encoding') && $content == 'chunked')
 			{
 				$is_chunked = TRUE;
 			}
 		}
 
 		$body = '';
-		while(!feof($sock))
+		while (!feof($sock))
 		{
-			if($is_chunked)
+			if ($is_chunked)
 			{
 				$chunk_size = hexdec(fgets($sock));
-				if($chunk_size)
+				if ($chunk_size)
 				{
-					$body .= fgets($sock, $chunk_size+1);
+					$body .= fgets($sock, $chunk_size + 1);
 				}
 			}
 			else
@@ -219,7 +219,7 @@ 
 		curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
 
-		switch($method)
+		switch ($method)
 		{
 			case 'GET': curl_setopt($ch, CURLOPT_HTTPGET, true);
 				break;
@@ -232,7 +232,7 @@ 
 		}
 
 		$arr_headers = array();
-		foreach($headers as $key => $value)
+		foreach ($headers as $key => $value)
 		{
 			$arr_headers[] = "$key: $value";
 		}
@@ -240,7 +240,7 @@ 
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $arr_headers);
 
 		$body = curl_exec($ch);
-		if(curl_errno($ch))
+		if (curl_errno($ch))
 		{
 			return new Object(-1, 'socket_connect_failed');
 		}

Braces +2 added lines, -4 removed lines

@@ -25,8 +25,7 @@ 
 		{
 			$mskin = 'default';
 			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
-		}
-		else
+		} else
 		{
 			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
 		}
@@ -40,8 +39,7 @@ 
 			if(!$this->memberInfo)
 			{
 				Context::set('member_srl','');
-			}
-			else
+			} else
 			{
 				Context::set('member_info',$this->memberInfo);
 			}