xpressengine / xe-core

classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php

Braces +3 added lines, -6 removed lines

@@ -41,14 +41,12 @@ 
 		if($column->attrs->var)

 		{

 			$this->argument = new QueryArgument($column);

-		}

-		else

+		} else

 		{

 			if(strpos($column->attrs->default, '.') !== FALSE)

 			{

 				$this->default_value = "'" . $dbParser->parseColumnName($column->attrs->default) . "'";

-			}

-			else

+			} else

 			{

 				$default_value = new DefaultValue($this->name, $column->attrs->default);

 				if($default_value->isOperation())

@@ -84,8 +82,7 @@ 
 			return sprintf('new UpdateExpression(\'%s\', ${\'%s_argument\'})'

 							, $this->name

 							, $this->argument->argument_name);

-		}

-		else

+		} else

 		{

 			return sprintf('new UpdateExpressionWithoutArgument(\'%s\', %s)'

 							, $this->name

Spacing +9 added lines, -9 removed lines

@@ -38,20 +38,20 @@ 
 		$dbParser = DB::getParser();

 		$this->name = $dbParser->parseColumnName($this->name);

 

-		if($column->attrs->var)

+		if ($column->attrs->var)

 		{

 			$this->argument = new QueryArgument($column);

 		}

 		else

 		{

-			if(strpos($column->attrs->default, '.') !== FALSE)

+			if (strpos($column->attrs->default, '.') !== FALSE)

 			{

-				$this->default_value = "'" . $dbParser->parseColumnName($column->attrs->default) . "'";

+				$this->default_value = "'".$dbParser->parseColumnName($column->attrs->default)."'";

 			}

 			else

 			{

 				$default_value = new DefaultValue($this->name, $column->attrs->default);

-				if($default_value->isOperation())

+				if ($default_value->isOperation())

 				{

 					$this->argument = new QueryArgument($column, TRUE);

 				}

@@ -59,13 +59,13 @@ 
 				else

 				{

 					$this->default_value = $default_value->toString();

-					if($default_value->isStringFromFunction())

+					if ($default_value->isStringFromFunction())

 					{

-						$this->default_value = '"\'".' . $this->default_value . '."\'"';

+						$this->default_value = '"\'".'.$this->default_value.'."\'"';

 					}

-					if($default_value->isString())

+					if ($default_value->isString())

 					{

-						$this->default_value = '"' . $this->default_value . '"';

+						$this->default_value = '"'.$this->default_value.'"';

 					}

 				}

 			}

@@ -79,7 +79,7 @@ 
 	 */

 	function getExpressionString()

 	{

-		if($this->argument)

+		if ($this->argument)

 		{

 			return sprintf('new UpdateExpression(\'%s\', ${\'%s_argument\'})'

 							, $this->name

classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 			if($column->name === 'query')

 			{

 				$this->columns[] = new QueryTag($column, true);

-			}

-			else

+			} else

 			{

 				$this->columns[] = new UpdateColumnTag($column);

 			}

Spacing +7 added lines, -7 removed lines

@@ -28,14 +28,14 @@ 
 	{

 		$this->columns = array();

 

-		if(!is_array($xml_columns))

+		if (!is_array($xml_columns))

 		{

 			$xml_columns = array($xml_columns);

 		}

 

-		foreach($xml_columns as $column)

+		foreach ($xml_columns as $column)

 		{

-			if($column->name === 'query')

+			if ($column->name === 'query')

 			{

 				$this->columns[] = new QueryTag($column, true);

 			}

@@ -53,10 +53,10 @@ 
 	 */

 	function toString()

 	{

-		$output_columns = 'array(' . PHP_EOL;

-		foreach($this->columns as $column)

+		$output_columns = 'array('.PHP_EOL;

+		foreach ($this->columns as $column)

 		{

-			$output_columns .= $column->getExpressionString() . PHP_EOL . ',';

+			$output_columns .= $column->getExpressionString().PHP_EOL.',';

 		}

 		$output_columns = substr($output_columns, 0, -1);

 		$output_columns .= ')';

@@ -71,7 +71,7 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		foreach($this->columns as $column)

+		foreach ($this->columns as $column)

 		{

 			$arguments[] = $column->getArgument();

 		}

classes/xml/xmlquery/tags/condition/ConditionTag.class.php

Braces +8 added lines, -16 removed lines

@@ -78,13 +78,11 @@ 
 		{

 			$this->query = new QueryTag($condition, TRUE);

 			$this->default_column = $this->query->toString();

-		}

-		else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

+		} else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

 		{

 			$this->argument = new QueryArgument($condition);

 			$this->argument_name = $this->argument->getArgumentName();

-		}

-		else

+		} else

 		{

 			if(isset($condition->attrs->default))

 			{

@@ -95,13 +93,11 @@ 
 					if(strpos($default_value, "'") !== FALSE)

 					{

 						$default_value = "\"" . $default_value . "\"";

-					}

-					else

+					} else

 					{

 						$default_value = "'" . $default_value . "'";

 					}

-				}

-				else

+				} else

 				{

 					$default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);

 					$default_value = $default_value_object->toString();

@@ -116,16 +112,14 @@ 
 						if(strpos($default_value, "'") !== FALSE)

 						{

 							$default_value = "\"" . $default_value . "\"";

-						}

-						else

+						} else

 						{

 							$default_value = "'" . $default_value . "'";

 						}

 					}

 				}

 				$this->default_column = $default_value;

-			}

-			else

+			} else

 			{

 				$this->default_column = "'" . $dbParser->parseColumnName($condition->attrs->var) . "'";

 			}

@@ -161,8 +155,7 @@ 
 							, '"' . $this->operation . '"'

 							, $this->pipe ? ", '" . $this->pipe . "'" : ''

 			);

-		}

-		else if(isset($this->default_column))

+		} else if(isset($this->default_column))

 		{

 			return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"

 							, $this->column_name

@@ -170,8 +163,7 @@ 
 							, '"' . $this->operation . '"'

 							, $this->pipe ? ", '" . $this->pipe . "'" : ''

 			);

-		}

-		else

