xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Native.php

Indentation +11 added lines, -11 removed lines

@@ -8,18 +8,18 @@
 class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
 {
 
-    protected function parseImplementation($var, $type, $allow_null) {
-        return $this->evalExpression($var);
-    }
+	protected function parseImplementation($var, $type, $allow_null) {
+		return $this->evalExpression($var);
+	}
 
-    protected function evalExpression($expr) {
-        $var = null;
-        $result = eval("\$var = $expr;");
-        if ($result === false) {
-            throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
-        }
-        return $var;
-    }
+	protected function evalExpression($expr) {
+		$var = null;
+		$result = eval("\$var = $expr;");
+		if ($result === false) {
+			throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
+		}
+		return $var;
+	}
 
 }
 

classes/xml/XmlGenerator.class.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 							{
 								$body .= $this->_makexml($arrNode);
 							}
-						}
-						else if(is_object($value))
+						} else if(is_object($value))
 						{
 							$body = $this->_makexml($value);
 						}

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 	{
 		$buff = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
 
-		foreach($xml as $nodeName => $nodeItem)
+		foreach ($xml as $nodeName => $nodeItem)
 		{
 			$buff .= $this->_makexml($nodeItem);
 		}
@@ -34,16 +34,16 @@ 
 	function _makexml($node)
 	{
 		$body = '';
-		foreach($node as $key => $value)
+		foreach ($node as $key => $value)
 		{
-			switch($key)
+			switch ($key)
 			{
 				case 'node_name' : break;
 				case 'attrs' : {
 						$attrs = '';
-						if(isset($value))
+						if (isset($value))
 						{
-							foreach($value as $attrName => $attrValue)
+							foreach ($value as $attrName => $attrValue)
 							{
 								$attrs .= sprintf(' %s="%s"', $attrName, htmlspecialchars($attrValue, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 							}
@@ -54,21 +54,21 @@ 
 					$body = $value;
 					break;
 				default : {
-						if(is_array($value))
+						if (is_array($value))
 						{
-							foreach($value as $idx => $arrNode)
+							foreach ($value as $idx => $arrNode)
 							{
 								$body .= $this->_makexml($arrNode);
 							}
 						}
-						else if(is_object($value))
+						else if (is_object($value))
 						{
 							$body = $this->_makexml($value);
 						}
 					}
 			}
 		}
-		return sprintf('<%s%s>%s</%s>' . "\n", $node->node_name, $attrs, $body, $node->node_name);
+		return sprintf('<%s%s>%s</%s>'."\n", $node->node_name, $attrs, $body, $node->node_name);
 	}
 
 }

classes/xml/XmlJsFilter.class.php

Braces +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
 		if(!file_exists($this->js_file))
 		{
 			$this->_compile();
-		}
-		else if(filemtime($this->xml_file) > filemtime($this->js_file))
+		} else if(filemtime($this->xml_file) > filemtime($this->js_file))
 		{
 			$this->_compile();
 		}

Spacing +55 added lines, -55 removed lines

@@ -81,7 +81,7 @@ 
 
 	function __construct($path, $xml_file)
 	{
-		if(substr($path, -1) !== '/')
+		if (substr($path, -1) !== '/')
 		{
 			$path .= '/';
 		}
@@ -95,15 +95,15 @@ 
 	 */
 	function compile()
 	{
-		if(!file_exists($this->xml_file))
+		if (!file_exists($this->xml_file))
 		{
 			return;
 		}
-		if(!file_exists($this->js_file))
+		if (!file_exists($this->js_file))
 		{
 			$this->_compile();
 		}
-		else if(filemtime($this->xml_file) > filemtime($this->js_file))
+		else if (filemtime($this->xml_file) > filemtime($this->js_file))
 		{
 			$this->_compile();
 		}
@@ -136,25 +136,25 @@ 
 
 
 		$field_node = $xml_obj->filter->form->node;
-		if($field_node && !is_array($field_node))
+		if ($field_node && !is_array($field_node))
 		{
 			$field_node = array($field_node);
 		}
 
 		$parameter_param = $xml_obj->filter->parameter->param;
-		if($parameter_param && !is_array($parameter_param))
+		if ($parameter_param && !is_array($parameter_param))
 		{
 			$parameter_param = array($parameter_param);
 		}
 
 		$response_tag = $xml_obj->filter->response->tag;
-		if($response_tag && !is_array($response_tag))
+		if ($response_tag && !is_array($response_tag))
 		{
 			$response_tag = array($response_tag);
 		}
 
 		// If extend_filter exists, result returned by calling the method
-		if($extend_filter)
+		if ($extend_filter)
 		{
 			// If extend_filter exists, it changes the name of cache not to use cache
 			$this->js_file .= '.nocache.js';
@@ -163,24 +163,24 @@ 
 			list($module_name, $method) = explode('.', $extend_filter);
 
 			// contibue if both module_name and methos exist.
-			if($module_name && $method)
+			if ($module_name && $method)
 			{
 				// get model object of the module
 				$oExtendFilter = getModel($module_name);
 
 				// execute if method exists
-				if(method_exists($oExtendFilter, $method))
+				if (method_exists($oExtendFilter, $method))
 				{
 					// get the result
 					$extend_filter_list = $oExtendFilter->{$method}(TRUE);
 					$extend_filter_count = count($extend_filter_list);
 
 					// apply lang_value from the result to the variable
-					for($i = 0; $i < $extend_filter_count; $i++)
+					for ($i = 0; $i < $extend_filter_count; $i++)
 					{
 						$name = $extend_filter_list[$i]->name;
 						$lang_value = $extend_filter_list[$i]->lang;
-						if($lang_value)
+						if ($lang_value)
 						{
 							$lang->{$name} = $lang_value;
 						}
@@ -200,15 +200,15 @@ 
 		$fields = array();
 
 		// create custom rule
-		if($rules && $rules->rule)
+		if ($rules && $rules->rule)
 		{
-			if(!is_array($rules->rule))
+			if (!is_array($rules->rule))
 			{
 				$rules->rule = array($rules->rule);
 			}
-			foreach($rules->rule as $r)
+			foreach ($rules->rule as $r)
 			{
-				if($r->attrs->type == 'regex')
+				if ($r->attrs->type == 'regex')
 				{
 					$js_rules[] = "v.cast('ADD_RULE', ['{$r->attrs->name}', {$r->body}]);";
 				}
@@ -217,14 +217,14 @@ 
 
 		// generates a field, which is a script of the checked item
 		$node_count = count($field_node);
-		if($node_count)
+		if ($node_count)
 		{
-			foreach($field_node as $key => $node)
+			foreach ($field_node as $key => $node)
 			{
 				$attrs = $node->attrs;
 				$target = trim($attrs->target);
 
-				if(!$target)
+				if (!$target)
 				{
 					continue;
 				}
@@ -234,34 +234,34 @@ 
 
 				$field = array();
 
-				if($attrs->required == 'true')
+				if ($attrs->required == 'true')
 				{
 					$field[] = 'required:true';
 				}
-				if($attrs->minlength > 0)
+				if ($attrs->minlength > 0)
 				{
-					$field[] = 'minlength:' . $attrs->minlength;
+					$field[] = 'minlength:'.$attrs->minlength;
 				}
-				if($attrs->maxlength > 0)
+				if ($attrs->maxlength > 0)
 				{
-					$field[] = 'maxlength:' . $attrs->maxlength;
+					$field[] = 'maxlength:'.$attrs->maxlength;
 				}
-				if($equalto)
+				if ($equalto)
 				{
 					$field[] = "equalto:'{$attrs->equalto}'";
 				}
-				if($rule)
+				if ($rule)
 				{
 					$field[] = "rule:'{$rule}'";
 				}
 
-				$fields[] = "'{$target}': {" . implode(',', $field) . "}";
+				$fields[] = "'{$target}': {".implode(',', $field)."}";
 
-				if(!in_array($target, $target_list))
+				if (!in_array($target, $target_list))
 				{
 					$target_list[] = $target;
 				}
-				if(!$target_type_list[$target])
+				if (!$target_type_list[$target])
 				{
 					$target_type_list[$target] = $filter;
 				}
@@ -271,12 +271,12 @@ 
 		// Check extend_filter_item
 		$rule_types = array('homepage' => 'homepage', 'email_address' => 'email');
 
-		for($i = 0; $i < $extend_filter_count; $i++)
+		for ($i = 0; $i < $extend_filter_count; $i++)
 		{
 			$filter_item = $extend_filter_list[$i];
 			$target = trim($filter_item->name);
 
-			if(!$target)
+			if (!$target)
 			{
 				continue;
 			}
@@ -287,21 +287,21 @@ 
 			$required = ($filter_item->required == 'true');
 
 			$field = array();
-			if($required)
+			if ($required)
 			{
 				$field[] = 'required:true';
 			}
-			if($rule)
+			if ($rule)
 			{
 				$field[] = "rule:'{$rule}'";
 			}
-			$fields[] = "\t\t'{$target}' : {" . implode(',', $field) . "}";
+			$fields[] = "\t\t'{$target}' : {".implode(',', $field)."}";
 
-			if(!in_array($target, $target_list))
+			if (!in_array($target, $target_list))
 			{
 				$target_list[] = $target;
 			}
-			if(!$target_type_list[$target])
+			if (!$target_type_list[$target])
 			{
 				$target_type_list[$target] = $type;
 			}
@@ -310,37 +310,37 @@ 
 		// generates parameter script to create dbata
 		$rename_params = array();
 		$parameter_count = count($parameter_param);
-		if($parameter_count)
+		if ($parameter_count)
 		{
 			// contains parameter of the default filter contents
-			foreach($parameter_param as $key => $param)
+			foreach ($parameter_param as $key => $param)
 			{
 				$attrs = $param->attrs;
 				$name = trim($attrs->name);
 				$target = trim($attrs->target);
 
 				//if($name && $target && ($name != $target)) $js_doc[] = "\t\tparams['{$name}'] = params['{$target}']; delete params['{$target}'];";
-				if($name && $target && ($name != $target))
+				if ($name && $target && ($name != $target))
 				{
 					$rename_params[] = "'{$target}':'{$name}'";
 				}
-				if($name && !in_array($name, $target_list))
+				if ($name && !in_array($name, $target_list))
 				{
 					$target_list[] = $name;
 				}
 			}
 
 			// Check extend_filter_item
-			for($i = 0; $i < $extend_filter_count; $i++)
+			for ($i = 0; $i < $extend_filter_count; $i++)
 			{
 				$filter_item = $extend_filter_list[$i];
 				$target = $name = trim($filter_item->name);
-				if(!$name || !$target)
+				if (!$name || !$target)
 				{
 					continue;
 				}
 
-				if(!in_array($name, $target_list))
+				if (!in_array($name, $target_list))
 				{
 					$target_list[] = $name;
 				}
@@ -350,7 +350,7 @@ 
 		// generates the response script
 		$response_count = count($response_tag);
 		$responses = array();
-		for($i = 0; $i < $response_count; $i++)
+		for ($i = 0; $i < $response_count; $i++)
 		{
 			$attrs = $response_tag[$i]->attrs;
 			$name = $attrs->name;
@@ -359,10 +359,10 @@ 
 
 		// writes lang values of the form field
 		$target_count = count($target_list);
-		for($i = 0; $i < $target_count; $i++)
+		for ($i = 0; $i < $target_count; $i++)
 		{
 			$target = $target_list[$i];
-			if(!$lang->{$target})
+			if (!$lang->{$target})
 			{
 				$lang->{$target} = $target;
 			}
@@ -381,9 +381,9 @@ 
 		 */
 
 		// writes error messages
-		foreach($lang->filter as $key => $val)
+		foreach ($lang->filter as $key => $val)
 		{
-			if(!$val)
+			if (!$val)
 			{
 				$val = $key;
 			}
@@ -392,24 +392,24 @@ 
 		}
 
 		$callback_func = $xml_obj->filter->response->attrs->callback_func;
-		if(!$callback_func)
+		if (!$callback_func)
 		{
 			$callback_func = "filterAlertMessage";
 		}
 
 		$confirm_msg = '';
-		if($confirm_msg_code)
+		if ($confirm_msg_code)
 		{
 			$confirm_msg = $lang->{$confirm_msg_code};
 		}
 
 		$jsdoc = array();
-		$jsdoc[] = "function {$filter_name}(form){ return legacy_filter('{$filter_name}', form, '{$module}', '{$act}', {$callback_func}, [" . implode(',', $responses) . "], '" . addslashes($confirm_msg) . "', {" . implode(',', $rename_params) . "}) };";
+		$jsdoc[] = "function {$filter_name}(form){ return legacy_filter('{$filter_name}', form, '{$module}', '{$act}', {$callback_func}, [".implode(',', $responses)."], '".addslashes($confirm_msg)."', {".implode(',', $rename_params)."}) };";
 		$jsdoc[] = '(function($){';
 		$jsdoc[] = "\tvar v=xe.getApp('validator')[0];if(!v)return false;";
-		$jsdoc[] = "\t" . 'v.cast("ADD_FILTER", ["' . $filter_name . '", {' . implode(',', $fields) . '}]);';
-		$jsdoc[] = "\t" . implode("\n\t", $js_rules);
-		$jsdoc[] = "\t" . implode("\n\t", $js_messages);
+		$jsdoc[] = "\t".'v.cast("ADD_FILTER", ["'.$filter_name.'", {'.implode(',', $fields).'}]);';
+		$jsdoc[] = "\t".implode("\n\t", $js_rules);
+		$jsdoc[] = "\t".implode("\n\t", $js_messages);
 		$jsdoc[] = '})(jQuery);';
 		$jsdoc = implode("\n", $jsdoc);
 
@@ -424,7 +424,7 @@ 
 	 */
 	function _getCompiledFileName($xml_file)
 	{
-		return sprintf('%s%s.%s.compiled.js', $this->compiled_path, md5($this->version . $xml_file), Context::getLangType());
+		return sprintf('%s%s.%s.compiled.js', $this->compiled_path, md5($this->version.$xml_file), Context::getLangType());
 	}
 
 }

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 +45 added lines, -45 removed lines

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

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/FirePHPCore/FirePHP.class.php

Indentation +677 added lines, -677 removed lines

@@ -192,9 +192,9 @@ 
    * @var array
    */
   protected $options = array('maxObjectDepth' => 10,
-                             'maxArrayDepth' => 20,
-                             'useNativeJsonEncode' => true,
-                             'includeLineNumbers' => true);
+							 'maxArrayDepth' => 20,
+							 'useNativeJsonEncode' => true,
+							 'includeLineNumbers' => true);
 
   /**
    * Filters used to exclude object members when encoding
@@ -229,7 +229,7 @@ 
    * @return array
    */  
   public function __sleep() {
-    return array('options','objectFilters','enabled');
+	return array('options','objectFilters','enabled');
   }
     
   /**
@@ -239,10 +239,10 @@ 
    * @return FirePHP
    */
   public static function getInstance($AutoCreate=false) {
-    if($AutoCreate===true && !self::$instance) {
-      self::init();
-    }
-    return self::$instance;
+	if($AutoCreate===true && !self::$instance) {
+	  self::init();
+	}
+	return self::$instance;
   }
    
   /**
@@ -251,7 +251,7 @@ 
    * @return FirePHP
    */
   public static function init() {
-    return self::$instance = new self();
+	return self::$instance = new self();
   }
   
   /**
@@ -261,7 +261,7 @@ 
    * @return void
    */
   public function setEnabled($Enabled) {
-    $this->enabled = $Enabled;
+	$this->enabled = $Enabled;
   }
   
   /**
@@ -270,7 +270,7 @@ 
    * @return boolean TRUE if enabled
    */
   public function getEnabled() {
-    return $this->enabled;
+	return $this->enabled;
   }
   
   /**
@@ -283,7 +283,7 @@ 
    * @return void
    */
   public function setObjectFilter($Class, $Filter) {
-    $this->objectFilters[strtolower($Class)] = $Filter;
+	$this->objectFilters[strtolower($Class)] = $Filter;
   }
   
   /**
@@ -299,7 +299,7 @@ 
    * @return void
    */
   public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
+	$this->options = array_merge($this->options,$Options);
   }
   
   /**
@@ -308,7 +308,7 @@ 
    * @return array The currently set options
    */
   public function getOptions() {
-    return $this->options;
+	return $this->options;
   }
   
   /**
@@ -320,14 +320,14 @@ 
    */
   public function registerErrorHandler($throwErrorExceptions=true)
   {
-    //NOTE: The following errors will not be caught by this error handler:
-    //      E_ERROR, E_PARSE, E_CORE_ERROR,
-    //      E_CORE_WARNING, E_COMPILE_ERROR,
-    //      E_COMPILE_WARNING, E_STRICT
+	//NOTE: The following errors will not be caught by this error handler:
+	//      E_ERROR, E_PARSE, E_CORE_ERROR,
+	//      E_CORE_WARNING, E_COMPILE_ERROR,
+	//      E_COMPILE_WARNING, E_STRICT
     
-    $this->throwErrorExceptions = $throwErrorExceptions;
+	$this->throwErrorExceptions = $throwErrorExceptions;
     
-    return set_error_handler(array($this,'errorHandler'));     
+	return set_error_handler(array($this,'errorHandler'));     
   }
 
   /**
@@ -343,20 +343,20 @@ 
    */
   public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
   {
-    // Don't throw exception if error reporting is switched off
-    if (error_reporting() == 0) {
-      return;
-    }
-    // Only throw exceptions for errors we are asking for
-    if (error_reporting() & $errno) {
-
-      $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
-      if($this->throwErrorExceptions) {
-        throw $exception;
-      } else {
-        $this->fb($exception);
-      }
-    }
+	// Don't throw exception if error reporting is switched off
+	if (error_reporting() == 0) {
+	  return;
+	}
+	// Only throw exceptions for errors we are asking for
+	if (error_reporting() & $errno) {
+
+	  $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
+	  if($this->throwErrorExceptions) {
+		throw $exception;
+	  } else {
+		$this->fb($exception);
+	  }
+	}
   }
   
   /**
@@ -368,7 +368,7 @@ 
    */
   public function registerExceptionHandler()
   {
-    return set_exception_handler(array($this,'exceptionHandler'));     
+	return set_exception_handler(array($this,'exceptionHandler'));     
   }
   
   /**
@@ -381,13 +381,13 @@ 
    */
   function exceptionHandler($Exception) {
     
-    $this->inExceptionHandler = true;
+	$this->inExceptionHandler = true;
 
-    header('HTTP/1.1 500 Internal Server Error');
+	header('HTTP/1.1 500 Internal Server Error');
 
-    $this->fb($Exception);
+	$this->fb($Exception);
     
-    $this->inExceptionHandler = false;
+	$this->inExceptionHandler = false;
   }
   
   /**
@@ -399,14 +399,14 @@ 
    */
   public function registerAssertionHandler($convertAssertionErrorsToExceptions=true, $throwAssertionExceptions=false)
   {
-    $this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
-    $this->throwAssertionExceptions = $throwAssertionExceptions;
+	$this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
+	$this->throwAssertionExceptions = $throwAssertionExceptions;
     
-    if($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
-      throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
-    }
+	if($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
+	  throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
+	}
     
-    return assert_options(ASSERT_CALLBACK, array($this, 'assertionHandler'));
+	return assert_options(ASSERT_CALLBACK, array($this, 'assertionHandler'));
   }
   
   /**
@@ -421,21 +421,21 @@ 
   public function assertionHandler($file, $line, $code)
   {
 
-    if($this->convertAssertionErrorsToExceptions) {
+	if($this->convertAssertionErrorsToExceptions) {
       
-      $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
+	  $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
 
-      if($this->throwAssertionExceptions) {
-        throw $exception;
-      } else {
-        $this->fb($exception);
-      }
+	  if($this->throwAssertionExceptions) {
+		throw $exception;
+	  } else {
+		$this->fb($exception);
+	  }
     
-    } else {
+	} else {
     
-      $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
+	  $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
     
-    }
+	}
   }  
   
   /**
@@ -445,7 +445,7 @@ 
    */    
   public function setProcessorUrl($URL)
   {
-    $this->setHeader('X-FirePHP-ProcessorURL', $URL);
+	$this->setHeader('X-FirePHP-ProcessorURL', $URL);
   }
 
   /**
@@ -455,7 +455,7 @@ 
    */
   public function setRendererUrl($URL)
   {
-    $this->setHeader('X-FirePHP-RendererURL', $URL);
+	$this->setHeader('X-FirePHP-RendererURL', $URL);
   }
   
   /**
@@ -472,20 +472,20 @@ 
    */
   public function group($Name, $Options=null) {
     
-    if(!$Name) {
-      throw $this->newException('You must specify a label for the group!');
-    }
+	if(!$Name) {
+	  throw $this->newException('You must specify a label for the group!');
+	}
     
-    if($Options) {
-      if(!is_array($Options)) {
-        throw $this->newException('Options must be defined as an array!');
-      }
-      if(array_key_exists('Collapsed', $Options)) {
-        $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
-      }
-    }
+	if($Options) {
+	  if(!is_array($Options)) {
+		throw $this->newException('Options must be defined as an array!');
+	  }
+	  if(array_key_exists('Collapsed', $Options)) {
+		$Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
+	  }
+	}
     
-    return $this->fb(null, $Name, FirePHP::GROUP_START, $Options);
+	return $this->fb(null, $Name, FirePHP::GROUP_START, $Options);
   }
   
   /**
@@ -495,7 +495,7 @@ 
    * @throws Exception
    */
   public function groupEnd() {
-    return $this->fb(null, null, FirePHP::GROUP_END);
+	return $this->fb(null, null, FirePHP::GROUP_END);
   }
 
   /**
@@ -508,7 +508,7 @@ 
    * @throws Exception
    */
   public function log($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::LOG);
+	return $this->fb($Object, $Label, FirePHP::LOG);
   } 
 
   /**
@@ -521,7 +521,7 @@ 
    * @throws Exception
    */
   public function info($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::INFO);
+	return $this->fb($Object, $Label, FirePHP::INFO);
   } 
 
   /**
@@ -534,7 +534,7 @@ 
    * @throws Exception
    */
   public function warn($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::WARN);
+	return $this->fb($Object, $Label, FirePHP::WARN);
   } 
 
   /**
@@ -547,7 +547,7 @@ 
    * @throws Exception
    */
   public function error($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::ERROR);
+	return $this->fb($Object, $Label, FirePHP::ERROR);
   } 
 
   /**
@@ -560,7 +560,7 @@ 
    * @throws Exception
    */
   public function dump($Key, $Variable) {
-    return $this->fb($Variable, $Key, FirePHP::DUMP);
+	return $this->fb($Variable, $Key, FirePHP::DUMP);
   }
   
   /**
@@ -572,7 +572,7 @@ 
    * @throws Exception
    */
   public function trace($Label) {
-    return $this->fb($Label, FirePHP::TRACE);
+	return $this->fb($Label, FirePHP::TRACE);
   } 
 
   /**
@@ -585,7 +585,7 @@ 
    * @throws Exception
    */
   public function table($Label, $Table) {
-    return $this->fb($Table, $Label, FirePHP::TABLE);
+	return $this->fb($Table, $Label, FirePHP::TABLE);
   }
   
   /**
@@ -594,12 +594,12 @@ 
    * @return boolean
    */
   public function detectClientExtension() {
-    /* Check if FirePHP is installed on client */
-    if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
-       !version_compare($m[1][0],'0.0.6','>=')) {
-      return false;
-    }
-    return true;    
+	/* Check if FirePHP is installed on client */
+	if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
+	   !version_compare($m[1][0],'0.0.6','>=')) {
+	  return false;
+	}
+	return true;    
   }
  
   /**
@@ -612,265 +612,265 @@ 
    */
   public function fb($Object) {
   
-    if(!$this->enabled) {
-      return false;
-    }
+	if(!$this->enabled) {
+	  return false;
+	}
   
-    if (headers_sent($filename, $linenum)) {
-      // If we are logging from within the exception handler we cannot throw another exception
-      if($this->inExceptionHandler) {
-        // Simply echo the error out to the page
-        echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>'.$filename.'</b> on line <b>'.$linenum.'</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
-      } else {
-        throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
-      }
-    }
+	if (headers_sent($filename, $linenum)) {
+	  // If we are logging from within the exception handler we cannot throw another exception
+	  if($this->inExceptionHandler) {
+		// Simply echo the error out to the page
+		echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>'.$filename.'</b> on line <b>'.$linenum.'</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
+	  } else {
+		throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
+	  }
+	}
   
-    $Type = null;
-    $Label = null;
-    $Options = array();
+	$Type = null;
+	$Label = null;
+	$Options = array();
   
-    if(func_num_args()==1) {
-    } else
-    if(func_num_args()==2) {
-      switch(func_get_arg(1)) {
-        case self::LOG:
-        case self::INFO:
-        case self::WARN:
-        case self::ERROR:
-        case self::DUMP:
-        case self::TRACE:
-        case self::EXCEPTION:
-        case self::TABLE:
-        case self::GROUP_START:
-        case self::GROUP_END:
-          $Type = func_get_arg(1);
-          break;
-        default:
-          $Label = func_get_arg(1);
-          break;
-      }
-    } else
-    if(func_num_args()==3) {
-      $Type = func_get_arg(2);
-      $Label = func_get_arg(1);
-    } else
-    if(func_num_args()==4) {
-      $Type = func_get_arg(2);
-      $Label = func_get_arg(1);
-      $Options = func_get_arg(3);
-    } else {
-      throw $this->newException('Wrong number of arguments to fb() function!');
-    }
+	if(func_num_args()==1) {
+	} else
+	if(func_num_args()==2) {
+	  switch(func_get_arg(1)) {
+		case self::LOG:
+		case self::INFO:
+		case self::WARN:
+		case self::ERROR:
+		case self::DUMP:
+		case self::TRACE:
+		case self::EXCEPTION:
+		case self::TABLE:
+		case self::GROUP_START:
+		case self::GROUP_END:
+		  $Type = func_get_arg(1);
+		  break;
+		default:
+		  $Label = func_get_arg(1);
+		  break;
+	  }
+	} else
+	if(func_num_args()==3) {
+	  $Type = func_get_arg(2);
+	  $Label = func_get_arg(1);
+	} else
+	if(func_num_args()==4) {
+	  $Type = func_get_arg(2);
+	  $Label = func_get_arg(1);
+	  $Options = func_get_arg(3);
+	} else {
+	  throw $this->newException('Wrong number of arguments to fb() function!');
+	}
   
   
-    if(!$this->detectClientExtension()) {
-      return false;
-    }
+	if(!$this->detectClientExtension()) {
+	  return false;
+	}
   
-    $meta = array();
-    $skipFinalObjectEncode = false;
+	$meta = array();
+	$skipFinalObjectEncode = false;
   
-    if($Object instanceof Exception) {
+	if($Object instanceof Exception) {
 
-      $meta['file'] = $this->_escapeTraceFile($Object->getFile());
-      $meta['line'] = $Object->getLine();
+	  $meta['file'] = $this->_escapeTraceFile($Object->getFile());
+	  $meta['line'] = $Object->getLine();
       
-      $trace = $Object->getTrace();
-      if($Object instanceof ErrorException
-         && isset($trace[0]['function'])
-         && $trace[0]['function']=='errorHandler'
-         && isset($trace[0]['class'])
-         && $trace[0]['class']=='FirePHP') {
+	  $trace = $Object->getTrace();
+	  if($Object instanceof ErrorException
+		 && isset($trace[0]['function'])
+		 && $trace[0]['function']=='errorHandler'
+		 && isset($trace[0]['class'])
+		 && $trace[0]['class']=='FirePHP') {
            
-        $severity = false;
-        switch($Object->getSeverity()) {
-          case E_WARNING: $severity = 'E_WARNING'; break;
-          case E_NOTICE: $severity = 'E_NOTICE'; break;
-          case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
-          case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
-          case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
-          case E_STRICT: $severity = 'E_STRICT'; break;
-          case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
-          case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
-          case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
-        }
+		$severity = false;
+		switch($Object->getSeverity()) {
+		  case E_WARNING: $severity = 'E_WARNING'; break;
+		  case E_NOTICE: $severity = 'E_NOTICE'; break;
+		  case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
+		  case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
+		  case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
+		  case E_STRICT: $severity = 'E_STRICT'; break;
+		  case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
+		  case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
+		  case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
+		}
            
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$severity.': '.$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'trigger',
-                        'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
-        $skipFinalObjectEncode = true;
-      } else {
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'throw',
-                        'Trace'=>$this->_escapeTrace($trace));
-        $skipFinalObjectEncode = true;
-      }
-      $Type = self::EXCEPTION;
+		$Object = array('Class'=>get_class($Object),
+						'Message'=>$severity.': '.$Object->getMessage(),
+						'File'=>$this->_escapeTraceFile($Object->getFile()),
+						'Line'=>$Object->getLine(),
+						'Type'=>'trigger',
+						'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
+		$skipFinalObjectEncode = true;
+	  } else {
+		$Object = array('Class'=>get_class($Object),
+						'Message'=>$Object->getMessage(),
+						'File'=>$this->_escapeTraceFile($Object->getFile()),
+						'Line'=>$Object->getLine(),
+						'Type'=>'throw',
+						'Trace'=>$this->_escapeTrace($trace));
+		$skipFinalObjectEncode = true;
+	  }
+	  $Type = self::EXCEPTION;
       
-    } else
-    if($Type==self::TRACE) {
+	} else
+	if($Type==self::TRACE) {
       
-      $trace = debug_backtrace();
-      if(!$trace) return false;
-      for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
-
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i]['file'])
-           && ($trace[$i]['class']=='FirePHP'
-               || $trace[$i]['class']=='FB')
-           && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-               || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-          /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-        } else
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i+1]['file'])
-           && $trace[$i]['class']=='FirePHP'
-           && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-          /* Skip fb() */
-        } else
-        if($trace[$i]['function']=='fb'
-           || $trace[$i]['function']=='trace'
-           || $trace[$i]['function']=='send') {
-          $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
-                          'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
-                          'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
-                          'Message'=>$trace[$i]['args'][0],
-                          'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
-                          'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
-                          'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
-                          'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
-
-          $skipFinalObjectEncode = true;
-          $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-          $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-          break;
-        }
-      }
-
-    } else
-    if($Type==self::TABLE) {
+	  $trace = debug_backtrace();
+	  if(!$trace) return false;
+	  for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
+
+		if(isset($trace[$i]['class'])
+		   && isset($trace[$i]['file'])
+		   && ($trace[$i]['class']=='FirePHP'
+			   || $trace[$i]['class']=='FB')
+		   && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
+			   || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+		  /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
+		} else
+		if(isset($trace[$i]['class'])
+		   && isset($trace[$i+1]['file'])
+		   && $trace[$i]['class']=='FirePHP'
+		   && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+		  /* Skip fb() */
+		} else
+		if($trace[$i]['function']=='fb'
+		   || $trace[$i]['function']=='trace'
+		   || $trace[$i]['function']=='send') {
+		  $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
+						  'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
+						  'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
+						  'Message'=>$trace[$i]['args'][0],
+						  'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
+						  'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
+						  'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
+						  'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
+
+		  $skipFinalObjectEncode = true;
+		  $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
+		  $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+		  break;
+		}
+	  }
+
+	} else
+	if($Type==self::TABLE) {
       
-      if(isset($Object[0]) && is_string($Object[0])) {
-        $Object[1] = $this->encodeTable($Object[1]);
-      } else {
-        $Object = $this->encodeTable($Object);
-      }
+	  if(isset($Object[0]) && is_string($Object[0])) {
+		$Object[1] = $this->encodeTable($Object[1]);
+	  } else {
+		$Object = $this->encodeTable($Object);
+	  }
 
-      $skipFinalObjectEncode = true;
+	  $skipFinalObjectEncode = true;
       
-    } else
-    if($Type==self::GROUP_START) {
+	} else
+	if($Type==self::GROUP_START) {
       
-      if(!$Label) {
-        throw $this->newException('You must specify a label for the group!');
-      }
+	  if(!$Label) {
+		throw $this->newException('You must specify a label for the group!');
+	  }
       
-    } else {
-      if($Type===null) {
-        $Type = self::LOG;
-      }
-    }
+	} else {
+	  if($Type===null) {
+		$Type = self::LOG;
+	  }
+	}
     
-    if($this->options['includeLineNumbers']) {
-      if(!isset($meta['file']) || !isset($meta['line'])) {
+	if($this->options['includeLineNumbers']) {
+	  if(!isset($meta['file']) || !isset($meta['line'])) {
 
-        $trace = debug_backtrace();
-        for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
+		$trace = debug_backtrace();
+		for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
   
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i]['file'])
-             && ($trace[$i]['class']=='FirePHP'
-                 || $trace[$i]['class']=='FB')
-             && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-                 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-            /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-          } else
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i+1]['file'])
-             && $trace[$i]['class']=='FirePHP'
-             && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip fb() */
-          } else
-          if(isset($trace[$i]['file'])
-             && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip FB::fb() */
-          } else {
-            $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-            $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-            break;
-          }
-        }      
+		  if(isset($trace[$i]['class'])
+			 && isset($trace[$i]['file'])
+			 && ($trace[$i]['class']=='FirePHP'
+				 || $trace[$i]['class']=='FB')
+			 && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
+				 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+			/* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
+		  } else
+		  if(isset($trace[$i]['class'])
+			 && isset($trace[$i+1]['file'])
+			 && $trace[$i]['class']=='FirePHP'
+			 && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+			/* Skip fb() */
+		  } else
+		  if(isset($trace[$i]['file'])
+			 && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
+			/* Skip FB::fb() */
+		  } else {
+			$meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
+			$meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+			break;
+		  }
+		}      
       