+		} else

 		{

 			return sprintf("new ConditionWithArgument('%s',%s,%s%s)"

 							, $this->column_name

Spacing +27 added lines, -27 removed lines

@@ -67,38 +67,38 @@ 
 		$this->column_name = $dbParser->parseExpression($condition->attrs->column);

 

 		// If default value is column name, it should be escaped

-		if($isColumnName = (strpos($condition->attrs->default, '.') !== FALSE

+		if ($isColumnName = (strpos($condition->attrs->default, '.') !== FALSE

 				&& strpos($condition->attrs->default, '.') !== 0

-				&& strpos($condition->attrs->default, '%') === FALSE ))

+				&& strpos($condition->attrs->default, '%') === FALSE))

 		{

 			$condition->attrs->default = $dbParser->parseExpression($condition->attrs->default);

 		}

 

-		if($condition->node_name == 'query')

+		if ($condition->node_name == 'query')

 		{

 			$this->query = new QueryTag($condition, TRUE);

 			$this->default_column = $this->query->toString();

 		}

-		else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

+		else if ($condition->attrs->var && !strpos($condition->attrs->var, '.'))

 		{

 			$this->argument = new QueryArgument($condition);

 			$this->argument_name = $this->argument->getArgumentName();

 		}

 		else

 		{

-			if(isset($condition->attrs->default))

+			if (isset($condition->attrs->default))

 			{

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

-				if(isset($operationList[$this->operation]))

+				if (isset($operationList[$this->operation]))

 				{

 					$default_value = $condition->attrs->default;

-					if(strpos($default_value, "'") !== FALSE)

+					if (strpos($default_value, "'") !== FALSE)

 					{

-						$default_value = "\"" . $default_value . "\"";

+						$default_value = "\"".$default_value."\"";

 					}

 					else

 					{

-						$default_value = "'" . $default_value . "'";

+						$default_value = "'".$default_value."'";

 					}

 				}

 				else

@@ -106,20 +106,20 @@ 
 					$default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);

 					$default_value = $default_value_object->toString();

 

-					if($default_value_object->isStringFromFunction())

+					if ($default_value_object->isStringFromFunction())

 					{

-						$default_value = '"\'".' . $default_value . '."\'"';

+						$default_value = '"\'".'.$default_value.'."\'"';

 					}

 

-					if($default_value_object->isString() && !$isColumnName && !is_numeric($condition->attrs->default))

+					if ($default_value_object->isString() && !$isColumnName && !is_numeric($condition->attrs->default))

 					{

-						if(strpos($default_value, "'") !== FALSE)

+						if (strpos($default_value, "'") !== FALSE)

 						{

-							$default_value = "\"" . $default_value . "\"";

+							$default_value = "\"".$default_value."\"";

 						}

 						else

 						{

-							$default_value = "'" . $default_value . "'";

+							$default_value = "'".$default_value."'";

 						}

 					}

 				}

@@ -127,7 +127,7 @@ 
 			}

 			else

 			{

-				$this->default_column = "'" . $dbParser->parseColumnName($condition->attrs->var) . "'";

+				$this->default_column = "'".$dbParser->parseColumnName($condition->attrs->var)."'";

 			}

 		}

 	}

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

 	{

 		$arguments = array();

-		if($this->query)

+		if ($this->query)

 		{

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

 		}

-		if($this->argument)

+		if ($this->argument)

 		{

 			$arguments[] = $this->argument;

 		}

@@ -153,31 +153,31 @@ 
 

 	function getConditionString()

 	{

-		if($this->query)

+		if ($this->query)

 		{

 			return sprintf("new ConditionSubquery('%s',%s,%s%s)"

 							, $this->column_name

 							, $this->default_column

-							, '"' . $this->operation . '"'

-							, $this->pipe ? ", '" . $this->pipe . "'" : ''

+							, '"'.$this->operation.'"'

+							, $this->pipe ? ", '".$this->pipe."'" : ''

 			);

 		}

-		else if(isset($this->default_column))

+		else if (isset($this->default_column))

 		{

 			return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"

 							, $this->column_name

 							, $this->default_column

-							, '"' . $this->operation . '"'

-							, $this->pipe ? ", '" . $this->pipe . "'" : ''

+							, '"'.$this->operation.'"'

+							, $this->pipe ? ", '".$this->pipe."'" : ''

 			);

 		}

 		else

 		{

 			return sprintf("new ConditionWithArgument('%s',%s,%s%s)"

 							, $this->column_name

-							, '$' . $this->argument_name . '_argument'

-							, '"' . $this->operation . '"'

-							, $this->pipe ? ", '" . $this->pipe . "'" : ''

+							, '$'.$this->argument_name.'_argument'

+							, '"'.$this->operation.'"'

+							, $this->pipe ? ", '".$this->pipe."'" : ''

 			);

 		}

 	}

classes/xml/xmlquery/tags/navigation/LimitTag.class.php

Spacing +5 added lines, -5 removed lines

@@ -42,11 +42,11 @@ 
 	 */

 	function LimitTag($index)

 	{

-		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

+		if ($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

+			if (!isset($index->page->attrs->default))

 				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

+			if (!isset($index->page_count->attrs->default))

 				$index->page_count->attrs->default = 10;

 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

@@ -54,7 +54,7 @@ 
 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

+		if (!isset($index->list_count->attrs->default))

 			$index->list_count->attrs->default = 0;

 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

@@ -62,7 +62,7 @@ 
 

 	function toString()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

 		}

Braces +10 added lines, -8 removed lines

@@ -44,18 +44,21 @@ 
 	{

 		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

-				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

-				$index->page_count->attrs->default = 10;

+			if(!isset($index->page->attrs->default)) {
+							$index->page->attrs->default = 1;
+			}
+			if(!isset($index->page_count->attrs->default)) {
+							$index->page_count->attrs->default = 10;
+			}
 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

 			$this->arguments[] = $this->page;

 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

-			$index->list_count->attrs->default = 0;

+		if(!isset($index->list_count->attrs->default)) {
+					$index->list_count->attrs->default = 0;
+		}
 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

 	}

@@ -65,8 +68,7 @@ 
 		if($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

-		}

-		else

+		} else

 		{

 			return sprintf('new Limit(${\'%s_argument\'})', $this->list_count->getArgumentName());

 		}

classes/xml/xmlquery/tags/navigation/NavigationTag.class.php

Braces +1 added lines, -2 removed lines

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

 		{

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

-		}

-		else

+		} else

 		{

 			return "";

 		}

Spacing +14 added lines, -14 removed lines