-      }
-    } else {
-      unset($meta['file']);
-      unset($meta['line']);
-    }
+	  }
+	} else {
+	  unset($meta['file']);
+	  unset($meta['line']);
+	}
 
   	$this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
   	$this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
  
-    $structure_index = 1;
-    if($Type==self::DUMP) {
-      $structure_index = 2;
-    	$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
-    } else {
-    	$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
-    }
+	$structure_index = 1;
+	if($Type==self::DUMP) {
+	  $structure_index = 2;
+		$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+	} else {
+		$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+	}
   
-    if($Type==self::DUMP) {
-    	$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
-    } else {
-      $msg_meta = $Options;
-      $msg_meta['Type'] = $Type;
-      if($Label!==null) {
-        $msg_meta['Label'] = $Label;
-      }
-      if(isset($meta['file']) && !isset($msg_meta['File'])) {
-        $msg_meta['File'] = $meta['file'];
-      }
-      if(isset($meta['line']) && !isset($msg_meta['Line'])) {
-        $msg_meta['Line'] = $meta['line'];
-      }
-    	$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
-    }
+	if($Type==self::DUMP) {
+		$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
+	} else {
+	  $msg_meta = $Options;
+	  $msg_meta['Type'] = $Type;
+	  if($Label!==null) {
+		$msg_meta['Label'] = $Label;
+	  }
+	  if(isset($meta['file']) && !isset($msg_meta['File'])) {
+		$msg_meta['File'] = $meta['file'];
+	  }
+	  if(isset($meta['line']) && !isset($msg_meta['Line'])) {
+		$msg_meta['Line'] = $meta['line'];
+	  }
+		$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
+	}
     
-    $parts = explode("\n",chunk_split($msg, 5000, "\n"));
+	$parts = explode("\n",chunk_split($msg, 5000, "\n"));
 
-    for( $i=0 ; $i<count($parts) ; $i++) {
+	for( $i=0 ; $i<count($parts) ; $i++) {
         
-        $part = $parts[$i];
-        if ($part) {
+		$part = $parts[$i];
+		if ($part) {
             
-            if(count($parts)>2) {
-              // Message needs to be split into multiple parts
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               (($i==0)?strlen($msg):'')
-                               . '|' . $part . '|'
-                               . (($i<count($parts)-2)?'\\':''));
-            } else {
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               strlen($part) . '|' . $part . '|');
-            }
+			if(count($parts)>2) {
+			  // Message needs to be split into multiple parts
+			  $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+							   (($i==0)?strlen($msg):'')
+							   . '|' . $part . '|'
+							   . (($i<count($parts)-2)?'\\':''));
+			} else {
+			  $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+							   strlen($part) . '|' . $part . '|');
+			}
             
-            $this->messageIndex++;
+			$this->messageIndex++;
             
-            if ($this->messageIndex > 99999) {
-                throw $this->newException('Maximum number (99,999) of messages reached!');             
-            }
-        }
-    }
+			if ($this->messageIndex > 99999) {
+				throw $this->newException('Maximum number (99,999) of messages reached!');             
+			}
+		}
+	}
 
   	$this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
 
-    return true;
+	return true;
   }
   
   /**
@@ -880,7 +880,7 @@ 
    * @return string
    */
   protected function _standardizePath($Path) {
-    return preg_replace('/\\\\+/','/',$Path);    
+	return preg_replace('/\\\\+/','/',$Path);    
   }
   
   /**
@@ -890,16 +890,16 @@ 
    * @return array
    */
   protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
-    for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
-      if(isset($Trace[$i]['file'])) {
-        $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
-      }
-      if(isset($Trace[$i]['args'])) {
-        $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
-      }
-    }
-    return $Trace;    
+	if(!$Trace) return $Trace;
+	for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
+	  if(isset($Trace[$i]['file'])) {
+		$Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
+	  }
+	  if(isset($Trace[$i]['args'])) {
+		$Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
+	  }
+	}
+	return $Trace;    
   }
   
   /**
@@ -909,15 +909,15 @@ 
    * @return string
    */
   protected function _escapeTraceFile($File) {
-    /* Check if we have a windows filepath */
-    if(strpos($File,'\\')) {
-      /* First strip down to single \ */
+	/* Check if we have a windows filepath */
+	if(strpos($File,'\\')) {
+	  /* First strip down to single \ */
       
-      $file = preg_replace('/\\\\+/','\\',$File);
+	  $file = preg_replace('/\\\\+/','\\',$File);
       
-      return $file;
-    }
-    return $File;
+	  return $file;
+	}
+	return $File;
   }
 
   /**
@@ -927,7 +927,7 @@ 
    * @param string_type $Value
    */
   protected function setHeader($Name, $Value) {
-    return header($Name.': '.$Value);
+	return header($Name.': '.$Value);
   }
 
   /**
@@ -936,8 +936,8 @@ 
    * @return string|false
    */
   protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