@@ -49,36 +49,36 @@ 
 	function NavigationTag($xml_navigation)

 	{

 		$this->order = array();

-		if($xml_navigation)

+		if ($xml_navigation)

 		{

 			$order = $xml_navigation->index;

-			if($order)

+			if ($order)

 			{

-				if(!is_array($order))

+				if (!is_array($order))

 				{

 					$order = array($order);

 				}

-				foreach($order as $order_info)

+				foreach ($order as $order_info)

 				{

 					$this->order[] = new IndexTag($order_info);

 				}

 

-				if($xml_navigation->page && $xml_navigation->page->attrs || $xml_navigation->list_count && $xml_navigation->list_count->attrs)

+				if ($xml_navigation->page && $xml_navigation->page->attrs || $xml_navigation->list_count && $xml_navigation->list_count->attrs)

 				{

 					$this->limit = new LimitTag($xml_navigation);

 				}

 

-				if($xml_navigation->list_count)

+				if ($xml_navigation->list_count)

 				{

 					$this->list_count = $xml_navigation->list_count->attrs;

 				}

 

-				if($xml_navigation->page_count)

+				if ($xml_navigation->page_count)

 				{

 					$this->page_count = $xml_navigation->page_count->attrs;

 				}

 

-				if($xml_navigation->page)

+				if ($xml_navigation->page)

 				{

 					$this->page = $xml_navigation->page->attrs;

 				}

@@ -92,10 +92,10 @@ 
 	 */

 	function getOrderByString()

 	{

-		$output = 'array(' . PHP_EOL;

-		foreach($this->order as $order)

+		$output = 'array('.PHP_EOL;

+		foreach ($this->order as $order)

 		{

-			$output .= $order->toString() . PHP_EOL . ',';

+			$output .= $order->toString().PHP_EOL.',';

 		}

 		$output = substr($output, 0, -1);

 		$output .= ')';

@@ -108,7 +108,7 @@ 
 	 */

 	function getLimitString()

 	{

-		if($this->limit)

+		if ($this->limit)

 		{

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

 		}

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

 	{

 		$arguments = array();

-		foreach($this->order as $order)

+		foreach ($this->order as $order)

 		{

 			$arguments = array_merge($order->getArguments(), $arguments);

 		}

-		if($this->limit)

+		if ($this->limit)

 		{

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

 		}

classes/xml/xmlquery/tags/table/TablesTag.class.php

Braces +3 added lines, -6 removed lines

@@ -68,14 +68,12 @@ 
 			if($tag->attrs->query == 'true')

 			{

 				$this->tables[] = new QueryTag($tag, true);

-			}

-			else

+			} else

 			{

 				if(isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])

 				{

 					$this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);

-				}

-				else

+				} else

 				{

 					$this->tables[] = new TableTag($tag);

 				}

@@ -96,8 +94,7 @@ 
 			if(is_a($table, 'QueryTag'))

 			{

 				$output_tables .= $table->toString() . PHP_EOL . ',';

-			}

-			else

+			} else

 			{

 				$output_tables .= $table->getTableString() . PHP_EOL . ',';

 			}

Spacing +14 added lines, -14 removed lines

@@ -38,21 +38,21 @@ 
 		$this->tables = array();

 

 		$xml_tables = $xml_tables_tag->table;

-		if(!is_array($xml_tables))

+		if (!is_array($xml_tables))

 		{

 			$xml_tables = array($xml_tables);

 		}

 

-		if($xml_index_hints_tag)

+		if ($xml_index_hints_tag)

 		{

 			$index_nodes = $xml_index_hints_tag->index;

-			if(!is_array($index_nodes))

+			if (!is_array($index_nodes))

 			{

 				$index_nodes = array($index_nodes);

 			}

-			foreach($index_nodes as $index_node)

+			foreach ($index_nodes as $index_node)

 			{

-				if(!isset($indexes[$index_node->attrs->table]))

+				if (!isset($indexes[$index_node->attrs->table]))

 				{

 					$indexes[$index_node->attrs->table] = array();

 				}

@@ -63,15 +63,15 @@ 
 			}

 		}

 

-		foreach($xml_tables as $tag)

+		foreach ($xml_tables as $tag)

 		{

-			if($tag->attrs->query == 'true')

+			if ($tag->attrs->query == 'true')

 			{

 				$this->tables[] = new QueryTag($tag, true);

 			}

 			else

 			{

-				if(isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])

+				if (isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])

 				{

 					$this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);

 				}

@@ -90,16 +90,16 @@ 
 

 	function toString()

 	{

-		$output_tables = 'array(' . PHP_EOL;

-		foreach($this->tables as $table)

+		$output_tables = 'array('.PHP_EOL;

+		foreach ($this->tables as $table)

 		{

-			if(is_a($table, 'QueryTag'))

+			if (is_a($table, 'QueryTag'))

 			{

-				$output_tables .= $table->toString() . PHP_EOL . ',';

+				$output_tables .= $table->toString().PHP_EOL.',';

 			}

 			else

 			{

-				$output_tables .= $table->getTableString() . PHP_EOL . ',';

+				$output_tables .= $table->getTableString().PHP_EOL.',';

 			}

 		}

 		$output_tables = substr($output_tables, 0, -1);

@@ -110,7 +110,7 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		foreach($this->tables as $table)

+		foreach ($this->tables as $table)

 		{

 			$arguments = array_merge($arguments, $table->getArguments());

 		}

config/config.inc.php

Braces +6 added lines, -7 removed lines

@@ -10,8 +10,7 @@ 
 if(version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
-}
-else
+} else
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
@@ -56,8 +55,7 @@ 
 if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
 {
 	require _XE_PATH_ . 'config/package.inc.php';
-}
-else
+} else
 {
 	/**
 	 * Package type
@@ -398,12 +396,13 @@ 
 	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
 		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
-	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	} elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
 		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		if(isset($matches[2]) && $matches[2]) {
+			$candidate_filename[] = 'admin';
+		}
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 

Spacing +36 added lines, -36 removed lines

@@ -7,7 +7,7 @@ 
  * @file   config/config.inc.php
  * @author NAVER (developers@xpressengine.com)
  */
-if(version_compare(PHP_VERSION, '5.4.0', '<'))
+if (version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
 }
@@ -16,7 +16,7 @@ 
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -53,9 +53,9 @@ 
 ini_set('session.use_only_cookies', 0);
 
 
-if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
+if (file_exists(_XE_PATH_.'config/package.inc.php'))
 {
-	require _XE_PATH_ . 'config/package.inc.php';
+	require _XE_PATH_.'config/package.inc.php';
 }
 else
 {
@@ -97,12 +97,12 @@ 
  * define('__ENABLE_PHPUNIT_TEST__', 0);
  * define('__PROXY_SERVER__', 'http://domain:port/path');
  */
-if(file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
+if (file_exists(_XE_PATH_.'config/config.user.inc.php'))
 {
-	require _XE_PATH_ . 'config/config.user.inc.php';
+	require _XE_PATH_.'config/config.user.inc.php';
 }
 
-if(!defined('__DEBUG__'))
+if (!defined('__DEBUG__'))
 {
 	/**
 	 * output debug message(bit value)
@@ -117,7 +117,7 @@ 
 	define('__DEBUG__', 0);
 }
 
-if(!defined('__DEBUG_OUTPUT__'))
+if (!defined('__DEBUG_OUTPUT__'))
 {
 	/**
 	 * output location of debug message
@@ -131,7 +131,7 @@ 
 	define('__DEBUG_OUTPUT__', 0);
 }
 
-if(!defined('__DEBUG_PROTECT__'))
+if (!defined('__DEBUG_PROTECT__'))
 {
 	/**
 	 * output comments of the firePHP console and browser
@@ -144,7 +144,7 @@ 
 	define('__DEBUG_PROTECT__', 1);
 }
 
-if(!defined('__DEBUG_PROTECT_IP__'))
+if (!defined('__DEBUG_PROTECT_IP__'))
 {
 	/**
 	 * Set a ip address to allow debug
@@ -152,7 +152,7 @@ 
 	define('__DEBUG_PROTECT_IP__', '127.0.0.1');
 }
 
-if(!defined('__DEBUG_DB_OUTPUT__'))
+if (!defined('__DEBUG_DB_OUTPUT__'))
 {
 	/**
 	 * DB error message definition
@@ -165,7 +165,7 @@ 
 	define('__DEBUG_DB_OUTPUT__', 0);
 }
 
-if(!defined('__LOG_SLOW_QUERY__'))
+if (!defined('__LOG_SLOW_QUERY__'))
 {
 	/**
 	 * Query log for only timeout query among DB queries
@@ -179,7 +179,7 @@ 
 	define('__LOG_SLOW_QUERY__', 0);
 }
 
-if(!defined('__LOG_SLOW_TRIGGER__'))
+if (!defined('__LOG_SLOW_TRIGGER__'))
 {
 	/**
 	 * Trigger excute time log
@@ -193,7 +193,7 @@ 
 	define('__LOG_SLOW_TRIGGER__', 0);
 }
 
-if(!defined('__LOG_SLOW_ADDON__'))
+if (!defined('__LOG_SLOW_ADDON__'))
 {
 	/**
 	 * Addon excute time log
@@ -207,7 +207,7 @@ 
 	define('__LOG_SLOW_ADDON__', 0);
 }
 
-if(!defined('__LOG_SLOW_WIDGET__'))
+if (!defined('__LOG_SLOW_WIDGET__'))
 {
 	/**
 	 * Widget excute time log
@@ -221,7 +221,7 @@ 
 	define('__LOG_SLOW_WIDGET__', 0);
 }
 
-if(!defined('__DEBUG_QUERY__'))
+if (!defined('__DEBUG_QUERY__'))
 {
 	/**
 	 * Leave DB query information
@@ -234,7 +234,7 @@ 
 	define('__DEBUG_QUERY__', 0);
 }
 
-if(!defined('__OB_GZHANDLER_ENABLE__'))
+if (!defined('__OB_GZHANDLER_ENABLE__'))
 {
 	/**
 	 * option to enable/disable a compression feature using ob_gzhandler
@@ -248,7 +248,7 @@ 
 	define('__OB_GZHANDLER_ENABLE__', 1);
 }
 
-if(!defined('__ENABLE_PHPUNIT_TEST__'))
+if (!defined('__ENABLE_PHPUNIT_TEST__'))
 {
 	/**
 	 * decide to use/not use the php unit test (Path/tests/index.php)
@@ -261,7 +261,7 @@ 
 	define('__ENABLE_PHPUNIT_TEST__', 0);
 }
 
-if(!defined('__PROXY_SERVER__'))
+if (!defined('__PROXY_SERVER__'))
 {
 	/**
 	 * __PROXY_SERVER__ has server information to request to the external through the target server
@@ -271,25 +271,25 @@ 
 }
 
 // Require specific files when using Firebug console output
-if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
+if ((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
 {
-	require _XE_PATH_ . 'libs/FirePHPCore/FirePHP.class.php';
+	require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
 }
 
 // Set Timezone as server time
-if(version_compare(PHP_VERSION, '5.3.0') >= 0)
+if (version_compare(PHP_VERSION, '5.3.0') >= 0)
 {
 	date_default_timezone_set(@date_default_timezone_get());
 }
 
 // Require a function-defined-file for simple use
-require(_XE_PATH_ . 'config/func.inc.php');
+require(_XE_PATH_.'config/func.inc.php');
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	define('__StartTime__', getMicroTime());
 }
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	$GLOBALS['__elapsed_class_load__'] = 0;
 }
 
@@ -391,38 +391,38 @@ 
 
 function __xe_autoload($class_name)
 {
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$time_at = getMicroTime();
 	}
 
-	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
+	if (isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
-		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
+		require _XE_PATH_.$GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
 	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	elseif (preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
-		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		$candidate_filename[] = 'modules/'.$matches[1].'/'.$matches[1];
+		if (isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 
 		$candidate_filename = implode('.', $candidate_filename);
 
-		if(file_exists(_XE_PATH_ . $candidate_filename))
+		if (file_exists(_XE_PATH_.$candidate_filename))
 		{
-			require _XE_PATH_ . $candidate_filename;
+			require _XE_PATH_.$candidate_filename;
 		}
 	}
 
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
 	}
 }
 spl_autoload_register('__xe_autoload');
 
-if(file_exists(_XE_PATH_  . '/vendor/autoload.php')) {
-	require _XE_PATH_  . '/vendor/autoload.php';
+if (file_exists(_XE_PATH_.'/vendor/autoload.php')) {
+	require _XE_PATH_.'/vendor/autoload.php';
 }
 /* End of file config.inc.php */
 /* Location: ./config/config.inc.php */

index.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		{
 			$oModuleHandler->displayContent($oModuleHandler->procModule());
 		}
-	}
-	catch(Exception $e)
+	} catch(Exception $e)
 	{
 		htmlHeader();
 		echo Context::getLang($e->getMessage());

Spacing +5 added lines, -5 removed lines

@@ -32,11 +32,11 @@ 
 /**
  * @brief Declare constants for generic use and for checking to avoid a direct call from the Web
  **/
-define('__XE__',   TRUE);
+define('__XE__', TRUE);
 /**
  * @brief Include the necessary configuration files
  **/
-require dirname(__FILE__) . '/config/config.inc.php';
+require dirname(__FILE__).'/config/config.inc.php';
 
 /**
  * @brief Initialize by creating Context object
@@ -48,18 +48,18 @@ 
 /**
  * @brief If default_url is set and it is different from the current url, attempt to redirect for SSO authentication and then process the module
  **/
-if($oContext->checkSSO())
+if ($oContext->checkSSO())
 {
 	$oModuleHandler = new ModuleHandler();
 
 	try
 	{
-		if($oModuleHandler->init())
+		if ($oModuleHandler->init())
 		{
 			$oModuleHandler->displayContent($oModuleHandler->procModule());
 		}
 	}
-	catch(Exception $e)
+	catch (Exception $e)
 	{
 		htmlHeader();
 		echo Context::getLang($e->getMessage());

libs/PEAR.1.9.5/HTTP/Request2/Adapter/Curl.php

Switch Indentation +39 added lines, -39 removed lines

@@ -268,29 +268,29 @@ 
 

         // set HTTP version

         switch ($this->request->getConfig('protocol_version')) {

-        case '1.0':

-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

-            break;

-        case '1.1':

-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

+        	case '1.0':

+            	curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

+            	break;

+        	case '1.1':

+            	curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

         }

 

         // set request method

         switch ($this->request->getMethod()) {

-        case HTTP_Request2::METHOD_GET:

-            curl_setopt($ch, CURLOPT_HTTPGET, true);

-            break;

-        case HTTP_Request2::METHOD_POST:

-            curl_setopt($ch, CURLOPT_POST, true);

-            break;

-        case HTTP_Request2::METHOD_HEAD:

-            curl_setopt($ch, CURLOPT_NOBODY, true);

-            break;

-        case HTTP_Request2::METHOD_PUT:

-            curl_setopt($ch, CURLOPT_UPLOAD, true);

-            break;

-        default:

-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

+        	case HTTP_Request2::METHOD_GET:

+            	curl_setopt($ch, CURLOPT_HTTPGET, true);

+            	break;

+        	case HTTP_Request2::METHOD_POST:

+            	curl_setopt($ch, CURLOPT_POST, true);

+            	break;

+        	case HTTP_Request2::METHOD_HEAD:

+            	curl_setopt($ch, CURLOPT_NOBODY, true);

+            	break;

+        	case HTTP_Request2::METHOD_PUT:

+            	curl_setopt($ch, CURLOPT_UPLOAD, true);

+            	break;

+        	default:

+            	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

         }

 

         // set proxy, if needed

@@ -307,25 +307,25 @@ 
                     $user . ':' . $this->request->getConfig('proxy_password')

                 );

                 switch ($this->request->getConfig('proxy_auth_scheme')) {

-                case HTTP_Request2::AUTH_BASIC:

-                    curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

-                    break;

-                case HTTP_Request2::AUTH_DIGEST:

-                    curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

+                	case HTTP_Request2::AUTH_BASIC:

+                    	curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

+                    	break;

+                	case HTTP_Request2::AUTH_DIGEST:

+                    	curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

                 }

             }

             if ($type = $this->request->getConfig('proxy_type')) {

                 switch ($type) {

-                case 'http':

-                    curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);

-                    break;

-                case 'socks5':

-                    curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

-                    break;

-                default:

-                    throw new HTTP_Request2_NotImplementedException(

-                        "Proxy type '{$type}' is not supported"

-                    );

+                	case 'http':

+                    	curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);

+                    	break;

+                	case 'socks5':

+                    	curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

+                    	break;

+                	default:

+                    	throw new HTTP_Request2_NotImplementedException(

+                        	"Proxy type '{$type}' is not supported"

+                    	);

                 }

             }

         }

@@ -334,11 +334,11 @@ 
         if ($auth = $this->request->getAuth()) {

             curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

             switch ($auth['scheme']) {

-            case HTTP_Request2::AUTH_BASIC:

-                curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

-                break;

-            case HTTP_Request2::AUTH_DIGEST:

-                curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

+            	case HTTP_Request2::AUTH_BASIC:

+                	curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

+                	break;

+            	case HTTP_Request2::AUTH_DIGEST:

+                	curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

             }

         }

 

Indentation +528 added lines, -528 removed lines

@@ -35,533 +35,533 @@
  */

 class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter

 {

-    /**

-     * Mapping of header names to cURL options

-     * @var  array

-     */

-    protected static $headerMap = array(

-        'accept-encoding' => CURLOPT_ENCODING,

-        'cookie'          => CURLOPT_COOKIE,

-        'referer'         => CURLOPT_REFERER,

-        'user-agent'      => CURLOPT_USERAGENT

-    );

-

-    /**

-     * Mapping of SSL context options to cURL options

-     * @var  array

-     */

-    protected static $sslContextMap = array(

-        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,

-        'ssl_cafile'      => CURLOPT_CAINFO,

-        'ssl_capath'      => CURLOPT_CAPATH,

-        'ssl_local_cert'  => CURLOPT_SSLCERT,

-        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD

-    );

-

-    /**

-     * Mapping of CURLE_* constants to Exception subclasses and error codes

-     * @var  array

-     */

-    protected static $errorMap = array(

-        CURLE_UNSUPPORTED_PROTOCOL  => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),

-        CURLE_COULDNT_RESOLVE_PROXY => array('HTTP_Request2_ConnectionException'),

-        CURLE_COULDNT_RESOLVE_HOST  => array('HTTP_Request2_ConnectionException'),

-        CURLE_COULDNT_CONNECT       => array('HTTP_Request2_ConnectionException'),

-        // error returned from write callback

-        CURLE_WRITE_ERROR           => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),

-        CURLE_OPERATION_TIMEOUTED   => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::TIMEOUT),

-        CURLE_HTTP_RANGE_ERROR      => array('HTTP_Request2_MessageException'),

-        CURLE_SSL_CONNECT_ERROR     => array('HTTP_Request2_ConnectionException'),

-        CURLE_LIBRARY_NOT_FOUND     => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::MISCONFIGURATION),

-        CURLE_FUNCTION_NOT_FOUND    => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::MISCONFIGURATION),

-        CURLE_ABORTED_BY_CALLBACK   => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),

-        CURLE_TOO_MANY_REDIRECTS    => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::TOO_MANY_REDIRECTS),

-        CURLE_SSL_PEER_CERTIFICATE  => array('HTTP_Request2_ConnectionException'),

-        CURLE_GOT_NOTHING           => array('HTTP_Request2_MessageException'),

-        CURLE_SSL_ENGINE_NOTFOUND   => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::MISCONFIGURATION),

-        CURLE_SSL_ENGINE_SETFAILED  => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::MISCONFIGURATION),

-        CURLE_SEND_ERROR            => array('HTTP_Request2_MessageException'),

-        CURLE_RECV_ERROR            => array('HTTP_Request2_MessageException'),

-        CURLE_SSL_CERTPROBLEM       => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::INVALID_ARGUMENT),

-        CURLE_SSL_CIPHER            => array('HTTP_Request2_ConnectionException'),

-        CURLE_SSL_CACERT            => array('HTTP_Request2_ConnectionException'),

-        CURLE_BAD_CONTENT_ENCODING  => array('HTTP_Request2_MessageException'),

-    );

-

-    /**

-     * Response being received

-     * @var  HTTP_Request2_Response

-     */

-    protected $response;

-

-    /**

-     * Whether 'sentHeaders' event was sent to observers

-     * @var  boolean

-     */

-    protected $eventSentHeaders = false;

-

-    /**

-     * Whether 'receivedHeaders' event was sent to observers

-     * @var boolean

-     */

-    protected $eventReceivedHeaders = false;

-