-    return $_SERVER['HTTP_USER_AGENT'];
+	if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+	return $_SERVER['HTTP_USER_AGENT'];
   }
 
   /**
@@ -947,7 +947,7 @@ 
    * @return Exception
    */
   protected function newException($Message) {
-    return new Exception($Message);
+	return new Exception($Message);
   }
   
   /**
@@ -960,17 +960,17 @@ 
    */
   public function jsonEncode($Object, $skipObjectEncode=false)
   {
-    if(!$skipObjectEncode) {
-      $Object = $this->encodeObject($Object);
-    }
+	if(!$skipObjectEncode) {
+	  $Object = $this->encodeObject($Object);
+	}
     
-    if(function_exists('json_encode')
-       && $this->options['useNativeJsonEncode']!=false) {
+	if(function_exists('json_encode')
+	   && $this->options['useNativeJsonEncode']!=false) {
 
-      return json_encode($Object);
-    } else {
-      return $this->json_encode($Object);
-    }
+	  return json_encode($Object);
+	} else {
+	  return $this->json_encode($Object);
+	}
   }
 
   /**
@@ -981,23 +981,23 @@ 
    */  
   protected function encodeTable($Table) {
     
-    if(!$Table) return $Table;
+	if(!$Table) return $Table;
     
-    $new_table = array();
-    foreach($Table as $row) {
+	$new_table = array();
+	foreach($Table as $row) {
   
-      if(is_array($row)) {
-        $new_row = array();
+	  if(is_array($row)) {
+		$new_row = array();
         
-        foreach($row as $item) {
-          $new_row[] = $this->encodeObject($item);
-        }
+		foreach($row as $item) {
+		  $new_row[] = $this->encodeObject($item);
+		}
         
-        $new_table[] = $new_row;
-      }
-    }
+		$new_table[] = $new_row;
+	  }
+	}
     
-    return $new_table;
+	return $new_table;
   }
 
   /**
@@ -1010,135 +1010,135 @@ 
    */
   protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)
   {
-    $return = array();
+	$return = array();
 
-    if (is_resource($Object)) {
+	if (is_resource($Object)) {
 
-      return '** '.(string)$Object.' **';
+	  return '** '.(string)$Object.' **';
 
-    } else    
-    if (is_object($Object)) {
+	} else    
+	if (is_object($Object)) {
 
-        if ($ObjectDepth > $this->options['maxObjectDepth']) {
-          return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
-        }
+		if ($ObjectDepth > $this->options['maxObjectDepth']) {
+		  return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
+		}
         
-        foreach ($this->objectStack as $refVal) {
-            if ($refVal === $Object) {
-                return '** Recursion ('.get_class($Object).') **';
-            }
-        }
-        array_push($this->objectStack, $Object);
+		foreach ($this->objectStack as $refVal) {
+			if ($refVal === $Object) {
+				return '** Recursion ('.get_class($Object).') **';
+			}
+		}
+		array_push($this->objectStack, $Object);
                 
-        $return['__className'] = $class = get_class($Object);
-        $class_lower = strtolower($class);
-
-        $reflectionClass = new ReflectionClass($class);  
-        $properties = array();
-        foreach( $reflectionClass->getProperties() as $property) {
-          $properties[$property->getName()] = $property;
-        }
+		$return['__className'] = $class = get_class($Object);
+		$class_lower = strtolower($class);
+
+		$reflectionClass = new ReflectionClass($class);  
+		$properties = array();
+		foreach( $reflectionClass->getProperties() as $property) {
+		  $properties[$property->getName()] = $property;
+		}
             
-        $members = (array)$Object;
+		$members = (array)$Object;
             
-        foreach( $properties as $raw_name => $property ) {
+		foreach( $properties as $raw_name => $property ) {
           
-          $name = $raw_name;
-          if($property->isStatic()) {
-            $name = 'static:'.$name;
-          }
-          if($property->isPublic()) {
-            $name = 'public:'.$name;
-          } else
-          if($property->isPrivate()) {
-            $name = 'private:'.$name;
-            $raw_name = "\0".$class."\0".$raw_name;
-          } else
-          if($property->isProtected()) {
-            $name = 'protected:'.$name;
-            $raw_name = "\0".'*'."\0".$raw_name;
-          }
+		  $name = $raw_name;
+		  if($property->isStatic()) {
+			$name = 'static:'.$name;
+		  }
+		  if($property->isPublic()) {
+			$name = 'public:'.$name;
+		  } else
+		  if($property->isPrivate()) {
+			$name = 'private:'.$name;
+			$raw_name = "\0".$class."\0".$raw_name;
+		  } else
+		  if($property->isProtected()) {
+			$name = 'protected:'.$name;
+			$raw_name = "\0".'*'."\0".$raw_name;
+		  }
           
-          if(!(isset($this->objectFilters[$class_lower])
-               && is_array($this->objectFilters[$class_lower])
-               && in_array($raw_name,$this->objectFilters[$class_lower]))) {
+		  if(!(isset($this->objectFilters[$class_lower])
+			   && is_array($this->objectFilters[$class_lower])
+			   && in_array($raw_name,$this->objectFilters[$class_lower]))) {
 
-            if(array_key_exists($raw_name,$members)
-               && !$property->isStatic()) {
+			if(array_key_exists($raw_name,$members)
+			   && !$property->isStatic()) {
               
-              $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
+			  $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
             
-            } else {
-              if(method_exists($property,'setAccessible')) {
-                $property->setAccessible(true);
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else
-              if($property->isPublic()) {
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else {
-                $return[$name] = '** Need PHP 5.3 to get value **';
-              }
-            }
-          } else {
-            $return[$name] = '** Excluded by Filter **';
-          }
-        }
+			} else {
+			  if(method_exists($property,'setAccessible')) {
+				$property->setAccessible(true);
+				$return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
+			  } else
+			  if($property->isPublic()) {
+				$return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
+			  } else {
+				$return[$name] = '** Need PHP 5.3 to get value **';
+			  }
+			}
+		  } else {
+			$return[$name] = '** Excluded by Filter **';
+		  }
+		}
         
-        // Include all members that are not defined in the class
-        // but exist in the object
-        foreach( $members as $raw_name => $value ) {
+		// Include all members that are not defined in the class
+		// but exist in the object
+		foreach( $members as $raw_name => $value ) {
           
-          $name = $raw_name;
+		  $name = $raw_name;
           
-          if ($name{0} == "\0") {
-            $parts = explode("\0", $name);
-            $name = $parts[2];
-          }
+		  if ($name{0} == "\0") {
+			$parts = explode("\0", $name);
+			$name = $parts[2];
+		  }
           
-          if(!isset($properties[$name])) {
-            $name = 'undeclared:'.$name;
+		  if(!isset($properties[$name])) {
+			$name = 'undeclared:'.$name;
               
-            if(!(isset($this->objectFilters[$class_lower])
-                 && is_array($this->objectFilters[$class_lower])
-                 && in_array($raw_name,$this->objectFilters[$class_lower]))) {
+			if(!(isset($this->objectFilters[$class_lower])
+				 && is_array($this->objectFilters[$class_lower])
+				 && in_array($raw_name,$this->objectFilters[$class_lower]))) {
               
-              $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
-            } else {
-              $return[$name] = '** Excluded by Filter **';
-            }
-          }
-        }
+			  $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
+			} else {
+			  $return[$name] = '** Excluded by Filter **';
+			}
+		  }
+		}
         
-        array_pop($this->objectStack);
+		array_pop($this->objectStack);
         
-    } elseif (is_array($Object)) {
+	} elseif (is_array($Object)) {
 
-        if ($ArrayDepth > $this->options['maxArrayDepth']) {
-          return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
-        }
+		if ($ArrayDepth > $this->options['maxArrayDepth']) {
+		  return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
+		}
       
-        foreach ($Object as $key => $val) {
+		foreach ($Object as $key => $val) {
           
-          // Encoding the $GLOBALS PHP array causes an infinite loop
-          // if the recursion is not reset here as it contains
-          // a reference to itself. This is the only way I have come up
-          // with to stop infinite recursion in this case.
-          if($key=='GLOBALS'
-             && is_array($val)
-             && array_key_exists('GLOBALS',$val)) {
-            $val['GLOBALS'] = '** Recursion (GLOBALS) **';
-          }
+		  // Encoding the $GLOBALS PHP array causes an infinite loop
+		  // if the recursion is not reset here as it contains
+		  // a reference to itself. This is the only way I have come up
+		  // with to stop infinite recursion in this case.
+		  if($key=='GLOBALS'
+			 && is_array($val)
+			 && array_key_exists('GLOBALS',$val)) {
+			$val['GLOBALS'] = '** Recursion (GLOBALS) **';
+		  }
           
-          $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
-        }
-    } else {
-      if(self::is_utf8($Object)) {
-        return $Object;
-      } else {
-        return utf8_encode($Object);
-      }
-    }
-    return $return;
+		  $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
+		}
+	} else {
+	  if(self::is_utf8($Object)) {
+		return $Object;
+	  } else {
+		return utf8_encode($Object);
+	  }
+	}
+	return $return;
   }
 
   /**
@@ -1148,29 +1148,29 @@ 
    * @return boolean
    */
   protected static function is_utf8($str) {
-    $c=0; $b=0;
-    $bits=0;
-    $len=strlen($str);
-    for($i=0; $i<$len; $i++){
-        $c=ord($str[$i]);
-        if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
-            else return false;
-            if(($i+$bits) > $len) return false;
-            while($bits > 1){
-                $i++;
-                $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
-                $bits--;
-            }
-        }
-    }
-    return true;
+	$c=0; $b=0;
+	$bits=0;
+	$len=strlen($str);
+	for($i=0; $i<$len; $i++){
+		$c=ord($str[$i]);
+		if($c > 128){
+			if(($c >= 254)) return false;
+			elseif($c >= 252) $bits=6;
+			elseif($c >= 248) $bits=5;
+			elseif($c >= 240) $bits=4;
+			elseif($c >= 224) $bits=3;
+			elseif($c >= 192) $bits=2;
+			else return false;
+			if(($i+$bits) > $len) return false;
+			while($bits > 1){
+				$i++;
+				$b=ord($str[$i]);
+				if($b < 128 || $b > 191) return false;
+				$bits--;
+			}
+		}
+	}
+	return true;
   } 
 
   /**
@@ -1249,35 +1249,35 @@ 
   */
   private function json_utf82utf16($utf8)
   {
-      // oh please oh please oh please oh please oh please
-      if(function_exists('mb_convert_encoding')) {
-          return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-      }
-
-      switch(strlen($utf8)) {
-          case 1:
-              // this case should never be reached, because we are in ASCII range
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return $utf8;
-
-          case 2:
-              // return a UTF-16 character from a 2-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr(0x07 & (ord($utf8{0}) >> 2))
-                   . chr((0xC0 & (ord($utf8{0}) << 6))
-                       | (0x3F & ord($utf8{1})));
-
-          case 3:
-              // return a UTF-16 character from a 3-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr((0xF0 & (ord($utf8{0}) << 4))
-                       | (0x0F & (ord($utf8{1}) >> 2)))
-                   . chr((0xC0 & (ord($utf8{1}) << 6))
-                       | (0x7F & ord($utf8{2})));
-      }
-
-      // ignoring UTF-32 for now, sorry
-      return '';
+	  // oh please oh please oh please oh please oh please
+	  if(function_exists('mb_convert_encoding')) {
+		  return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+	  }
+
+	  switch(strlen($utf8)) {
+		  case 1:
+			  // this case should never be reached, because we are in ASCII range
+			  // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+			  return $utf8;
+
+		  case 2:
+			  // return a UTF-16 character from a 2-byte UTF-8 char
+			  // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+			  return chr(0x07 & (ord($utf8{0}) >> 2))
+				   . chr((0xC0 & (ord($utf8{0}) << 6))
+					   | (0x3F & ord($utf8{1})));
+
+		  case 3:
+			  // return a UTF-16 character from a 3-byte UTF-8 char
+			  // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+			  return chr((0xF0 & (ord($utf8{0}) << 4))
+					   | (0x0F & (ord($utf8{1}) >> 2)))
+				   . chr((0xC0 & (ord($utf8{1}) << 6))
+					   | (0x7F & ord($utf8{2})));
+	  }
+
+	  // ignoring UTF-32 for now, sorry
+	  return '';
   }
 
  /**
@@ -1294,133 +1294,133 @@ 
   private function json_encode($var)
   {
     
-    if(is_object($var)) {
-      if(in_array($var,$this->json_objectStack)) {
-        return '"** Recursion **"';
-      }
-    }
+	if(is_object($var)) {
+	  if(in_array($var,$this->json_objectStack)) {
+		return '"** Recursion **"';
+	  }
+	}
           
-      switch (gettype($var)) {
-          case 'boolean':
-              return $var ? 'true' : 'false';
+	  switch (gettype($var)) {
+		  case 'boolean':
+			  return $var ? 'true' : 'false';
 
-          case 'NULL':
-              return 'null';
+		  case 'NULL':
+			  return 'null';
 
-          case 'integer':
-              return (int) $var;
+		  case 'integer':
+			  return (int) $var;
 
-          case 'double':
-          case 'float':
-              return (float) $var;
+		  case 'double':
+		  case 'float':
+			  return (float) $var;
 
-          case 'string':
-              // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-              $ascii = '';
-              $strlen_var = strlen($var);
+		  case 'string':
+			  // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+			  $ascii = '';
+			  $strlen_var = strlen($var);
 
-             /*
+			 /*
               * Iterate over every character in the string,
               * escaping with a slash or encoding to UTF-8 where necessary
               */
-              for ($c = 0; $c < $strlen_var; ++$c) {
-
-                  $ord_var_c = ord($var{$c});
-
-                  switch (true) {
-                      case $ord_var_c == 0x08:
-                          $ascii .= '\b';
-                          break;
-                      case $ord_var_c == 0x09:
-                          $ascii .= '\t';
-                          break;
-                      case $ord_var_c == 0x0A:
-                          $ascii .= '\n';
-                          break;
-                      case $ord_var_c == 0x0C:
-                          $ascii .= '\f';
-                          break;
-                      case $ord_var_c == 0x0D:
-                          $ascii .= '\r';
-                          break;
-
-                      case $ord_var_c == 0x22:
-                      case $ord_var_c == 0x2F:
-                      case $ord_var_c == 0x5C:
-                          // double quote, slash, slosh
-                          $ascii .= '\\'.$var{$c};
-                          break;
-
-                      case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                          // characters U-00000000 - U-0000007F (same as ASCII)
-                          $ascii .= $var{$c};
-                          break;
-
-                      case (($ord_var_c & 0xE0) == 0xC0):
-                          // characters U-00000080 - U-000007FF, mask 110XXXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                          $c += 1;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF0) == 0xE0):
-                          // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}));
-                          $c += 2;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF8) == 0xF0):
-                          // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}));
-                          $c += 3;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFC) == 0xF8):
-                          // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}));
-                          $c += 4;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFE) == 0xFC):
-                          // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}),
-                                       ord($var{$c + 5}));
-                          $c += 5;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-                  }
-              }
-
-              return '"'.$ascii.'"';
-
-          case 'array':
-             /*
+			  for ($c = 0; $c < $strlen_var; ++$c) {
+
+				  $ord_var_c = ord($var{$c});
+
+				  switch (true) {
+					  case $ord_var_c == 0x08:
+						  $ascii .= '\b';
+						  break;
+					  case $ord_var_c == 0x09:
+						  $ascii .= '\t';
+						  break;
+					  case $ord_var_c == 0x0A:
+						  $ascii .= '\n';
+						  break;
+					  case $ord_var_c == 0x0C:
+						  $ascii .= '\f';
+						  break;
+					  case $ord_var_c == 0x0D:
+						  $ascii .= '\r';
+						  break;
+
+					  case $ord_var_c == 0x22:
+					  case $ord_var_c == 0x2F:
+					  case $ord_var_c == 0x5C:
+						  // double quote, slash, slosh
+						  $ascii .= '\\'.$var{$c};
+						  break;
+
+					  case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+						  // characters U-00000000 - U-0000007F (same as ASCII)
+						  $ascii .= $var{$c};
+						  break;
+
+					  case (($ord_var_c & 0xE0) == 0xC0):
+						  // characters U-00000080 - U-000007FF, mask 110XXXXX
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+						  $c += 1;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+
+					  case (($ord_var_c & 0xF0) == 0xE0):
+						  // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c,
+									   ord($var{$c + 1}),
+									   ord($var{$c + 2}));
+						  $c += 2;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+
+					  case (($ord_var_c & 0xF8) == 0xF0):
+						  // characters U-00010000 - U-001FFFFF, mask 11110XXX
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c,
+									   ord($var{$c + 1}),
+									   ord($var{$c + 2}),
+									   ord($var{$c + 3}));
+						  $c += 3;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+
+					  case (($ord_var_c & 0xFC) == 0xF8):
+						  // characters U-00200000 - U-03FFFFFF, mask 111110XX
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c,
+									   ord($var{$c + 1}),
+									   ord($var{$c + 2}),
+									   ord($var{$c + 3}),
+									   ord($var{$c + 4}));
+						  $c += 4;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+
+					  case (($ord_var_c & 0xFE) == 0xFC):
+						  // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c,
+									   ord($var{$c + 1}),
+									   ord($var{$c + 2}),
+									   ord($var{$c + 3}),
+									   ord($var{$c + 4}),
+									   ord($var{$c + 5}));
+						  $c += 5;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+				  }
+			  }
+
+			  return '"'.$ascii.'"';
+
+		  case 'array':
+			 /*
               * As per JSON spec if any array key is not an integer
               * we must treat the the whole array as an object. We
               * also try to catch a sparsely populated associative
@@ -1438,63 +1438,63 @@ 
               * bracket notation.
               */
 
-              // treat as a JSON object
-              if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+			  // treat as a JSON object
+			  if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
                   
-                  $this->json_objectStack[] = $var;
+				  $this->json_objectStack[] = $var;
 
-                  $properties = array_map(array($this, 'json_name_value'),
-                                          array_keys($var),
-                                          array_values($var));
+				  $properties = array_map(array($this, 'json_name_value'),
+										  array_keys($var),
+										  array_values($var));
 
-                  array_pop($this->json_objectStack);
+				  array_pop($this->json_objectStack);
 
-                  foreach($properties as $property) {
-                      if($property instanceof Exception) {
-                          return $property;
-                      }
-                  }
+				  foreach($properties as $property) {
+					  if($property instanceof Exception) {
+						  return $property;
+					  }
+				  }
 
-                  return '{' . join(',', $properties) . '}';
-              }
+				  return '{' . join(',', $properties) . '}';
+			  }
 