-    /**

-     * Position within request body

-     * @var  integer

-     * @see  callbackReadBody()

-     */

-    protected $position = 0;

-

-    /**

-     * Information about last transfer, as returned by curl_getinfo()

-     * @var  array

-     */

-    protected $lastInfo;

-

-    /**

-     * Creates a subclass of HTTP_Request2_Exception from curl error data

-     *

-     * @param resource $ch curl handle

-     *

-     * @return HTTP_Request2_Exception

-     */

-    protected static function wrapCurlError($ch)

-    {

-        $nativeCode = curl_errno($ch);

-        $message    = 'Curl error: ' . curl_error($ch);

-        if (!isset(self::$errorMap[$nativeCode])) {

-            return new HTTP_Request2_Exception($message, 0, $nativeCode);

-        } else {

-            $class = self::$errorMap[$nativeCode][0];

-            $code  = empty(self::$errorMap[$nativeCode][1])

-                     ? 0 : self::$errorMap[$nativeCode][1];

-            return new $class($message, $code, $nativeCode);

-        }

-    }

-

-    /**

-     * Sends request to the remote server and returns its response

-     *

-     * @param HTTP_Request2 $request HTTP request message

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   HTTP_Request2_Exception

-     */

-    public function sendRequest(HTTP_Request2 $request)

-    {

-        if (!extension_loaded('curl')) {

-            throw new HTTP_Request2_LogicException(

-                'cURL extension not available', HTTP_Request2_Exception::MISCONFIGURATION

-            );

-        }

-

-        $this->request              = $request;

-        $this->response             = null;

-        $this->position             = 0;

-        $this->eventSentHeaders     = false;

-        $this->eventReceivedHeaders = false;

-

-        try {

-            if (false === curl_exec($ch = $this->createCurlHandle())) {

-                $e = self::wrapCurlError($ch);

-            }

-        } catch (Exception $e) {

-        }

-        if (isset($ch)) {

-            $this->lastInfo = curl_getinfo($ch);

-            curl_close($ch);

-        }

-

-        $response = $this->response;

-        unset($this->request, $this->requestBody, $this->response);

-

-        if (!empty($e)) {

-            throw $e;

-        }

-

-        if ($jar = $request->getCookieJar()) {

-            $jar->addCookiesFromResponse($response, $request->getUrl());

-        }

-

-        if (0 < $this->lastInfo['size_download']) {

-            $request->setLastEvent('receivedBody', $response);

-        }

-        return $response;

-    }

-

-    /**

-     * Returns information about last transfer

-     *

-     * @return   array   associative array as returned by curl_getinfo()

-     */

-    public function getInfo()

-    {

-        return $this->lastInfo;

-    }

-

-    /**

-     * Creates a new cURL handle and populates it with data from the request

-     *

-     * @return   resource    a cURL handle, as created by curl_init()

-     * @throws   HTTP_Request2_LogicException

-     * @throws   HTTP_Request2_NotImplementedException

-     */

-    protected function createCurlHandle()

-    {

-        $ch = curl_init();

-

-        curl_setopt_array($ch, array(

-            // setup write callbacks

-            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),

-            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),

-            // buffer size

-            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),

-            // connection timeout

-            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),

-            // save full outgoing headers, in case someone is interested

-            CURLINFO_HEADER_OUT    => true,

-            // request url

-            CURLOPT_URL            => $this->request->getUrl()->getUrl()

-        ));

-

-        // set up redirects

-        if (!$this->request->getConfig('follow_redirects')) {

-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);

-        } else {

-            if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true)) {

-                throw new HTTP_Request2_LogicException(

-                    'Redirect support in curl is unavailable due to open_basedir or safe_mode setting',

-                    HTTP_Request2_Exception::MISCONFIGURATION

-                );

-            }

-            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));

-            // limit redirects to http(s), works in 5.2.10+

-            if (defined('CURLOPT_REDIR_PROTOCOLS')) {

-                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);

-            }

-            // works in 5.3.2+, http://bugs.php.net/bug.php?id=49571

-            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR')) {

-                curl_setopt($ch, CURLOPT_POSTREDIR, 3);

-            }

-        }

-

-        // set local IP via CURLOPT_INTERFACE (request #19515)

-        if ($ip = $this->request->getConfig('local_ip')) {

-            curl_setopt($ch, CURLOPT_INTERFACE, $ip);

-        }

-

-        // request timeout

-        if ($timeout = $this->request->getConfig('timeout')) {

-            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);

-        }

-

-        // set HTTP version

-        switch ($this->request->getConfig('protocol_version')) {

-        case '1.0':

-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

-            break;

-        case '1.1':

-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

-        }

-

-        // set request method

-        switch ($this->request->getMethod()) {

-        case HTTP_Request2::METHOD_GET:

-            curl_setopt($ch, CURLOPT_HTTPGET, true);

-            break;

-        case HTTP_Request2::METHOD_POST:

-            curl_setopt($ch, CURLOPT_POST, true);

-            break;

-        case HTTP_Request2::METHOD_HEAD:

-            curl_setopt($ch, CURLOPT_NOBODY, true);

-            break;

-        case HTTP_Request2::METHOD_PUT:

-            curl_setopt($ch, CURLOPT_UPLOAD, true);

-            break;

-        default:

-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

-        }

-

-        // set proxy, if needed

-        if ($host = $this->request->getConfig('proxy_host')) {

-            if (!($port = $this->request->getConfig('proxy_port'))) {

-                throw new HTTP_Request2_LogicException(

-                    'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE

-                );

-            }

-            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);

-            if ($user = $this->request->getConfig('proxy_user')) {

-                curl_setopt(

-                    $ch, CURLOPT_PROXYUSERPWD,

-                    $user . ':' . $this->request->getConfig('proxy_password')

-                );

-                switch ($this->request->getConfig('proxy_auth_scheme')) {

-                case HTTP_Request2::AUTH_BASIC:

-                    curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

-                    break;

-                case HTTP_Request2::AUTH_DIGEST:

-                    curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

-                }

-            }

-            if ($type = $this->request->getConfig('proxy_type')) {

-                switch ($type) {

-                case 'http':

-                    curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);

-                    break;

-                case 'socks5':

-                    curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

-                    break;

-                default:

-                    throw new HTTP_Request2_NotImplementedException(

-                        "Proxy type '{$type}' is not supported"

-                    );

-                }

-            }

-        }

-

-        // set authentication data

-        if ($auth = $this->request->getAuth()) {

-            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

-            switch ($auth['scheme']) {

-            case HTTP_Request2::AUTH_BASIC:

-                curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

-                break;

-            case HTTP_Request2::AUTH_DIGEST:

-                curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

-            }

-        }

-

-        // set SSL options

-        foreach ($this->request->getConfig() as $name => $value) {

-            if ('ssl_verify_host' == $name && null !== $value) {

-                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);

-            } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {

-                curl_setopt($ch, self::$sslContextMap[$name], $value);

-            }

-        }

-

-        $headers = $this->request->getHeaders();

-        // make cURL automagically send proper header

-        if (!isset($headers['accept-encoding'])) {

-            $headers['accept-encoding'] = '';

-        }

-

-        if (($jar = $this->request->getCookieJar())

-            && ($cookies = $jar->getMatching($this->request->getUrl(), true))

-        ) {

-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

-        }

-

-        // set headers having special cURL keys

-        foreach (self::$headerMap as $name => $option) {

-            if (isset($headers[$name])) {

-                curl_setopt($ch, $option, $headers[$name]);

-                unset($headers[$name]);

-            }

-        }

-

-        $this->calculateRequestLength($headers);

-        if (isset($headers['content-length']) || isset($headers['transfer-encoding'])) {

-            $this->workaroundPhpBug47204($ch, $headers);

-        }

-

-        // set headers not having special keys

-        $headersFmt = array();

-        foreach ($headers as $name => $value) {

-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

-            $headersFmt[]  = $canonicalName . ': ' . $value;

-        }

-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);

-

-        return $ch;

-    }

-

-    /**

-     * Workaround for PHP bug #47204 that prevents rewinding request body

-     *

-     * The workaround consists of reading the entire request body into memory

-     * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large

-     * file uploads, use Socket adapter instead.

-     *

-     * @param resource $ch       cURL handle

-     * @param array    &$headers Request headers

-     */

-    protected function workaroundPhpBug47204($ch, &$headers)