-              $this->json_objectStack[] = $var;
+			  $this->json_objectStack[] = $var;
 
-              // treat it like a regular array
-              $elements = array_map(array($this, 'json_encode'), $var);
+			  // treat it like a regular array
+			  $elements = array_map(array($this, 'json_encode'), $var);
 
-              array_pop($this->json_objectStack);
+			  array_pop($this->json_objectStack);
 
-              foreach($elements as $element) {
-                  if($element instanceof Exception) {
-                      return $element;
-                  }
-              }
+			  foreach($elements as $element) {
+				  if($element instanceof Exception) {
+					  return $element;
+				  }
+			  }
 
-              return '[' . join(',', $elements) . ']';
+			  return '[' . join(',', $elements) . ']';
 
-          case 'object':
-              $vars = self::encodeObject($var);
+		  case 'object':
+			  $vars = self::encodeObject($var);
 
-              $this->json_objectStack[] = $var;
+			  $this->json_objectStack[] = $var;
 
-              $properties = array_map(array($this, 'json_name_value'),
-                                      array_keys($vars),
-                                      array_values($vars));
+			  $properties = array_map(array($this, 'json_name_value'),
+									  array_keys($vars),
+									  array_values($vars));
 
-              array_pop($this->json_objectStack);
+			  array_pop($this->json_objectStack);
               
-              foreach($properties as $property) {
-                  if($property instanceof Exception) {
-                      return $property;
-                  }
-              }
+			  foreach($properties as $property) {
+				  if($property instanceof Exception) {
+					  return $property;
+				  }
+			  }
                      
-              return '{' . join(',', $properties) . '}';
+			  return '{' . join(',', $properties) . '}';
 
-          default:
-              return null;
-      }
+		  default:
+			  return null;
+	  }
   }
 
  /**
@@ -1508,22 +1508,22 @@ 
   */
   private function json_name_value($name, $value)
   {
-      // Encoding the $GLOBALS PHP array causes an infinite loop
-      // if the recursion is not reset here as it contains
-      // a reference to itself. This is the only way I have come up
-      // with to stop infinite recursion in this case.
-      if($name=='GLOBALS'
-         && is_array($value)
-         && array_key_exists('GLOBALS',$value)) {
-        $value['GLOBALS'] = '** Recursion **';
-      }
+	  // Encoding the $GLOBALS PHP array causes an infinite loop
+	  // if the recursion is not reset here as it contains
+	  // a reference to itself. This is the only way I have come up
+	  // with to stop infinite recursion in this case.
+	  if($name=='GLOBALS'
+		 && is_array($value)
+		 && array_key_exists('GLOBALS',$value)) {
+		$value['GLOBALS'] = '** Recursion **';
+	  }
     
-      $encoded_value = $this->json_encode($value);
+	  $encoded_value = $this->json_encode($value);
 
-      if($encoded_value instanceof Exception) {
-          return $encoded_value;
-      }
+	  if($encoded_value instanceof Exception) {
+		  return $encoded_value;
+	  }
 
-      return $this->json_encode(strval($name)) . ':' . $encoded_value;
+	  return $this->json_encode(strval($name)) . ':' . $encoded_value;
   }
 }

Braces +33 added lines, -13 removed lines

@@ -718,7 +718,9 @@ 
     if($Type==self::TRACE) {
       
       $trace = debug_backtrace();
-      if(!$trace) return false;
+      if(!$trace) {
+      	return false;
+      }
       for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
 
         if(isset($trace[$i]['class'])
@@ -890,7 +892,9 @@ 
    * @return array
    */
   protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
+    if(!$Trace) {
+    	return $Trace;
+    }
     for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
       if(isset($Trace[$i]['file'])) {
         $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
@@ -936,7 +940,9 @@ 
    * @return string|false
    */
   protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+    if(!isset($_SERVER['HTTP_USER_AGENT'])) {
+    	return false;
+    }
     return $_SERVER['HTTP_USER_AGENT'];
   }
 
@@ -981,7 +987,9 @@ 
    */  
   protected function encodeTable($Table) {
     
-    if(!$Table) return $Table;
+    if(!$Table) {
+    	return $Table;
+    }
     
     $new_table = array();
     foreach($Table as $row) {
@@ -1154,18 +1162,30 @@ 
     for($i=0; $i<$len; $i++){
         $c=ord($str[$i]);
         if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
-            else return false;
-            if(($i+$bits) > $len) return false;
+            if(($c >= 254)) {
+            	return false;
+            } elseif($c >= 252) {
+            	$bits=6;
+            } elseif($c >= 248) {
+            	$bits=5;
+            } elseif($c >= 240) {
+            	$bits=4;
+            } elseif($c >= 224) {
+            	$bits=3;
+            } elseif($c >= 192) {
+            	$bits=2;
+            } else {
+            	return false;
+            }
+            if(($i+$bits) > $len) {
+            	return false;
+            }
             while($bits > 1){
                 $i++;
                 $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
+                if($b < 128 || $b > 191) {
+                	return false;
+                }
                 $bits--;
             }
         }

Spacing +170 added lines, -170 removed lines

@@ -229,7 +229,7 @@ 
    * @return array
    */  
   public function __sleep() {
-    return array('options','objectFilters','enabled');
+    return array('options', 'objectFilters', 'enabled');
   }
     
   /**
@@ -238,8 +238,8 @@ 
    * @param boolean $AutoCreate
    * @return FirePHP
    */
-  public static function getInstance($AutoCreate=false) {
-    if($AutoCreate===true && !self::$instance) {
+  public static function getInstance($AutoCreate = false) {
+    if ($AutoCreate === true && !self::$instance) {
       self::init();
     }
     return self::$instance;
@@ -299,7 +299,7 @@ 
    * @return void
    */
   public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
+    $this->options = array_merge($this->options, $Options);
   }
   
   /**
@@ -318,7 +318,7 @@ 
    * 
    * @return mixed Returns a string containing the previously defined error handler (if any)
    */
-  public function registerErrorHandler($throwErrorExceptions=true)
+  public function registerErrorHandler($throwErrorExceptions = true)
   {
     //NOTE: The following errors will not be caught by this error handler:
     //      E_ERROR, E_PARSE, E_CORE_ERROR,
@@ -327,7 +327,7 @@ 
     
     $this->throwErrorExceptions = $throwErrorExceptions;
     
-    return set_error_handler(array($this,'errorHandler'));     
+    return set_error_handler(array($this, 'errorHandler'));     
   }
 
   /**
@@ -351,7 +351,7 @@ 
     if (error_reporting() & $errno) {
 
       $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
-      if($this->throwErrorExceptions) {
+      if ($this->throwErrorExceptions) {
         throw $exception;
       } else {
         $this->fb($exception);
@@ -368,7 +368,7 @@ 
    */
   public function registerExceptionHandler()
   {
-    return set_exception_handler(array($this,'exceptionHandler'));     
+    return set_exception_handler(array($this, 'exceptionHandler'));     
   }
   
   /**
@@ -397,12 +397,12 @@ 
    * @param boolean $throwAssertionExceptions
    * @return mixed Returns the original setting or FALSE on errors
    */
-  public function registerAssertionHandler($convertAssertionErrorsToExceptions=true, $throwAssertionExceptions=false)
+  public function registerAssertionHandler($convertAssertionErrorsToExceptions = true, $throwAssertionExceptions = false)
   {
     $this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
     $this->throwAssertionExceptions = $throwAssertionExceptions;
     
-    if($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
+    if ($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
       throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
     }
     
@@ -421,11 +421,11 @@ 
   public function assertionHandler($file, $line, $code)
   {
 
-    if($this->convertAssertionErrorsToExceptions) {
+    if ($this->convertAssertionErrorsToExceptions) {
       
       $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
 
-      if($this->throwAssertionExceptions) {
+      if ($this->throwAssertionExceptions) {
         throw $exception;
       } else {
         $this->fb($exception);
@@ -433,7 +433,7 @@ 
     
     } else {
     
-      $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
+      $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file, 'Line'=>$line));
     
     }
   }  
@@ -470,18 +470,18 @@ 
    * @return true
    * @throws Exception
    */
-  public function group($Name, $Options=null) {
+  public function group($Name, $Options = null) {
     
-    if(!$Name) {
+    if (!$Name) {
       throw $this->newException('You must specify a label for the group!');
     }
     
-    if($Options) {
-      if(!is_array($Options)) {
+    if ($Options) {
+      if (!is_array($Options)) {
         throw $this->newException('Options must be defined as an array!');
       }
-      if(array_key_exists('Collapsed', $Options)) {
-        $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
+      if (array_key_exists('Collapsed', $Options)) {
+        $Options['Collapsed'] = ($Options['Collapsed']) ? 'true' : 'false';
       }
     }
     
@@ -507,7 +507,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function log($Object, $Label=null) {
+  public function log($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::LOG);
   } 
 
@@ -520,7 +520,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function info($Object, $Label=null) {
+  public function info($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::INFO);
   } 
 
@@ -533,7 +533,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function warn($Object, $Label=null) {
+  public function warn($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::WARN);
   } 
 
@@ -546,7 +546,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function error($Object, $Label=null) {
+  public function error($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::ERROR);
   } 
 
@@ -595,8 +595,8 @@ 
    */
   public function detectClientExtension() {
     /* Check if FirePHP is installed on client */
-    if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
-       !version_compare($m[1][0],'0.0.6','>=')) {
+    if (!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si', $this->getUserAgent(), $m) ||
+       !version_compare($m[1][0], '0.0.6', '>=')) {
       return false;
     }
     return true;    
@@ -612,13 +612,13 @@ 
    */
   public function fb($Object) {
   
-    if(!$this->enabled) {
+    if (!$this->enabled) {
       return false;
     }
   
     if (headers_sent($filename, $linenum)) {
       // If we are logging from within the exception handler we cannot throw another exception
-      if($this->inExceptionHandler) {
+      if ($this->inExceptionHandler) {
         // Simply echo the error out to the page
         echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>'.$filename.'</b> on line <b>'.$linenum.'</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
       } else {
@@ -630,10 +630,10 @@ 
     $Label = null;
     $Options = array();
   
-    if(func_num_args()==1) {
+    if (func_num_args() == 1) {
     } else
-    if(func_num_args()==2) {
-      switch(func_get_arg(1)) {
+    if (func_num_args() == 2) {
+      switch (func_get_arg(1)) {
         case self::LOG:
         case self::INFO:
         case self::WARN:
@@ -651,11 +651,11 @@ 
           break;
       }
     } else
-    if(func_num_args()==3) {
+    if (func_num_args() == 3) {
       $Type = func_get_arg(2);
       $Label = func_get_arg(1);
     } else
-    if(func_num_args()==4) {
+    if (func_num_args() == 4) {
       $Type = func_get_arg(2);
       $Label = func_get_arg(1);
       $Options = func_get_arg(3);
@@ -664,27 +664,27 @@ 
     }
   
   
-    if(!$this->detectClientExtension()) {
+    if (!$this->detectClientExtension()) {
       return false;
     }
   
     $meta = array();
     $skipFinalObjectEncode = false;
   
-    if($Object instanceof Exception) {
+    if ($Object instanceof Exception) {
 
       $meta['file'] = $this->_escapeTraceFile($Object->getFile());
       $meta['line'] = $Object->getLine();
       
       $trace = $Object->getTrace();
-      if($Object instanceof ErrorException
+      if ($Object instanceof ErrorException
          && isset($trace[0]['function'])
-         && $trace[0]['function']=='errorHandler'
+         && $trace[0]['function'] == 'errorHandler'
          && isset($trace[0]['class'])
-         && $trace[0]['class']=='FirePHP') {
+         && $trace[0]['class'] == 'FirePHP') {
            
         $severity = false;
-        switch($Object->getSeverity()) {
+        switch ($Object->getSeverity()) {
           case E_WARNING: $severity = 'E_WARNING'; break;
           case E_NOTICE: $severity = 'E_NOTICE'; break;
           case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
@@ -701,7 +701,7 @@ 
                         'File'=>$this->_escapeTraceFile($Object->getFile()),
                         'Line'=>$Object->getLine(),
                         'Type'=>'trigger',
-                        'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
+                        'Trace'=>$this->_escapeTrace(array_splice($trace, 2)));
         $skipFinalObjectEncode = true;
       } else {
         $Object = array('Class'=>get_class($Object),
@@ -715,49 +715,49 @@ 
       $Type = self::EXCEPTION;
       
     } else
-    if($Type==self::TRACE) {
+    if ($Type == self::TRACE) {
       
       $trace = debug_backtrace();
-      if(!$trace) return false;
-      for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
+      if (!$trace) return false;
+      for ($i = 0; $i < sizeof($trace); $i++) {
 
-        if(isset($trace[$i]['class'])
+        if (isset($trace[$i]['class'])
            && isset($trace[$i]['file'])
-           && ($trace[$i]['class']=='FirePHP'
-               || $trace[$i]['class']=='FB')
-           && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-               || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+           && ($trace[$i]['class'] == 'FirePHP'
+               || $trace[$i]['class'] == 'FB')
+           && (substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php'
+               || substr($this->_standardizePath($trace[$i]['file']), -29, 29) == 'FirePHPCore/FirePHP.class.php')) {
           /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
         } else
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i+1]['file'])
-           && $trace[$i]['class']=='FirePHP'
-           && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+        if (isset($trace[$i]['class'])
+           && isset($trace[$i + 1]['file'])
+           && $trace[$i]['class'] == 'FirePHP'
+           && substr($this->_standardizePath($trace[$i + 1]['file']), -18, 18) == 'FirePHPCore/fb.php') {
           /* Skip fb() */
         } else
-        if($trace[$i]['function']=='fb'
-           || $trace[$i]['function']=='trace'
-           || $trace[$i]['function']=='send') {
-          $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
-                          'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
-                          'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
+        if ($trace[$i]['function'] == 'fb'
+           || $trace[$i]['function'] == 'trace'
+           || $trace[$i]['function'] == 'send') {
+          $Object = array('Class'=>isset($trace[$i]['class']) ? $trace[$i]['class'] : '',
+                          'Type'=>isset($trace[$i]['type']) ? $trace[$i]['type'] : '',
+                          'Function'=>isset($trace[$i]['function']) ? $trace[$i]['function'] : '',
                           'Message'=>$trace[$i]['args'][0],
-                          'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
-                          'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
-                          'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
-                          'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
+                          'File'=>isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '',
+                          'Line'=>isset($trace[$i]['line']) ? $trace[$i]['line'] : '',
+                          'Args'=>isset($trace[$i]['args']) ? $this->encodeObject($trace[$i]['args']) : '',
+                          'Trace'=>$this->_escapeTrace(array_splice($trace, $i + 1)));
 
           $skipFinalObjectEncode = true;
-          $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-          $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+          $meta['file'] = isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '';
+          $meta['line'] = isset($trace[$i]['line']) ? $trace[$i]['line'] : '';
           break;
         }
       }
 
     } else
-    if($Type==self::TABLE) {
+    if ($Type == self::TABLE) {
       
-      if(isset($Object[0]) && is_string($Object[0])) {
+      if (isset($Object[0]) && is_string($Object[0])) {
         $Object[1] = $this->encodeTable($Object[1]);
       } else {
         $Object = $this->encodeTable($Object);
@@ -766,44 +766,44 @@ 
       $skipFinalObjectEncode = true;
       
     } else
-    if($Type==self::GROUP_START) {
+    if ($Type == self::GROUP_START) {
       
-      if(!$Label) {
+      if (!$Label) {
         throw $this->newException('You must specify a label for the group!');
       }
       
     } else {
-      if($Type===null) {
+      if ($Type === null) {
         $Type = self::LOG;
       }
     }
     
-    if($this->options['includeLineNumbers']) {
-      if(!isset($meta['file']) || !isset($meta['line'])) {
+    if ($this->options['includeLineNumbers']) {
+      if (!isset($meta['file']) || !isset($meta['line'])) {
 
         $trace = debug_backtrace();
-        for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
+        for ($i = 0; $trace && $i < sizeof($trace); $i++) {
   
-          if(isset($trace[$i]['class'])
+          if (isset($trace[$i]['class'])
              && isset($trace[$i]['file'])
-             && ($trace[$i]['class']=='FirePHP'
-                 || $trace[$i]['class']=='FB')
-             && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-                 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+             && ($trace[$i]['class'] == 'FirePHP'
+                 || $trace[$i]['class'] == 'FB')
+             && (substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php'
+                 || substr($this->_standardizePath($trace[$i]['file']), -29, 29) == 'FirePHPCore/FirePHP.class.php')) {
             /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
           } else
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i+1]['file'])
-             && $trace[$i]['class']=='FirePHP'
-             && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+          if (isset($trace[$i]['class'])
+             && isset($trace[$i + 1]['file'])
+             && $trace[$i]['class'] == 'FirePHP'
+             && substr($this->_standardizePath($trace[$i + 1]['file']), -18, 18) == 'FirePHPCore/fb.php') {
             /* Skip fb() */
           } else
-          if(isset($trace[$i]['file'])
-             && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
+          if (isset($trace[$i]['file'])
+             && substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php') {
             /* Skip FB::fb() */
           } else {
-            $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-            $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+            $meta['file'] = isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '';
+            $meta['line'] = isset($trace[$i]['line']) ? $trace[$i]['line'] : '';
             break;
           }
         }      
@@ -814,50 +814,50 @@ 
       unset($meta['line']);
     }
 
-  	$this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
-  	$this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
+  	$this->setHeader('X-Wf-Protocol-1', 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
+  	$this->setHeader('X-Wf-1-Plugin-1', 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
  
     $structure_index = 1;
-    if($Type==self::DUMP) {
+    if ($Type == self::DUMP) {
       $structure_index = 2;
-    	$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+    	$this->setHeader('X-Wf-1-Structure-2', 'http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
     } else {
-    	$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+    	$this->setHeader('X-Wf-1-Structure-1', 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
     }
   
-    if($Type==self::DUMP) {
+    if ($Type == self::DUMP) {
     	$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
     } else {
       $msg_meta = $Options;
       $msg_meta['Type'] = $Type;
-      if($Label!==null) {
+      if ($Label !== null) {
         $msg_meta['Label'] = $Label;
       }
-      if(isset($meta['file']) && !isset($msg_meta['File'])) {
+      if (isset($meta['file']) && !isset($msg_meta['File'])) {
         $msg_meta['File'] = $meta['file'];
       }
-      if(isset($meta['line']) && !isset($msg_meta['Line'])) {
+      if (isset($meta['line']) && !isset($msg_meta['Line'])) {
         $msg_meta['Line'] = $meta['line'];
       }
     	$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
     }
     
-    $parts = explode("\n",chunk_split($msg, 5000, "\n"));
+    $parts = explode("\n", chunk_split($msg, 5000, "\n"));
 
-    for( $i=0 ; $i<count($parts) ; $i++) {
+    for ($i = 0; $i < count($parts); $i++) {
         
         $part = $parts[$i];
         if ($part) {
             
-            if(count($parts)>2) {
+            if (count($parts) > 2) {
               // Message needs to be split into multiple parts
               $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               (($i==0)?strlen($msg):'')
-                               . '|' . $part . '|'
-                               . (($i<count($parts)-2)?'\\':''));
+                               (($i == 0) ?strlen($msg) : '')
+                               . '|'.$part.'|'
+                               . (($i < count($parts) - 2) ? '\\' : ''));
             } else {
               $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               strlen($part) . '|' . $part . '|');
+                               strlen($part).'|'.$part.'|');
             }
             
             $this->messageIndex++;
@@ -868,7 +868,7 @@ 
         }
     }
 
-  	$this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
+  	$this->setHeader('X-Wf-1-Index', $this->messageIndex - 1);
 
     return true;
   }
@@ -880,7 +880,7 @@ 
    * @return string
    */
   protected function _standardizePath($Path) {
-    return preg_replace('/\\\\+/','/',$Path);    
+    return preg_replace('/\\\\+/', '/', $Path);    
   }
   
   /**
@@ -890,12 +890,12 @@ 
    * @return array
    */
   protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
-    for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
-      if(isset($Trace[$i]['file'])) {
+    if (!$Trace) return $Trace;
+    for ($i = 0; $i < sizeof($Trace); $i++) {
+      if (isset($Trace[$i]['file'])) {
         $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
       }
-      if(isset($Trace[$i]['args'])) {
+      if (isset($Trace[$i]['args'])) {
         $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
       }
     }
@@ -910,10 +910,10 @@ 
    */
   protected function _escapeTraceFile($File) {
     /* Check if we have a windows filepath */
-    if(strpos($File,'\\')) {
+    if (strpos($File, '\\')) {
       /* First strip down to single \ */
       
-      $file = preg_replace('/\\\\+/','\\',$File);
+      $file = preg_replace('/\\\\+/', '\\', $File);
       
       return $file;
     }
@@ -936,7 +936,7 @@ 
    * @return string|false
    */
   protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+    if (!isset($_SERVER['HTTP_USER_AGENT'])) return false;
     return $_SERVER['HTTP_USER_AGENT'];
   }
 
@@ -958,14 +958,14 @@ 
    * @param object $Object The object to be encoded
    * @return string The JSON string
    */
-  public function jsonEncode($Object, $skipObjectEncode=false)
+  public function jsonEncode($Object, $skipObjectEncode = false)
   {
-    if(!$skipObjectEncode) {
+    if (!$skipObjectEncode) {
       $Object = $this->encodeObject($Object);
     }
     
-    if(function_exists('json_encode')
-       && $this->options['useNativeJsonEncode']!=false) {
+    if (function_exists('json_encode')
+       && $this->options['useNativeJsonEncode'] != false) {
 
       return json_encode($Object);
     } else {
@@ -981,15 +981,15 @@ 
    */  
   protected function encodeTable($Table) {
     
-    if(!$Table) return $Table;
+    if (!$Table) return $Table;
     
     $new_table = array();
-    foreach($Table as $row) {
+    foreach ($Table as $row) {
   
-      if(is_array($row)) {
+      if (is_array($row)) {
         $new_row = array();
         
-        foreach($row as $item) {
+        foreach ($row as $item) {
           $new_row[] = $this->encodeObject($item);
         }
         
@@ -1014,7 +1014,7 @@ 
 
     if (is_resource($Object)) {
 
-      return '** '.(string)$Object.' **';
+      return '** '.(string) $Object.' **';
 
     } else    
     if (is_object($Object)) {
@@ -1035,45 +1035,45 @@ 
 
         $reflectionClass = new ReflectionClass($class);  
         $properties = array();
-        foreach( $reflectionClass->getProperties() as $property) {
+        foreach ($reflectionClass->getProperties() as $property) {
           $properties[$property->getName()] = $property;
         }
             
-        $members = (array)$Object;
+        $members = (array) $Object;
             
-        foreach( $properties as $raw_name => $property ) {
+        foreach ($properties as $raw_name => $property) {
           
           $name = $raw_name;
-          if($property->isStatic()) {
+          if ($property->isStatic()) {
             $name = 'static:'.$name;
           }
-          if($property->isPublic()) {
+          if ($property->isPublic()) {
             $name = 'public:'.$name;
           } else
-          if($property->isPrivate()) {
+          if ($property->isPrivate()) {
             $name = 'private:'.$name;
             $raw_name = "\0".$class."\0".$raw_name;
           } else
-          if($property->isProtected()) {
+          if ($property->isProtected()) {
             $name = 'protected:'.$name;
             $raw_name = "\0".'*'."\0".$raw_name;
           }
           
-          if(!(isset($this->objectFilters[$class_lower])
+          if (!(isset($this->objectFilters[$class_lower])
                && is_array($this->objectFilters[$class_lower])
-               && in_array($raw_name,$this->objectFilters[$class_lower]))) {
+               && in_array($raw_name, $this->objectFilters[$class_lower]))) {
 
-            if(array_key_exists($raw_name,$members)
+            if (array_key_exists($raw_name, $members)
                && !$property->isStatic()) {
               
               $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
             
             } else {
-              if(method_exists($property,'setAccessible')) {
+              if (method_exists($property, 'setAccessible')) {
                 $property->setAccessible(true);
                 $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
               } else
-              if($property->isPublic()) {
+              if ($property->isPublic()) {
                 $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
               } else {
                 $return[$name] = '** Need PHP 5.3 to get value **';
@@ -1086,7 +1086,7 @@ 
         
         // Include all members that are not defined in the class
         // but exist in the object
-        foreach( $members as $raw_name => $value ) {
+        foreach ($members as $raw_name => $value) {
           
           $name = $raw_name;
           
@@ -1095,12 +1095,12 @@ 
             $name = $parts[2];
           }
           
-          if(!isset($properties[$name])) {
+          if (!isset($properties[$name])) {
             $name = 'undeclared:'.$name;
               
-            if(!(isset($this->objectFilters[$class_lower])
+            if (!(isset($this->objectFilters[$class_lower])
                  && is_array($this->objectFilters[$class_lower])
-                 && in_array($raw_name,$this->objectFilters[$class_lower]))) {
+                 && in_array($raw_name, $this->objectFilters[$class_lower]))) {
               
               $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
             } else {
@@ -1123,16 +1123,16 @@ 
           // if the recursion is not reset here as it contains
           // a reference to itself. This is the only way I have come up
           // with to stop infinite recursion in this case.
-          if($key=='GLOBALS'
+          if ($key == 'GLOBALS'
              && is_array($val)
-             && array_key_exists('GLOBALS',$val)) {
+             && array_key_exists('GLOBALS', $val)) {
             $val['GLOBALS'] = '** Recursion (GLOBALS) **';
           }
           
           $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
         }
     } else {
-      if(self::is_utf8($Object)) {
+      if (self::is_utf8($Object)) {
         return $Object;
       } else {
         return utf8_encode($Object);
@@ -1148,24 +1148,24 @@ 
    * @return boolean
    */
   protected static function is_utf8($str) {
-    $c=0; $b=0;
-    $bits=0;
-    $len=strlen($str);
-    for($i=0; $i<$len; $i++){
-        $c=ord($str[$i]);
-        if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
+    $c = 0; $b = 0;
+    $bits = 0;
+    $len = strlen($str);
+    for ($i = 0; $i < $len; $i++) {
+        $c = ord($str[$i]);
+        if ($c > 128) {
+            if (($c >= 254)) return false;
+            elseif ($c >= 252) $bits = 6;
+            elseif ($c >= 248) $bits = 5;
+            elseif ($c >= 240) $bits = 4;
+            elseif ($c >= 224) $bits = 3;
+            elseif ($c >= 192) $bits = 2;
             else return false;
-            if(($i+$bits) > $len) return false;
-            while($bits > 1){
+            if (($i + $bits) > $len) return false;
+            while ($bits > 1) {
                 $i++;
-                $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
+                $b = ord($str[$i]);
+                if ($b < 128 || $b > 191) return false;
                 $bits--;
             }
         }
@@ -1250,11 +1250,11 @@ 
   private function json_utf82utf16($utf8)
   {
       // oh please oh please oh please oh please oh please
-      if(function_exists('mb_convert_encoding')) {
+      if (function_exists('mb_convert_encoding')) {
           return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
       }
 
-      switch(strlen($utf8)) {
+      switch (strlen($utf8)) {
           case 1:
               // this case should never be reached, because we are in ASCII range
               // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -1294,8 +1294,8 @@ 
   private function json_encode($var)
   {
     
-    if(is_object($var)) {
-      if(in_array($var,$this->json_objectStack)) {
+    if (is_object($var)) {
+      if (in_array($var, $this->json_objectStack)) {
         return '"** Recursion **"';
       }
     }
@@ -1449,13 +1449,13 @@ 
 
                   array_pop($this->json_objectStack);
 
-                  foreach($properties as $property) {
-                      if($property instanceof Exception) {
+                  foreach ($properties as $property) {
+                      if ($property instanceof Exception) {
                           return $property;
                       }
                   }
 
-                  return '{' . join(',', $properties) . '}';
+                  return '{'.join(',', $properties).'}';
               }
 
               $this->json_objectStack[] = $var;
@@ -1465,13 +1465,13 @@ 
 
               array_pop($this->json_objectStack);
 
-              foreach($elements as $element) {
-                  if($element instanceof Exception) {
+              foreach ($elements as $element) {
+                  if ($element instanceof Exception) {
                       return $element;
                   }
               }
 
-              return '[' . join(',', $elements) . ']';
+              return '['.join(',', $elements).']';
 
           case 'object':
               $vars = self::encodeObject($var);
@@ -1484,13 +1484,13 @@ 
 
               array_pop($this->json_objectStack);
               
-              foreach($properties as $property) {
-                  if($property instanceof Exception) {
+              foreach ($properties as $property) {
+                  if ($property instanceof Exception) {
                       return $property;
                   }
               }
                      
-              return '{' . join(',', $properties) . '}';
+              return '{'.join(',', $properties).'}';
 
           default:
               return null;
@@ -1512,18 +1512,18 @@ 
       // if the recursion is not reset here as it contains
       // a reference to itself. This is the only way I have come up
       // with to stop infinite recursion in this case.
-      if($name=='GLOBALS'
+      if ($name == 'GLOBALS'
          && is_array($value)
-         && array_key_exists('GLOBALS',$value)) {
+         && array_key_exists('GLOBALS', $value)) {
         $value['GLOBALS'] = '** Recursion **';
       }
     
       $encoded_value = $this->json_encode($value);
 
-      if($encoded_value instanceof Exception) {
+      if ($encoded_value instanceof Exception) {
           return $encoded_value;
       }
 
-      return $this->json_encode(strval($name)) . ':' . $encoded_value;
+      return $this->json_encode(strval($name)).':'.$encoded_value;
   }
 }

Doc Comments +13 added lines, -14 removed lines

@@ -226,7 +226,7 @@ 
   /**
    * When the object gets serialized only include specific object members.
    * 
-   * @return array
+   * @return string[]
    */  
   public function __sleep() {
     return array('options','objectFilters','enabled');
@@ -316,7 +316,7 @@ 
    * 
    * Will throw exceptions for each php error.
    * 
-   * @return mixed Returns a string containing the previously defined error handler (if any)
+   * @return null|callable Returns a string containing the previously defined error handler (if any)
    */
   public function registerErrorHandler($throwErrorExceptions=true)
   {
@@ -362,7 +362,7 @@ 
   /**
    * Register FirePHP as your exception handler
    * 
-   * @return mixed Returns the name of the previously defined exception handler,
+   * @return callable Returns the name of the previously defined exception handler,
    *               or NULL on error.
    *               If no previous handler was defined, NULL is also returned.
    */
@@ -467,7 +467,7 @@ 
    *
    * @param string $Name
    * @param array $Options OPTIONAL Instructions on how to log the group
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function group($Name, $Options=null) {
@@ -491,7 +491,7 @@ 
   /**
    * Ends a group you have started before
    *
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function groupEnd() {
@@ -504,7 +504,7 @@ 
    * @see FirePHP::LOG
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function log($Object, $Label=null) {
@@ -517,7 +517,7 @@ 
    * @see FirePHP::INFO
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function info($Object, $Label=null) {
@@ -530,7 +530,7 @@ 
    * @see FirePHP::WARN
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function warn($Object, $Label=null) {
@@ -543,7 +543,7 @@ 
    * @see FirePHP::ERROR
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function error($Object, $Label=null) {
@@ -556,7 +556,7 @@ 
    * @see FirePHP::DUMP
    * @param string $Key
    * @param mixed $Variable
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function dump($Key, $Variable) {
@@ -568,7 +568,7 @@ 
    *
    * @see FirePHP::TRACE
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function trace($Label) {
@@ -581,7 +581,7 @@ 
    * @see FirePHP::TABLE
    * @param string $Label
    * @param string $Table
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function table($Label, $Table) {
@@ -607,7 +607,7 @@ 
    * 
    * @see http://www.firephp.org/Wiki/Reference/Fb
    * @param mixed $Object The variable to be logged
-   * @return true Return TRUE if message was added to headers, FALSE otherwise
+   * @return boolean Return TRUE if message was added to headers, FALSE otherwise
    * @throws Exception
    */
   public function fb($Object) {
@@ -1005,7 +1005,6 @@ 
    * protected and private visibility
    * 
    * @param BaseObject $Object The object to be encoded
-   * @param int $Depth The current traversal depth
    * @return array All members of the object
    */
   protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)

libs/PEAR.1.9.5/HTTP/Request.php

Spacing +4 added lines, -4 removed lines

@@ -18,28 +18,28 @@
 	}
 
 	public function getResponseCode() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getStatus();
 		}
 	}
 
 	public function getResponseHeader() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getHeader();	
 		}
 	}
 
 	public function getResponseBody() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getBody();
 		}
 	}
 
 	public function getResponseCookies() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getCookies();
 		}

libs/PEAR.1.9.5/HTTP/Request2.php

Indentation +977 added lines, -977 removed lines

@@ -41,990 +41,990 @@
  */

 class HTTP_Request2 implements SplSubject

 {

-    /**#@+

+	/**#@+

      * Constants for HTTP request methods

      *

      * @link http://tools.ietf.org/html/rfc2616#section-5.1.1

      */

-    const METHOD_OPTIONS = 'OPTIONS';

-    const METHOD_GET     = 'GET';

-    const METHOD_HEAD    = 'HEAD';

-    const METHOD_POST    = 'POST';

-    const METHOD_PUT     = 'PUT';

-    const METHOD_DELETE  = 'DELETE';

-    const METHOD_TRACE   = 'TRACE';

-    const METHOD_CONNECT = 'CONNECT';

-    /**#@-*/

-

-    /**#@+

+	const METHOD_OPTIONS = 'OPTIONS';

+	const METHOD_GET     = 'GET';

+	const METHOD_HEAD    = 'HEAD';

+	const METHOD_POST    = 'POST';

+	const METHOD_PUT     = 'PUT';

+	const METHOD_DELETE  = 'DELETE';

+	const METHOD_TRACE   = 'TRACE';

+	const METHOD_CONNECT = 'CONNECT';

+	/**#@-*/

+

+	/**#@+

      * Constants for HTTP authentication schemes

      *

      * @link http://tools.ietf.org/html/rfc2617

      */

-    const AUTH_BASIC  = 'basic';

-    const AUTH_DIGEST = 'digest';

-    /**#@-*/

-

-    /**

-     * Regular expression used to check for invalid symbols in RFC 2616 tokens

-     * @link http://pear.php.net/bugs/bug.php?id=15630

-     */

-    const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';

-

-    /**

-     * Regular expression used to check for invalid symbols in cookie strings

-     * @link http://pear.php.net/bugs/bug.php?id=15630

-     * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html

-     */

-    const REGEXP_INVALID_COOKIE = '/[\s,;]/';

-

-    /**

-     * Fileinfo magic database resource

-     * @var  resource

-     * @see  detectMimeType()

-     */

-    private static $_fileinfoDb;

-

-    /**

-     * Observers attached to the request (instances of SplObserver)

-     * @var  array

-     */

-    protected $observers = array();

-

-    /**

-     * Request URL

-     * @var  Net_URL2

-     */

-    protected $url;

-

-    /**

-     * Request method

-     * @var  string

-     */

-    protected $method = self::METHOD_GET;

-

-    /**

-     * Authentication data

-     * @var  array

-     * @see  getAuth()

-     */

-    protected $auth;

-

-    /**

-     * Request headers

-     * @var  array

-     */

-    protected $headers = array();

-

-    /**

-     * Configuration parameters

-     * @var  array

-     * @see  setConfig()

-     */

-    protected $config = array(

-        'adapter'           => 'HTTP_Request2_Adapter_Socket',

-        'connect_timeout'   => 10,

-        'timeout'           => 0,

-        'use_brackets'      => true,

-        'protocol_version'  => '1.1',

-        'buffer_size'       => 16384,

-        'store_body'        => true,

-        'local_ip'          => null,

-

-        'proxy_host'        => '',

-        'proxy_port'        => '',

-        'proxy_user'        => '',

-        'proxy_password'    => '',

-        'proxy_auth_scheme' => self::AUTH_BASIC,

-        'proxy_type'        => 'http',

-

-        'ssl_verify_peer'   => true,

-        'ssl_verify_host'   => true,

-        'ssl_cafile'        => null,

-        'ssl_capath'        => null,

-        'ssl_local_cert'    => null,

-        'ssl_passphrase'    => null,

-

-        'digest_compat_ie'  => false,

-

-        'follow_redirects'  => false,

-        'max_redirects'     => 5,

-        'strict_redirects'  => false

-    );

-

-    /**

-     * Last event in request / response handling, intended for observers

-     * @var  array

-     * @see  getLastEvent()

-     */

-    protected $lastEvent = array(

-        'name' => 'start',

-        'data' => null

-    );

-

-    /**

-     * Request body

-     * @var  string|resource

-     * @see  setBody()

-     */

-    protected $body = '';

-

-    /**

-     * Array of POST parameters

-     * @var  array

-     */

-    protected $postParams = array();

-

-    /**

-     * Array of file uploads (for multipart/form-data POST requests)

-     * @var  array

-     */

-    protected $uploads = array();

-

-    /**

-     * Adapter used to perform actual HTTP request

-     * @var  HTTP_Request2_Adapter

-     */

-    protected $adapter;

-

-    /**

-     * Cookie jar to persist cookies between requests

-     * @var HTTP_Request2_CookieJar

-     */

-    protected $cookieJar = null;

-

-    /**

-     * Constructor. Can set request URL, method and configuration array.

-     *

-     * Also sets a default value for User-Agent header.

-     *

-     * @param string|Net_Url2 $url    Request URL

-     * @param string          $method Request method

-     * @param array           $config Configuration for this Request instance

-     */

-    public function __construct(

-        $url = null, $method = self::METHOD_GET, array $config = array()

-    ) {

-        $this->setConfig($config);

-        if (!empty($url)) {

-            $this->setUrl($url);

-        }

-        if (!empty($method)) {

-            $this->setMethod($method);

-        }

-        $this->setHeader(

-            'user-agent', 'HTTP_Request2/2.2.1 ' .

-            '(http://pear.php.net/package/http_request2) PHP/' . phpversion()

-        );

-    }

-

-    /**

-     * Sets the URL for this request

-     *

-     * If the URL has userinfo part (username & password) these will be removed

-     * and converted to auth data. If the URL does not have a path component,

-     * that will be set to '/'.

-     *

-     * @param string|Net_URL2 $url Request URL

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function setUrl($url)

-    {

-        if (is_string($url)) {

-            $url = new Net_URL2(

-                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])

-            );

-        }

-        if (!$url instanceof Net_URL2) {

-            throw new HTTP_Request2_LogicException(

-                'Parameter is not a valid HTTP URL',

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        // URL contains username / password?

-        if ($url->getUserinfo()) {

-            $username = $url->getUser();

-            $password = $url->getPassword();

-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');

-            $url->setUserinfo('');

-        }

-        if ('' == $url->getPath()) {

-            $url->setPath('/');

-        }

-        $this->url = $url;

-

-        return $this;

-    }

-

-    /**

-     * Returns the request URL

-     *

-     * @return   Net_URL2

-     */

-    public function getUrl()

-    {

-        return $this->url;

-    }

-

-    /**

-     * Sets the request method

-     *

-     * @param string $method one of the methods defined in RFC 2616

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException if the method name is invalid

-     */

-    public function setMethod($method)

-    {

-        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1

-        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {

-            throw new HTTP_Request2_LogicException(

-                "Invalid request method '{$method}'",

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        $this->method = $method;

-

-        return $this;

-    }

-

-    /**

-     * Returns the request method

-     *

-     * @return   string

-     */

-    public function getMethod()

-    {

-        return $this->method;

-    }

-

-    /**

-     * Sets the configuration parameter(s)

-     *

-     * The following parameters are available:

-     * <ul>

-     *   <li> 'adapter'           - adapter to use (string)</li>

-     *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>

-     *   <li> 'timeout'           - Total number of seconds a request can take.

-     *                              Use 0 for no limit, should be greater than

-     *                              'connect_timeout' if set (integer)</li>

-     *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>

-     *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>

-     *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>

-     *   <li> 'store_body'        - Whether to store response body in response object.

-     *                              Set to false if receiving a huge response and

-     *                              using an Observer to save it (boolean)</li>

-     *   <li> 'local_ip'          - Specifies the IP address that will be used for accessing

-     *                              the network (string)</li>

-     *   <li> 'proxy_type'        - Proxy type, 'http' or 'socks5' (string)</li>

-     *   <li> 'proxy_host'        - Proxy server host (string)</li>

-     *   <li> 'proxy_port'        - Proxy server port (integer)</li>

-     *   <li> 'proxy_user'        - Proxy auth username (string)</li>

-     *   <li> 'proxy_password'    - Proxy auth password (string)</li>

-     *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>

-     *   <li> 'proxy'             - Shorthand for proxy_* parameters, proxy given as URL,

-     *                              e.g. 'socks5://localhost:1080/' (string)</li>

-     *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>

-     *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL

-     *                              certificate matches host name (bool)</li>

-     *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer

-     *                              with (use with 'ssl_verify_peer') (string)</li>

-     *   <li> 'ssl_capath'        - Directory holding multiple Certificate

-     *                              Authority files (string)</li>

-     *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>

-     *   <li> 'ssl_passphrase'    - Passphrase with which local certificate

-     *                              was encoded (string)</li>

-     *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6

-     *                              in using URL without query string in digest

-     *                              authentication (boolean)</li>

-     *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>

-     *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>

-     *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and

-     *                              302 (true, needed for compatibility with RFC 2616)

-     *                              or switch to GET (false, needed for compatibility with most

-     *                              browsers) (boolean)</li>

-     * </ul>

-     *

-     * @param string|array $nameOrConfig configuration parameter name or array

-     *                                   ('parameter name' => 'parameter value')

-     * @param mixed        $value        parameter value if $nameOrConfig is not an array

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException If the parameter is unknown

-     */

-    public function setConfig($nameOrConfig, $value = null)

-    {

-        if (is_array($nameOrConfig)) {

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

-                $this->setConfig($name, $value);

-            }

-

-        } elseif ('proxy' == $nameOrConfig) {

-            $url = new Net_URL2($value);

-            $this->setConfig(array(

-                'proxy_type'     => $url->getScheme(),

-                'proxy_host'     => $url->getHost(),

-                'proxy_port'     => $url->getPort(),

-                'proxy_user'     => rawurldecode($url->getUser()),

-                'proxy_password' => rawurldecode($url->getPassword())

-            ));

-

-        } else {

-            if (!array_key_exists($nameOrConfig, $this->config)) {

-                throw new HTTP_Request2_LogicException(

-                    "Unknown configuration parameter '{$nameOrConfig}'",

-                    HTTP_Request2_Exception::INVALID_ARGUMENT

-                );

-            }

-            $this->config[$nameOrConfig] = $value;

-        }

-

-        return $this;

-    }

-

-    /**

-     * Returns the value(s) of the configuration parameter(s)

-     *

-     * @param string $name parameter name

-     *

-     * @return   mixed   value of $name parameter, array of all configuration

-     *                   parameters if $name is not given

-     * @throws   HTTP_Request2_LogicException If the parameter is unknown

-     */

-    public function getConfig($name = null)

-    {

-        if (null === $name) {

-            return $this->config;

-        } elseif (!array_key_exists($name, $this->config)) {

-            throw new HTTP_Request2_LogicException(

-                "Unknown configuration parameter '{$name}'",

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        return $this->config[$name];

-    }

-

-    /**

-     * Sets the autentification data

-     *

-     * @param string $user     user name

-     * @param string $password password

-     * @param string $scheme   authentication scheme

-     *

-     * @return   HTTP_Request2

-     */

-    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)

-    {

-        if (empty($user)) {

-            $this->auth = null;

-        } else {

-            $this->auth = array(

-                'user'     => (string)$user,

-                'password' => (string)$password,

-                'scheme'   => $scheme

-            );

-        }

-

-        return $this;

-    }

-

-    /**

-     * Returns the authentication data

-     *

-     * The array has the keys 'user', 'password' and 'scheme', where 'scheme'

-     * is one of the HTTP_Request2::AUTH_* constants.

-     *

-     * @return   array

-     */

-    public function getAuth()

-    {

-        return $this->auth;

-    }

-

-    /**

-     * Sets request header(s)

-     *

-     * The first parameter may be either a full header string 'header: value' or

-     * header name. In the former case $value parameter is ignored, in the latter

-     * the header's value will either be set to $value or the header will be

-     * removed if $value is null. The first parameter can also be an array of

-     * headers, in that case method will be called recursively.

-     *

-     * Note that headers are treated case insensitively as per RFC 2616.

-     *

-     * <code>

-     * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'

-     * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'

-     * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'

-     * $req->setHeader('FOO'); // removes 'Foo' header from request

-     * </code>

-     *

-     * @param string|array      $name    header name, header string ('Header: value')

-     *                                   or an array of headers

-     * @param string|array|null $value   header value if $name is not an array,

-     *                                   header will be removed if value is null

-     * @param bool              $replace whether to replace previous header with the

-     *                                   same name or append to its value

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function setHeader($name, $value = null, $replace = true)

-    {

-        if (is_array($name)) {

-            foreach ($name as $k => $v) {

-                if (is_string($k)) {

-                    $this->setHeader($k, $v, $replace);

-                } else {

-                    $this->setHeader($v, null, $replace);

-                }

-            }

-        } else {

-            if (null === $value && strpos($name, ':')) {

-                list($name, $value) = array_map('trim', explode(':', $name, 2));

-            }

-            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2

-            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {

-                throw new HTTP_Request2_LogicException(

-                    "Invalid header name '{$name}'",

-                    HTTP_Request2_Exception::INVALID_ARGUMENT

-                );

-            }

-            // Header names are case insensitive anyway

-            $name = strtolower($name);

-            if (null === $value) {

-                unset($this->headers[$name]);

-

-            } else {

-                if (is_array($value)) {

-                    $value = implode(', ', array_map('trim', $value));

-                } elseif (is_string($value)) {

-                    $value = trim($value);

-                }

-                if (!isset($this->headers[$name]) || $replace) {

-                    $this->headers[$name] = $value;

-                } else {

-                    $this->headers[$name] .= ', ' . $value;

-                }

-            }

-        }

-

-        return $this;

-    }

-

-    /**

-     * Returns the request headers

-     *

-     * The array is of the form ('header name' => 'header value'), header names

-     * are lowercased

-     *

-     * @return   array

-     */

-    public function getHeaders()

-    {

-        return $this->headers;

-    }

-

-    /**

-     * Adds a cookie to the request

-     *

-     * If the request does not have a CookieJar object set, this method simply

-     * appends a cookie to "Cookie:" header.

-     *

-     * If a CookieJar object is available, the cookie is stored in that object.

-     * Data from request URL will be used for setting its 'domain' and 'path'

-     * parameters, 'expires' and 'secure' will be set to null and false,

-     * respectively. If you need further control, use CookieJar's methods.

-     *

-     * @param string $name  cookie name

-     * @param string $value cookie value

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     * @see      setCookieJar()

-     */

-    public function addCookie($name, $value)

-    {

-        if (!empty($this->cookieJar)) {

-            $this->cookieJar->store(

-                array('name' => $name, 'value' => $value), $this->url

-            );

-

-        } else {

-            $cookie = $name . '=' . $value;

-            if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {

-                throw new HTTP_Request2_LogicException(

-                    "Invalid cookie: '{$cookie}'",

-                    HTTP_Request2_Exception::INVALID_ARGUMENT

-                );

-            }

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

-            $this->setHeader('cookie', $cookies . $cookie);

-        }

-

-        return $this;

-    }

-

-    /**

-     * Sets the request body

-     *

-     * If you provide file pointer rather than file name, it should support

-     * fstat() and rewind() operations.

-     *

-     * @param string|resource|HTTP_Request2_MultipartBody $body       Either a

-     *               string with the body or filename containing body or

-     *               pointer to an open file or object with multipart body data

-     * @param bool                                        $isFilename Whether

-     *               first parameter is a filename

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function setBody($body, $isFilename = false)

-    {

-        if (!$isFilename && !is_resource($body)) {

-            if (!$body instanceof HTTP_Request2_MultipartBody) {

-                $this->body = (string)$body;

-            } else {

-                $this->body = $body;

-            }

-        } else {

-            $fileData = $this->fopenWrapper($body, empty($this->headers['content-type']));

-            $this->body = $fileData['fp'];

-            if (empty($this->headers['content-type'])) {

-                $this->setHeader('content-type', $fileData['type']);

-            }

-        }

-        $this->postParams = $this->uploads = array();

-

-        return $this;

-    }

-

-    /**

-     * Returns the request body

-     *

-     * @return   string|resource|HTTP_Request2_MultipartBody

-     */

-    public function getBody()

-    {

-        if (self::METHOD_POST == $this->method

-            && (!empty($this->postParams) || !empty($this->uploads))

-        ) {

-            if (0 === strpos($this->headers['content-type'], 'application/x-www-form-urlencoded')) {

-                $body = http_build_query($this->postParams, '', '&');

-                if (!$this->getConfig('use_brackets')) {

-                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);

-                }

-                // support RFC 3986 by not encoding '~' symbol (request #15368)

-                return str_replace('%7E', '~', $body);

-

-            } elseif (0 === strpos($this->headers['content-type'], 'multipart/form-data')) {

-                require_once 'HTTP/Request2/MultipartBody.php';

-                return new HTTP_Request2_MultipartBody(

-                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')

-                );

-            }

-        }

-        return $this->body;

-    }

-

-    /**

-     * Adds a file to form-based file upload

-     *

-     * Used to emulate file upload via a HTML form. The method also sets

-     * Content-Type of HTTP request to 'multipart/form-data'.

-     *

-     * If you just want to send the contents of a file as the body of HTTP

-     * request you should use setBody() method.

-     *

-     * If you provide file pointers rather than file names, they should support

-     * fstat() and rewind() operations.

-     *

-     * @param string                $fieldName    name of file-upload field

-     * @param string|resource|array $filename     full name of local file,

-     *               pointer to open file or an array of files

-     * @param string                $sendFilename filename to send in the request

-     * @param string                $contentType  content-type of file being uploaded

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function addUpload(

-        $fieldName, $filename, $sendFilename = null, $contentType = null

-    ) {

-        if (!is_array($filename)) {

-            $fileData = $this->fopenWrapper($filename, empty($contentType));

-            $this->uploads[$fieldName] = array(

-                'fp'        => $fileData['fp'],

-                'filename'  => !empty($sendFilename)? $sendFilename

-                                :(is_string($filename)? basename($filename): 'anonymous.blob') ,

-                'size'      => $fileData['size'],

-                'type'      => empty($contentType)? $fileData['type']: $contentType

-            );

-        } else {

-            $fps = $names = $sizes = $types = array();

-            foreach ($filename as $f) {

-                if (!is_array($f)) {

-                    $f = array($f);

-                }

-                $fileData = $this->fopenWrapper($f[0], empty($f[2]));

-                $fps[]   = $fileData['fp'];

-                $names[] = !empty($f[1])? $f[1]

-                            :(is_string($f[0])? basename($f[0]): 'anonymous.blob');

-                $sizes[] = $fileData['size'];

-                $types[] = empty($f[2])? $fileData['type']: $f[2];

-            }

-            $this->uploads[$fieldName] = array(

-                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types

-            );

-        }

-        if (empty($this->headers['content-type'])

-            || 'application/x-www-form-urlencoded' == $this->headers['content-type']

-        ) {

-            $this->setHeader('content-type', 'multipart/form-data');

-        }

-

-        return $this;

-    }

-

-    /**

-     * Adds POST parameter(s) to the request.

-     *

-     * @param string|array $name  parameter name or array ('name' => 'value')

-     * @param mixed        $value parameter value (can be an array)

-     *

-     * @return   HTTP_Request2

-     */

-    public function addPostParameter($name, $value = null)

-    {

-        if (!is_array($name)) {

-            $this->postParams[$name] = $value;

-        } else {

-            foreach ($name as $k => $v) {

-                $this->addPostParameter($k, $v);

-            }

-        }

-        if (empty($this->headers['content-type'])) {

-            $this->setHeader('content-type', 'application/x-www-form-urlencoded');

-        }

-

-        return $this;

-    }

-

-    /**

-     * Attaches a new observer

-     *

-     * @param SplObserver $observer any object implementing SplObserver

-     */

-    public function attach(SplObserver $observer)

-    {

-        foreach ($this->observers as $attached) {

-            if ($attached === $observer) {

-                return;

-            }

-        }

-        $this->observers[] = $observer;

-    }

-

-    /**

-     * Detaches an existing observer

-     *

-     * @param SplObserver $observer any object implementing SplObserver

-     */

-    public function detach(SplObserver $observer)

-    {

-        foreach ($this->observers as $key => $attached) {

-            if ($attached === $observer) {

-                unset($this->observers[$key]);

-                return;

-            }

-        }

-    }

-

-    /**

-     * Notifies all observers

-     */

-    public function notify()

-    {

-        foreach ($this->observers as $observer) {

-            $observer->update($this);

-        }

-    }

-

-    /**

-     * Sets the last event

-     *

-     * Adapters should use this method to set the current state of the request

-     * and notify the observers.

-     *

-     * @param string $name event name

-     * @param mixed  $data event data

-     */

-    public function setLastEvent($name, $data = null)

-    {

-        $this->lastEvent = array(

-            'name' => $name,

-            'data' => $data

-        );

-        $this->notify();

-    }

-

-    /**

-     * Returns the last event

-     *

-     * Observers should use this method to access the last change in request.

-     * The following event names are possible:

-     * <ul>

-     *   <li>'connect'                 - after connection to remote server,

-     *                                   data is the destination (string)</li>

-     *   <li>'disconnect'              - after disconnection from server</li>

-     *   <li>'sentHeaders'             - after sending the request headers,

-     *                                   data is the headers sent (string)</li>

-     *   <li>'sentBodyPart'            - after sending a part of the request body,

-     *                                   data is the length of that part (int)</li>

-     *   <li>'sentBody'                - after sending the whole request body,

-     *                                   data is request body length (int)</li>

-     *   <li>'receivedHeaders'         - after receiving the response headers,

-     *                                   data is HTTP_Request2_Response object</li>

-     *   <li>'receivedBodyPart'        - after receiving a part of the response

-     *                                   body, data is that part (string)</li>

-     *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still

-     *                                   encoded by Content-Encoding</li>

-     *   <li>'receivedBody'            - after receiving the complete response

-     *                                   body, data is HTTP_Request2_Response object</li>

-     * </ul>

-     * Different adapters may not send all the event types. Mock adapter does

-     * not send any events to the observers.

-     *

-     * @return   array   The array has two keys: 'name' and 'data'

-     */

-    public function getLastEvent()

-    {

-        return $this->lastEvent;

-    }

-

-    /**

-     * Sets the adapter used to actually perform the request

-     *

-     * You can pass either an instance of a class implementing HTTP_Request2_Adapter

-     * or a class name. The method will only try to include a file if the class

-     * name starts with HTTP_Request2_Adapter_, it will also try to prepend this

-     * prefix to the class name if it doesn't contain any underscores, so that

-     * <code>

-     * $request->setAdapter('curl');

-     * </code>

-     * will work.

-     *

-     * @param string|HTTP_Request2_Adapter $adapter Adapter to use

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function setAdapter($adapter)

-    {

-        if (is_string($adapter)) {

-            if (!class_exists($adapter, false)) {

-                if (false === strpos($adapter, '_')) {

-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);

-                }

-                if (!class_exists($adapter, false)

-                    && preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)

-                ) {

-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';

-                }

-                if (!class_exists($adapter, false)) {

-                    throw new HTTP_Request2_LogicException(

-                        "Class {$adapter} not found",

-                        HTTP_Request2_Exception::MISSING_VALUE

-                    );

-                }

-            }

-            $adapter = new $adapter;

-        }

-        if (!$adapter instanceof HTTP_Request2_Adapter) {

-            throw new HTTP_Request2_LogicException(

-                'Parameter is not a HTTP request adapter',

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        $this->adapter = $adapter;

-

-        return $this;

-    }

-

-    /**

-     * Sets the cookie jar

-     *

-     * A cookie jar is used to maintain cookies across HTTP requests and

-     * responses. Cookies from jar will be automatically added to the request

-     * headers based on request URL.

-     *

-     * @param HTTP_Request2_CookieJar|bool $jar Existing CookieJar object, true to

-     *                                          create a new one, false to remove

-     *

-     * @return HTTP_Request2

-     * @throws HTTP_Request2_LogicException

-     */

-    public function setCookieJar($jar = true)

-    {

-        if (!class_exists('HTTP_Request2_CookieJar', false)) {

-            require_once 'HTTP/Request2/CookieJar.php';

-        }

-

-        if ($jar instanceof HTTP_Request2_CookieJar) {

-            $this->cookieJar = $jar;

-        } elseif (true === $jar) {

-            $this->cookieJar = new HTTP_Request2_CookieJar();

-        } elseif (!$jar) {

-            $this->cookieJar = null;

-        } else {

-            throw new HTTP_Request2_LogicException(

-                'Invalid parameter passed to setCookieJar()',

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-

-        return $this;

-    }

-

-    /**

-     * Returns current CookieJar object or null if none

-     *

-     * @return HTTP_Request2_CookieJar|null

-     */

-    public function getCookieJar()

-    {

-        return $this->cookieJar;

-    }

-

-    /**

-     * Sends the request and returns the response

-     *

-     * @throws   HTTP_Request2_Exception

-     * @return   HTTP_Request2_Response

-     */

-    public function send()

-    {

-        // Sanity check for URL

-        if (!$this->url instanceof Net_URL2

-            || !$this->url->isAbsolute()

-            || !in_array(strtolower($this->url->getScheme()), array('https', 'http'))

-        ) {

-            throw new HTTP_Request2_LogicException(

-                'HTTP_Request2 needs an absolute HTTP(S) request URL, '

-                . ($this->url instanceof Net_URL2

-                   ? "'" . $this->url->__toString() . "'" : 'none')

-                . ' given',

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

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

-            $this->setAdapter($this->getConfig('adapter'));

-        }

-        // magic_quotes_runtime may break file uploads and chunked response

-        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.

-        if ($magicQuotes = get_magic_quotes_runtime()) {

-            set_magic_quotes_runtime(false);

-        }

-        // force using single byte encoding if mbstring extension overloads

-        // strlen() and substr(); see bug #1781, bug #10605

-        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {

-            $oldEncoding = mb_internal_encoding();

-            mb_internal_encoding('8bit');

-        }

-

-        try {

-            $response = $this->adapter->sendRequest($this);

-        } catch (Exception $e) {

-        }

-        // cleanup in either case (poor man's "finally" clause)

-        if ($magicQuotes) {

-            set_magic_quotes_runtime(true);

-        }

-        if (!empty($oldEncoding)) {

-            mb_internal_encoding($oldEncoding);

-        }

-        // rethrow the exception

-        if (!empty($e)) {

-            throw $e;

-        }

-        return $response;

-    }

-

-    /**

-     * Wrapper around fopen()/fstat() used by setBody() and addUpload()

-     *

-     * @param string|resource $file       file name or pointer to open file

-     * @param bool            $detectType whether to try autodetecting MIME

-     *                        type of file, will only work if $file is a

-     *                        filename, not pointer

-     *

-     * @return array array('fp' => file pointer, 'size' => file size, 'type' => MIME type)

-     * @throws HTTP_Request2_LogicException

-     */

-    protected function fopenWrapper($file, $detectType = false)

-    {

-        if (!is_string($file) && !is_resource($file)) {

-            throw new HTTP_Request2_LogicException(

-                "Filename or file pointer resource expected",

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        $fileData = array(

-            'fp'   => is_string($file)? null: $file,

-            'type' => 'application/octet-stream',

-            'size' => 0

-        );

-        if (is_string($file)) {

-            if (!($fileData['fp'] = @fopen($file, 'rb'))) {

-                $error = error_get_last();

-                throw new HTTP_Request2_LogicException(

-                    $error['message'], HTTP_Request2_Exception::READ_ERROR

-                );

-            }

-            if ($detectType) {

-                $fileData['type'] = self::detectMimeType($file);

-            }

-        }

-        if (!($stat = fstat($fileData['fp']))) {

-            throw new HTTP_Request2_LogicException(

-                "fstat() call failed", HTTP_Request2_Exception::READ_ERROR

-            );

-        }

-        $fileData['size'] = $stat['size'];

-

-        return $fileData;

-    }

-

-    /**

-     * Tries to detect MIME type of a file

-     *

-     * The method will try to use fileinfo extension if it is available,

-     * deprecated mime_content_type() function in the other case. If neither

-     * works, default 'application/octet-stream' MIME type is returned

-     *

-     * @param string $filename file name

-     *

-     * @return   string  file MIME type

-     */

-    protected static function detectMimeType($filename)

-    {

-        // finfo extension from PECL available

-        if (function_exists('finfo_open')) {

-            if (!isset(self::$_fileinfoDb)) {

-                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);

-            }

-            if (self::$_fileinfoDb) {

-                $info = finfo_file(self::$_fileinfoDb, $filename);

-            }

-        }

-        // (deprecated) mime_content_type function available

-        if (empty($info) && function_exists('mime_content_type')) {

-            return mime_content_type($filename);

-        }

-        return empty($info)? 'application/octet-stream': $info;

-    }

+	const AUTH_BASIC  = 'basic';

+	const AUTH_DIGEST = 'digest';

+	/**#@-*/

+

+	/**

+	 * Regular expression used to check for invalid symbols in RFC 2616 tokens

+	 * @link http://pear.php.net/bugs/bug.php?id=15630

+	 */

+	const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';

+

+	/**

+	 * Regular expression used to check for invalid symbols in cookie strings

+	 * @link http://pear.php.net/bugs/bug.php?id=15630

+	 * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html

+	 */

+	const REGEXP_INVALID_COOKIE = '/[\s,;]/';

+

+	/**

+	 * Fileinfo magic database resource

+	 * @var  resource

+	 * @see  detectMimeType()

+	 */

+	private static $_fileinfoDb;

+

+	/**

+	 * Observers attached to the request (instances of SplObserver)

+	 * @var  array

+	 */

+	protected $observers = array();

+

+	/**

+	 * Request URL

+	 * @var  Net_URL2

+	 */

+	protected $url;

+

+	/**

+	 * Request method

+	 * @var  string

+	 */

+	protected $method = self::METHOD_GET;

+

+	/**

+	 * Authentication data

+	 * @var  array

+	 * @see  getAuth()

+	 */

+	protected $auth;

+

+	/**

+	 * Request headers

+	 * @var  array

+	 */

+	protected $headers = array();

+

+	/**

+	 * Configuration parameters

+	 * @var  array

+	 * @see  setConfig()

+	 */

+	protected $config = array(

+		'adapter'           => 'HTTP_Request2_Adapter_Socket',

+		'connect_timeout'   => 10,

+		'timeout'           => 0,

+		'use_brackets'      => true,

+		'protocol_version'  => '1.1',

+		'buffer_size'       => 16384,

+		'store_body'        => true,

+		'local_ip'          => null,

+

+		'proxy_host'        => '',

+		'proxy_port'        => '',

+		'proxy_user'        => '',

+		'proxy_password'    => '',

+		'proxy_auth_scheme' => self::AUTH_BASIC,

+		'proxy_type'        => 'http',

+

+		'ssl_verify_peer'   => true,

+		'ssl_verify_host'   => true,

+		'ssl_cafile'        => null,

+		'ssl_capath'        => null,

+		'ssl_local_cert'    => null,

+		'ssl_passphrase'    => null,

+

+		'digest_compat_ie'  => false,

+

+		'follow_redirects'  => false,

+		'max_redirects'     => 5,

+		'strict_redirects'  => false

+	);

+

+	/**

+	 * Last event in request / response handling, intended for observers

+	 * @var  array

+	 * @see  getLastEvent()

+	 */

+	protected $lastEvent = array(

+		'name' => 'start',

+		'data' => null

+	);

+

+	/**

+	 * Request body

+	 * @var  string|resource

+	 * @see  setBody()

+	 */

+	protected $body = '';

+

+	/**

+	 * Array of POST parameters

+	 * @var  array

+	 */

+	protected $postParams = array();

+

+	/**

+	 * Array of file uploads (for multipart/form-data POST requests)

+	 * @var  array

+	 */

+	protected $uploads = array();

+

+	/**

+	 * Adapter used to perform actual HTTP request

+	 * @var  HTTP_Request2_Adapter

+	 */

+	protected $adapter;

+

+	/**

+	 * Cookie jar to persist cookies between requests

+	 * @var HTTP_Request2_CookieJar

+	 */

+	protected $cookieJar = null;

+

+	/**

+	 * Constructor. Can set request URL, method and configuration array.

+	 *

+	 * Also sets a default value for User-Agent header.

+	 *

+	 * @param string|Net_Url2 $url    Request URL

+	 * @param string          $method Request method

+	 * @param array           $config Configuration for this Request instance

+	 */

+	public function __construct(

+		$url = null, $method = self::METHOD_GET, array $config = array()

+	) {

+		$this->setConfig($config);

+		if (!empty($url)) {

+			$this->setUrl($url);

+		}

+		if (!empty($method)) {

+			$this->setMethod($method);

+		}

+		$this->setHeader(

+			'user-agent', 'HTTP_Request2/2.2.1 ' .

+			'(http://pear.php.net/package/http_request2) PHP/' . phpversion()

+		);

+	}

+

+	/**

+	 * Sets the URL for this request

+	 *

+	 * If the URL has userinfo part (username & password) these will be removed

+	 * and converted to auth data. If the URL does not have a path component,

+	 * that will be set to '/'.

+	 *

+	 * @param string|Net_URL2 $url Request URL

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function setUrl($url)

+	{

+		if (is_string($url)) {

+			$url = new Net_URL2(

+				$url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])

+			);

+		}

+		if (!$url instanceof Net_URL2) {

+			throw new HTTP_Request2_LogicException(

+				'Parameter is not a valid HTTP URL',

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		// URL contains username / password?

+		if ($url->getUserinfo()) {

+			$username = $url->getUser();

+			$password = $url->getPassword();

+			$this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');

+			$url->setUserinfo('');

+		}

+		if ('' == $url->getPath()) {

+			$url->setPath('/');

+		}

+		$this->url = $url;

+

+		return $this;

+	}

+

+	/**

+	 * Returns the request URL

+	 *

+	 * @return   Net_URL2

+	 */

+	public function getUrl()

+	{

+		return $this->url;

+	}

+

+	/**

+	 * Sets the request method

+	 *

+	 * @param string $method one of the methods defined in RFC 2616

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException if the method name is invalid

+	 */

+	public function setMethod($method)

+	{

+		// Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1

+		if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {

+			throw new HTTP_Request2_LogicException(

+				"Invalid request method '{$method}'",

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		$this->method = $method;

+

+		return $this;

+	}

+

+	/**

+	 * Returns the request method

+	 *

+	 * @return   string

+	 */

+	public function getMethod()

+	{

+		return $this->method;

+	}

+

+	/**

+	 * Sets the configuration parameter(s)

+	 *

+	 * The following parameters are available:

+	 * <ul>

+	 *   <li> 'adapter'           - adapter to use (string)</li>

+	 *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>

+	 *   <li> 'timeout'           - Total number of seconds a request can take.

+	 *                              Use 0 for no limit, should be greater than

+	 *                              'connect_timeout' if set (integer)</li>

+	 *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>

+	 *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>

+	 *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>

+	 *   <li> 'store_body'        - Whether to store response body in response object.

+	 *                              Set to false if receiving a huge response and

+	 *                              using an Observer to save it (boolean)</li>

+	 *   <li> 'local_ip'          - Specifies the IP address that will be used for accessing

+	 *                              the network (string)</li>

+	 *   <li> 'proxy_type'        - Proxy type, 'http' or 'socks5' (string)</li>

+	 *   <li> 'proxy_host'        - Proxy server host (string)</li>

+	 *   <li> 'proxy_port'        - Proxy server port (integer)</li>

+	 *   <li> 'proxy_user'        - Proxy auth username (string)</li>

+	 *   <li> 'proxy_password'    - Proxy auth password (string)</li>

+	 *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>

+	 *   <li> 'proxy'             - Shorthand for proxy_* parameters, proxy given as URL,

+	 *                              e.g. 'socks5://localhost:1080/' (string)</li>

+	 *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>

+	 *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL

+	 *                              certificate matches host name (bool)</li>

+	 *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer

+	 *                              with (use with 'ssl_verify_peer') (string)</li>

+	 *   <li> 'ssl_capath'        - Directory holding multiple Certificate

+	 *                              Authority files (string)</li>

+	 *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>

+	 *   <li> 'ssl_passphrase'    - Passphrase with which local certificate

+	 *                              was encoded (string)</li>

+	 *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6

+	 *                              in using URL without query string in digest

+	 *                              authentication (boolean)</li>

+	 *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>

+	 *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>

+	 *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and

+	 *                              302 (true, needed for compatibility with RFC 2616)

+	 *                              or switch to GET (false, needed for compatibility with most

+	 *                              browsers) (boolean)</li>

+	 * </ul>

+	 *

+	 * @param string|array $nameOrConfig configuration parameter name or array

+	 *                                   ('parameter name' => 'parameter value')

+	 * @param mixed        $value        parameter value if $nameOrConfig is not an array

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException If the parameter is unknown

+	 */

+	public function setConfig($nameOrConfig, $value = null)

+	{

+		if (is_array($nameOrConfig)) {

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

+				$this->setConfig($name, $value);

+			}

+

+		} elseif ('proxy' == $nameOrConfig) {

+			$url = new Net_URL2($value);

+			$this->setConfig(array(

+				'proxy_type'     => $url->getScheme(),

+				'proxy_host'     => $url->getHost(),

+				'proxy_port'     => $url->getPort(),

+				'proxy_user'     => rawurldecode($url->getUser()),

+				'proxy_password' => rawurldecode($url->getPassword())

+			));

+

+		} else {

+			if (!array_key_exists($nameOrConfig, $this->config)) {

+				throw new HTTP_Request2_LogicException(

+					"Unknown configuration parameter '{$nameOrConfig}'",

+					HTTP_Request2_Exception::INVALID_ARGUMENT

+				);

+			}

+			$this->config[$nameOrConfig] = $value;

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Returns the value(s) of the configuration parameter(s)

+	 *

+	 * @param string $name parameter name

+	 *

+	 * @return   mixed   value of $name parameter, array of all configuration

+	 *                   parameters if $name is not given

+	 * @throws   HTTP_Request2_LogicException If the parameter is unknown

+	 */

+	public function getConfig($name = null)

+	{

+		if (null === $name) {

+			return $this->config;

+		} elseif (!array_key_exists($name, $this->config)) {

+			throw new HTTP_Request2_LogicException(

+				"Unknown configuration parameter '{$name}'",

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		return $this->config[$name];

+	}

+

+	/**

+	 * Sets the autentification data

+	 *

+	 * @param string $user     user name

+	 * @param string $password password

+	 * @param string $scheme   authentication scheme

+	 *

+	 * @return   HTTP_Request2

+	 */

+	public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)

+	{

+		if (empty($user)) {

+			$this->auth = null;

+		} else {

+			$this->auth = array(

+				'user'     => (string)$user,

+				'password' => (string)$password,

+				'scheme'   => $scheme

+			);

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Returns the authentication data

+	 *

+	 * The array has the keys 'user', 'password' and 'scheme', where 'scheme'

+	 * is one of the HTTP_Request2::AUTH_* constants.

+	 *

+	 * @return   array

+	 */

+	public function getAuth()

+	{

+		return $this->auth;

+	}

+

+	/**

+	 * Sets request header(s)

+	 *

+	 * The first parameter may be either a full header string 'header: value' or

+	 * header name. In the former case $value parameter is ignored, in the latter

+	 * the header's value will either be set to $value or the header will be

+	 * removed if $value is null. The first parameter can also be an array of

+	 * headers, in that case method will be called recursively.

+	 *

+	 * Note that headers are treated case insensitively as per RFC 2616.

+	 *

+	 * <code>

+	 * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'

+	 * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'

+	 * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'

+	 * $req->setHeader('FOO'); // removes 'Foo' header from request

+	 * </code>

+	 *

+	 * @param string|array      $name    header name, header string ('Header: value')

+	 *                                   or an array of headers

+	 * @param string|array|null $value   header value if $name is not an array,

+	 *                                   header will be removed if value is null

+	 * @param bool              $replace whether to replace previous header with the

+	 *                                   same name or append to its value

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function setHeader($name, $value = null, $replace = true)

+	{

+		if (is_array($name)) {

+			foreach ($name as $k => $v) {

+				if (is_string($k)) {

+					$this->setHeader($k, $v, $replace);

+				} else {

+					$this->setHeader($v, null, $replace);

+				}

+			}

+		} else {

+			if (null === $value && strpos($name, ':')) {

+				list($name, $value) = array_map('trim', explode(':', $name, 2));

+			}

+			// Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2

+			if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {

+				throw new HTTP_Request2_LogicException(

+					"Invalid header name '{$name}'",

+					HTTP_Request2_Exception::INVALID_ARGUMENT

+				);

+			}

+			// Header names are case insensitive anyway

+			$name = strtolower($name);

+			if (null === $value) {

+				unset($this->headers[$name]);

+

+			} else {

+				if (is_array($value)) {

+					$value = implode(', ', array_map('trim', $value));

+				} elseif (is_string($value)) {

+					$value = trim($value);

+				}

+				if (!isset($this->headers[$name]) || $replace) {

+					$this->headers[$name] = $value;

+				} else {

+					$this->headers[$name] .= ', ' . $value;

+				}

+			}

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Returns the request headers

+	 *

+	 * The array is of the form ('header name' => 'header value'), header names

+	 * are lowercased

+	 *

+	 * @return   array

+	 */

+	public function getHeaders()

+	{

+		return $this->headers;

+	}

+

+	/**

+	 * Adds a cookie to the request

+	 *

+	 * If the request does not have a CookieJar object set, this method simply

+	 * appends a cookie to "Cookie:" header.

+	 *

+	 * If a CookieJar object is available, the cookie is stored in that object.

+	 * Data from request URL will be used for setting its 'domain' and 'path'

+	 * parameters, 'expires' and 'secure' will be set to null and false,

+	 * respectively. If you need further control, use CookieJar's methods.

+	 *

+	 * @param string $name  cookie name

+	 * @param string $value cookie value

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 * @see      setCookieJar()

+	 */

+	public function addCookie($name, $value)

+	{

+		if (!empty($this->cookieJar)) {

+			$this->cookieJar->store(

+				array('name' => $name, 'value' => $value), $this->url

+			);

+

+		} else {

+			$cookie = $name . '=' . $value;

+			if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {

+				throw new HTTP_Request2_LogicException(

+					"Invalid cookie: '{$cookie}'",

+					HTTP_Request2_Exception::INVALID_ARGUMENT

+				);

+			}

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

+			$this->setHeader('cookie', $cookies . $cookie);

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Sets the request body

+	 *

+	 * If you provide file pointer rather than file name, it should support

+	 * fstat() and rewind() operations.

+	 *

+	 * @param string|resource|HTTP_Request2_MultipartBody $body       Either a

+	 *               string with the body or filename containing body or

+	 *               pointer to an open file or object with multipart body data

+	 * @param bool                                        $isFilename Whether

+	 *               first parameter is a filename

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function setBody($body, $isFilename = false)

+	{

+		if (!$isFilename && !is_resource($body)) {

+			if (!$body instanceof HTTP_Request2_MultipartBody) {

+				$this->body = (string)$body;

+			} else {

+				$this->body = $body;

+			}

+		} else {

+			$fileData = $this->fopenWrapper($body, empty($this->headers['content-type']));

+			$this->body = $fileData['fp'];

+			if (empty($this->headers['content-type'])) {

+				$this->setHeader('content-type', $fileData['type']);

+			}

+		}

+		$this->postParams = $this->uploads = array();

+

+		return $this;

+	}

+

+	/**

+	 * Returns the request body

+	 *

+	 * @return   string|resource|HTTP_Request2_MultipartBody

+	 */

+	public function getBody()

+	{

+		if (self::METHOD_POST == $this->method

+			&& (!empty($this->postParams) || !empty($this->uploads))

+		) {

+			if (0 === strpos($this->headers['content-type'], 'application/x-www-form-urlencoded')) {

+				$body = http_build_query($this->postParams, '', '&');

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

+					$body = preg_replace('/%5B\d+%5D=/', '=', $body);

+				}

+				// support RFC 3986 by not encoding '~' symbol (request #15368)

+				return str_replace('%7E', '~', $body);

+

+			} elseif (0 === strpos($this->headers['content-type'], 'multipart/form-data')) {

+				require_once 'HTTP/Request2/MultipartBody.php';

+				return new HTTP_Request2_MultipartBody(

+					$this->postParams, $this->uploads, $this->getConfig('use_brackets')

+				);

+			}

+		}

+		return $this->body;

+	}

+

+	/**

+	 * Adds a file to form-based file upload

+	 *

+	 * Used to emulate file upload via a HTML form. The method also sets

+	 * Content-Type of HTTP request to 'multipart/form-data'.

+	 *

+	 * If you just want to send the contents of a file as the body of HTTP

+	 * request you should use setBody() method.

+	 *

+	 * If you provide file pointers rather than file names, they should support

+	 * fstat() and rewind() operations.

+	 *

+	 * @param string                $fieldName    name of file-upload field

+	 * @param string|resource|array $filename     full name of local file,

+	 *               pointer to open file or an array of files

+	 * @param string                $sendFilename filename to send in the request

+	 * @param string                $contentType  content-type of file being uploaded

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function addUpload(

+		$fieldName, $filename, $sendFilename = null, $contentType = null

+	) {

+		if (!is_array($filename)) {

+			$fileData = $this->fopenWrapper($filename, empty($contentType));

+			$this->uploads[$fieldName] = array(

+				'fp'        => $fileData['fp'],

+				'filename'  => !empty($sendFilename)? $sendFilename

+								:(is_string($filename)? basename($filename): 'anonymous.blob') ,

+				'size'      => $fileData['size'],

+				'type'      => empty($contentType)? $fileData['type']: $contentType

+			);

+		} else {

+			$fps = $names = $sizes = $types = array();

+			foreach ($filename as $f) {

+				if (!is_array($f)) {

+					$f = array($f);

+				}

+				$fileData = $this->fopenWrapper($f[0], empty($f[2]));

+				$fps[]   = $fileData['fp'];

+				$names[] = !empty($f[1])? $f[1]

+							:(is_string($f[0])? basename($f[0]): 'anonymous.blob');

+				$sizes[] = $fileData['size'];

+				$types[] = empty($f[2])? $fileData['type']: $f[2];

+			}

+			$this->uploads[$fieldName] = array(

+				'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types

+			);

+		}

+		if (empty($this->headers['content-type'])

+			|| 'application/x-www-form-urlencoded' == $this->headers['content-type']

+		) {

+			$this->setHeader('content-type', 'multipart/form-data');

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Adds POST parameter(s) to the request.

+	 *

+	 * @param string|array $name  parameter name or array ('name' => 'value')

+	 * @param mixed        $value parameter value (can be an array)

+	 *

+	 * @return   HTTP_Request2

+	 */

+	public function addPostParameter($name, $value = null)

+	{

+		if (!is_array($name)) {

+			$this->postParams[$name] = $value;

+		} else {

+			foreach ($name as $k => $v) {

+				$this->addPostParameter($k, $v);

+			}

+		}

+		if (empty($this->headers['content-type'])) {

+			$this->setHeader('content-type', 'application/x-www-form-urlencoded');

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Attaches a new observer

+	 *

+	 * @param SplObserver $observer any object implementing SplObserver

+	 */

+	public function attach(SplObserver $observer)

+	{

+		foreach ($this->observers as $attached) {

+			if ($attached === $observer) {

+				return;

+			}

+		}

+		$this->observers[] = $observer;

+	}

+

+	/**

+	 * Detaches an existing observer

+	 *

+	 * @param SplObserver $observer any object implementing SplObserver

+	 */

+	public function detach(SplObserver $observer)

+	{

+		foreach ($this->observers as $key => $attached) {

+			if ($attached === $observer) {

+				unset($this->observers[$key]);

+				return;

+			}

+		}

+	}

+

+	/**

+	 * Notifies all observers

+	 */

+	public function notify()

+	{

+		foreach ($this->observers as $observer) {

+			$observer->update($this);

+		}

+	}

+

+	/**

+	 * Sets the last event

+	 *

+	 * Adapters should use this method to set the current state of the request

+	 * and notify the observers.

+	 *

+	 * @param string $name event name

+	 * @param mixed  $data event data

+	 */

+	public function setLastEvent($name, $data = null)

+	{

+		$this->lastEvent = array(

+			'name' => $name,

+			'data' => $data

+		);

+		$this->notify();

+	}

+

+	/**

+	 * Returns the last event

+	 *

+	 * Observers should use this method to access the last change in request.

+	 * The following event names are possible:

+	 * <ul>

+	 *   <li>'connect'                 - after connection to remote server,

+	 *                                   data is the destination (string)</li>

+	 *   <li>'disconnect'              - after disconnection from server</li>

+	 *   <li>'sentHeaders'             - after sending the request headers,

+	 *                                   data is the headers sent (string)</li>

+	 *   <li>'sentBodyPart'            - after sending a part of the request body,

+	 *                                   data is the length of that part (int)</li>

+	 *   <li>'sentBody'                - after sending the whole request body,

+	 *                                   data is request body length (int)</li>

+	 *   <li>'receivedHeaders'         - after receiving the response headers,

+	 *                                   data is HTTP_Request2_Response object</li>

+	 *   <li>'receivedBodyPart'        - after receiving a part of the response

+	 *                                   body, data is that part (string)</li>

+	 *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still

+	 *                                   encoded by Content-Encoding</li>

+	 *   <li>'receivedBody'            - after receiving the complete response

+	 *                                   body, data is HTTP_Request2_Response object</li>

+	 * </ul>

+	 * Different adapters may not send all the event types. Mock adapter does

+	 * not send any events to the observers.

+	 *

+	 * @return   array   The array has two keys: 'name' and 'data'

+	 */

+	public function getLastEvent()

+	{

+		return $this->lastEvent;

+	}

+

+	/**

+	 * Sets the adapter used to actually perform the request

+	 *

+	 * You can pass either an instance of a class implementing HTTP_Request2_Adapter

+	 * or a class name. The method will only try to include a file if the class

+	 * name starts with HTTP_Request2_Adapter_, it will also try to prepend this

+	 * prefix to the class name if it doesn't contain any underscores, so that

+	 * <code>

+	 * $request->setAdapter('curl');

+	 * </code>

+	 * will work.

+	 *

+	 * @param string|HTTP_Request2_Adapter $adapter Adapter to use

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function setAdapter($adapter)

+	{

+		if (is_string($adapter)) {

+			if (!class_exists($adapter, false)) {

+				if (false === strpos($adapter, '_')) {

+					$adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);

+				}

+				if (!class_exists($adapter, false)

+					&& preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)

+				) {

+					include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';

+				}

+				if (!class_exists($adapter, false)) {

+					throw new HTTP_Request2_LogicException(

+						"Class {$adapter} not found",

+						HTTP_Request2_Exception::MISSING_VALUE

+					);

+				}

+			}

+			$adapter = new $adapter;

+		}

+		if (!$adapter instanceof HTTP_Request2_Adapter) {

+			throw new HTTP_Request2_LogicException(

+				'Parameter is not a HTTP request adapter',

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		$this->adapter = $adapter;

+

+		return $this;

+	}

+

+	/**

+	 * Sets the cookie jar

+	 *

+	 * A cookie jar is used to maintain cookies across HTTP requests and

+	 * responses. Cookies from jar will be automatically added to the request

+	 * headers based on request URL.

+	 *

+	 * @param HTTP_Request2_CookieJar|bool $jar Existing CookieJar object, true to

+	 *                                          create a new one, false to remove

+	 *

+	 * @return HTTP_Request2

+	 * @throws HTTP_Request2_LogicException

+	 */

+	public function setCookieJar($jar = true)

+	{

+		if (!class_exists('HTTP_Request2_CookieJar', false)) {

+			require_once 'HTTP/Request2/CookieJar.php';

+		}

+

+		if ($jar instanceof HTTP_Request2_CookieJar) {

+			$this->cookieJar = $jar;

+		} elseif (true === $jar) {

+			$this->cookieJar = new HTTP_Request2_CookieJar();

+		} elseif (!$jar) {

+			$this->cookieJar = null;

+		} else {

+			throw new HTTP_Request2_LogicException(

+				'Invalid parameter passed to setCookieJar()',

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Returns current CookieJar object or null if none

+	 *

+	 * @return HTTP_Request2_CookieJar|null

+	 */

+	public function getCookieJar()

+	{

+		return $this->cookieJar;

+	}

+

+	/**

+	 * Sends the request and returns the response

+	 *

+	 * @throws   HTTP_Request2_Exception

+	 * @return   HTTP_Request2_Response

+	 */

+	public function send()

+	{

+		// Sanity check for URL

+		if (!$this->url instanceof Net_URL2

+			|| !$this->url->isAbsolute()

+			|| !in_array(strtolower($this->url->getScheme()), array('https', 'http'))

+		) {

+			throw new HTTP_Request2_LogicException(

+				'HTTP_Request2 needs an absolute HTTP(S) request URL, '

+				. ($this->url instanceof Net_URL2

+				   ? "'" . $this->url->__toString() . "'" : 'none')

+				. ' given',

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

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

+			$this->setAdapter($this->getConfig('adapter'));

+		}

+		// magic_quotes_runtime may break file uploads and chunked response

+		// processing; see bug #4543. Don't use ini_get() here; see bug #16440.

+		if ($magicQuotes = get_magic_quotes_runtime()) {

+			set_magic_quotes_runtime(false);

+		}

+		// force using single byte encoding if mbstring extension overloads

+		// strlen() and substr(); see bug #1781, bug #10605

+		if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {

+			$oldEncoding = mb_internal_encoding();

+			mb_internal_encoding('8bit');

+		}

+

+		try {

+			$response = $this->adapter->sendRequest($this);

+		} catch (Exception $e) {

+		}

+		// cleanup in either case (poor man's "finally" clause)

+		if ($magicQuotes) {

+			set_magic_quotes_runtime(true);

+		}

+		if (!empty($oldEncoding)) {

+			mb_internal_encoding($oldEncoding);

+		}

+		// rethrow the exception

+		if (!empty($e)) {

+			throw $e;

+		}

+		return $response;

+	}

+

+	/**

+	 * Wrapper around fopen()/fstat() used by setBody() and addUpload()

+	 *

+	 * @param string|resource $file       file name or pointer to open file

+	 * @param bool            $detectType whether to try autodetecting MIME

+	 *                        type of file, will only work if $file is a

+	 *                        filename, not pointer

+	 *

+	 * @return array array('fp' => file pointer, 'size' => file size, 'type' => MIME type)

+	 * @throws HTTP_Request2_LogicException

+	 */

+	protected function fopenWrapper($file, $detectType = false)

+	{

+		if (!is_string($file) && !is_resource($file)) {

+			throw new HTTP_Request2_LogicException(

+				"Filename or file pointer resource expected",

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		$fileData = array(

+			'fp'   => is_string($file)? null: $file,

+			'type' => 'application/octet-stream',

+			'size' => 0

+		);

+		if (is_string($file)) {

+			if (!($fileData['fp'] = @fopen($file, 'rb'))) {

+				$error = error_get_last();

+				throw new HTTP_Request2_LogicException(

+					$error['message'], HTTP_Request2_Exception::READ_ERROR

+				);

+			}

+			if ($detectType) {

+				$fileData['type'] = self::detectMimeType($file);

+			}

+		}

+		if (!($stat = fstat($fileData['fp']))) {

+			throw new HTTP_Request2_LogicException(

+				"fstat() call failed", HTTP_Request2_Exception::READ_ERROR

+			);

+		}

+		$fileData['size'] = $stat['size'];

+

+		return $fileData;

+	}

+

+	/**

+	 * Tries to detect MIME type of a file

+	 *

+	 * The method will try to use fileinfo extension if it is available,

+	 * deprecated mime_content_type() function in the other case. If neither

+	 * works, default 'application/octet-stream' MIME type is returned

+	 *

+	 * @param string $filename file name

+	 *

+	 * @return   string  file MIME type

+	 */

+	protected static function detectMimeType($filename)

+	{

+		// finfo extension from PECL available

+		if (function_exists('finfo_open')) {

+			if (!isset(self::$_fileinfoDb)) {

+				self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);

+			}

+			if (self::$_fileinfoDb) {

+				$info = finfo_file(self::$_fileinfoDb, $filename);

+			}

+		}

+		// (deprecated) mime_content_type function available

+		if (empty($info) && function_exists('mime_content_type')) {

+			return mime_content_type($filename);

+		}

+		return empty($info)? 'application/octet-stream': $info;

+	}

 }

 ?>

Doc Comments +2 added lines, -2 removed lines

@@ -261,7 +261,7 @@ 
     /**

      * Returns the request URL

      *

-     * @return   Net_URL2

+     * @return   string

      */

     public function getUrl()

     {

@@ -573,7 +573,7 @@ 
      * If you provide file pointer rather than file name, it should support

      * fstat() and rewind() operations.

      *

-     * @param string|resource|HTTP_Request2_MultipartBody $body       Either a

+     * @param string $body       Either a

      *               string with the body or filename containing body or

      *               pointer to an open file or object with multipart body data

      * @param bool                                        $isFilename Whether

Spacing +21 added lines, -21 removed lines

@@ -213,8 +213,8 @@ 
             $this->setMethod($method);

         }

         $this->setHeader(

-            'user-agent', 'HTTP_Request2/2.2.1 ' .

-            '(http://pear.php.net/package/http_request2) PHP/' . phpversion()

+            'user-agent', 'HTTP_Request2/2.2.1 '.

+            '(http://pear.php.net/package/http_request2) PHP/'.phpversion()

         );

     }

 

@@ -247,7 +247,7 @@ 
         if ($url->getUserinfo()) {

             $username = $url->getUser();

             $password = $url->getPassword();

-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');

+            $this->setAuth(rawurldecode($username), $password ? rawurldecode($password) : '');

             $url->setUserinfo('');

         }

         if ('' == $url->getPath()) {

@@ -421,8 +421,8 @@ 
             $this->auth = null;

         } else {

             $this->auth = array(

-                'user'     => (string)$user,

-                'password' => (string)$password,

+                'user'     => (string) $user,

+                'password' => (string) $password,

                 'scheme'   => $scheme

             );

         }

@@ -506,7 +506,7 @@ 
                 if (!isset($this->headers[$name]) || $replace) {

                     $this->headers[$name] = $value;

                 } else {

-                    $this->headers[$name] .= ', ' . $value;

+                    $this->headers[$name] .= ', '.$value;

                 }

             }

         }

@@ -553,15 +553,15 @@ 
             );

 

         } else {

-            $cookie = $name . '=' . $value;

+            $cookie = $name.'='.$value;

             if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {

                 throw new HTTP_Request2_LogicException(

                     "Invalid cookie: '{$cookie}'",

                     HTTP_Request2_Exception::INVALID_ARGUMENT

                 );

             }

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

-            $this->setHeader('cookie', $cookies . $cookie);

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

+            $this->setHeader('cookie', $cookies.$cookie);

         }

 

         return $this;

@@ -586,7 +586,7 @@ 
     {

         if (!$isFilename && !is_resource($body)) {

             if (!$body instanceof HTTP_Request2_MultipartBody) {

-                $this->body = (string)$body;

+                $this->body = (string) $body;

             } else {

                 $this->body = $body;

             }

@@ -658,10 +658,10 @@ 
             $fileData = $this->fopenWrapper($filename, empty($contentType));

             $this->uploads[$fieldName] = array(

                 'fp'        => $fileData['fp'],

-                'filename'  => !empty($sendFilename)? $sendFilename

-                                :(is_string($filename)? basename($filename): 'anonymous.blob') ,

+                'filename'  => !empty($sendFilename) ? $sendFilename

+                                :(is_string($filename) ? basename($filename) : 'anonymous.blob'),

                 'size'      => $fileData['size'],

-                'type'      => empty($contentType)? $fileData['type']: $contentType

+                'type'      => empty($contentType) ? $fileData['type'] : $contentType

             );

         } else {

             $fps = $names = $sizes = $types = array();

@@ -671,10 +671,10 @@ 
                 }

                 $fileData = $this->fopenWrapper($f[0], empty($f[2]));

                 $fps[]   = $fileData['fp'];

-                $names[] = !empty($f[1])? $f[1]

-                            :(is_string($f[0])? basename($f[0]): 'anonymous.blob');

+                $names[] = !empty($f[1]) ? $f[1]

+                            :(is_string($f[0]) ? basename($f[0]) : 'anonymous.blob');

                 $sizes[] = $fileData['size'];

-                $types[] = empty($f[2])? $fileData['type']: $f[2];

+                $types[] = empty($f[2]) ? $fileData['type'] : $f[2];

             }

             $this->uploads[$fieldName] = array(

                 'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types

@@ -827,12 +827,12 @@ 
         if (is_string($adapter)) {

             if (!class_exists($adapter, false)) {

                 if (false === strpos($adapter, '_')) {

-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);

+                    $adapter = 'HTTP_Request2_Adapter_'.ucfirst($adapter);

                 }

                 if (!class_exists($adapter, false)

                     && preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)

                 ) {

-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';

+                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter).'.php';

                 }

                 if (!class_exists($adapter, false)) {

                     throw new HTTP_Request2_LogicException(

@@ -915,7 +915,7 @@ 
             throw new HTTP_Request2_LogicException(

                 'HTTP_Request2 needs an absolute HTTP(S) request URL, '

                 . ($this->url instanceof Net_URL2

-                   ? "'" . $this->url->__toString() . "'" : 'none')

+                   ? "'".$this->url->__toString()."'" : 'none')

                 . ' given',

                 HTTP_Request2_Exception::INVALID_ARGUMENT

             );

@@ -973,7 +973,7 @@ 
             );

         }

         $fileData = array(

-            'fp'   => is_string($file)? null: $file,

+            'fp'   => is_string($file) ? null: $file,

             'type' => 'application/octet-stream',

             'size' => 0

         );

@@ -1024,7 +1024,7 @@ 
         if (empty($info) && function_exists('mime_content_type')) {

             return mime_content_type($filename);

         }

-        return empty($info)? 'application/octet-stream': $info;

+        return empty($info) ? 'application/octet-stream' : $info;

     }

 }

 ?>

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