-    {

-        // no redirects, no digest auth -> probably no rewind needed

-        if (!$this->request->getConfig('follow_redirects')

-            && (!($auth = $this->request->getAuth())

-                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])

-        ) {

-            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));

-

-        } else {

-            // rewind may be needed, read the whole body into memory

-            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {

-                $this->requestBody = $this->requestBody->__toString();

-

-            } elseif (is_resource($this->requestBody)) {

-                $fp = $this->requestBody;

-                $this->requestBody = '';

-                while (!feof($fp)) {

-                    $this->requestBody .= fread($fp, 16384);

-                }

-            }

-            // curl hangs up if content-length is present

-            unset($headers['content-length']);

-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);

-        }

-    }

-

-    /**

-     * Callback function called by cURL for reading the request body

-     *

-     * @param resource $ch     cURL handle

-     * @param resource $fd     file descriptor (not used)

-     * @param integer  $length maximum length of data to return

-     *

-     * @return   string      part of the request body, up to $length bytes

-     */

-    protected function callbackReadBody($ch, $fd, $length)

-    {

-        if (!$this->eventSentHeaders) {

-            $this->request->setLastEvent(

-                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

-            );

-            $this->eventSentHeaders = true;

-        }

-        if (in_array($this->request->getMethod(), self::$bodyDisallowed)

-            || 0 == $this->contentLength || $this->position >= $this->contentLength

-        ) {

-            return '';

-        }

-        if (is_string($this->requestBody)) {

-            $string = substr($this->requestBody, $this->position, $length);

-        } elseif (is_resource($this->requestBody)) {

-            $string = fread($this->requestBody, $length);

-        } else {

-            $string = $this->requestBody->read($length);

-        }

-        $this->request->setLastEvent('sentBodyPart', strlen($string));

-        $this->position += strlen($string);

-        return $string;

-    }

-

-    /**

-     * Callback function called by cURL for saving the response headers

-     *

-     * @param resource $ch     cURL handle

-     * @param string   $string response header (with trailing CRLF)

-     *

-     * @return   integer     number of bytes saved

-     * @see      HTTP_Request2_Response::parseHeaderLine()

-     */

-    protected function callbackWriteHeader($ch, $string)

-    {

-        // we may receive a second set of headers if doing e.g. digest auth

-        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {

-            // don't bother with 100-Continue responses (bug #15785)

-            if (!$this->eventSentHeaders

-                || $this->response->getStatus() >= 200

-            ) {

-                $this->request->setLastEvent(

-                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

-                );

-            }

-            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);

-            // if body wasn't read by a callback, send event with total body size

-            if ($upload > $this->position) {

-                $this->request->setLastEvent(

-                    'sentBodyPart', $upload - $this->position

-                );

-                $this->position = $upload;

-            }

-            if ($upload && (!$this->eventSentHeaders

-                            || $this->response->getStatus() >= 200)

-            ) {

-                $this->request->setLastEvent('sentBody', $upload);

-            }

-            $this->eventSentHeaders = true;

-            // we'll need a new response object

-            if ($this->eventReceivedHeaders) {

-                $this->eventReceivedHeaders = false;

-                $this->response             = null;

-            }

-        }

-        if (empty($this->response)) {

-            $this->response = new HTTP_Request2_Response(

-                $string, false, curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)

-            );

-        } else {

-            $this->response->parseHeaderLine($string);

-            if ('' == trim($string)) {

-                // don't bother with 100-Continue responses (bug #15785)

-                if (200 <= $this->response->getStatus()) {

-                    $this->request->setLastEvent('receivedHeaders', $this->response);

-                }

-

-                if ($this->request->getConfig('follow_redirects') && $this->response->isRedirect()) {

-                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));

-

-                    // for versions lower than 5.2.10, check the redirection URL protocol

-                    if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()

-                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))

-                    ) {

-                        return -1;

-                    }

-

-                    if ($jar = $this->request->getCookieJar()) {

-                        $jar->addCookiesFromResponse($this->response, $this->request->getUrl());

-                        if (!$redirectUrl->isAbsolute()) {

-                            $redirectUrl = $this->request->getUrl()->resolve($redirectUrl);

-                        }

-                        if ($cookies = $jar->getMatching($redirectUrl, true)) {

-                            curl_setopt($ch, CURLOPT_COOKIE, $cookies);

-                        }

-                    }

-                }

-                $this->eventReceivedHeaders = true;

-            }

-        }

-        return strlen($string);

-    }

-

-    /**

-     * Callback function called by cURL for saving the response body

-     *

-     * @param resource $ch     cURL handle (not used)

-     * @param string   $string part of the response body

-     *

-     * @return   integer     number of bytes saved

-     * @throws   HTTP_Request2_MessageException

-     * @see      HTTP_Request2_Response::appendBody()

-     */

-    protected function callbackWriteBody($ch, $string)

-    {

-        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if

-        // response doesn't start with proper HTTP status line (see bug #15716)

-        if (empty($this->response)) {

-            throw new HTTP_Request2_MessageException(

-                "Malformed response: {$string}",

-                HTTP_Request2_Exception::MALFORMED_RESPONSE

-            );

-        }

-        if ($this->request->getConfig('store_body')) {

-            $this->response->appendBody($string);

-        }

-        $this->request->setLastEvent('receivedBodyPart', $string);

-        return strlen($string);

-    }

+	/**

+	 * Mapping of header names to cURL options

+	 * @var  array

+	 */

+	protected static $headerMap = array(

+		'accept-encoding' => CURLOPT_ENCODING,

+		'cookie'          => CURLOPT_COOKIE,

+		'referer'         => CURLOPT_REFERER,

+		'user-agent'      => CURLOPT_USERAGENT

+	);

+

+	/**

+	 * Mapping of SSL context options to cURL options

+	 * @var  array

+	 */

+	protected static $sslContextMap = array(

+		'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,

+		'ssl_cafile'      => CURLOPT_CAINFO,

+		'ssl_capath'      => CURLOPT_CAPATH,

+		'ssl_local_cert'  => CURLOPT_SSLCERT,

+		'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD

+	);

+

+	/**

+	 * Mapping of CURLE_* constants to Exception subclasses and error codes

+	 * @var  array

+	 */

+	protected static $errorMap = array(

+		CURLE_UNSUPPORTED_PROTOCOL  => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::NON_HTTP_REDIRECT),

+		CURLE_COULDNT_RESOLVE_PROXY => array('HTTP_Request2_ConnectionException'),

+		CURLE_COULDNT_RESOLVE_HOST  => array('HTTP_Request2_ConnectionException'),

+		CURLE_COULDNT_CONNECT       => array('HTTP_Request2_ConnectionException'),

+		// error returned from write callback

+		CURLE_WRITE_ERROR           => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::NON_HTTP_REDIRECT),

+		CURLE_OPERATION_TIMEOUTED   => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::TIMEOUT),

+		CURLE_HTTP_RANGE_ERROR      => array('HTTP_Request2_MessageException'),

+		CURLE_SSL_CONNECT_ERROR     => array('HTTP_Request2_ConnectionException'),

+		CURLE_LIBRARY_NOT_FOUND     => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::MISCONFIGURATION),

+		CURLE_FUNCTION_NOT_FOUND    => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::MISCONFIGURATION),

+		CURLE_ABORTED_BY_CALLBACK   => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::NON_HTTP_REDIRECT),

+		CURLE_TOO_MANY_REDIRECTS    => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::TOO_MANY_REDIRECTS),

+		CURLE_SSL_PEER_CERTIFICATE  => array('HTTP_Request2_ConnectionException'),

+		CURLE_GOT_NOTHING           => array('HTTP_Request2_MessageException'),

+		CURLE_SSL_ENGINE_NOTFOUND   => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::MISCONFIGURATION),

+		CURLE_SSL_ENGINE_SETFAILED  => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::MISCONFIGURATION),

+		CURLE_SEND_ERROR            => array('HTTP_Request2_MessageException'),

+		CURLE_RECV_ERROR            => array('HTTP_Request2_MessageException'),

+		CURLE_SSL_CERTPROBLEM       => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::INVALID_ARGUMENT),

+		CURLE_SSL_CIPHER            => array('HTTP_Request2_ConnectionException'),

+		CURLE_SSL_CACERT            => array('HTTP_Request2_ConnectionException'),

+		CURLE_BAD_CONTENT_ENCODING  => array('HTTP_Request2_MessageException'),

+	);

+

+	/**

+	 * Response being received

+	 * @var  HTTP_Request2_Response

+	 */

+	protected $response;

+

+	/**

+	 * Whether 'sentHeaders' event was sent to observers

+	 * @var  boolean

+	 */

+	protected $eventSentHeaders = false;

+

+	/**

+	 * Whether 'receivedHeaders' event was sent to observers

+	 * @var boolean

+	 */

+	protected $eventReceivedHeaders = false;

+

+	/**

+	 * Position within request body

+	 * @var  integer

+	 * @see  callbackReadBody()

+	 */

+	protected $position = 0;

+

+	/**

+	 * Information about last transfer, as returned by curl_getinfo()

+	 * @var  array

+	 */

+	protected $lastInfo;

+

+	/**

+	 * Creates a subclass of HTTP_Request2_Exception from curl error data

+	 *

+	 * @param resource $ch curl handle

+	 *

+	 * @return HTTP_Request2_Exception

+	 */

+	protected static function wrapCurlError($ch)

+	{

+		$nativeCode = curl_errno($ch);

+		$message    = 'Curl error: ' . curl_error($ch);

+		if (!isset(self::$errorMap[$nativeCode])) {

+			return new HTTP_Request2_Exception($message, 0, $nativeCode);

+		} else {

+			$class = self::$errorMap[$nativeCode][0];

+			$code  = empty(self::$errorMap[$nativeCode][1])

+					 ? 0 : self::$errorMap[$nativeCode][1];

+			return new $class($message, $code, $nativeCode);

+		}

+	}

+

+	/**

+	 * Sends request to the remote server and returns its response

+	 *

+	 * @param HTTP_Request2 $request HTTP request message

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   HTTP_Request2_Exception

+	 */

+	public function sendRequest(HTTP_Request2 $request)

+	{

+		if (!extension_loaded('curl')) {

+			throw new HTTP_Request2_LogicException(

+				'cURL extension not available', HTTP_Request2_Exception::MISCONFIGURATION

+			);

+		}

+

+		$this->request              = $request;

+		$this->response             = null;

+		$this->position             = 0;

+		$this->eventSentHeaders     = false;

+		$this->eventReceivedHeaders = false;

+

+		try {

+			if (false === curl_exec($ch = $this->createCurlHandle())) {

+				$e = self::wrapCurlError($ch);

+			}

+		} catch (Exception $e) {

+		}

+		if (isset($ch)) {

+			$this->lastInfo = curl_getinfo($ch);

+			curl_close($ch);

+		}

+

+		$response = $this->response;

+		unset($this->request, $this->requestBody, $this->response);

+

+		if (!empty($e)) {

+			throw $e;

+		}

+

+		if ($jar = $request->getCookieJar()) {

+			$jar->addCookiesFromResponse($response, $request->getUrl());

+		}

+

+		if (0 < $this->lastInfo['size_download']) {

+			$request->setLastEvent('receivedBody', $response);

+		}

+		return $response;

+	}

+

+	/**

+	 * Returns information about last transfer

+	 *

+	 * @return   array   associative array as returned by curl_getinfo()

+	 */

+	public function getInfo()

+	{

+		return $this->lastInfo;

+	}

+

+	/**

+	 * Creates a new cURL handle and populates it with data from the request

+	 *

+	 * @return   resource    a cURL handle, as created by curl_init()

+	 * @throws   HTTP_Request2_LogicException

+	 * @throws   HTTP_Request2_NotImplementedException

+	 */

+	protected function createCurlHandle()

+	{

+		$ch = curl_init();

+

+		curl_setopt_array($ch, array(

+			// setup write callbacks

+			CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),

+			CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),

+			// buffer size

+			CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),

+			// connection timeout

+			CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),

+			// save full outgoing headers, in case someone is interested

+			CURLINFO_HEADER_OUT    => true,

+			// request url

+			CURLOPT_URL            => $this->request->getUrl()->getUrl()

+		));

+

+		// set up redirects

+		if (!$this->request->getConfig('follow_redirects')) {

+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);

+		} else {

+			if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true)) {

+				throw new HTTP_Request2_LogicException(

+					'Redirect support in curl is unavailable due to open_basedir or safe_mode setting',

+					HTTP_Request2_Exception::MISCONFIGURATION

+				);

+			}

+			curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));

+			// limit redirects to http(s), works in 5.2.10+

+			if (defined('CURLOPT_REDIR_PROTOCOLS')) {

+				curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);

+			}

+			// works in 5.3.2+, http://bugs.php.net/bug.php?id=49571

+			if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR')) {

+				curl_setopt($ch, CURLOPT_POSTREDIR, 3);

+			}

+		}

+

+		// set local IP via CURLOPT_INTERFACE (request #19515)

+		if ($ip = $this->request->getConfig('local_ip')) {

+			curl_setopt($ch, CURLOPT_INTERFACE, $ip);

+		}

+

+		// request timeout

+		if ($timeout = $this->request->getConfig('timeout')) {

+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);

+		}

+

+		// set HTTP version

+		switch ($this->request->getConfig('protocol_version')) {

+		case '1.0':

+			curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

+			break;

+		case '1.1':

+			curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

+		}

+

+		// set request method

+		switch ($this->request->getMethod()) {

+		case HTTP_Request2::METHOD_GET:

+			curl_setopt($ch, CURLOPT_HTTPGET, true);

+			break;

+		case HTTP_Request2::METHOD_POST:

+			curl_setopt($ch, CURLOPT_POST, true);

+			break;

+		case HTTP_Request2::METHOD_HEAD:

+			curl_setopt($ch, CURLOPT_NOBODY, true);

+			break;

+		case HTTP_Request2::METHOD_PUT:

+			curl_setopt($ch, CURLOPT_UPLOAD, true);

+			break;

+		default:

+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

+		}

+

+		// set proxy, if needed

+		if ($host = $this->request->getConfig('proxy_host')) {

+			if (!($port = $this->request->getConfig('proxy_port'))) {

+				throw new HTTP_Request2_LogicException(

+					'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE

+				);

+			}

+			curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);

+			if ($user = $this->request->getConfig('proxy_user')) {

+				curl_setopt(

+					$ch, CURLOPT_PROXYUSERPWD,

+					$user . ':' . $this->request->getConfig('proxy_password')

+				);

+				switch ($this->request->getConfig('proxy_auth_scheme')) {

+				case HTTP_Request2::AUTH_BASIC:

+					curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

+					break;

+				case HTTP_Request2::AUTH_DIGEST:

+					curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

+				}

+			}

+			if ($type = $this->request->getConfig('proxy_type')) {

+				switch ($type) {

+				case 'http':

+					curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);

+					break;

+				case 'socks5':

+					curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

+					break;

+				default:

+					throw new HTTP_Request2_NotImplementedException(

+						"Proxy type '{$type}' is not supported"

+					);

+				}

+			}

+		}

+

+		// set authentication data

+		if ($auth = $this->request->getAuth()) {

+			curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

+			switch ($auth['scheme']) {

+			case HTTP_Request2::AUTH_BASIC:

+				curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

+				break;

+			case HTTP_Request2::AUTH_DIGEST:

+				curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

+			}

+		}

+

+		// set SSL options

+		foreach ($this->request->getConfig() as $name => $value) {

+			if ('ssl_verify_host' == $name && null !== $value) {

+				curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);

+			} elseif (isset(self::$sslContextMap[$name]) && null !== $value) {

+				curl_setopt($ch, self::$sslContextMap[$name], $value);

+			}

+		}

+

+		$headers = $this->request->getHeaders();

+		// make cURL automagically send proper header

+		if (!isset($headers['accept-encoding'])) {

+			$headers['accept-encoding'] = '';

+		}

+

+		if (($jar = $this->request->getCookieJar())

+			&& ($cookies = $jar->getMatching($this->request->getUrl(), true))

+		) {

+			$headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

+		}

+

+		// set headers having special cURL keys

+		foreach (self::$headerMap as $name => $option) {

+			if (isset($headers[$name])) {

+				curl_setopt($ch, $option, $headers[$name]);

+				unset($headers[$name]);

+			}

+		}

+

+		$this->calculateRequestLength($headers);

+		if (isset($headers['content-length']) || isset($headers['transfer-encoding'])) {

+			$this->workaroundPhpBug47204($ch, $headers);

+		}

+

+		// set headers not having special keys

+		$headersFmt = array();

+		foreach ($headers as $name => $value) {

+			$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

+			$headersFmt[]  = $canonicalName . ': ' . $value;

+		}

+		curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);

+

+		return $ch;

+	}

+

+	/**

+	 * Workaround for PHP bug #47204 that prevents rewinding request body

+	 *

+	 * The workaround consists of reading the entire request body into memory

+	 * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large

+	 * file uploads, use Socket adapter instead.

+	 *

+	 * @param resource $ch       cURL handle

+	 * @param array    &$headers Request headers

+	 */

+	protected function workaroundPhpBug47204($ch, &$headers)

+	{

+		// no redirects, no digest auth -> probably no rewind needed

+		if (!$this->request->getConfig('follow_redirects')

+			&& (!($auth = $this->request->getAuth())

+				|| HTTP_Request2::AUTH_DIGEST != $auth['scheme'])

+		) {

+			curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));

+

+		} else {

+			// rewind may be needed, read the whole body into memory

+			if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {

+				$this->requestBody = $this->requestBody->__toString();

+

+			} elseif (is_resource($this->requestBody)) {

+				$fp = $this->requestBody;

+				$this->requestBody = '';

+				while (!feof($fp)) {

+					$this->requestBody .= fread($fp, 16384);

+				}

+			}

+			// curl hangs up if content-length is present

+			unset($headers['content-length']);

+			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);

+		}

+	}

+

+	/**

+	 * Callback function called by cURL for reading the request body

+	 *

+	 * @param resource $ch     cURL handle

+	 * @param resource $fd     file descriptor (not used)

+	 * @param integer  $length maximum length of data to return

+	 *

+	 * @return   string      part of the request body, up to $length bytes

+	 */

+	protected function callbackReadBody($ch, $fd, $length)

+	{

+		if (!$this->eventSentHeaders) {

+			$this->request->setLastEvent(

+				'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

+			);

+			$this->eventSentHeaders = true;

+		}

+		if (in_array($this->request->getMethod(), self::$bodyDisallowed)

+			|| 0 == $this->contentLength || $this->position >= $this->contentLength

+		) {

+			return '';

+		}

+		if (is_string($this->requestBody)) {

+			$string = substr($this->requestBody, $this->position, $length);

+		} elseif (is_resource($this->requestBody)) {

+			$string = fread($this->requestBody, $length);

+		} else {

+			$string = $this->requestBody->read($length);

+		}

+		$this->request->setLastEvent('sentBodyPart', strlen($string));

+		$this->position += strlen($string);

+		return $string;

+	}

+

+	/**

+	 * Callback function called by cURL for saving the response headers

+	 *

+	 * @param resource $ch     cURL handle

+	 * @param string   $string response header (with trailing CRLF)

+	 *

+	 * @return   integer     number of bytes saved

+	 * @see      HTTP_Request2_Response::parseHeaderLine()

+	 */

+	protected function callbackWriteHeader($ch, $string)

+	{

+		// we may receive a second set of headers if doing e.g. digest auth

+		if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {

+			// don't bother with 100-Continue responses (bug #15785)

+			if (!$this->eventSentHeaders

+				|| $this->response->getStatus() >= 200

+			) {

+				$this->request->setLastEvent(

+					'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

+				);

+			}

+			$upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);

+			// if body wasn't read by a callback, send event with total body size

+			if ($upload > $this->position) {

+				$this->request->setLastEvent(

+					'sentBodyPart', $upload - $this->position

+				);

+				$this->position = $upload;

+			}

+			if ($upload && (!$this->eventSentHeaders

+							|| $this->response->getStatus() >= 200)

+			) {

+				$this->request->setLastEvent('sentBody', $upload);

+			}

+			$this->eventSentHeaders = true;

+			// we'll need a new response object

+			if ($this->eventReceivedHeaders) {

+				$this->eventReceivedHeaders = false;

+				$this->response             = null;

+			}

+		}

+		if (empty($this->response)) {

+			$this->response = new HTTP_Request2_Response(

+				$string, false, curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)

+			);

+		} else {

+			$this->response->parseHeaderLine($string);

+			if ('' == trim($string)) {

+				// don't bother with 100-Continue responses (bug #15785)

+				if (200 <= $this->response->getStatus()) {

+					$this->request->setLastEvent('receivedHeaders', $this->response);

+				}

+

+				if ($this->request->getConfig('follow_redirects') && $this->response->isRedirect()) {

+					$redirectUrl = new Net_URL2($this->response->getHeader('location'));

+

+					// for versions lower than 5.2.10, check the redirection URL protocol

+					if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()

+						&& !in_array($redirectUrl->getScheme(), array('http', 'https'))

+					) {

+						return -1;

+					}

+

+					if ($jar = $this->request->getCookieJar()) {

+						$jar->addCookiesFromResponse($this->response, $this->request->getUrl());

+						if (!$redirectUrl->isAbsolute()) {

+							$redirectUrl = $this->request->getUrl()->resolve($redirectUrl);

+						}

+						if ($cookies = $jar->getMatching($redirectUrl, true)) {

+							curl_setopt($ch, CURLOPT_COOKIE, $cookies);

+						}

+					}

+				}

+				$this->eventReceivedHeaders = true;

+			}

+		}

+		return strlen($string);

+	}

+

+	/**

+	 * Callback function called by cURL for saving the response body

+	 *

+	 * @param resource $ch     cURL handle (not used)

+	 * @param string   $string part of the response body

+	 *

+	 * @return   integer     number of bytes saved

+	 * @throws   HTTP_Request2_MessageException

+	 * @see      HTTP_Request2_Response::appendBody()

+	 */

+	protected function callbackWriteBody($ch, $string)

+	{

+		// cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if

+		// response doesn't start with proper HTTP status line (see bug #15716)

+		if (empty($this->response)) {

+			throw new HTTP_Request2_MessageException(

+				"Malformed response: {$string}",

+				HTTP_Request2_Exception::MALFORMED_RESPONSE

+			);

+		}

+		if ($this->request->getConfig('store_body')) {

+			$this->response->appendBody($string);

+		}

+		$this->request->setLastEvent('receivedBodyPart', $string);

+		return strlen($string);

+	}

 }

 ?>

Spacing +7 added lines, -7 removed lines

@@ -139,7 +139,7 @@ 
     protected static function wrapCurlError($ch)

     {

         $nativeCode = curl_errno($ch);

-        $message    = 'Curl error: ' . curl_error($ch);

+        $message    = 'Curl error: '.curl_error($ch);

         if (!isset(self::$errorMap[$nativeCode])) {

             return new HTTP_Request2_Exception($message, 0, $nativeCode);

         } else {

@@ -300,11 +300,11 @@ 
                     'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE

                 );

             }

-            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);

+            curl_setopt($ch, CURLOPT_PROXY, $host.':'.$port);

             if ($user = $this->request->getConfig('proxy_user')) {

                 curl_setopt(

                     $ch, CURLOPT_PROXYUSERPWD,

-                    $user . ':' . $this->request->getConfig('proxy_password')

+                    $user.':'.$this->request->getConfig('proxy_password')

                 );

                 switch ($this->request->getConfig('proxy_auth_scheme')) {

                 case HTTP_Request2::AUTH_BASIC:

@@ -332,7 +332,7 @@ 
 

         // set authentication data

         if ($auth = $this->request->getAuth()) {

-            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

+            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'].':'.$auth['password']);

             switch ($auth['scheme']) {

             case HTTP_Request2::AUTH_BASIC:

                 curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

@@ -345,7 +345,7 @@ 
         // set SSL options

         foreach ($this->request->getConfig() as $name => $value) {

             if ('ssl_verify_host' == $name && null !== $value) {

-                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);

+                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value ? 2 : 0);

             } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {

                 curl_setopt($ch, self::$sslContextMap[$name], $value);

             }

@@ -360,7 +360,7 @@ 
         if (($jar = $this->request->getCookieJar())

             && ($cookies = $jar->getMatching($this->request->getUrl(), true))

         ) {

-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

+            $headers['cookie'] = (empty($headers['cookie']) ? '' : $headers['cookie'].'; ').$cookies;

         }

 

         // set headers having special cURL keys

@@ -380,7 +380,7 @@ 
         $headersFmt = array();

         foreach ($headers as $name => $value) {

             $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

-            $headersFmt[]  = $canonicalName . ': ' . $value;

+            $headersFmt[]  = $canonicalName.': '.$value;

         }

         curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);