xpressengine / xe-core

libs/PEAR.1.9/HTTP/Request2/Adapter/Socket.php

Spacing +20 added lines, -23 removed lines

@@ -216,7 +216,7 @@ 
         $headers = $this->request->getHeaders();
         $reqHost = $this->request->getUrl()->getHost();
         if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
+            $reqPort = $secure ? 443 : 80;
         }
 
         if ($host = $this->request->getConfig('proxy_host')) {
@@ -253,7 +253,7 @@ 
                       empty($headers['connection'])) ||
                      (!empty($headers['connection']) &&
                       'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+        $host = ((!$secure || $proxy) ? 'tcp://' : 'ssl://') . $host;
 
         $options = array();
         if ($secure || $tunnel) {
@@ -274,8 +274,8 @@ 
         // Changing SSL context options after connection is established does *not*
         // work, we need a new connection if options change
         $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
+        $socketKey = $remote . (($secure && $proxy) ? "->{$reqHost}:{$reqPort}" : '') .
+                     (empty($options) ? '' : ':' . serialize($options));
         unset($this->socket);
 
         // We use persistent connections and have a connected socket?
@@ -283,14 +283,14 @@ 
         if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
             !feof(self::$sockets[$socketKey])
         ) {
-            $this->socket =& self::$sockets[$socketKey];
+            $this->socket = & self::$sockets[$socketKey];
 
         } elseif ($secure && $proxy && !$tunnel) {
             $this->establishTunnel();
             $this->request->setLastEvent(
                 'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
             );
-            self::$sockets[$socketKey] =& $this->socket;
+            self::$sockets[$socketKey] = & $this->socket;
 
         } else {
             // Set SSL context options if doing HTTPS request or creating a tunnel
@@ -313,7 +313,7 @@ 
                 );
             }
             $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
+            self::$sockets[$socketKey] = & $this->socket;
         }
         return $keepAlive;
     }
@@ -515,7 +515,7 @@ 
                 // probably credentials are invalid
                 $ret = false;
             }
-            self::$challenges[$prefix] =& $challenge;
+            self::$challenges[$prefix] = & $challenge;
         }
         return $ret;
     }
@@ -696,12 +696,10 @@ 
                'nonce="' . $challenge['nonce'] . '", ' .
                'uri="' . $url . '", ' .
                'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
+               (!empty($challenge['opaque']) ?
+                ', opaque="' . $challenge['opaque'] . '"' : '') .
+               (!empty($challenge['qop']) ?
+                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"' : '');
     }
 
    /**
@@ -725,17 +723,16 @@ 
 
             case HTTP_Request2::AUTH_DIGEST:
                 unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
+                $fullUrl = ('/' == $requestUrl[0]) ?
                            $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
+                            $requestHost . $requestUrl : $requestUrl;
                 foreach (array_keys(self::$challenges) as $key) {
                     if ($key == substr($fullUrl, 0, strlen($key))) {
                         $headers['authorization'] = $this->createDigestResponse(
                             $auth['user'], $auth['password'],
                             $requestUrl, self::$challenges[$key]
                         );
-                        $this->serverChallenge =& self::$challenges[$key];
+                        $this->serverChallenge = & self::$challenges[$key];
                         break;
                     }
                 }
@@ -781,7 +778,7 @@ 
                         $user, $password,
                         $requestUrl, self::$challenges[$proxyUrl]
                     );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
+                    $this->proxyChallenge = & self::$challenges[$proxyUrl];
                 }
                 break;
 
@@ -807,9 +804,9 @@ 
         $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
         $host    = $url->getHost();
 
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https') ? 443 : 80;
         if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
+            $host .= ':' . (empty($port) ? $defaultPort : $port);
         }
         // Do not overwrite explicitly set 'Host' header, see bug #16146
         if (!isset($headers['host'])) {
@@ -829,7 +826,7 @@ 
             }
             $path        = $url->getPath();
             $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+            $requestUrl .= (empty($path) ? '/' : $path) . (empty($query) ? '' : '?' . $query);
         }
 
         if ('1.1' == $this->request->getConfig('protocol_version') &&
@@ -920,7 +917,7 @@ 
             // 3. ... If a message is received with both a
             // Transfer-Encoding header field and a Content-Length header field,
             // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
+            $toRead = ($chunked || null === $length) ? null : $length;
             $this->chunkLength = 0;
 
             while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {

Indentation +719 added lines, -719 removed lines

@@ -62,19 +62,19 @@ 
    /**
     * Regular expression for 'token' rule from RFC 2616
     */
-    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
+	const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
 
    /**
     * Regular expression for 'quoted-string' rule from RFC 2616
     */
-    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
+	const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
 
    /**
     * Connected sockets, needed for Keep-Alive support
     * @var  array
     * @see  connect()
     */
-    protected static $sockets = array();
+	protected static $sockets = array();
 
    /**
     * Data for digest authentication scheme
@@ -88,39 +88,39 @@ 
     *
     * @var  array
     */
-    protected static $challenges = array();
+	protected static $challenges = array();
 
    /**
     * Connected socket
     * @var  resource
     * @see  connect()
     */
-    protected $socket;
+	protected $socket;
 
    /**
     * Challenge used for server digest authentication
     * @var  array
     */
-    protected $serverChallenge;
+	protected $serverChallenge;
 
    /**
     * Challenge used for proxy digest authentication
     * @var  array
     */
-    protected $proxyChallenge;
+	protected $proxyChallenge;
 
    /**
     * Sum of start time and global timeout, exception will be thrown if request continues past this time
     * @var  integer
     */
-    protected $deadline = null;
+	protected $deadline = null;
 
    /**
     * Remaining length of the current chunk, when reading chunked response
     * @var  integer
     * @see  readChunked()
     */
-    protected $chunkLength = 0;
+	protected $chunkLength = 0;
 
    /**
     * Remaining amount of redirections to follow
@@ -130,7 +130,7 @@ 
     *
     * @var  integer
     */
-    protected $redirectCountdown = null;
+	protected $redirectCountdown = null;
 
    /**
     * Sends request to the remote server and returns its response
@@ -139,69 +139,69 @@ 
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        $this->request = $request;
-
-        // Use global request timeout if given, see feature requests #5735, #8964
-        if ($timeout = $request->getConfig('timeout')) {
-            $this->deadline = time() + $timeout;
-        } else {
-            $this->deadline = null;
-        }
-
-        try {
-            $keepAlive = $this->connect();
-            $headers   = $this->prepareHeaders();
-            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
-                throw new HTTP_Request2_Exception('Error writing request');
-            }
-            // provide request headers to the observer, see request #7633
-            $this->request->setLastEvent('sentHeaders', $headers);
-            $this->writeBody();
-
-            if ($this->deadline && time() > $this->deadline) {
-                throw new HTTP_Request2_Exception(
-                    'Request timed out after ' .
-                    $request->getConfig('timeout') . ' second(s)'
-                );
-            }
-
-            $response = $this->readResponse();
-
-            if (!$this->canKeepAlive($keepAlive, $response)) {
-                $this->disconnect();
-            }
-
-            if ($this->shouldUseProxyDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($this->shouldUseServerDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($authInfo = $response->getHeader('authentication-info')) {
-                $this->updateChallenge($this->serverChallenge, $authInfo);
-            }
-            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
-                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
-            }
-
-        } catch (Exception $e) {
-            $this->disconnect();
-        }
-
-        unset($this->request, $this->requestBody);
-
-        if (!empty($e)) {
-            throw $e;
-        }
-
-        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
-            return $response;
-        } else {
-            return $this->handleRedirect($request, $response);
-        }
-    }
+	public function sendRequest(HTTP_Request2 $request)
+	{
+		$this->request = $request;
+
+		// Use global request timeout if given, see feature requests #5735, #8964
+		if ($timeout = $request->getConfig('timeout')) {
+			$this->deadline = time() + $timeout;
+		} else {
+			$this->deadline = null;
+		}
+
+		try {
+			$keepAlive = $this->connect();
+			$headers   = $this->prepareHeaders();
+			if (false === @fwrite($this->socket, $headers, strlen($headers))) {
+				throw new HTTP_Request2_Exception('Error writing request');
+			}
+			// provide request headers to the observer, see request #7633
+			$this->request->setLastEvent('sentHeaders', $headers);
+			$this->writeBody();
+
+			if ($this->deadline && time() > $this->deadline) {
+				throw new HTTP_Request2_Exception(
+					'Request timed out after ' .
+					$request->getConfig('timeout') . ' second(s)'
+				);
+			}
+
+			$response = $this->readResponse();
+
+			if (!$this->canKeepAlive($keepAlive, $response)) {
+				$this->disconnect();
+			}
+
+			if ($this->shouldUseProxyDigestAuth($response)) {
+				return $this->sendRequest($request);
+			}
+			if ($this->shouldUseServerDigestAuth($response)) {
+				return $this->sendRequest($request);
+			}
+			if ($authInfo = $response->getHeader('authentication-info')) {
+				$this->updateChallenge($this->serverChallenge, $authInfo);
+			}
+			if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
+				$this->updateChallenge($this->proxyChallenge, $proxyInfo);
+			}
+
+		} catch (Exception $e) {
+			$this->disconnect();
+		}
+
+		unset($this->request, $this->requestBody);
+
+		if (!empty($e)) {
+			throw $e;
+		}
+
+		if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
+			return $response;
+		} else {
+			return $this->handleRedirect($request, $response);
+		}
+	}
 
    /**
     * Connects to the remote server
@@ -209,114 +209,114 @@ 
     * @return   bool    whether the connection can be persistent
     * @throws   HTTP_Request2_Exception
     */
-    protected function connect()
-    {
-        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
-        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $headers = $this->request->getHeaders();
-        $reqHost = $this->request->getUrl()->getHost();
-        if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
-        }
-
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_Exception('Proxy port not provided');
-            }
-            $proxy = true;
-        } else {
-            $host  = $reqHost;
-            $port  = $reqPort;
-            $proxy = false;
-        }
-
-        if ($tunnel && !$proxy) {
-            throw new HTTP_Request2_Exception(
-                "Trying to perform CONNECT request without proxy"
-            );
-        }
-        if ($secure && !in_array('ssl', stream_get_transports())) {
-            throw new HTTP_Request2_Exception(
-                'Need OpenSSL support for https:// requests'
-            );
-        }
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
-        // connection token to a proxy server...
-        if ($proxy && !$secure &&
-            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
-        ) {
-            $this->request->setHeader('connection');
-        }
-
-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
-                      empty($headers['connection'])) ||
-                     (!empty($headers['connection']) &&
-                      'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
-
-        $options = array();
-        if ($secure || $tunnel) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
-                    if ('ssl_verify_host' == $name) {
-                        if ($value) {
-                            $options['CN_match'] = $reqHost;
-                        }
-                    } else {
-                        $options[substr($name, 4)] = $value;
-                    }
-                }
-            }
-            ksort($options);
-        }
-
-        // Changing SSL context options after connection is established does *not*
-        // work, we need a new connection if options change
-        $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
-        unset($this->socket);
-
-        // We use persistent connections and have a connected socket?
-        // Ensure that the socket is still connected, see bug #16149
-        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
-            !feof(self::$sockets[$socketKey])
-        ) {
-            $this->socket =& self::$sockets[$socketKey];
-
-        } elseif ($secure && $proxy && !$tunnel) {
-            $this->establishTunnel();
-            $this->request->setLastEvent(
-                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
-            );
-            self::$sockets[$socketKey] =& $this->socket;
-
-        } else {
-            // Set SSL context options if doing HTTPS request or creating a tunnel
-            $context = stream_context_create();
-            foreach ($options as $name => $value) {
-                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
-                    throw new HTTP_Request2_Exception(
-                        "Error setting SSL context option '{$name}'"
-                    );
-                }
-            }
-            $this->socket = @stream_socket_client(
-                $remote, $errno, $errstr,
-                $this->request->getConfig('connect_timeout'),
-                STREAM_CLIENT_CONNECT, $context
-            );
-            if (!$this->socket) {
-                throw new HTTP_Request2_Exception(
-                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
-                );
-            }
-            $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
-        }
-        return $keepAlive;
-    }
+	protected function connect()
+	{
+		$secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
+		$tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+		$headers = $this->request->getHeaders();
+		$reqHost = $this->request->getUrl()->getHost();
+		if (!($reqPort = $this->request->getUrl()->getPort())) {
+			$reqPort = $secure? 443: 80;
+		}
+
+		if ($host = $this->request->getConfig('proxy_host')) {
+			if (!($port = $this->request->getConfig('proxy_port'))) {
+				throw new HTTP_Request2_Exception('Proxy port not provided');
+			}
+			$proxy = true;
+		} else {
+			$host  = $reqHost;
+			$port  = $reqPort;
+			$proxy = false;
+		}
+
+		if ($tunnel && !$proxy) {
+			throw new HTTP_Request2_Exception(
+				"Trying to perform CONNECT request without proxy"
+			);
+		}
+		if ($secure && !in_array('ssl', stream_get_transports())) {
+			throw new HTTP_Request2_Exception(
+				'Need OpenSSL support for https:// requests'
+			);
+		}
+
+		// RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+		// connection token to a proxy server...
+		if ($proxy && !$secure &&
+			!empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
+		) {
+			$this->request->setHeader('connection');
+		}
+
+		$keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
+					  empty($headers['connection'])) ||
+					 (!empty($headers['connection']) &&
+					  'Keep-Alive' == $headers['connection']);
+		$host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+
+		$options = array();
+		if ($secure || $tunnel) {
+			foreach ($this->request->getConfig() as $name => $value) {
+				if ('ssl_' == substr($name, 0, 4) && null !== $value) {
+					if ('ssl_verify_host' == $name) {
+						if ($value) {
+							$options['CN_match'] = $reqHost;
+						}
+					} else {
+						$options[substr($name, 4)] = $value;
+					}
+				}
+			}
+			ksort($options);
+		}
+
+		// Changing SSL context options after connection is established does *not*
+		// work, we need a new connection if options change
+		$remote    = $host . ':' . $port;
+		$socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
+					 (empty($options)? '': ':' . serialize($options));
+		unset($this->socket);
+
+		// We use persistent connections and have a connected socket?
+		// Ensure that the socket is still connected, see bug #16149
+		if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
+			!feof(self::$sockets[$socketKey])
+		) {
+			$this->socket =& self::$sockets[$socketKey];
+
+		} elseif ($secure && $proxy && !$tunnel) {
+			$this->establishTunnel();
+			$this->request->setLastEvent(
+				'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
+			);
+			self::$sockets[$socketKey] =& $this->socket;
+
+		} else {
+			// Set SSL context options if doing HTTPS request or creating a tunnel
+			$context = stream_context_create();
+			foreach ($options as $name => $value) {
+				if (!stream_context_set_option($context, 'ssl', $name, $value)) {
+					throw new HTTP_Request2_Exception(
+						"Error setting SSL context option '{$name}'"
+					);
+				}
+			}
+			$this->socket = @stream_socket_client(
+				$remote, $errno, $errstr,
+				$this->request->getConfig('connect_timeout'),
+				STREAM_CLIENT_CONNECT, $context
+			);
+			if (!$this->socket) {
+				throw new HTTP_Request2_Exception(
+					"Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
+				);
+			}
+			$this->request->setLastEvent('connect', $remote);
+			self::$sockets[$socketKey] =& $this->socket;
+		}
+		return $keepAlive;
+	}
 
    /**
     * Establishes a tunnel to a secure remote server via HTTP CONNECT request
@@ -328,40 +328,40 @@ 
     * @link     http://tools.ietf.org/html/rfc2817#section-5.2
     * @throws   HTTP_Request2_Exception
     */
-    protected function establishTunnel()
-    {
-        $donor   = new self;
-        $connect = new HTTP_Request2(
-            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
-            array_merge($this->request->getConfig(),
-                        array('adapter' => $donor))
-        );
-        $response = $connect->send();
-        // Need any successful (2XX) response
-        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
-            throw new HTTP_Request2_Exception(
-                'Failed to connect via HTTPS proxy. Proxy response: ' .
-                $response->getStatus() . ' ' . $response->getReasonPhrase()
-            );
-        }
-        $this->socket = $donor->socket;
-
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
-        );
-
-        foreach ($modes as $mode) {
-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
-                return;
-            }
-        }
-        throw new HTTP_Request2_Exception(
-            'Failed to enable secure connection when connecting through proxy'
-        );
-    }
+	protected function establishTunnel()
+	{
+		$donor   = new self;
+		$connect = new HTTP_Request2(
+			$this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
+			array_merge($this->request->getConfig(),
+						array('adapter' => $donor))
+		);
+		$response = $connect->send();
+		// Need any successful (2XX) response
+		if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
+			throw new HTTP_Request2_Exception(
+				'Failed to connect via HTTPS proxy. Proxy response: ' .
+				$response->getStatus() . ' ' . $response->getReasonPhrase()
+			);
+		}
+		$this->socket = $donor->socket;
+
+		$modes = array(
+			STREAM_CRYPTO_METHOD_TLS_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv2_CLIENT
+		);
+
+		foreach ($modes as $mode) {
+			if (stream_socket_enable_crypto($this->socket, true, $mode)) {
+				return;
+			}
+		}
+		throw new HTTP_Request2_Exception(
+			'Failed to enable secure connection when connecting through proxy'
+		);
+	}
 
    /**
     * Checks whether current connection may be reused or should be closed
@@ -371,34 +371,34 @@ 
     * @param    HTTP_Request2_Response  response object to check
     * @return   boolean
     */
-    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
-    {
-        // Do not close socket on successful CONNECT request
-        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-            200 <= $response->getStatus() && 300 > $response->getStatus()
-        ) {
-            return true;
-        }
-
-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
-                       null !== $response->getHeader('content-length');
-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
-                       (null === $response->getHeader('connection') &&
-                        '1.1' == $response->getVersion());
-        return $requestKeepAlive && $lengthKnown && $persistent;
-    }
+	protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
+	{
+		// Do not close socket on successful CONNECT request
+		if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+			200 <= $response->getStatus() && 300 > $response->getStatus()
+		) {
+			return true;
+		}
+
+		$lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
+					   null !== $response->getHeader('content-length');
+		$persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
+					   (null === $response->getHeader('connection') &&
+						'1.1' == $response->getVersion());
+		return $requestKeepAlive && $lengthKnown && $persistent;
+	}
 
    /**
     * Disconnects from the remote server
     */
-    protected function disconnect()
-    {
-        if (is_resource($this->socket)) {
-            fclose($this->socket);
-            $this->socket = null;
-            $this->request->setLastEvent('disconnect');
-        }
-    }
+	protected function disconnect()
+	{
+		if (is_resource($this->socket)) {
+			fclose($this->socket);
+			$this->socket = null;
+			$this->request->setLastEvent('disconnect');
+		}
+	}
 
    /**
     * Handles HTTP redirection
@@ -412,49 +412,49 @@ 
     * @return   HTTP_Request2_Response      Response from a new location
     * @throws   HTTP_Request2_Exception
     */
-    protected function handleRedirect(HTTP_Request2 $request,
-                                      HTTP_Request2_Response $response)
-    {
-        if (is_null($this->redirectCountdown)) {
-            $this->redirectCountdown = $request->getConfig('max_redirects');
-        }
-        if (0 == $this->redirectCountdown) {
-            // Copying cURL behaviour
-            throw new HTTP_Request2_Exception(
-                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
-            );
-        }
-        $redirectUrl = new Net_URL2(
-            $response->getHeader('location'),
-            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
-        );
-        // refuse non-HTTP redirect
-        if ($redirectUrl->isAbsolute()
-            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-        ) {
-            throw new HTTP_Request2_Exception(
-                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
-            );
-        }
-        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
-        // but in practice it is often not
-        if (!$redirectUrl->isAbsolute()) {
-            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
-        }
-        $redirect = clone $request;
-        $redirect->setUrl($redirectUrl);
-        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
-             && in_array($response->getStatus(), array(301, 302)))
-        ) {
-            $redirect->setMethod(HTTP_Request2::METHOD_GET);
-            $redirect->setBody('');
-        }
-
-        if (0 < $this->redirectCountdown) {
-            $this->redirectCountdown--;
-        }
-        return $this->sendRequest($redirect);
-    }
+	protected function handleRedirect(HTTP_Request2 $request,
+									  HTTP_Request2_Response $response)
+	{
+		if (is_null($this->redirectCountdown)) {
+			$this->redirectCountdown = $request->getConfig('max_redirects');
+		}
+		if (0 == $this->redirectCountdown) {
+			// Copying cURL behaviour
+			throw new HTTP_Request2_Exception(
+				'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
+			);
+		}
+		$redirectUrl = new Net_URL2(
+			$response->getHeader('location'),
+			array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
+		);
+		// refuse non-HTTP redirect
+		if ($redirectUrl->isAbsolute()
+			&& !in_array($redirectUrl->getScheme(), array('http', 'https'))
+		) {
+			throw new HTTP_Request2_Exception(
+				'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
+			);
+		}
+		// Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
+		// but in practice it is often not
+		if (!$redirectUrl->isAbsolute()) {
+			$redirectUrl = $request->getUrl()->resolve($redirectUrl);
+		}
+		$redirect = clone $request;
+		$redirect->setUrl($redirectUrl);
+		if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
+			 && in_array($response->getStatus(), array(301, 302)))
+		) {
+			$redirect->setMethod(HTTP_Request2::METHOD_GET);
+			$redirect->setBody('');
+		}
+
+		if (0 < $this->redirectCountdown) {
+			$this->redirectCountdown--;
+		}
+		return $this->sendRequest($redirect);
+	}
 
    /**
     * Checks whether another request should be performed with server digest auth
@@ -473,52 +473,52 @@ 
     * @return   boolean whether another request should be performed
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
-    {
-        // no sense repeating a request if we don't have credentials
-        if (401 != $response->getStatus() || !$this->request->getAuth()) {
-            return false;
-        }
-        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
-            return false;
-        }
-
-        $url    = $this->request->getUrl();
-        $scheme = $url->getScheme();
-        $host   = $scheme . '://' . $url->getHost();
-        if ($port = $url->getPort()) {
-            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
-                (0 == strcasecmp($scheme, 'https') && 443 != $port)
-            ) {
-                $host .= ':' . $port;
-            }
-        }
-
-        if (!empty($challenge['domain'])) {
-            $prefixes = array();
-            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
-                // don't bother with different servers
-                if ('/' == substr($prefix, 0, 1)) {
-                    $prefixes[] = $host . $prefix;
-                }
-            }
-        }
-        if (empty($prefixes)) {
-            $prefixes = array($host . '/');
-        }
-
-        $ret = true;
-        foreach ($prefixes as $prefix) {
-            if (!empty(self::$challenges[$prefix]) &&
-                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-            ) {
-                // probably credentials are invalid
-                $ret = false;
-            }
-            self::$challenges[$prefix] =& $challenge;
-        }
-        return $ret;
-    }
+	protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
+	{
+		// no sense repeating a request if we don't have credentials
+		if (401 != $response->getStatus() || !$this->request->getAuth()) {
+			return false;
+		}
+		if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
+			return false;
+		}
+
+		$url    = $this->request->getUrl();
+		$scheme = $url->getScheme();
+		$host   = $scheme . '://' . $url->getHost();
+		if ($port = $url->getPort()) {
+			if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
+				(0 == strcasecmp($scheme, 'https') && 443 != $port)
+			) {
+				$host .= ':' . $port;
+			}
+		}
+
+		if (!empty($challenge['domain'])) {
+			$prefixes = array();
+			foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
+				// don't bother with different servers
+				if ('/' == substr($prefix, 0, 1)) {
+					$prefixes[] = $host . $prefix;
+				}
+			}
+		}
+		if (empty($prefixes)) {
+			$prefixes = array($host . '/');
+		}
+
+		$ret = true;
+		foreach ($prefixes as $prefix) {
+			if (!empty(self::$challenges[$prefix]) &&
+				(empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+			) {
+				// probably credentials are invalid
+				$ret = false;
+			}
+			self::$challenges[$prefix] =& $challenge;
+		}
+		return $ret;
+	}
 
    /**
     * Checks whether another request should be performed with proxy digest auth
@@ -537,28 +537,28 @@ 
     * @return   boolean whether another request should be performed
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
-    {
-        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
-            return false;
-        }
-        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
-            return false;
-        }
-
-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
-               ':' . $this->request->getConfig('proxy_port');
-
-        if (!empty(self::$challenges[$key]) &&
-            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-        ) {
-            $ret = false;
-        } else {
-            $ret = true;
-        }
-        self::$challenges[$key] = $challenge;
-        return $ret;
-    }
+	protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
+	{
+		if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
+			return false;
+		}
+		if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
+			return false;
+		}
+
+		$key = 'proxy://' . $this->request->getConfig('proxy_host') .
+			   ':' . $this->request->getConfig('proxy_port');
+
+		if (!empty(self::$challenges[$key]) &&
+			(empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+		) {
+			$ret = false;
+		} else {
+			$ret = true;
+		}
+		self::$challenges[$key] = $challenge;
+		return $ret;
+	}
 
    /**
     * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
@@ -588,48 +588,48 @@ 
     *                   no challenge is present in header value
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function parseDigestChallenge($headerValue)
-    {
-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
-        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
-        if (!preg_match($challenge, $headerValue, $matches)) {
-            return false;
-        }
-
-        preg_match_all('!' . $authParam . '!', $matches[0], $params);
-        $paramsAry   = array();
-        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
-                             'algorithm', 'qop');
-        for ($i = 0; $i < count($params[0]); $i++) {
-            // section 3.2.1: Any unrecognized directive MUST be ignored.
-            if (in_array($params[1][$i], $knownParams)) {
-                if ('"' == substr($params[2][$i], 0, 1)) {
-                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-                } else {
-                    $paramsAry[$params[1][$i]] = $params[2][$i];
-                }
-            }
-        }
-        // we only support qop=auth
-        if (!empty($paramsAry['qop']) &&
-            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
-        ) {
-            throw new HTTP_Request2_Exception(
-                "Only 'auth' qop is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['qop']}'"
-            );
-        }
-        // we only support algorithm=MD5
-        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
-            throw new HTTP_Request2_Exception(
-                "Only 'MD5' algorithm is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['algorithm']}'"
-            );
-        }
-
-        return $paramsAry;
-    }
+	protected function parseDigestChallenge($headerValue)
+	{
+		$authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+					   self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
+		$challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
+		if (!preg_match($challenge, $headerValue, $matches)) {
+			return false;
+		}
+
+		preg_match_all('!' . $authParam . '!', $matches[0], $params);
+		$paramsAry   = array();
+		$knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
+							 'algorithm', 'qop');
+		for ($i = 0; $i < count($params[0]); $i++) {
+			// section 3.2.1: Any unrecognized directive MUST be ignored.
+			if (in_array($params[1][$i], $knownParams)) {
+				if ('"' == substr($params[2][$i], 0, 1)) {
+					$paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+				} else {
+					$paramsAry[$params[1][$i]] = $params[2][$i];
+				}
+			}
+		}
+		// we only support qop=auth
+		if (!empty($paramsAry['qop']) &&
+			!in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
+		) {
+			throw new HTTP_Request2_Exception(
+				"Only 'auth' qop is currently supported in digest authentication, " .
+				"server requested '{$paramsAry['qop']}'"
+			);
+		}
+		// we only support algorithm=MD5
+		if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
+			throw new HTTP_Request2_Exception(
+				"Only 'MD5' algorithm is currently supported in digest authentication, " .
+				"server requested '{$paramsAry['algorithm']}'"
+			);
+		}
+
+		return $paramsAry;
+	}
 
    /**
     * Parses [Proxy-]Authentication-Info header value and updates challenge
@@ -638,26 +638,26 @@ 
     * @param    string  value of [Proxy-]Authentication-Info header
     * @todo     validate server rspauth response
     */
-    protected function updateChallenge(&$challenge, $headerValue)
-    {
-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
-        $paramsAry   = array();
-
-        preg_match_all($authParam, $headerValue, $params);
-        for ($i = 0; $i < count($params[0]); $i++) {
-            if ('"' == substr($params[2][$i], 0, 1)) {
-                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-            } else {
-                $paramsAry[$params[1][$i]] = $params[2][$i];
-            }
-        }
-        // for now, just update the nonce value
-        if (!empty($paramsAry['nextnonce'])) {
-            $challenge['nonce'] = $paramsAry['nextnonce'];
-            $challenge['nc']    = 1;
-        }
-    }
+	protected function updateChallenge(&$challenge, $headerValue)
+	{
+		$authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+					   self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
+		$paramsAry   = array();
+
+		preg_match_all($authParam, $headerValue, $params);
+		for ($i = 0; $i < count($params[0]); $i++) {
+			if ('"' == substr($params[2][$i], 0, 1)) {
+				$paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+			} else {
+				$paramsAry[$params[1][$i]] = $params[2][$i];
+			}
+		}
+		// for now, just update the nonce value
+		if (!empty($paramsAry['nextnonce'])) {
+			$challenge['nonce'] = $paramsAry['nextnonce'];
+			$challenge['nc']    = 1;
+		}
+	}
 
    /**
     * Creates a value for [Proxy-]Authorization header when using digest authentication
@@ -669,40 +669,40 @@ 
     * @return   string  value of [Proxy-]Authorization request header
     * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
     */
-    protected function createDigestResponse($user, $password, $url, &$challenge)
-    {
-        if (false !== ($q = strpos($url, '?')) &&
-            $this->request->getConfig('digest_compat_ie')
-        ) {
-            $url = substr($url, 0, $q);
-        }
-
-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
-        $a2 = md5($this->request->getMethod() . ':' . $url);
-
-        if (empty($challenge['qop'])) {
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
-        } else {
-            $challenge['cnonce'] = 'Req2.' . rand();
-            if (empty($challenge['nc'])) {
-                $challenge['nc'] = 1;
-            }
-            $nc     = sprintf('%08x', $challenge['nc']++);
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
-                          $challenge['cnonce'] . ':auth:' . $a2);
-        }
-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
-               'realm="' . $challenge['realm'] . '", ' .
-               'nonce="' . $challenge['nonce'] . '", ' .
-               'uri="' . $url . '", ' .
-               'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
-    }
+	protected function createDigestResponse($user, $password, $url, &$challenge)
+	{
+		if (false !== ($q = strpos($url, '?')) &&
+			$this->request->getConfig('digest_compat_ie')
+		) {
+			$url = substr($url, 0, $q);
+		}
+
+		$a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
+		$a2 = md5($this->request->getMethod() . ':' . $url);
+
+		if (empty($challenge['qop'])) {
+			$digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
+		} else {
+			$challenge['cnonce'] = 'Req2.' . rand();
+			if (empty($challenge['nc'])) {
+				$challenge['nc'] = 1;
+			}
+			$nc     = sprintf('%08x', $challenge['nc']++);
+			$digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
+						  $challenge['cnonce'] . ':auth:' . $a2);
+		}
+		return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
+			   'realm="' . $challenge['realm'] . '", ' .
+			   'nonce="' . $challenge['nonce'] . '", ' .
+			   'uri="' . $url . '", ' .
+			   'response="' . $digest . '"' .
+			   (!empty($challenge['opaque'])?
+				', opaque="' . $challenge['opaque'] . '"':
+				'') .
+			   (!empty($challenge['qop'])?
+				', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
+				'');
+	}
 
    /**
     * Adds 'Authorization' header (if needed) to request headers array
@@ -712,41 +712,41 @@ 
     * @param    string  request URL (needed for digest authentication)
     * @throws   HTTP_Request2_Exception
     */
-    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
-    {
-        if (!($auth = $this->request->getAuth())) {
-            return;
-        }
-        switch ($auth['scheme']) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['authorization'] =
-                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
-                           $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
-                foreach (array_keys(self::$challenges) as $key) {
-                    if ($key == substr($fullUrl, 0, strlen($key))) {
-                        $headers['authorization'] = $this->createDigestResponse(
-                            $auth['user'], $auth['password'],
-                            $requestUrl, self::$challenges[$key]
-                        );
-                        $this->serverChallenge =& self::$challenges[$key];
-                        break;
-                    }
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
-                );
-        }
-    }
+	protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
+	{
+		if (!($auth = $this->request->getAuth())) {
+			return;
+		}
+		switch ($auth['scheme']) {
+			case HTTP_Request2::AUTH_BASIC:
+				$headers['authorization'] =
+					'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
+				break;
+
+			case HTTP_Request2::AUTH_DIGEST:
+				unset($this->serverChallenge);
+				$fullUrl = ('/' == $requestUrl[0])?
+						   $this->request->getUrl()->getScheme() . '://' .
+							$requestHost . $requestUrl:
+						   $requestUrl;
+				foreach (array_keys(self::$challenges) as $key) {
+					if ($key == substr($fullUrl, 0, strlen($key))) {
+						$headers['authorization'] = $this->createDigestResponse(
+							$auth['user'], $auth['password'],
+							$requestUrl, self::$challenges[$key]
+						);
+						$this->serverChallenge =& self::$challenges[$key];
+						break;
+					}
+				}
+				break;
+
+			default:
+				throw new HTTP_Request2_Exception(
+					"Unknown HTTP authentication scheme '{$auth['scheme']}'"
+				);
+		}
+	}
 
    /**
     * Adds 'Proxy-Authorization' header (if needed) to request headers array
@@ -755,43 +755,43 @@ 
     * @param    string  request URL (needed for digest authentication)
     * @throws   HTTP_Request2_Exception
     */
-    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
-    {
-        if (!$this->request->getConfig('proxy_host') ||
-            !($user = $this->request->getConfig('proxy_user')) ||
-            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
-             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
-        ) {
-            return;
-        }
-
-        $password = $this->request->getConfig('proxy_password');
-        switch ($this->request->getConfig('proxy_auth_scheme')) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['proxy-authorization'] =
-                    'Basic ' . base64_encode($user . ':' . $password);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->proxyChallenge);
-                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
-                            ':' . $this->request->getConfig('proxy_port');
-                if (!empty(self::$challenges[$proxyUrl])) {
-                    $headers['proxy-authorization'] = $this->createDigestResponse(
-                        $user, $password,
-                        $requestUrl, self::$challenges[$proxyUrl]
-                    );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '" .
-                    $this->request->getConfig('proxy_auth_scheme') . "'"
-                );
-        }
-    }
+	protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
+	{
+		if (!$this->request->getConfig('proxy_host') ||
+			!($user = $this->request->getConfig('proxy_user')) ||
+			(0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
+			 HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
+		) {
+			return;
+		}
+
+		$password = $this->request->getConfig('proxy_password');
+		switch ($this->request->getConfig('proxy_auth_scheme')) {
+			case HTTP_Request2::AUTH_BASIC:
+				$headers['proxy-authorization'] =
+					'Basic ' . base64_encode($user . ':' . $password);
+				break;
+
+			case HTTP_Request2::AUTH_DIGEST:
+				unset($this->proxyChallenge);
+				$proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
+							':' . $this->request->getConfig('proxy_port');
+				if (!empty(self::$challenges[$proxyUrl])) {
+					$headers['proxy-authorization'] = $this->createDigestResponse(
+						$user, $password,
+						$requestUrl, self::$challenges[$proxyUrl]
+					);
+					$this->proxyChallenge =& self::$challenges[$proxyUrl];
+				}
+				break;
+
+			default:
+				throw new HTTP_Request2_Exception(
+					"Unknown HTTP authentication scheme '" .
+					$this->request->getConfig('proxy_auth_scheme') . "'"
+				);
+		}
+	}
 
 
    /**
@@ -800,88 +800,88 @@ 
     * @return   string
     * @throws   HTTP_Request2_Exception
     */
-    protected function prepareHeaders()
-    {
-        $headers = $this->request->getHeaders();
-        $url     = $this->request->getUrl();
-        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $host    = $url->getHost();
-
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
-        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
-        }
-        // Do not overwrite explicitly set 'Host' header, see bug #16146
-        if (!isset($headers['host'])) {
-            $headers['host'] = $host;
-        }
-
-        if ($connect) {
-            $requestUrl = $host;
-
-        } else {
-            if (!$this->request->getConfig('proxy_host') ||
-                0 == strcasecmp($url->getScheme(), 'https')
-            ) {
-                $requestUrl = '';
-            } else {
-                $requestUrl = $url->getScheme() . '://' . $host;
-            }
-            $path        = $url->getPath();
-            $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
-        }
-
-        if ('1.1' == $this->request->getConfig('protocol_version') &&
-            extension_loaded('zlib') && !isset($headers['accept-encoding'])
-        ) {
-            $headers['accept-encoding'] = 'gzip, deflate';
-        }
-
-        $this->addAuthorizationHeader($headers, $host, $requestUrl);
-        $this->addProxyAuthorizationHeader($headers, $requestUrl);
-        $this->calculateRequestLength($headers);
-
-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
-                      $this->request->getConfig('protocol_version') . "\r\n";
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
-        }
-        return $headersStr . "\r\n";
-    }
+	protected function prepareHeaders()
+	{
+		$headers = $this->request->getHeaders();
+		$url     = $this->request->getUrl();
+		$connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+		$host    = $url->getHost();
+
+		$defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+		if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
+			$host .= ':' . (empty($port)? $defaultPort: $port);
+		}
+		// Do not overwrite explicitly set 'Host' header, see bug #16146
+		if (!isset($headers['host'])) {
+			$headers['host'] = $host;
+		}
+
+		if ($connect) {
+			$requestUrl = $host;
+
+		} else {
+			if (!$this->request->getConfig('proxy_host') ||
+				0 == strcasecmp($url->getScheme(), 'https')
+			) {
+				$requestUrl = '';
+			} else {
+				$requestUrl = $url->getScheme() . '://' . $host;
+			}
+			$path        = $url->getPath();
+			$query       = $url->getQuery();
+			$requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+		}
+
+		if ('1.1' == $this->request->getConfig('protocol_version') &&
+			extension_loaded('zlib') && !isset($headers['accept-encoding'])
+		) {
+			$headers['accept-encoding'] = 'gzip, deflate';
+		}
+
+		$this->addAuthorizationHeader($headers, $host, $requestUrl);
+		$this->addProxyAuthorizationHeader($headers, $requestUrl);
+		$this->calculateRequestLength($headers);
+
+		$headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
+					  $this->request->getConfig('protocol_version') . "\r\n";
+		foreach ($headers as $name => $value) {
+			$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+			$headersStr   .= $canonicalName . ': ' . $value . "\r\n";
+		}
+		return $headersStr . "\r\n";
+	}
 
    /**
     * Sends the request body
     *
     * @throws   HTTP_Request2_Exception
     */
-    protected function writeBody()
-    {
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            return;
-        }
-
-        $position   = 0;
-        $bufferSize = $this->request->getConfig('buffer_size');
-        while ($position < $this->contentLength) {
-            if (is_string($this->requestBody)) {
-                $str = substr($this->requestBody, $position, $bufferSize);
-            } elseif (is_resource($this->requestBody)) {
-                $str = fread($this->requestBody, $bufferSize);
-            } else {
-                $str = $this->requestBody->read($bufferSize);
-            }
-            if (false === @fwrite($this->socket, $str, strlen($str))) {
-                throw new HTTP_Request2_Exception('Error writing request');
-            }
-            // Provide the length of written string to the observer, request #7630
-            $this->request->setLastEvent('sentBodyPart', strlen($str));
-            $position += strlen($str);
-        }
-    }
+	protected function writeBody()
+	{
+		if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+			0 == $this->contentLength
+		) {
+			return;
+		}
+
+		$position   = 0;
+		$bufferSize = $this->request->getConfig('buffer_size');
+		while ($position < $this->contentLength) {
+			if (is_string($this->requestBody)) {
+				$str = substr($this->requestBody, $position, $bufferSize);
+			} elseif (is_resource($this->requestBody)) {
+				$str = fread($this->requestBody, $bufferSize);
+			} else {
+				$str = $this->requestBody->read($bufferSize);
+			}
+			if (false === @fwrite($this->socket, $str, strlen($str))) {
+				throw new HTTP_Request2_Exception('Error writing request');
+			}
+			// Provide the length of written string to the observer, request #7630
+			$this->request->setLastEvent('sentBodyPart', strlen($str));
+			$position += strlen($str);
+		}
+	}
 
    /**
     * Reads the remote server's response
@@ -889,70 +889,70 @@ 
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    protected function readResponse()
-    {
-        $bufferSize = $this->request->getConfig('buffer_size');
-
-        do {
-            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
-            do {
-                $headerLine = $this->readLine($bufferSize);
-                $response->parseHeaderLine($headerLine);
-            } while ('' != $headerLine);
-        } while (in_array($response->getStatus(), array(100, 101)));
-
-        $this->request->setLastEvent('receivedHeaders', $response);
-
-        // No body possible in such responses
-        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
-            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-             200 <= $response->getStatus() && 300 > $response->getStatus()) ||
-            in_array($response->getStatus(), array(204, 304))
-        ) {
-            return $response;
-        }
-
-        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
-        $length  = $response->getHeader('content-length');
-        $hasBody = false;
-        if ($chunked || null === $length || 0 < intval($length)) {
-            // RFC 2616, section 4.4:
-            // 3. ... If a message is received with both a
-            // Transfer-Encoding header field and a Content-Length header field,
-            // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
-            $this->chunkLength = 0;
-
-            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
-                if ($chunked) {
-                    $data = $this->readChunked($bufferSize);
-                } elseif (is_null($toRead)) {
-                    $data = $this->fread($bufferSize);
-                } else {
-                    $data    = $this->fread(min($toRead, $bufferSize));
-                    $toRead -= strlen($data);
-                }
-                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
-                    break;
-                }
-
-                $hasBody = true;
-                if ($this->request->getConfig('store_body')) {
-                    $response->appendBody($data);
-                }
-                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
-                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
-                } else {
-                    $this->request->setLastEvent('receivedBodyPart', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            $this->request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
+	protected function readResponse()
+	{
+		$bufferSize = $this->request->getConfig('buffer_size');
+
+		do {
+			$response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
+			do {
+				$headerLine = $this->readLine($bufferSize);
+				$response->parseHeaderLine($headerLine);
+			} while ('' != $headerLine);
+		} while (in_array($response->getStatus(), array(100, 101)));
+
+		$this->request->setLastEvent('receivedHeaders', $response);
+
+		// No body possible in such responses
+		if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
+			(HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+			 200 <= $response->getStatus() && 300 > $response->getStatus()) ||
+			in_array($response->getStatus(), array(204, 304))
+		) {
+			return $response;
+		}
+
+		$chunked = 'chunked' == $response->getHeader('transfer-encoding');
+		$length  = $response->getHeader('content-length');
+		$hasBody = false;
+		if ($chunked || null === $length || 0 < intval($length)) {
+			// RFC 2616, section 4.4:
+			// 3. ... If a message is received with both a
+			// Transfer-Encoding header field and a Content-Length header field,
+			// the latter MUST be ignored.
+			$toRead = ($chunked || null === $length)? null: $length;
+			$this->chunkLength = 0;
+
+			while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
+				if ($chunked) {
+					$data = $this->readChunked($bufferSize);
+				} elseif (is_null($toRead)) {
+					$data = $this->fread($bufferSize);
+				} else {
+					$data    = $this->fread(min($toRead, $bufferSize));
+					$toRead -= strlen($data);
+				}
+				if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
+					break;
+				}
+
+				$hasBody = true;
+				if ($this->request->getConfig('store_body')) {
+					$response->appendBody($data);
+				}
+				if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
+					$this->request->setLastEvent('receivedEncodedBodyPart', $data);
+				} else {
+					$this->request->setLastEvent('receivedBodyPart', $data);
+				}
+			}
+		}
+
+		if ($hasBody) {
+			$this->request->setLastEvent('receivedBody', $response);
+		}
+		return $response;
+	}
 
    /**
     * Reads until either the end of the socket or a newline, whichever comes first
@@ -964,27 +964,27 @@ 
     * @return   Available data up to the newline (not including newline)
     * @throws   HTTP_Request2_Exception     In case of timeout
     */
-    protected function readLine($bufferSize)
-    {
-        $line = '';
-        while (!feof($this->socket)) {
-            if ($this->deadline) {
-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-            }
-            $line .= @fgets($this->socket, $bufferSize);
-            $info  = stream_get_meta_data($this->socket);
-            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-                $reason = $this->deadline
-                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                          : 'due to default_socket_timeout php.ini setting';
-                throw new HTTP_Request2_Exception("Request timed out {$reason}");
-            }
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
+	protected function readLine($bufferSize)
+	{
+		$line = '';
+		while (!feof($this->socket)) {
+			if ($this->deadline) {
+				stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+			}
+			$line .= @fgets($this->socket, $bufferSize);
+			$info  = stream_get_meta_data($this->socket);
+			if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+				$reason = $this->deadline
+						  ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+						  : 'due to default_socket_timeout php.ini setting';
+				throw new HTTP_Request2_Exception("Request timed out {$reason}");
+			}
+			if (substr($line, -1) == "\n") {
+				return rtrim($line, "\r\n");
+			}
+		}
+		return $line;
+	}
 
    /**
     * Wrapper around fread(), handles global request timeout
@@ -993,21 +993,21 @@ 
     * @return   Data read from socket
     * @throws   HTTP_Request2_Exception     In case of timeout
     */
-    protected function fread($length)
-    {
-        if ($this->deadline) {
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-        }
-        $data = fread($this->socket, $length);
-        $info = stream_get_meta_data($this->socket);
-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-            $reason = $this->deadline
-                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                      : 'due to default_socket_timeout php.ini setting';
-            throw new HTTP_Request2_Exception("Request timed out {$reason}");
-        }
-        return $data;
-    }
+	protected function fread($length)
+	{
+		if ($this->deadline) {
+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+		}
+		$data = fread($this->socket, $length);
+		$info = stream_get_meta_data($this->socket);
+		if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+			$reason = $this->deadline
+					  ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+					  : 'due to default_socket_timeout php.ini setting';
+			throw new HTTP_Request2_Exception("Request timed out {$reason}");
+		}
+		return $data;
+	}
 
    /**
     * Reads a part of response body encoded with chunked Transfer-Encoding
@@ -1016,31 +1016,31 @@ 
     * @return   string
     * @throws   HTTP_Request2_Exception
     */
-    protected function readChunked($bufferSize)
-    {
-        // at start of the next chunk?
-        if (0 == $this->chunkLength) {
-            $line = $this->readLine($bufferSize);
-            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                throw new HTTP_Request2_Exception(
-                    "Cannot decode chunked response, invalid chunk length '{$line}'"
-                );
-            } else {
-                $this->chunkLength = hexdec($matches[1]);
-                // Chunk with zero length indicates the end
-                if (0 == $this->chunkLength) {
-                    $this->readLine($bufferSize);
-                    return '';
-                }
-            }
-        }
-        $data = $this->fread(min($this->chunkLength, $bufferSize));
-        $this->chunkLength -= strlen($data);
-        if (0 == $this->chunkLength) {
-            $this->readLine($bufferSize); // Trailing CRLF
-        }
-        return $data;
-    }
+	protected function readChunked($bufferSize)
+	{
+		// at start of the next chunk?
+		if (0 == $this->chunkLength) {
+			$line = $this->readLine($bufferSize);
+			if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+				throw new HTTP_Request2_Exception(
+					"Cannot decode chunked response, invalid chunk length '{$line}'"
+				);
+			} else {
+				$this->chunkLength = hexdec($matches[1]);
+				// Chunk with zero length indicates the end
+				if (0 == $this->chunkLength) {
+					$this->readLine($bufferSize);
+					return '';
+				}
+			}
+		}
+		$data = $this->fread(min($this->chunkLength, $bufferSize));
+		$this->chunkLength -= strlen($data);
+		if (0 == $this->chunkLength) {
+			$this->readLine($bufferSize); // Trailing CRLF
+		}
+		return $data;
+	}
 }
 
 ?>
\ No newline at end of file

libs/PEAR.1.9/HTTP/Request2/MultipartBody.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
             } else {
                 for ($i = 0; $i < count($f['fp']); $i++) {
                     $upload = array(
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
+                        'name' => ($useBrackets ? $fieldName . '[' . $i . ']' : $fieldName)
                     );
                     foreach (array('fp', 'filename', 'size', 'type') as $key) {
                         $upload[$key] = $f[$key][$i];
@@ -188,7 +188,7 @@ 
                     $ret    .= substr($header, $this->_pos[1], $length);
                     $length -= min(strlen($header) - $this->_pos[1], $length);
                 }
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
+                $filePos = max(0, $this->_pos[1] - strlen($header));
                 if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
                     $ret     .= fread($this->_uploads[$pos]['fp'], $length);
                     $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);

Indentation +166 added lines, -166 removed lines

@@ -1,45 +1,45 @@ 
 <?php
 /**
- * Helper class for building multipart/form-data request body
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: MultipartBody.php 290192 2009-11-03 21:29:32Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
+	 * Helper class for building multipart/form-data request body
+	 *
+	 * PHP version 5
+	 *
+	 * LICENSE:
+	 *
+	 * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions
+	 * are met:
+	 *
+	 *    * Redistributions of source code must retain the above copyright
+	 *      notice, this list of conditions and the following disclaimer.
+	 *    * Redistributions in binary form must reproduce the above copyright
+	 *      notice, this list of conditions and the following disclaimer in the
+	 *      documentation and/or other materials provided with the distribution.
+	 *    * The names of the authors may not be used to endorse or promote products
+	 *      derived from this software without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+	 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+	 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+	 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+	 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+	 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+	 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+	 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @category   HTTP
+	 * @package    HTTP_Request2
+	 * @author     Alexey Borzov <avb@php.net>
+	 * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+	 * @version    SVN: $Id: MultipartBody.php 290192 2009-11-03 21:29:32Z avb $
+	 * @link       http://pear.php.net/package/HTTP_Request2
+	 */
 
 /**
  * Class for building multipart/form-data request body
@@ -59,31 +59,31 @@ 
     * MIME boundary
     * @var  string
     */
-    private $_boundary;
+	private $_boundary;
 
    /**
     * Form parameters added via {@link HTTP_Request2::addPostParameter()}
     * @var  array
     */
-    private $_params = array();
+	private $_params = array();
 
    /**
     * File uploads added via {@link HTTP_Request2::addUpload()}
     * @var  array
     */
-    private $_uploads = array();
+	private $_uploads = array();
 
    /**
     * Header for parts with parameters
     * @var  string
     */
-    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
+	private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
 
    /**
     * Header for parts with uploads
     * @var  string
     */
-    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
+	private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
 
    /**
     * Current position in parameter and upload arrays
@@ -93,7 +93,7 @@ 
     *
     * @var  array
     */
-    private $_pos = array(0, 0);
+	private $_pos = array(0, 0);
 
 
    /**
@@ -103,59 +103,59 @@ 
     * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}
     * @param    bool    whether to append brackets to array variable names
     */
-    public function __construct(array $params, array $uploads, $useBrackets = true)
-    {
-        $this->_params = self::_flattenArray('', $params, $useBrackets);
-        foreach ($uploads as $fieldName => $f) {
-            if (!is_array($f['fp'])) {
-                $this->_uploads[] = $f + array('name' => $fieldName);
-            } else {
-                for ($i = 0; $i < count($f['fp']); $i++) {
-                    $upload = array(
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
-                    );
-                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
-                        $upload[$key] = $f[$key][$i];
-                    }
-                    $this->_uploads[] = $upload;
-                }
-            }
-        }
-    }
+	public function __construct(array $params, array $uploads, $useBrackets = true)
+	{
+		$this->_params = self::_flattenArray('', $params, $useBrackets);
+		foreach ($uploads as $fieldName => $f) {
+			if (!is_array($f['fp'])) {
+				$this->_uploads[] = $f + array('name' => $fieldName);
+			} else {
+				for ($i = 0; $i < count($f['fp']); $i++) {
+					$upload = array(
+						'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
+					);
+					foreach (array('fp', 'filename', 'size', 'type') as $key) {
+						$upload[$key] = $f[$key][$i];
+					}
+					$this->_uploads[] = $upload;
+				}
+			}
+		}
+	}
 
    /**
     * Returns the length of the body to use in Content-Length header
     *
     * @return   integer
     */
-    public function getLength()
-    {
-        $boundaryLength     = strlen($this->getBoundary());
-        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
-        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
-        $length             = $boundaryLength + 6;
-        foreach ($this->_params as $p) {
-            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
-        }
-        foreach ($this->_uploads as $u) {
-            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
-                       strlen($u['filename']) + $u['size'] + 2;
-        }
-        return $length;
-    }
+	public function getLength()
+	{
+		$boundaryLength     = strlen($this->getBoundary());
+		$headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
+		$headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
+		$length             = $boundaryLength + 6;
+		foreach ($this->_params as $p) {
+			$length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
+		}
+		foreach ($this->_uploads as $u) {
+			$length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
+					   strlen($u['filename']) + $u['size'] + 2;
+		}
+		return $length;
+	}
 
    /**
     * Returns the boundary to use in Content-Type header
     *
     * @return   string
     */
-    public function getBoundary()
-    {
-        if (empty($this->_boundary)) {
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
-        }
-        return $this->_boundary;
-    }
+	public function getBoundary()
+	{
+		if (empty($this->_boundary)) {
+			$this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
+		}
+		return $this->_boundary;
+	}
 
    /**
     * Returns next chunk of request body
@@ -163,69 +163,69 @@ 
     * @param    integer Amount of bytes to read
     * @return   string  Up to $length bytes of data, empty string if at end
     */
-    public function read($length)
-    {
-        $ret         = '';
-        $boundary    = $this->getBoundary();
-        $paramCount  = count($this->_params);
-        $uploadCount = count($this->_uploads);
-        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
-            $oldLength = $length;
-            if ($this->_pos[0] < $paramCount) {
-                $param = sprintf($this->_headerParam, $boundary,
-                                 $this->_params[$this->_pos[0]][0]) .
-                         $this->_params[$this->_pos[0]][1] . "\r\n";
-                $ret    .= substr($param, $this->_pos[1], $length);
-                $length -= min(strlen($param) - $this->_pos[1], $length);
+	public function read($length)
+	{
+		$ret         = '';
+		$boundary    = $this->getBoundary();
+		$paramCount  = count($this->_params);
+		$uploadCount = count($this->_uploads);
+		while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
+			$oldLength = $length;
+			if ($this->_pos[0] < $paramCount) {
+				$param = sprintf($this->_headerParam, $boundary,
+								 $this->_params[$this->_pos[0]][0]) .
+						 $this->_params[$this->_pos[0]][1] . "\r\n";
+				$ret    .= substr($param, $this->_pos[1], $length);
+				$length -= min(strlen($param) - $this->_pos[1], $length);
 
-            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {
-                $pos    = $this->_pos[0] - $paramCount;
-                $header = sprintf($this->_headerUpload, $boundary,
-                                  $this->_uploads[$pos]['name'],
-                                  $this->_uploads[$pos]['filename'],
-                                  $this->_uploads[$pos]['type']);
-                if ($this->_pos[1] < strlen($header)) {
-                    $ret    .= substr($header, $this->_pos[1], $length);
-                    $length -= min(strlen($header) - $this->_pos[1], $length);
-                }
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
-                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
-                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);
-                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
-                }
-                if ($length > 0) {
-                    $start   = $this->_pos[1] + ($oldLength - $length) -
-                               strlen($header) - $this->_uploads[$pos]['size'];
-                    $ret    .= substr("\r\n", $start, $length);
-                    $length -= min(2 - $start, $length);
-                }
+			} elseif ($this->_pos[0] < $paramCount + $uploadCount) {
+				$pos    = $this->_pos[0] - $paramCount;
+				$header = sprintf($this->_headerUpload, $boundary,
+								  $this->_uploads[$pos]['name'],
+								  $this->_uploads[$pos]['filename'],
+								  $this->_uploads[$pos]['type']);
+				if ($this->_pos[1] < strlen($header)) {
+					$ret    .= substr($header, $this->_pos[1], $length);
+					$length -= min(strlen($header) - $this->_pos[1], $length);
+				}
+				$filePos  = max(0, $this->_pos[1] - strlen($header));
+				if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
+					$ret     .= fread($this->_uploads[$pos]['fp'], $length);
+					$length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
+				}
+				if ($length > 0) {
+					$start   = $this->_pos[1] + ($oldLength - $length) -
+							   strlen($header) - $this->_uploads[$pos]['size'];
+					$ret    .= substr("\r\n", $start, $length);
+					$length -= min(2 - $start, $length);
+				}
 
-            } else {
-                $closing  = '--' . $boundary . "--\r\n";
-                $ret     .= substr($closing, $this->_pos[1], $length);
-                $length  -= min(strlen($closing) - $this->_pos[1], $length);
-            }
-            if ($length > 0) {
-                $this->_pos     = array($this->_pos[0] + 1, 0);
-            } else {
-                $this->_pos[1] += $oldLength;
-            }
-        }
-        return $ret;
-    }
+			} else {
+				$closing  = '--' . $boundary . "--\r\n";
+				$ret     .= substr($closing, $this->_pos[1], $length);
+				$length  -= min(strlen($closing) - $this->_pos[1], $length);
+			}
+			if ($length > 0) {
+				$this->_pos     = array($this->_pos[0] + 1, 0);
+			} else {
+				$this->_pos[1] += $oldLength;
+			}
+		}
+		return $ret;
+	}
 
    /**
     * Sets the current position to the start of the body
     *
     * This allows reusing the same body in another request
     */
-    public function rewind()
-    {
-        $this->_pos = array(0, 0);
-        foreach ($this->_uploads as $u) {
-            rewind($u['fp']);
-        }
-    }
+	public function rewind()
+	{
+		$this->_pos = array(0, 0);
+		foreach ($this->_uploads as $u) {
+			rewind($u['fp']);
+		}
+	}
 
    /**
     * Returns the body as string
@@ -235,11 +235,11 @@ 
     *
     * @return   string
     */
-    public function __toString()
-    {
-        $this->rewind();
-        return $this->read($this->getLength());
-    }
+	public function __toString()
+	{
+		$this->rewind();
+		return $this->read($this->getLength());
+	}
 
 
    /**
@@ -251,24 +251,24 @@ 
     * @param    bool    whether to append [] to array variables' names
     * @return   array   array with the following items: array('item name', 'item value');
     */
-    private static function _flattenArray($name, $values, $useBrackets)
-    {
-        if (!is_array($values)) {
-            return array(array($name, $values));
-        } else {
-            $ret = array();
-            foreach ($values as $k => $v) {
-                if (empty($name)) {
-                    $newName = $k;
-                } elseif ($useBrackets) {
-                    $newName = $name . '[' . $k . ']';
-                } else {
-                    $newName = $name;
-                }
-                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
-            }
-            return $ret;
-        }
-    }
+	private static function _flattenArray($name, $values, $useBrackets)
+	{
+		if (!is_array($values)) {
+			return array(array($name, $values));
+		} else {
+			$ret = array();
+			foreach ($values as $k => $v) {
+				if (empty($name)) {
+					$newName = $k;
+				} elseif ($useBrackets) {
+					$newName = $name . '[' . $k . ']';
+				} else {
+					$newName = $name;
+				}
+				$ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
+			}
+			return $ret;
+		}
+	}
 }
 ?>

libs/PEAR.1.9/HTTP/Request2/Observer/Log.php

Indentation +149 added lines, -149 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 /**
- * An observer useful for debugging / testing.
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   David Jean Louis <izi@php.net>
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  SVN: $Id: Log.php 293416 2010-01-11 18:06:15Z avb $
- * @link     http://pear.php.net/package/HTTP_Request2
- */
+	 * An observer useful for debugging / testing.
+	 *
+	 * PHP version 5
+	 *
+	 * LICENSE:
+	 *
+	 * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions
+	 * are met:
+	 *
+	 *    * Redistributions of source code must retain the above copyright
+	 *      notice, this list of conditions and the following disclaimer.
+	 *    * Redistributions in binary form must reproduce the above copyright
+	 *      notice, this list of conditions and the following disclaimer in the
+	 *      documentation and/or other materials provided with the distribution.
+	 *    * The names of the authors may not be used to endorse or promote products
+	 *      derived from this software without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+	 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+	 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+	 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+	 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+	 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+	 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+	 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @category HTTP
+	 * @package  HTTP_Request2
+	 * @author   David Jean Louis <izi@php.net>
+	 * @author   Alexey Borzov <avb@php.net>
+	 * @license  http://opensource.org/licenses/bsd-license.php New BSD License
+	 * @version  SVN: $Id: Log.php 293416 2010-01-11 18:06:15Z avb $
+	 * @link     http://pear.php.net/package/HTTP_Request2
+	 */
 
 /**
  * Exception class for HTTP_Request2 package
@@ -92,124 +92,124 @@ 
  */
 class HTTP_Request2_Observer_Log implements SplObserver
 {
-    // properties {{{
+	// properties {{{
 
-    /**
-     * The log target, it can be a a resource or a PEAR Log instance.
-     *
-     * @var resource|Log $target
-     */
-    protected $target = null;
+	/**
+	 * The log target, it can be a a resource or a PEAR Log instance.
+	 *
+	 * @var resource|Log $target
+	 */
+	protected $target = null;
 
-    /**
-     * The events to log.
-     *
-     * @var array $events
-     */
-    public $events = array(
-        'connect',
-        'sentHeaders',
-        'sentBodyPart',
-        'receivedHeaders',
-        'receivedBody',
-        'disconnect',
-    );
+	/**
+	 * The events to log.
+	 *
+	 * @var array $events
+	 */
+	public $events = array(
+		'connect',
+		'sentHeaders',
+		'sentBodyPart',
+		'receivedHeaders',
+		'receivedBody',
+		'disconnect',
+	);
 
-    // }}}
-    // __construct() {{{
+	// }}}
+	// __construct() {{{
 
-    /**
-     * Constructor.
-     *
-     * @param mixed $target Can be a file path (default: php://output), a resource,
-     *                      or an instance of the PEAR Log class.
-     * @param array $events Array of events to listen to (default: all events)
-     *
-     * @return void
-     */
-    public function __construct($target = 'php://output', array $events = array())
-    {
-        if (!empty($events)) {
-            $this->events = $events;
-        }
-        if (is_resource($target) || $target instanceof Log) {
-            $this->target = $target;
-        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
-            throw new HTTP_Request2_Exception("Unable to open '{$target}'");
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param mixed $target Can be a file path (default: php://output), a resource,
+	 *                      or an instance of the PEAR Log class.
+	 * @param array $events Array of events to listen to (default: all events)
+	 *
+	 * @return void
+	 */
+	public function __construct($target = 'php://output', array $events = array())
+	{
+		if (!empty($events)) {
+			$this->events = $events;
+		}
+		if (is_resource($target) || $target instanceof Log) {
+			$this->target = $target;
+		} elseif (false === ($this->target = @fopen($target, 'ab'))) {
+			throw new HTTP_Request2_Exception("Unable to open '{$target}'");
+		}
+	}
 
-    // }}}
-    // update() {{{
+	// }}}
+	// update() {{{
 
-    /**
-     * Called when the request notifies us of an event.
-     *
-     * @param HTTP_Request2 $subject The HTTP_Request2 instance
-     *
-     * @return void
-     */
-    public function update(SplSubject $subject)
-    {
-        $event = $subject->getLastEvent();
-        if (!in_array($event['name'], $this->events)) {
-            return;
-        }
+	/**
+	 * Called when the request notifies us of an event.
+	 *
+	 * @param HTTP_Request2 $subject The HTTP_Request2 instance
+	 *
+	 * @return void
+	 */
+	public function update(SplSubject $subject)
+	{
+		$event = $subject->getLastEvent();
+		if (!in_array($event['name'], $this->events)) {
+			return;
+		}
 
-        switch ($event['name']) {
-        case 'connect':
-            $this->log('* Connected to ' . $event['data']);
-            break;
-        case 'sentHeaders':
-            $headers = explode("\r\n", $event['data']);
-            array_pop($headers);
-            foreach ($headers as $header) {
-                $this->log('> ' . $header);
-            }
-            break;
-        case 'sentBodyPart':
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
-            break;
-        case 'receivedHeaders':
-            $this->log(sprintf('< HTTP/%s %s %s',
-                $event['data']->getVersion(),
-                $event['data']->getStatus(),
-                $event['data']->getReasonPhrase()));
-            $headers = $event['data']->getHeader();
-            foreach ($headers as $key => $val) {
-                $this->log('< ' . $key . ': ' . $val);
-            }
-            $this->log('< ');
-            break;
-        case 'receivedBody':
-            $this->log($event['data']->getBody());
-            break;
-        case 'disconnect':
-            $this->log('* Disconnected');
-            break;
-        }
-    }
+		switch ($event['name']) {
+		case 'connect':
+			$this->log('* Connected to ' . $event['data']);
+			break;
+		case 'sentHeaders':
+			$headers = explode("\r\n", $event['data']);
+			array_pop($headers);
+			foreach ($headers as $header) {
+				$this->log('> ' . $header);
+			}
+			break;
+		case 'sentBodyPart':
+			$this->log('> ' . $event['data'] . ' byte(s) sent');
+			break;
+		case 'receivedHeaders':
+			$this->log(sprintf('< HTTP/%s %s %s',
+				$event['data']->getVersion(),
+				$event['data']->getStatus(),
+				$event['data']->getReasonPhrase()));
+			$headers = $event['data']->getHeader();
+			foreach ($headers as $key => $val) {
+				$this->log('< ' . $key . ': ' . $val);
+			}
+			$this->log('< ');
+			break;
+		case 'receivedBody':
+			$this->log($event['data']->getBody());
+			break;
+		case 'disconnect':
+			$this->log('* Disconnected');
+			break;
+		}
+	}
 
-    // }}}
-    // log() {{{
+	// }}}
+	// log() {{{
 
-    /**
-     * Logs the given message to the configured target.
-     *
-     * @param string $message Message to display
-     *
-     * @return void
-     */
-    protected function log($message)
-    {
-        if ($this->target instanceof Log) {
-            $this->target->debug($message);
-        } elseif (is_resource($this->target)) {
-            fwrite($this->target, $message . "\r\n");
-        }
-    }
+	/**
+	 * Logs the given message to the configured target.
+	 *
+	 * @param string $message Message to display
+	 *
+	 * @return void
+	 */
+	protected function log($message)
+	{
+		if ($this->target instanceof Log) {
+			$this->target->debug($message);
+		} elseif (is_resource($this->target)) {
+			fwrite($this->target, $message . "\r\n");
+		}
+	}
 
-    // }}}
+	// }}}
 }
 
 ?>
\ No newline at end of file

Switch Indentation +30 added lines, -30 removed lines

@@ -157,36 +157,36 @@
         }
 
         switch ($event['name']) {
-        case 'connect':
-            $this->log('* Connected to ' . $event['data']);
-            break;
-        case 'sentHeaders':
-            $headers = explode("\r\n", $event['data']);
-            array_pop($headers);
-            foreach ($headers as $header) {
-                $this->log('> ' . $header);
-            }
-            break;
-        case 'sentBodyPart':
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
-            break;
-        case 'receivedHeaders':
-            $this->log(sprintf('< HTTP/%s %s %s',
-                $event['data']->getVersion(),
-                $event['data']->getStatus(),
-                $event['data']->getReasonPhrase()));
-            $headers = $event['data']->getHeader();
-            foreach ($headers as $key => $val) {
-                $this->log('< ' . $key . ': ' . $val);
-            }
-            $this->log('< ');
-            break;
-        case 'receivedBody':
-            $this->log($event['data']->getBody());
-            break;
-        case 'disconnect':
-            $this->log('* Disconnected');
-            break;
+        	case 'connect':
+            	$this->log('* Connected to ' . $event['data']);
+            	break;
+        	case 'sentHeaders':
+            	$headers = explode("\r\n", $event['data']);
+            	array_pop($headers);
+            	foreach ($headers as $header) {
+                	$this->log('> ' . $header);
+            	}
+            	break;
+        	case 'sentBodyPart':
+            	$this->log('> ' . $event['data'] . ' byte(s) sent');
+            	break;
+        	case 'receivedHeaders':
+            	$this->log(sprintf('< HTTP/%s %s %s',
+                	$event['data']->getVersion(),
+                	$event['data']->getStatus(),
+                	$event['data']->getReasonPhrase()));
+            	$headers = $event['data']->getHeader();
+            	foreach ($headers as $key => $val) {
+                	$this->log('< ' . $key . ': ' . $val);
+            	}
+            	$this->log('< ');
+            	break;
+        	case 'receivedBody':
+            	$this->log($event['data']->getBody());
+            	break;
+        	case 'disconnect':
+            	$this->log('* Disconnected');
+            	break;
         }
     }
 

libs/PEAR.1.9/HTTP/Request2/Response.php

Indentation +330 added lines, -330 removed lines

@@ -79,33 +79,33 @@ 
     * HTTP protocol version (e.g. 1.0, 1.1)
     * @var  string
     */
-    protected $version;
+	protected $version;
 
    /**
     * Status code
     * @var  integer
     * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
     */
-    protected $code;
+	protected $code;
 
    /**
     * Reason phrase
     * @var  string
     * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
     */
-    protected $reasonPhrase;
+	protected $reasonPhrase;
 
    /**
     * Associative array of response headers
     * @var  array
     */
-    protected $headers = array();
+	protected $headers = array();
 
    /**
     * Cookies set in the response
     * @var  array
     */
-    protected $cookies = array();
+	protected $cookies = array();
 
    /**
     * Name of last header processed by parseHederLine()
@@ -114,13 +114,13 @@ 
     *
     * @var  string
     */
-    protected $lastHeader = null;
+	protected $lastHeader = null;
 
    /**
     * Response body
     * @var  string
     */
-    protected $body = '';
+	protected $body = '';
 
    /**
     * Whether the body is still encoded by Content-Encoding
@@ -130,7 +130,7 @@ 
     *
     * @var  bool
     */
-    protected $bodyEncoded;
+	protected $bodyEncoded;
 
    /**
     * Associative array of HTTP status code / reason phrase.
@@ -138,64 +138,64 @@ 
     * @var  array
     * @link http://tools.ietf.org/html/rfc2616#section-10
     */
-    protected static $phrases = array(
-
-        // 1xx: Informational - Request received, continuing process
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-
-        // 2xx: Success - The action was successfully received, understood and
-        // accepted
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-
-        // 3xx: Redirection - Further action must be taken in order to complete
-        // the request
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-
-        // 4xx: Client Error - The request contains bad syntax or cannot be
-        // fulfilled
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-
-        // 5xx: Server Error - The server failed to fulfill an apparently
-        // valid request
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        509 => 'Bandwidth Limit Exceeded',
-
-    );
+	protected static $phrases = array(
+
+		// 1xx: Informational - Request received, continuing process
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+
+		// 2xx: Success - The action was successfully received, understood and
+		// accepted
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+
+		// 3xx: Redirection - Further action must be taken in order to complete
+		// the request
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found',  // 1.1
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		307 => 'Temporary Redirect',
+
+		// 4xx: Client Error - The request contains bad syntax or cannot be
+		// fulfilled
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Request Entity Too Large',
+		414 => 'Request-URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Requested Range Not Satisfiable',
+		417 => 'Expectation Failed',
+
+		// 5xx: Server Error - The server failed to fulfill an apparently
+		// valid request
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported',
+		509 => 'Bandwidth Limit Exceeded',
+
+	);
 
    /**
     * Constructor, parses the response status line
@@ -204,20 +204,20 @@ 
     * @param    bool    Whether body is still encoded by Content-Encoding
     * @throws   HTTP_Request2_Exception if status line is invalid according to spec
     */
-    public function __construct($statusLine, $bodyEncoded = true)
-    {
-        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
-            throw new HTTP_Request2_Exception("Malformed response: {$statusLine}");
-        }
-        $this->version = $m[1];
-        $this->code    = intval($m[2]);
-        if (!empty($m[3])) {
-            $this->reasonPhrase = trim($m[3]);
-        } elseif (!empty(self::$phrases[$this->code])) {
-            $this->reasonPhrase = self::$phrases[$this->code];
-        }
-        $this->bodyEncoded = (bool)$bodyEncoded;
-    }
+	public function __construct($statusLine, $bodyEncoded = true)
+	{
+		if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
+			throw new HTTP_Request2_Exception("Malformed response: {$statusLine}");
+		}
+		$this->version = $m[1];
+		$this->code    = intval($m[2]);
+		if (!empty($m[3])) {
+			$this->reasonPhrase = trim($m[3]);
+		} elseif (!empty(self::$phrases[$this->code])) {
+			$this->reasonPhrase = self::$phrases[$this->code];
+		}
+		$this->bodyEncoded = (bool)$bodyEncoded;
+	}
 
    /**
     * Parses the line from HTTP response filling $headers array
@@ -229,51 +229,51 @@ 
     *
     * @param    string  Line from HTTP response
     */
-    public function parseHeaderLine($headerLine)
-    {
-        $headerLine = trim($headerLine, "\r\n");
-
-        // empty string signals the end of headers, process the received ones
-        if ('' == $headerLine) {
-            if (!empty($this->headers['set-cookie'])) {
-                $cookies = is_array($this->headers['set-cookie'])?
-                           $this->headers['set-cookie']:
-                           array($this->headers['set-cookie']);
-                foreach ($cookies as $cookieString) {
-                    $this->parseCookie($cookieString);
-                }
-                unset($this->headers['set-cookie']);
-            }
-            foreach (array_keys($this->headers) as $k) {
-                if (is_array($this->headers[$k])) {
-                    $this->headers[$k] = implode(', ', $this->headers[$k]);
-                }
-            }
-
-        // string of the form header-name: header value
-        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
-            $name  = strtolower($m[1]);
-            $value = trim($m[2]);
-            if (empty($this->headers[$name])) {
-                $this->headers[$name] = $value;
-            } else {
-                if (!is_array($this->headers[$name])) {
-                    $this->headers[$name] = array($this->headers[$name]);
-                }
-                $this->headers[$name][] = $value;
-            }
-            $this->lastHeader = $name;
-
-        // continuation of a previous header
-        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
-            if (!is_array($this->headers[$this->lastHeader])) {
-                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
-            } else {
-                $key = count($this->headers[$this->lastHeader]) - 1;
-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
-            }
-        }
-    }
+	public function parseHeaderLine($headerLine)
+	{
+		$headerLine = trim($headerLine, "\r\n");
+
+		// empty string signals the end of headers, process the received ones
+		if ('' == $headerLine) {
+			if (!empty($this->headers['set-cookie'])) {
+				$cookies = is_array($this->headers['set-cookie'])?
+						   $this->headers['set-cookie']:
+						   array($this->headers['set-cookie']);
+				foreach ($cookies as $cookieString) {
+					$this->parseCookie($cookieString);
+				}
+				unset($this->headers['set-cookie']);
+			}
+			foreach (array_keys($this->headers) as $k) {
+				if (is_array($this->headers[$k])) {
+					$this->headers[$k] = implode(', ', $this->headers[$k]);
+				}
+			}
+
+		// string of the form header-name: header value
+		} elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
+			$name  = strtolower($m[1]);
+			$value = trim($m[2]);
+			if (empty($this->headers[$name])) {
+				$this->headers[$name] = $value;
+			} else {
+				if (!is_array($this->headers[$name])) {
+					$this->headers[$name] = array($this->headers[$name]);
+				}
+				$this->headers[$name][] = $value;
+			}
+			$this->lastHeader = $name;
+
+		// continuation of a previous header
+		} elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
+			if (!is_array($this->headers[$this->lastHeader])) {
+				$this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
+			} else {
+				$key = count($this->headers[$this->lastHeader]) - 1;
+				$this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
+			}
+		}
+	}
 
    /**
     * Parses a Set-Cookie header to fill $cookies array
@@ -281,86 +281,86 @@ 
     * @param    string    value of Set-Cookie header
     * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
     */
-    protected function parseCookie($cookieString)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        // Only a name=value pair
-        if (!strpos($cookieString, ';')) {
-            $pos = strpos($cookieString, '=');
-            $cookie['name']  = trim(substr($cookieString, 0, $pos));
-            $cookie['value'] = trim(substr($cookieString, $pos + 1));
-
-        // Some optional parameters are supplied
-        } else {
-            $elements = explode(';', $cookieString);
-            $pos = strpos($elements[0], '=');
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
-
-            for ($i = 1; $i < count($elements); $i++) {
-                if (false === strpos($elements[$i], '=')) {
-                    $elName  = trim($elements[$i]);
-                    $elValue = null;
-                } else {
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
-                }
-                $elName = strtolower($elName);
-                if ('secure' == $elName) {
-                    $cookie['secure'] = true;
-                } elseif ('expires' == $elName) {
-                    $cookie['expires'] = str_replace('"', '', $elValue);
-                } elseif ('path' == $elName || 'domain' == $elName) {
-                    $cookie[$elName] = urldecode($elValue);
-                } else {
-                    $cookie[$elName] = $elValue;
-                }
-            }
-        }
-        $this->cookies[] = $cookie;
-    }
+	protected function parseCookie($cookieString)
+	{
+		$cookie = array(
+			'expires' => null,
+			'domain'  => null,
+			'path'    => null,
+			'secure'  => false
+		);
+
+		// Only a name=value pair
+		if (!strpos($cookieString, ';')) {
+			$pos = strpos($cookieString, '=');
+			$cookie['name']  = trim(substr($cookieString, 0, $pos));
+			$cookie['value'] = trim(substr($cookieString, $pos + 1));
+
+		// Some optional parameters are supplied
+		} else {
+			$elements = explode(';', $cookieString);
+			$pos = strpos($elements[0], '=');
+			$cookie['name']  = trim(substr($elements[0], 0, $pos));
+			$cookie['value'] = trim(substr($elements[0], $pos + 1));
+
+			for ($i = 1; $i < count($elements); $i++) {
+				if (false === strpos($elements[$i], '=')) {
+					$elName  = trim($elements[$i]);
+					$elValue = null;
+				} else {
+					list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
+				}
+				$elName = strtolower($elName);
+				if ('secure' == $elName) {
+					$cookie['secure'] = true;
+				} elseif ('expires' == $elName) {
+					$cookie['expires'] = str_replace('"', '', $elValue);
+				} elseif ('path' == $elName || 'domain' == $elName) {
+					$cookie[$elName] = urldecode($elValue);
+				} else {
+					$cookie[$elName] = $elValue;
+				}
+			}
+		}
+		$this->cookies[] = $cookie;
+	}
 
    /**
     * Appends a string to the response body
     * @param    string
     */
-    public function appendBody($bodyChunk)
-    {
-        $this->body .= $bodyChunk;
-    }
+	public function appendBody($bodyChunk)
+	{
+		$this->body .= $bodyChunk;
+	}
 
    /**
     * Returns the status code
     * @return   integer
     */
-    public function getStatus()
-    {
-        return $this->code;
-    }
+	public function getStatus()
+	{
+		return $this->code;
+	}
 
    /**
     * Returns the reason phrase
     * @return   string
     */
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
+	public function getReasonPhrase()
+	{
+		return $this->reasonPhrase;
+	}
 
    /**
     * Whether response is a redirect that can be automatically handled by HTTP_Request2
     * @return   bool
     */
-    public function isRedirect()
-    {
-        return in_array($this->code, array(300, 301, 302, 303, 307))
-               && isset($this->headers['location']);
-    }
+	public function isRedirect()
+	{
+		return in_array($this->code, array(300, 301, 302, 303, 307))
+			   && isset($this->headers['location']);
+	}
 
    /**
     * Returns either the named header or all response headers
@@ -370,25 +370,25 @@ 
     *                           not present), array of all response headers if
     *                           $headerName is null
     */
-    public function getHeader($headerName = null)
-    {
-        if (null === $headerName) {
-            return $this->headers;
-        } else {
-            $headerName = strtolower($headerName);
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
-        }
-    }
+	public function getHeader($headerName = null)
+	{
+		if (null === $headerName) {
+			return $this->headers;
+		} else {
+			$headerName = strtolower($headerName);
+			return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
+		}
+	}
 
    /**
     * Returns cookies set in response
     *
     * @return   array
     */
-    public function getCookies()
-    {
-        return $this->cookies;
-    }
+	public function getCookies()
+	{
+		return $this->cookies;
+	}
 
    /**
     * Returns the body of the response
@@ -396,49 +396,49 @@ 
     * @return   string
     * @throws   HTTP_Request2_Exception if body cannot be decoded
     */
-    public function getBody()
-    {
-        if (!$this->bodyEncoded ||
-            !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
-        ) {
-            return $this->body;
-
-        } else {
-            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-                $oldEncoding = mb_internal_encoding();
-                mb_internal_encoding('iso-8859-1');
-            }
-
-            try {
-                switch (strtolower($this->getHeader('content-encoding'))) {
-                    case 'gzip':
-                        $decoded = self::decodeGzip($this->body);
-                        break;
-                    case 'deflate':
-                        $decoded = self::decodeDeflate($this->body);
-                }
-            } catch (Exception $e) {
-            }
-
-            if (!empty($oldEncoding)) {
-                mb_internal_encoding($oldEncoding);
-            }
-            if (!empty($e)) {
-                throw $e;
-            }
-            return $decoded;
-        }
-    }
+	public function getBody()
+	{
+		if (!$this->bodyEncoded ||
+			!in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
+		) {
+			return $this->body;
+
+		} else {
+			if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+				$oldEncoding = mb_internal_encoding();
+				mb_internal_encoding('iso-8859-1');
+			}
+
+			try {
+				switch (strtolower($this->getHeader('content-encoding'))) {
+					case 'gzip':
+						$decoded = self::decodeGzip($this->body);
+						break;
+					case 'deflate':
+						$decoded = self::decodeDeflate($this->body);
+				}
+			} catch (Exception $e) {
+			}
+
+			if (!empty($oldEncoding)) {
+				mb_internal_encoding($oldEncoding);
+			}
+			if (!empty($e)) {
+				throw $e;
+			}
+			return $decoded;
+		}
+	}
 
    /**
     * Get the HTTP version of the response
     *
     * @return   string
     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
+	public function getVersion()
+	{
+		return $this->version;
+	}
 
    /**
     * Decodes the message-body encoded by gzip
@@ -452,89 +452,89 @@ 
     * @throws   HTTP_Request2_Exception
     * @link     http://tools.ietf.org/html/rfc1952
     */
-    public static function decodeGzip($data)
-    {
-        $length = strlen($data);
-        // If it doesn't look like gzip-encoded data, don't bother
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
-            return $data;
-        }
-        if (!function_exists('gzinflate')) {
-            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            throw new HTTP_Request2_Exception('Error parsing gzip header: unknown compression method');
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            throw new HTTP_Request2_Exception('Error parsing gzip header: reserved bits are set');
-        }
-
-        // header is 10 bytes minimum. may be longer, though.
-        $headerLength = 10;
-        // extra fields, need to skip 'em
-        if ($flags & 4) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 2) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                throw new HTTP_Request2_Exception('Header CRC check failed');
-            }
-            $headerLength += 2;
-        }
-        // unpacked data CRC and size at the end of encoded data
-        $tmp = unpack('V2', substr($data, -8));
-        $dataCrc  = $tmp[1];
-        $dataSize = $tmp[2];
-
-        // finally, call the gzinflate() function
-        // don't pass $dataSize to gzinflate, see bugs #13135, #14370
-        $unpacked = gzinflate(substr($data, $headerLength, -8));
-        if (false === $unpacked) {
-            throw new HTTP_Request2_Exception('gzinflate() call failed');
-        } elseif ($dataSize != strlen($unpacked)) {
-            throw new HTTP_Request2_Exception('Data size check failed');
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            throw new HTTP_Request2_Exception('Data CRC check failed');
-        }
-        return $unpacked;
-    }
+	public static function decodeGzip($data)
+	{
+		$length = strlen($data);
+		// If it doesn't look like gzip-encoded data, don't bother
+		if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
+			return $data;
+		}
+		if (!function_exists('gzinflate')) {
+			throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
+		}
+		$method = ord(substr($data, 2, 1));
+		if (8 != $method) {
+			throw new HTTP_Request2_Exception('Error parsing gzip header: unknown compression method');
+		}
+		$flags = ord(substr($data, 3, 1));
+		if ($flags & 224) {
+			throw new HTTP_Request2_Exception('Error parsing gzip header: reserved bits are set');
+		}
+
+		// header is 10 bytes minimum. may be longer, though.
+		$headerLength = 10;
+		// extra fields, need to skip 'em
+		if ($flags & 4) {
+			if ($length - $headerLength - 2 < 8) {
+				throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+			}
+			$extraLength = unpack('v', substr($data, 10, 2));
+			if ($length - $headerLength - 2 - $extraLength[1] < 8) {
+				throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+			}
+			$headerLength += $extraLength[1] + 2;
+		}
+		// file name, need to skip that
+		if ($flags & 8) {
+			if ($length - $headerLength - 1 < 8) {
+				throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+			}
+			$filenameLength = strpos(substr($data, $headerLength), chr(0));
+			if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
+				throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+			}
+			$headerLength += $filenameLength + 1;
+		}
+		// comment, need to skip that also
+		if ($flags & 16) {
+			if ($length - $headerLength - 1 < 8) {
+				throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+			}
+			$commentLength = strpos(substr($data, $headerLength), chr(0));
+			if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
+				throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+			}
+			$headerLength += $commentLength + 1;
+		}
+		// have a CRC for header. let's check
+		if ($flags & 2) {
+			if ($length - $headerLength - 2 < 8) {
+				throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+			}
+			$crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
+			$crcStored = unpack('v', substr($data, $headerLength, 2));
+			if ($crcReal != $crcStored[1]) {
+				throw new HTTP_Request2_Exception('Header CRC check failed');
+			}
+			$headerLength += 2;
+		}
+		// unpacked data CRC and size at the end of encoded data
+		$tmp = unpack('V2', substr($data, -8));
+		$dataCrc  = $tmp[1];
+		$dataSize = $tmp[2];
+
+		// finally, call the gzinflate() function
+		// don't pass $dataSize to gzinflate, see bugs #13135, #14370
+		$unpacked = gzinflate(substr($data, $headerLength, -8));
+		if (false === $unpacked) {
+			throw new HTTP_Request2_Exception('gzinflate() call failed');
+		} elseif ($dataSize != strlen($unpacked)) {
+			throw new HTTP_Request2_Exception('Data size check failed');
+		} elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
+			throw new HTTP_Request2_Exception('Data CRC check failed');
+		}
+		return $unpacked;
+	}
 
    /**
     * Decodes the message-body encoded by deflate
@@ -543,17 +543,17 @@ 
     * @return   string  decoded data
     * @throws   HTTP_Request2_Exception
     */
-    public static function decodeDeflate($data)
-    {
-        if (!function_exists('gzuncompress')) {
-            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
-        }
-        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
-        // while many applications send raw deflate stream from RFC 1951.
-        // We should check for presence of zlib header and use gzuncompress() or
-        // gzinflate() as needed. See bug #15305
-        $header = unpack('n', substr($data, 0, 2));
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
-    }
+	public static function decodeDeflate($data)
+	{
+		if (!function_exists('gzuncompress')) {
+			throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
+		}
+		// RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
+		// while many applications send raw deflate stream from RFC 1951.
+		// We should check for presence of zlib header and use gzuncompress() or
+		// gzinflate() as needed. See bug #15305
+		$header = unpack('n', substr($data, 0, 2));
+		return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
+	}
 }
 ?>
\ No newline at end of file

Spacing +6 added lines, -7 removed lines

@@ -158,7 +158,7 @@ 
         // the request
         300 => 'Multiple Choices',
         301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
+        302 => 'Found', // 1.1
         303 => 'See Other',
         304 => 'Not Modified',
         305 => 'Use Proxy',
@@ -216,7 +216,7 @@ 
         } elseif (!empty(self::$phrases[$this->code])) {
             $this->reasonPhrase = self::$phrases[$this->code];
         }
-        $this->bodyEncoded = (bool)$bodyEncoded;
+        $this->bodyEncoded = (bool) $bodyEncoded;
     }
 
    /**
@@ -236,9 +236,8 @@ 
         // empty string signals the end of headers, process the received ones
         if ('' == $headerLine) {
             if (!empty($this->headers['set-cookie'])) {
-                $cookies = is_array($this->headers['set-cookie'])?
-                           $this->headers['set-cookie']:
-                           array($this->headers['set-cookie']);
+                $cookies = is_array($this->headers['set-cookie']) ?
+                           $this->headers['set-cookie'] : array($this->headers['set-cookie']);
                 foreach ($cookies as $cookieString) {
                     $this->parseCookie($cookieString);
                 }
@@ -376,7 +375,7 @@ 
             return $this->headers;
         } else {
             $headerName = strtolower($headerName);
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
+            return isset($this->headers[$headerName]) ? $this->headers[$headerName] : null;
         }
     }
 
@@ -553,7 +552,7 @@ 
         // We should check for presence of zlib header and use gzuncompress() or
         // gzinflate() as needed. See bug #15305
         $header = unpack('n', substr($data, 0, 2));
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
+        return (0 == $header[1] % 31) ? gzuncompress($data) : gzinflate($data);
     }
 }
 ?>
\ No newline at end of file

libs/PEAR/Net/Socket.php

Indentation +490 added lines, -490 removed lines

@@ -34,495 +34,495 @@
  */
 class Net_Socket extends PEAR {
 
-    /**
-     * Socket file pointer.
-     * @var resource $fp
-     */
-    var $fp = null;
-
-    /**
-     * Whether the socket is blocking. Defaults to true.
-     * @var boolean $blocking
-     */
-    var $blocking = true;
-
-    /**
-     * Whether the socket is persistent. Defaults to false.
-     * @var boolean $persistent
-     */
-    var $persistent = false;
-
-    /**
-     * The IP address to connect to.
-     * @var string $addr
-     */
-    var $addr = '';
-
-    /**
-     * The port number to connect to.
-     * @var integer $port
-     */
-    var $port = 0;
-
-    /**
-     * Number of seconds to wait on socket connections before assuming
-     * there's no more data. Defaults to no timeout.
-     * @var integer $timeout
-     */
-    var $timeout = false;
-
-    /**
-     * Number of bytes to read at a time in readLine() and
-     * readAll(). Defaults to 2048.
-     * @var integer $lineLength
-     */
-    var $lineLength = 2048;
-
-    /**
-     * Connect to the specified port. If called when the socket is
-     * already connected, it disconnects and connects again.
-     *
-     * @param string  $addr        IP address or host name.
-     * @param integer $port        TCP port number.
-     * @param boolean $persistent  (optional) Whether the connection is
-     *                             persistent (kept open between requests
-     *                             by the web server).
-     * @param integer $timeout     (optional) How long to wait for data.
-     * @param array   $options     See options for stream_context_create.
-     *
-     * @access public
-     *
-     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
-     */
-    function connect($addr, $port = 0, $persistent = null, $timeout = null, $options = null)
-    {
-        if (is_resource($this->fp)) {
-            @fclose($this->fp);
-            $this->fp = null;
-        }
-
-        if (!$addr) {
-            return $this->raiseError('$addr cannot be empty');
-        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
-                  strstr($addr, '/') !== false) {
-            $this->addr = $addr;
-        } else {
-            $this->addr = @gethostbyname($addr);
-        }
-
-        $this->port = $port % 65536;
-
-        if ($persistent !== null) {
-            $this->persistent = $persistent;
-        }
-
-        if ($timeout !== null) {
-            $this->timeout = $timeout;
-        }
-
-        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
-        $errno = 0;
-        $errstr = '';
-        if ($options && function_exists('stream_context_create')) {
-            if ($this->timeout) {
-                $timeout = $this->timeout;
-            } else {
-                $timeout = 0;
-            }
-            $context = stream_context_create($options);
-            $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout, $context);
-        } else {
-            if ($this->timeout) {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $this->timeout);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
-            }
-        }
-
-        if (!$fp) {
-            return $this->raiseError($errstr, $errno);
-        }
-
-        $this->fp = $fp;
-
-        return $this->setBlocking($this->blocking);
-    }
-
-    /**
-     * Disconnects from the peer, closes the socket.
-     *
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function disconnect()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        @fclose($this->fp);
-        $this->fp = null;
-        return true;
-    }
-
-    /**
-     * Find out if the socket is in blocking mode.
-     *
-     * @access public
-     * @return boolean  The current blocking mode.
-     */
-    function isBlocking()
-    {
-        return $this->blocking;
-    }
-
-    /**
-     * Sets whether the socket connection should be blocking or
-     * not. A read call to a non-blocking socket will return immediately
-     * if there is no data available, whereas it will block until there
-     * is data for blocking sockets.
-     *
-     * @param boolean $mode  True for blocking sockets, false for nonblocking.
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function setBlocking($mode)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $this->blocking = $mode;
-        socket_set_blocking($this->fp, $this->blocking);
-        return true;
-    }
-
-    /**
-     * Sets the timeout value on socket descriptor,
-     * expressed in the sum of seconds and microseconds
-     *
-     * @param integer $seconds  Seconds.
-     * @param integer $microseconds  Microseconds.
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function setTimeout($seconds, $microseconds)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_set_timeout($this->fp, $seconds, $microseconds);
-    }
-
-    /**
-     * Returns information about an existing socket resource.
-     * Currently returns four entries in the result array:
-     *
-     * <p>
-     * timed_out (bool) - The socket timed out waiting for data<br>
-     * blocked (bool) - The socket was blocked<br>
-     * eof (bool) - Indicates EOF event<br>
-     * unread_bytes (int) - Number of bytes left in the socket buffer<br>
-     * </p>
-     *
-     * @access public
-     * @return mixed Array containing information about existing socket resource or an error object otherwise
-     */
-    function getStatus()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_get_status($this->fp);
-    }
-
-    /**
-     * Get a specified line of data
-     *
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function gets($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fgets($this->fp, $size);
-    }
-
-    /**
-     * Read a specified amount of data. This is guaranteed to return,
-     * and has the added benefit of getting everything in one fread()
-     * chunk; if you know the size of the data you're getting
-     * beforehand, this is definitely the way to go.
-     *
-     * @param integer $size  The number of bytes to read from the socket.
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function read($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fread($this->fp, $size);
-    }
-
-    /**
-     * Write a specified amount of data.
-     *
-     * @param string  $data       Data to write.
-     * @param integer $blocksize  Amount of data to write at once.
-     *                            NULL means all at once.
-     *
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function write($data, $blocksize = null)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        if (is_null($blocksize) && !OS_WINDOWS) {
-            return fwrite($this->fp, $data);
-        } else {
-            if (is_null($blocksize)) {
-                $blocksize = 1024;
-            }
-
-            $pos = 0;
-            $size = strlen($data);
-            while ($pos < $size) {
-                $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
-                if ($written === false) {
-                    return false;
-                }
-                $pos += $written;
-            }
-
-            return $pos;
-        }
-    }
-
-    /**
-     * Write a line of data to the socket, followed by a trailing "\r\n".
-     *
-     * @access public
-     * @return mixed fputs result, or an error
-     */
-    function writeLine($data)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return fwrite($this->fp, $data . "\r\n");
-    }
-
-    /**
-     * Tests for end-of-file on a socket descriptor.
-     *
-     * @access public
-     * @return bool
-     */
-    function eof()
-    {
-        return (is_resource($this->fp) && feof($this->fp));
-    }
-
-    /**
-     * Reads a byte of data
-     *
-     * @access public
-     * @return 1 byte of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readByte()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return ord(@fread($this->fp, 1));
-    }
-
-    /**
-     * Reads a word of data
-     *
-     * @access public
-     * @return 1 word of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readWord()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 2);
-        return (ord($buf[0]) + (ord($buf[1]) << 8));
-    }
-
-    /**
-     * Reads an int of data
-     *
-     * @access public
-     * @return integer  1 int of data from the socket, or a PEAR_Error if
-     *                  not connected.
-     */
-    function readInt()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return (ord($buf[0]) + (ord($buf[1]) << 8) +
-                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
-    }
-
-    /**
-     * Reads a zero-terminated string of data
-     *
-     * @access public
-     * @return string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readString()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00")  {
-            $string .= $char;
-        }
-        return $string;
-    }
-
-    /**
-     * Reads an IP Address and returns it in a dot formated string
-     *
-     * @access public
-     * @return Dot formated string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readIPAddress()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return sprintf("%s.%s.%s.%s", ord($buf[0]), ord($buf[1]),
-                       ord($buf[2]), ord($buf[3]));
-    }
-
-    /**
-     * Read until either the end of the socket or a newline, whichever
-     * comes first. Strips the trailing newline from the returned data.
-     *
-     * @access public
-     * @return All available data up to a newline, without that
-     *         newline, or until the end of the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readLine()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $line = '';
-        $timeout = time() + $this->timeout;
-        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
-            $line .= @fgets($this->fp, $this->lineLength);
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Read until the socket closes, or until there is no more data in
-     * the inner PHP buffer. If the inner buffer is empty, in blocking
-     * mode we wait for at least 1 byte of data. Therefore, in
-     * blocking mode, if there is no data at all to be read, this
-     * function will never exit (unless the socket is closed on the
-     * remote end).
-     *
-     * @access public
-     *
-     * @return string  All data until the socket closes, or a PEAR_Error if
-     *                 not connected.
-     */
-    function readAll()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $data = '';
-        while (!feof($this->fp)) {
-            $data .= @fread($this->fp, $this->lineLength);
-        }
-        return $data;
-    }
-
-    /**
-     * Runs the equivalent of the select() system call on the socket
-     * with a timeout specified by tv_sec and tv_usec.
-     *
-     * @param integer $state    Which of read/write/error to check for.
-     * @param integer $tv_sec   Number of seconds for timeout.
-     * @param integer $tv_usec  Number of microseconds for timeout.
-     *
-     * @access public
-     * @return False if select fails, integer describing which of read/write/error
-     *         are ready, or PEAR_Error if not connected.
-     */
-    function select($state, $tv_sec, $tv_usec = 0)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $read = null;
-        $write = null;
-        $except = null;
-        if ($state & NET_SOCKET_READ) {
-            $read[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_WRITE) {
-            $write[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_ERROR) {
-            $except[] = $this->fp;
-        }
-        if (false === ($sr = stream_select($read, $write, $except, $tv_sec, $tv_usec))) {
-            return false;
-        }
-
-        $result = 0;
-        if (count($read)) {
-            $result |= NET_SOCKET_READ;
-        }
-        if (count($write)) {
-            $result |= NET_SOCKET_WRITE;
-        }
-        if (count($except)) {
-            $result |= NET_SOCKET_ERROR;
-        }
-        return $result;
-    }
+	/**
+	 * Socket file pointer.
+	 * @var resource $fp
+	 */
+	var $fp = null;
+
+	/**
+	 * Whether the socket is blocking. Defaults to true.
+	 * @var boolean $blocking
+	 */
+	var $blocking = true;
+
+	/**
+	 * Whether the socket is persistent. Defaults to false.
+	 * @var boolean $persistent
+	 */
+	var $persistent = false;
+
+	/**
+	 * The IP address to connect to.
+	 * @var string $addr
+	 */
+	var $addr = '';
+
+	/**
+	 * The port number to connect to.
+	 * @var integer $port
+	 */
+	var $port = 0;
+
+	/**
+	 * Number of seconds to wait on socket connections before assuming
+	 * there's no more data. Defaults to no timeout.
+	 * @var integer $timeout
+	 */
+	var $timeout = false;
+
+	/**
+	 * Number of bytes to read at a time in readLine() and
+	 * readAll(). Defaults to 2048.
+	 * @var integer $lineLength
+	 */
+	var $lineLength = 2048;
+
+	/**
+	 * Connect to the specified port. If called when the socket is
+	 * already connected, it disconnects and connects again.
+	 *
+	 * @param string  $addr        IP address or host name.
+	 * @param integer $port        TCP port number.
+	 * @param boolean $persistent  (optional) Whether the connection is
+	 *                             persistent (kept open between requests
+	 *                             by the web server).
+	 * @param integer $timeout     (optional) How long to wait for data.
+	 * @param array   $options     See options for stream_context_create.
+	 *
+	 * @access public
+	 *
+	 * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
+	 */
+	function connect($addr, $port = 0, $persistent = null, $timeout = null, $options = null)
+	{
+		if (is_resource($this->fp)) {
+			@fclose($this->fp);
+			$this->fp = null;
+		}
+
+		if (!$addr) {
+			return $this->raiseError('$addr cannot be empty');
+		} elseif (strspn($addr, '.0123456789') == strlen($addr) ||
+				  strstr($addr, '/') !== false) {
+			$this->addr = $addr;
+		} else {
+			$this->addr = @gethostbyname($addr);
+		}
+
+		$this->port = $port % 65536;
+
+		if ($persistent !== null) {
+			$this->persistent = $persistent;
+		}
+
+		if ($timeout !== null) {
+			$this->timeout = $timeout;
+		}
+
+		$openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
+		$errno = 0;
+		$errstr = '';
+		if ($options && function_exists('stream_context_create')) {
+			if ($this->timeout) {
+				$timeout = $this->timeout;
+			} else {
+				$timeout = 0;
+			}
+			$context = stream_context_create($options);
+			$fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout, $context);
+		} else {
+			if ($this->timeout) {
+				$fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $this->timeout);
+			} else {
+				$fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
+			}
+		}
+
+		if (!$fp) {
+			return $this->raiseError($errstr, $errno);
+		}
+
+		$this->fp = $fp;
+
+		return $this->setBlocking($this->blocking);
+	}
+
+	/**
+	 * Disconnects from the peer, closes the socket.
+	 *
+	 * @access public
+	 * @return mixed true on success or an error object otherwise
+	 */
+	function disconnect()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		@fclose($this->fp);
+		$this->fp = null;
+		return true;
+	}
+
+	/**
+	 * Find out if the socket is in blocking mode.
+	 *
+	 * @access public
+	 * @return boolean  The current blocking mode.
+	 */
+	function isBlocking()
+	{
+		return $this->blocking;
+	}
+
+	/**
+	 * Sets whether the socket connection should be blocking or
+	 * not. A read call to a non-blocking socket will return immediately
+	 * if there is no data available, whereas it will block until there
+	 * is data for blocking sockets.
+	 *
+	 * @param boolean $mode  True for blocking sockets, false for nonblocking.
+	 * @access public
+	 * @return mixed true on success or an error object otherwise
+	 */
+	function setBlocking($mode)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$this->blocking = $mode;
+		socket_set_blocking($this->fp, $this->blocking);
+		return true;
+	}
+
+	/**
+	 * Sets the timeout value on socket descriptor,
+	 * expressed in the sum of seconds and microseconds
+	 *
+	 * @param integer $seconds  Seconds.
+	 * @param integer $microseconds  Microseconds.
+	 * @access public
+	 * @return mixed true on success or an error object otherwise
+	 */
+	function setTimeout($seconds, $microseconds)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return socket_set_timeout($this->fp, $seconds, $microseconds);
+	}
+
+	/**
+	 * Returns information about an existing socket resource.
+	 * Currently returns four entries in the result array:
+	 *
+	 * <p>
+	 * timed_out (bool) - The socket timed out waiting for data<br>
+	 * blocked (bool) - The socket was blocked<br>
+	 * eof (bool) - Indicates EOF event<br>
+	 * unread_bytes (int) - Number of bytes left in the socket buffer<br>
+	 * </p>
+	 *
+	 * @access public
+	 * @return mixed Array containing information about existing socket resource or an error object otherwise
+	 */
+	function getStatus()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return socket_get_status($this->fp);
+	}
+
+	/**
+	 * Get a specified line of data
+	 *
+	 * @access public
+	 * @return $size bytes of data from the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	function gets($size)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return @fgets($this->fp, $size);
+	}
+
+	/**
+	 * Read a specified amount of data. This is guaranteed to return,
+	 * and has the added benefit of getting everything in one fread()
+	 * chunk; if you know the size of the data you're getting
+	 * beforehand, this is definitely the way to go.
+	 *
+	 * @param integer $size  The number of bytes to read from the socket.
+	 * @access public
+	 * @return $size bytes of data from the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	function read($size)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return @fread($this->fp, $size);
+	}
+
+	/**
+	 * Write a specified amount of data.
+	 *
+	 * @param string  $data       Data to write.
+	 * @param integer $blocksize  Amount of data to write at once.
+	 *                            NULL means all at once.
+	 *
+	 * @access public
+	 * @return mixed true on success or an error object otherwise
+	 */
+	function write($data, $blocksize = null)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		if (is_null($blocksize) && !OS_WINDOWS) {
+			return fwrite($this->fp, $data);
+		} else {
+			if (is_null($blocksize)) {
+				$blocksize = 1024;
+			}
+
+			$pos = 0;
+			$size = strlen($data);
+			while ($pos < $size) {
+				$written = @fwrite($this->fp, substr($data, $pos, $blocksize));
+				if ($written === false) {
+					return false;
+				}
+				$pos += $written;
+			}
+
+			return $pos;
+		}
+	}
+
+	/**
+	 * Write a line of data to the socket, followed by a trailing "\r\n".
+	 *
+	 * @access public
+	 * @return mixed fputs result, or an error
+	 */
+	function writeLine($data)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return fwrite($this->fp, $data . "\r\n");
+	}
+
+	/**
+	 * Tests for end-of-file on a socket descriptor.
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	function eof()
+	{
+		return (is_resource($this->fp) && feof($this->fp));
+	}
+
+	/**
+	 * Reads a byte of data
+	 *
+	 * @access public
+	 * @return 1 byte of data from the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	function readByte()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		return ord(@fread($this->fp, 1));
+	}
+
+	/**
+	 * Reads a word of data
+	 *
+	 * @access public
+	 * @return 1 word of data from the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	function readWord()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$buf = @fread($this->fp, 2);
+		return (ord($buf[0]) + (ord($buf[1]) << 8));
+	}
+
+	/**
+	 * Reads an int of data
+	 *
+	 * @access public
+	 * @return integer  1 int of data from the socket, or a PEAR_Error if
+	 *                  not connected.
+	 */
+	function readInt()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$buf = @fread($this->fp, 4);
+		return (ord($buf[0]) + (ord($buf[1]) << 8) +
+				(ord($buf[2]) << 16) + (ord($buf[3]) << 24));
+	}
+
+	/**
+	 * Reads a zero-terminated string of data
+	 *
+	 * @access public
+	 * @return string, or a PEAR_Error if
+	 *         not connected.
+	 */
+	function readString()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$string = '';
+		while (($char = @fread($this->fp, 1)) != "\x00")  {
+			$string .= $char;
+		}
+		return $string;
+	}
+
+	/**
+	 * Reads an IP Address and returns it in a dot formated string
+	 *
+	 * @access public
+	 * @return Dot formated string, or a PEAR_Error if
+	 *         not connected.
+	 */
+	function readIPAddress()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$buf = @fread($this->fp, 4);
+		return sprintf("%s.%s.%s.%s", ord($buf[0]), ord($buf[1]),
+					   ord($buf[2]), ord($buf[3]));
+	}
+
+	/**
+	 * Read until either the end of the socket or a newline, whichever
+	 * comes first. Strips the trailing newline from the returned data.
+	 *
+	 * @access public
+	 * @return All available data up to a newline, without that
+	 *         newline, or until the end of the socket, or a PEAR_Error if
+	 *         not connected.
+	 */
+	function readLine()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$line = '';
+		$timeout = time() + $this->timeout;
+		while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
+			$line .= @fgets($this->fp, $this->lineLength);
+			if (substr($line, -1) == "\n") {
+				return rtrim($line, "\r\n");
+			}
+		}
+		return $line;
+	}
+
+	/**
+	 * Read until the socket closes, or until there is no more data in
+	 * the inner PHP buffer. If the inner buffer is empty, in blocking
+	 * mode we wait for at least 1 byte of data. Therefore, in
+	 * blocking mode, if there is no data at all to be read, this
+	 * function will never exit (unless the socket is closed on the
+	 * remote end).
+	 *
+	 * @access public
+	 *
+	 * @return string  All data until the socket closes, or a PEAR_Error if
+	 *                 not connected.
+	 */
+	function readAll()
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$data = '';
+		while (!feof($this->fp)) {
+			$data .= @fread($this->fp, $this->lineLength);
+		}
+		return $data;
+	}
+
+	/**
+	 * Runs the equivalent of the select() system call on the socket
+	 * with a timeout specified by tv_sec and tv_usec.
+	 *
+	 * @param integer $state    Which of read/write/error to check for.
+	 * @param integer $tv_sec   Number of seconds for timeout.
+	 * @param integer $tv_usec  Number of microseconds for timeout.
+	 *
+	 * @access public
+	 * @return False if select fails, integer describing which of read/write/error
+	 *         are ready, or PEAR_Error if not connected.
+	 */
+	function select($state, $tv_sec, $tv_usec = 0)
+	{
+		if (!is_resource($this->fp)) {
+			return $this->raiseError('not connected');
+		}
+
+		$read = null;
+		$write = null;
+		$except = null;
+		if ($state & NET_SOCKET_READ) {
+			$read[] = $this->fp;
+		}
+		if ($state & NET_SOCKET_WRITE) {
+			$write[] = $this->fp;
+		}
+		if ($state & NET_SOCKET_ERROR) {
+			$except[] = $this->fp;
+		}
+		if (false === ($sr = stream_select($read, $write, $except, $tv_sec, $tv_usec))) {
+			return false;
+		}
+
+		$result = 0;
+		if (count($read)) {
+			$result |= NET_SOCKET_READ;
+		}
+		if (count($write)) {
+			$result |= NET_SOCKET_WRITE;
+		}
+		if (count($except)) {
+			$result |= NET_SOCKET_ERROR;
+		}
+		return $result;
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 require_once 'PEAR.php';
 
-define('NET_SOCKET_READ',  1);
+define('NET_SOCKET_READ', 1);
 define('NET_SOCKET_WRITE', 2);
 define('NET_SOCKET_ERROR', 3);
 
@@ -402,7 +402,7 @@ 
         }
 
         $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00")  {
+        while (($char = @fread($this->fp, 1)) != "\x00") {
             $string .= $char;
         }
         return $string;

libs/PEAR/PEAR.php

Spacing +15 added lines, -16 removed lines

@@ -28,11 +28,11 @@ 
 /**#@+
  * ERROR constants
  */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
+define('PEAR_ERROR_RETURN', 1);
+define('PEAR_ERROR_PRINT', 2);
+define('PEAR_ERROR_TRIGGER', 4);
+define('PEAR_ERROR_DIE', 8);
+define('PEAR_ERROR_CALLBACK', 16);
 /**
  * WARNING: obsolete
  * @deprecated
@@ -44,12 +44,12 @@ 
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
+    define('OS_UNIX', false);
+    define('PEAR_OS', 'Windows');
 } else {
     define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
+    define('OS_UNIX', true);
+    define('PEAR_OS', 'Unix'); // blatant assumption
 }
 
 // instant backwards compatibility
@@ -460,9 +460,9 @@ 
             // $error_code is a non-empty array here;
             // we walk through it trying to unset all
             // values
-            foreach($error_code as $key => $error) {
+            foreach ($error_code as $key => $error) {
                 if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
+                    $deleted = true;
                 } else {
                     $deleted = false;
                 }
@@ -756,7 +756,7 @@ 
             } else {
                 $suffix = '.so';
             }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+            return @dl('php_' . $ext . $suffix) || @dl($ext . $suffix);
         }
         return true;
     }
@@ -1063,13 +1063,12 @@ 
         if ($this->mode & PEAR_ERROR_CALLBACK) {
             if (is_array($this->callback)) {
                 $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
+                    strtolower(get_class($this->callback[0])) : $this->callback[0]) . '::' .
                     $this->callback[1];
             } else {
                 $callback = $this->callback;
             }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
+            return sprintf('[%s: message="%s" code=%d mode=callback ' .
                            'callback=%s prefix="%s" info="%s"]',
                            strtolower(get_class($this)), $this->message, $this->code,
                            $callback, $this->error_message_prefix,
@@ -1087,7 +1086,7 @@ 
         if ($this->mode & PEAR_ERROR_RETURN) {
             $modes[] = 'return';
         }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+        return sprintf('[%s: message="%s" code=%d mode=%s level=%s ' .
                        'prefix="%s" info="%s"]',
                        strtolower(get_class($this)), $this->message, $this->code,
                        implode("|", $modes), $levels[$this->level],

Indentation +1003 added lines, -1003 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 /**
- * PEAR, the PHP Extension and Application Repository
- *
- * PEAR class and PEAR_Error class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   pear
- * @package    PEAR
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: PEAR.php,v 1.101 2006/04/25 02:41:03 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
+	 * PEAR, the PHP Extension and Application Repository
+	 *
+	 * PEAR class and PEAR_Error class
+	 *
+	 * PHP versions 4 and 5
+	 *
+	 * LICENSE: This source file is subject to version 3.0 of the PHP license
+	 * that is available through the world-wide-web at the following URI:
+	 * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+	 * the PHP License and are unable to obtain it through the web, please
+	 * send a note to license@php.net so we can mail you a copy immediately.
+	 *
+	 * @category   pear
+	 * @package    PEAR
+	 * @author     Sterling Hughes <sterling@php.net>
+	 * @author     Stig Bakken <ssb@php.net>
+	 * @author     Tomas V.V.Cox <cox@idecnet.com>
+	 * @author     Greg Beaver <cellog@php.net>
+	 * @copyright  1997-2006 The PHP Group
+	 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+	 * @version    CVS: $Id: PEAR.php,v 1.101 2006/04/25 02:41:03 cellog Exp $
+	 * @link       http://pear.php.net/package/PEAR
+	 * @since      File available since Release 0.1
+	 */
 
 /**#@+
  * ERROR constants
@@ -40,25 +40,25 @@ 
 define('PEAR_ERROR_EXCEPTION', 32);
 /**#@-*/
 define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
+					version_compare(zend_version(), "2-dev", "ge")));
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
+	define('OS_WINDOWS', true);
+	define('OS_UNIX',    false);
+	define('PEAR_OS',    'Windows');
 } else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
+	define('OS_WINDOWS', false);
+	define('OS_UNIX',    true);
+	define('PEAR_OS',    'Unix'); // blatant assumption
 }
 
 // instant backwards compatibility
 if (!defined('PATH_SEPARATOR')) {
-    if (OS_WINDOWS) {
-        define('PATH_SEPARATOR', ';');
-    } else {
-        define('PATH_SEPARATOR', ':');
-    }
+	if (OS_WINDOWS) {
+		define('PATH_SEPARATOR', ';');
+	} else {
+		define('PATH_SEPARATOR', ':');
+	}
 }
 
 $GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
@@ -101,704 +101,704 @@ 
  */
 class PEAR
 {
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function("_PEAR_call_destructors");
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    function isError($data, $code = null)
-    {
-        if (is_a($data, 'PEAR_Error')) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
-            } else {
-                return $data->getCode() == $code;
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return sizeof($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
-            }
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-            }
-        } else {
-            // $error_code is empty
-            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-        }
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-        if ($skipmsg) {
-            $a = &new $ec($code, $mode, $options, $userinfo);
-            return $a;
-        } else {
-            $a = &new $ec($message, $code, $mode, $options, $userinfo);
-            return $a;
-        }
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     */
-    function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        } else {
-            $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        }
-    }
-
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-        }
-        return true;
-    }
-
-    // }}}
+	// {{{ properties
+
+	/**
+	 * Whether to enable internal debug messages.
+	 *
+	 * @var     bool
+	 * @access  private
+	 */
+	var $_debug = false;
+
+	/**
+	 * Default error mode for this object.
+	 *
+	 * @var     int
+	 * @access  private
+	 */
+	var $_default_error_mode = null;
+
+	/**
+	 * Default error options used for this object when error mode
+	 * is PEAR_ERROR_TRIGGER.
+	 *
+	 * @var     int
+	 * @access  private
+	 */
+	var $_default_error_options = null;
+
+	/**
+	 * Default error handler (callback) for this object, if error mode is
+	 * PEAR_ERROR_CALLBACK.
+	 *
+	 * @var     string
+	 * @access  private
+	 */
+	var $_default_error_handler = '';
+
+	/**
+	 * Which class to use for error objects.
+	 *
+	 * @var     string
+	 * @access  private
+	 */
+	var $_error_class = 'PEAR_Error';
+
+	/**
+	 * An array of expected errors.
+	 *
+	 * @var     array
+	 * @access  private
+	 */
+	var $_expected_errors = array();
+
+	// }}}
+
+	// {{{ constructor
+
+	/**
+	 * Constructor.  Registers this object in
+	 * $_PEAR_destructor_object_list for destructor emulation if a
+	 * destructor object exists.
+	 *
+	 * @param string $error_class  (optional) which class to use for
+	 *        error objects, defaults to PEAR_Error.
+	 * @access public
+	 * @return void
+	 */
+	function PEAR($error_class = null)
+	{
+		$classname = strtolower(get_class($this));
+		if ($this->_debug) {
+			print "PEAR constructor called, class=$classname\n";
+		}
+		if ($error_class !== null) {
+			$this->_error_class = $error_class;
+		}
+		while ($classname && strcasecmp($classname, "pear")) {
+			$destructor = "_$classname";
+			if (method_exists($this, $destructor)) {
+				global $_PEAR_destructor_object_list;
+				$_PEAR_destructor_object_list[] = &$this;
+				if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+					register_shutdown_function("_PEAR_call_destructors");
+					$GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+				}
+				break;
+			} else {
+				$classname = get_parent_class($classname);
+			}
+		}
+	}
+
+	// }}}
+	// {{{ destructor
+
+	/**
+	 * Destructor (the emulated type of...).  Does nothing right now,
+	 * but is included for forward compatibility, so subclass
+	 * destructors should always call it.
+	 *
+	 * See the note in the class desciption about output from
+	 * destructors.
+	 *
+	 * @access public
+	 * @return void
+	 */
+	function _PEAR() {
+		if ($this->_debug) {
+			printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
+		}
+	}
+
+	// }}}
+	// {{{ getStaticProperty()
+
+	/**
+	 * If you have a class that's mostly/entirely static, and you need static
+	 * properties, you can use this method to simulate them. Eg. in your method(s)
+	 * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
+	 * You MUST use a reference, or they will not persist!
+	 *
+	 * @access public
+	 * @param  string $class  The calling classname, to prevent clashes
+	 * @param  string $var    The variable to retrieve.
+	 * @return mixed   A reference to the variable. If not set it will be
+	 *                 auto initialised to NULL.
+	 */
+	function &getStaticProperty($class, $var)
+	{
+		static $properties;
+		if (!isset($properties[$class])) {
+			$properties[$class] = array();
+		}
+		if (!array_key_exists($var, $properties[$class])) {
+			$properties[$class][$var] = null;
+		}
+		return $properties[$class][$var];
+	}
+
+	// }}}
+	// {{{ registerShutdownFunc()
+
+	/**
+	 * Use this function to register a shutdown method for static
+	 * classes.
+	 *
+	 * @access public
+	 * @param  mixed $func  The function name (or array of class/method) to call
+	 * @param  mixed $args  The arguments to pass to the function
+	 * @return void
+	 */
+	function registerShutdownFunc($func, $args = array())
+	{
+		// if we are called statically, there is a potential
+		// that no shutdown func is registered.  Bug #6445
+		if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+			register_shutdown_function("_PEAR_call_destructors");
+			$GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+		}
+		$GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
+	}
+
+	// }}}
+	// {{{ isError()
+
+	/**
+	 * Tell whether a value is a PEAR error.
+	 *
+	 * @param   mixed $data   the value to test
+	 * @param   int   $code   if $data is an error object, return true
+	 *                        only if $code is a string and
+	 *                        $obj->getMessage() == $code or
+	 *                        $code is an integer and $obj->getCode() == $code
+	 * @access  public
+	 * @return  bool    true if parameter is an error
+	 */
+	function isError($data, $code = null)
+	{
+		if (is_a($data, 'PEAR_Error')) {
+			if (is_null($code)) {
+				return true;
+			} elseif (is_string($code)) {
+				return $data->getMessage() == $code;
+			} else {
+				return $data->getCode() == $code;
+			}
+		}
+		return false;
+	}
+
+	// }}}
+	// {{{ setErrorHandling()
+
+	/**
+	 * Sets how errors generated by this object should be handled.
+	 * Can be invoked both in objects and statically.  If called
+	 * statically, setErrorHandling sets the default behaviour for all
+	 * PEAR objects.  If called in an object, setErrorHandling sets
+	 * the default behaviour for that object.
+	 *
+	 * @param int $mode
+	 *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+	 *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+	 *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
+	 *
+	 * @param mixed $options
+	 *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
+	 *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+	 *
+	 *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
+	 *        to be the callback function or method.  A callback
+	 *        function is a string with the name of the function, a
+	 *        callback method is an array of two elements: the element
+	 *        at index 0 is the object, and the element at index 1 is
+	 *        the name of the method to call in the object.
+	 *
+	 *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
+	 *        a printf format string used when printing the error
+	 *        message.
+	 *
+	 * @access public
+	 * @return void
+	 * @see PEAR_ERROR_RETURN
+	 * @see PEAR_ERROR_PRINT
+	 * @see PEAR_ERROR_TRIGGER
+	 * @see PEAR_ERROR_DIE
+	 * @see PEAR_ERROR_CALLBACK
+	 * @see PEAR_ERROR_EXCEPTION
+	 *
+	 * @since PHP 4.0.5
+	 */
+
+	function setErrorHandling($mode = null, $options = null)
+	{
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$setmode     = &$this->_default_error_mode;
+			$setoptions  = &$this->_default_error_options;
+		} else {
+			$setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+			$setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+		}
+
+		switch ($mode) {
+			case PEAR_ERROR_EXCEPTION:
+			case PEAR_ERROR_RETURN:
+			case PEAR_ERROR_PRINT:
+			case PEAR_ERROR_TRIGGER:
+			case PEAR_ERROR_DIE:
+			case null:
+				$setmode = $mode;
+				$setoptions = $options;
+				break;
+
+			case PEAR_ERROR_CALLBACK:
+				$setmode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$setoptions = $options;
+				} else {
+					trigger_error("invalid error callback", E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error("invalid error mode", E_USER_WARNING);
+				break;
+		}
+	}
+
+	// }}}
+	// {{{ expectError()
+
+	/**
+	 * This method is used to tell which errors you expect to get.
+	 * Expected errors are always returned with error mode
+	 * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
+	 * and this method pushes a new element onto it.  The list of
+	 * expected errors are in effect until they are popped off the
+	 * stack with the popExpect() method.
+	 *
+	 * Note that this method can not be called statically
+	 *
+	 * @param mixed $code a single error code or an array of error codes to expect
+	 *
+	 * @return int     the new depth of the "expected errors" stack
+	 * @access public
+	 */
+	function expectError($code = '*')
+	{
+		if (is_array($code)) {
+			array_push($this->_expected_errors, $code);
+		} else {
+			array_push($this->_expected_errors, array($code));
+		}
+		return sizeof($this->_expected_errors);
+	}
+
+	// }}}
+	// {{{ popExpect()
+
+	/**
+	 * This method pops one element off the expected error codes
+	 * stack.
+	 *
+	 * @return array   the list of error codes that were popped
+	 */
+	function popExpect()
+	{
+		return array_pop($this->_expected_errors);
+	}
+
+	// }}}
+	// {{{ _checkDelExpect()
+
+	/**
+	 * This method checks unsets an error code if available
+	 *
+	 * @param mixed error code
+	 * @return bool true if the error code was unset, false otherwise
+	 * @access private
+	 * @since PHP 4.3.0
+	 */
+	function _checkDelExpect($error_code)
+	{
+		$deleted = false;
+
+		foreach ($this->_expected_errors AS $key => $error_array) {
+			if (in_array($error_code, $error_array)) {
+				unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
+				$deleted = true;
+			}
+
+			// clean up empty arrays
+			if (0 == count($this->_expected_errors[$key])) {
+				unset($this->_expected_errors[$key]);
+			}
+		}
+		return $deleted;
+	}
+
+	// }}}
+	// {{{ delExpect()
+
+	/**
+	 * This method deletes all occurences of the specified element from
+	 * the expected error codes stack.
+	 *
+	 * @param  mixed $error_code error code that should be deleted
+	 * @return mixed list of error codes that were deleted or error
+	 * @access public
+	 * @since PHP 4.3.0
+	 */
+	function delExpect($error_code)
+	{
+		$deleted = false;
+
+		if ((is_array($error_code) && (0 != count($error_code)))) {
+			// $error_code is a non-empty array here;
+			// we walk through it trying to unset all
+			// values
+			foreach($error_code as $key => $error) {
+				if ($this->_checkDelExpect($error)) {
+					$deleted =  true;
+				} else {
+					$deleted = false;
+				}
+			}
+			return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+		} elseif (!empty($error_code)) {
+			// $error_code comes alone, trying to unset it
+			if ($this->_checkDelExpect($error_code)) {
+				return true;
+			} else {
+				return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+			}
+		} else {
+			// $error_code is empty
+			return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
+		}
+	}
+
+	// }}}
+	// {{{ raiseError()
+
+	/**
+	 * This method is a wrapper that returns an instance of the
+	 * configured error class with this object's default error
+	 * handling applied.  If the $mode and $options parameters are not
+	 * specified, the object's defaults are used.
+	 *
+	 * @param mixed $message a text error message or a PEAR error object
+	 *
+	 * @param int $code      a numeric error code (it is up to your class
+	 *                  to define these if you want to use codes)
+	 *
+	 * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+	 *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+	 *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
+	 *
+	 * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
+	 *                  specifies the PHP-internal error level (one of
+	 *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+	 *                  If $mode is PEAR_ERROR_CALLBACK, this
+	 *                  parameter specifies the callback function or
+	 *                  method.  In other error modes this parameter
+	 *                  is ignored.
+	 *
+	 * @param string $userinfo If you need to pass along for example debug
+	 *                  information, this parameter is meant for that.
+	 *
+	 * @param string $error_class The returned error object will be
+	 *                  instantiated from this class, if specified.
+	 *
+	 * @param bool $skipmsg If true, raiseError will only pass error codes,
+	 *                  the error message parameter will be dropped.
+	 *
+	 * @access public
+	 * @return object   a PEAR error object
+	 * @see PEAR::setErrorHandling
+	 * @since PHP 4.0.5
+	 */
+	function &raiseError($message = null,
+						 $code = null,
+						 $mode = null,
+						 $options = null,
+						 $userinfo = null,
+						 $error_class = null,
+						 $skipmsg = false)
+	{
+		// The error is yet a PEAR error object
+		if (is_object($message)) {
+			$code        = $message->getCode();
+			$userinfo    = $message->getUserInfo();
+			$error_class = $message->getType();
+			$message->error_message_prefix = '';
+			$message     = $message->getMessage();
+		}
+
+		if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
+			if ($exp[0] == "*" ||
+				(is_int(reset($exp)) && in_array($code, $exp)) ||
+				(is_string(reset($exp)) && in_array($message, $exp))) {
+				$mode = PEAR_ERROR_RETURN;
+			}
+		}
+		// No mode given, try global ones
+		if ($mode === null) {
+			// Class error handler
+			if (isset($this) && isset($this->_default_error_mode)) {
+				$mode    = $this->_default_error_mode;
+				$options = $this->_default_error_options;
+			// Global error handler
+			} elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
+				$mode    = $GLOBALS['_PEAR_default_error_mode'];
+				$options = $GLOBALS['_PEAR_default_error_options'];
+			}
+		}
+
+		if ($error_class !== null) {
+			$ec = $error_class;
+		} elseif (isset($this) && isset($this->_error_class)) {
+			$ec = $this->_error_class;
+		} else {
+			$ec = 'PEAR_Error';
+		}
+		if ($skipmsg) {
+			$a = &new $ec($code, $mode, $options, $userinfo);
+			return $a;
+		} else {
+			$a = &new $ec($message, $code, $mode, $options, $userinfo);
+			return $a;
+		}
+	}
+
+	// }}}
+	// {{{ throwError()
+
+	/**
+	 * Simpler form of raiseError with fewer options.  In most cases
+	 * message, code and userinfo are enough.
+	 *
+	 * @param string $message
+	 *
+	 */
+	function &throwError($message = null,
+						 $code = null,
+						 $userinfo = null)
+	{
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$a = &$this->raiseError($message, $code, null, null, $userinfo);
+			return $a;
+		} else {
+			$a = &PEAR::raiseError($message, $code, null, null, $userinfo);
+			return $a;
+		}
+	}
+
+	// }}}
+	function staticPushErrorHandling($mode, $options = null)
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		$def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+		$def_options = &$GLOBALS['_PEAR_default_error_options'];
+		$stack[] = array($def_mode, $def_options);
+		switch ($mode) {
+			case PEAR_ERROR_EXCEPTION:
+			case PEAR_ERROR_RETURN:
+			case PEAR_ERROR_PRINT:
+			case PEAR_ERROR_TRIGGER:
+			case PEAR_ERROR_DIE:
+			case null:
+				$def_mode = $mode;
+				$def_options = $options;
+				break;
+
+			case PEAR_ERROR_CALLBACK:
+				$def_mode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$def_options = $options;
+				} else {
+					trigger_error("invalid error callback", E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error("invalid error mode", E_USER_WARNING);
+				break;
+		}
+		$stack[] = array($mode, $options);
+		return true;
+	}
+
+	function staticPopErrorHandling()
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		$setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+		$setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+		array_pop($stack);
+		list($mode, $options) = $stack[sizeof($stack) - 1];
+		array_pop($stack);
+		switch ($mode) {
+			case PEAR_ERROR_EXCEPTION:
+			case PEAR_ERROR_RETURN:
+			case PEAR_ERROR_PRINT:
+			case PEAR_ERROR_TRIGGER:
+			case PEAR_ERROR_DIE:
+			case null:
+				$setmode = $mode;
+				$setoptions = $options;
+				break;
+
+			case PEAR_ERROR_CALLBACK:
+				$setmode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$setoptions = $options;
+				} else {
+					trigger_error("invalid error callback", E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error("invalid error mode", E_USER_WARNING);
+				break;
+		}
+		return true;
+	}
+
+	// {{{ pushErrorHandling()
+
+	/**
+	 * Push a new error handler on top of the error handler options stack. With this
+	 * you can easily override the actual error handler for some code and restore
+	 * it later with popErrorHandling.
+	 *
+	 * @param mixed $mode (same as setErrorHandling)
+	 * @param mixed $options (same as setErrorHandling)
+	 *
+	 * @return bool Always true
+	 *
+	 * @see PEAR::setErrorHandling
+	 */
+	function pushErrorHandling($mode, $options = null)
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$def_mode    = &$this->_default_error_mode;
+			$def_options = &$this->_default_error_options;
+		} else {
+			$def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+			$def_options = &$GLOBALS['_PEAR_default_error_options'];
+		}
+		$stack[] = array($def_mode, $def_options);
+
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$this->setErrorHandling($mode, $options);
+		} else {
+			PEAR::setErrorHandling($mode, $options);
+		}
+		$stack[] = array($mode, $options);
+		return true;
+	}
+
+	// }}}
+	// {{{ popErrorHandling()
+
+	/**
+	 * Pop the last error handler used
+	 *
+	 * @return bool Always true
+	 *
+	 * @see PEAR::pushErrorHandling
+	 */
+	function popErrorHandling()
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		array_pop($stack);
+		list($mode, $options) = $stack[sizeof($stack) - 1];
+		array_pop($stack);
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$this->setErrorHandling($mode, $options);
+		} else {
+			PEAR::setErrorHandling($mode, $options);
+		}
+		return true;
+	}
+
+	// }}}
+	// {{{ loadExtension()
+
+	/**
+	 * OS independant PHP extension load. Remember to take care
+	 * on the correct extension name for case sensitive OSes.
+	 *
+	 * @param string $ext The extension name
+	 * @return bool Success or not on the dl() call
+	 */
+	function loadExtension($ext)
+	{
+		if (!extension_loaded($ext)) {
+			// if either returns true dl() will produce a FATAL error, stop that
+			if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+				return false;
+			}
+			if (OS_WINDOWS) {
+				$suffix = '.dll';
+			} elseif (PHP_OS == 'HP-UX') {
+				$suffix = '.sl';
+			} elseif (PHP_OS == 'AIX') {
+				$suffix = '.a';
+			} elseif (PHP_OS == 'OSX') {
+				$suffix = '.bundle';
+			} else {
+				$suffix = '.so';
+			}
+			return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+		}
+		return true;
+	}
+
+	// }}}
 }
 
 // {{{ _PEAR_call_destructors()
 
 function _PEAR_call_destructors()
 {
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (PEAR::getStaticProperty('PEAR', 'destructlifo')) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
+	global $_PEAR_destructor_object_list;
+	if (is_array($_PEAR_destructor_object_list) &&
+		sizeof($_PEAR_destructor_object_list))
+	{
+		reset($_PEAR_destructor_object_list);
+		if (PEAR::getStaticProperty('PEAR', 'destructlifo')) {
+			$_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
+		}
+		while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
+			$classname = get_class($objref);
+			while ($classname) {
+				$destructor = "_$classname";
+				if (method_exists($objref, $destructor)) {
+					$objref->$destructor();
+					break;
+				} else {
+					$classname = get_parent_class($classname);
+				}
+			}
+		}
+		// Empty the object list to ensure that destructors are
+		// not called more than once.
+		$_PEAR_destructor_object_list = array();
+	}
+
+	// Now call the shutdown functions
+	if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+		foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
+			call_user_func_array($value[0], $value[1]);
+		}
+	}
 }
 
 // }}}
@@ -821,281 +821,281 @@ 
  */
 class PEAR_Error
 {
-    // {{{ properties
-
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-        if (!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
-            $this->backtrace = debug_backtrace();
-            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
-                unset($this->backtrace[0]['object']);
-            }
-        }
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-            $this->level = $options;
-            $this->callback = null;
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-            printf($format, $this->getMessage());
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode() {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback() {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString() {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-
-    // }}}
+	// {{{ properties
+
+	var $error_message_prefix = '';
+	var $mode                 = PEAR_ERROR_RETURN;
+	var $level                = E_USER_NOTICE;
+	var $code                 = -1;
+	var $message              = '';
+	var $userinfo             = '';
+	var $backtrace            = null;
+
+	// }}}
+	// {{{ constructor
+
+	/**
+	 * PEAR_Error constructor
+	 *
+	 * @param string $message  message
+	 *
+	 * @param int $code     (optional) error code
+	 *
+	 * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
+	 * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
+	 * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
+	 *
+	 * @param mixed $options   (optional) error level, _OR_ in the case of
+	 * PEAR_ERROR_CALLBACK, the callback function or object/method
+	 * tuple.
+	 *
+	 * @param string $userinfo (optional) additional user/debug info
+	 *
+	 * @access public
+	 *
+	 */
+	function PEAR_Error($message = 'unknown error', $code = null,
+						$mode = null, $options = null, $userinfo = null)
+	{
+		if ($mode === null) {
+			$mode = PEAR_ERROR_RETURN;
+		}
+		$this->message   = $message;
+		$this->code      = $code;
+		$this->mode      = $mode;
+		$this->userinfo  = $userinfo;
+		if (!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
+			$this->backtrace = debug_backtrace();
+			if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
+				unset($this->backtrace[0]['object']);
+			}
+		}
+		if ($mode & PEAR_ERROR_CALLBACK) {
+			$this->level = E_USER_NOTICE;
+			$this->callback = $options;
+		} else {
+			if ($options === null) {
+				$options = E_USER_NOTICE;
+			}
+			$this->level = $options;
+			$this->callback = null;
+		}
+		if ($this->mode & PEAR_ERROR_PRINT) {
+			if (is_null($options) || is_int($options)) {
+				$format = "%s";
+			} else {
+				$format = $options;
+			}
+			printf($format, $this->getMessage());
+		}
+		if ($this->mode & PEAR_ERROR_TRIGGER) {
+			trigger_error($this->getMessage(), $this->level);
+		}
+		if ($this->mode & PEAR_ERROR_DIE) {
+			$msg = $this->getMessage();
+			if (is_null($options) || is_int($options)) {
+				$format = "%s";
+				if (substr($msg, -1) != "\n") {
+					$msg .= "\n";
+				}
+			} else {
+				$format = $options;
+			}
+			die(sprintf($format, $msg));
+		}
+		if ($this->mode & PEAR_ERROR_CALLBACK) {
+			if (is_callable($this->callback)) {
+				call_user_func($this->callback, $this);
+			}
+		}
+		if ($this->mode & PEAR_ERROR_EXCEPTION) {
+			trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
+			eval('$e = new Exception($this->message, $this->code);throw($e);');
+		}
+	}
+
+	// }}}
+	// {{{ getMode()
+
+	/**
+	 * Get the error mode from an error object.
+	 *
+	 * @return int error mode
+	 * @access public
+	 */
+	function getMode() {
+		return $this->mode;
+	}
+
+	// }}}
+	// {{{ getCallback()
+
+	/**
+	 * Get the callback function/method from an error object.
+	 *
+	 * @return mixed callback function or object/method array
+	 * @access public
+	 */
+	function getCallback() {
+		return $this->callback;
+	}
+
+	// }}}
+	// {{{ getMessage()
+
+
+	/**
+	 * Get the error message from an error object.
+	 *
+	 * @return  string  full error message
+	 * @access public
+	 */
+	function getMessage()
+	{
+		return ($this->error_message_prefix . $this->message);
+	}
+
+
+	// }}}
+	// {{{ getCode()
+
+	/**
+	 * Get error code from an error object
+	 *
+	 * @return int error code
+	 * @access public
+	 */
+	 function getCode()
+	 {
+		return $this->code;
+	 }
+
+	// }}}
+	// {{{ getType()
+
+	/**
+	 * Get the name of this error/exception.
+	 *
+	 * @return string error/exception name (type)
+	 * @access public
+	 */
+	function getType()
+	{
+		return get_class($this);
+	}
+
+	// }}}
+	// {{{ getUserInfo()
+
+	/**
+	 * Get additional user-supplied information.
+	 *
+	 * @return string user-supplied information
+	 * @access public
+	 */
+	function getUserInfo()
+	{
+		return $this->userinfo;
+	}
+
+	// }}}
+	// {{{ getDebugInfo()
+
+	/**
+	 * Get additional debug information supplied by the application.
+	 *
+	 * @return string debug information
+	 * @access public
+	 */
+	function getDebugInfo()
+	{
+		return $this->getUserInfo();
+	}
+
+	// }}}
+	// {{{ getBacktrace()
+
+	/**
+	 * Get the call backtrace from where the error was generated.
+	 * Supported with PHP 4.3.0 or newer.
+	 *
+	 * @param int $frame (optional) what frame to fetch
+	 * @return array Backtrace, or NULL if not available.
+	 * @access public
+	 */
+	function getBacktrace($frame = null)
+	{
+		if (defined('PEAR_IGNORE_BACKTRACE')) {
+			return null;
+		}
+		if ($frame === null) {
+			return $this->backtrace;
+		}
+		return $this->backtrace[$frame];
+	}
+
+	// }}}
+	// {{{ addUserInfo()
+
+	function addUserInfo($info)
+	{
+		if (empty($this->userinfo)) {
+			$this->userinfo = $info;
+		} else {
+			$this->userinfo .= " ** $info";
+		}
+	}
+
+	// }}}
+	// {{{ toString()
+
+	/**
+	 * Make a string representation of this object.
+	 *
+	 * @return string a string with an object summary
+	 * @access public
+	 */
+	function toString() {
+		$modes = array();
+		$levels = array(E_USER_NOTICE  => 'notice',
+						E_USER_WARNING => 'warning',
+						E_USER_ERROR   => 'error');
+		if ($this->mode & PEAR_ERROR_CALLBACK) {
+			if (is_array($this->callback)) {
+				$callback = (is_object($this->callback[0]) ?
+					strtolower(get_class($this->callback[0])) :
+					$this->callback[0]) . '::' .
+					$this->callback[1];
+			} else {
+				$callback = $this->callback;
+			}
+			return sprintf('[%s: message="%s" code=%d mode=callback '.
+						   'callback=%s prefix="%s" info="%s"]',
+						   strtolower(get_class($this)), $this->message, $this->code,
+						   $callback, $this->error_message_prefix,
+						   $this->userinfo);
+		}
+		if ($this->mode & PEAR_ERROR_PRINT) {
+			$modes[] = 'print';
+		}
+		if ($this->mode & PEAR_ERROR_TRIGGER) {
+			$modes[] = 'trigger';
+		}
+		if ($this->mode & PEAR_ERROR_DIE) {
+			$modes[] = 'die';
+		}
+		if ($this->mode & PEAR_ERROR_RETURN) {
+			$modes[] = 'return';
+		}
+		return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+					   'prefix="%s" info="%s"]',
+					   strtolower(get_class($this)), $this->message, $this->code,
+					   implode("|", $modes), $levels[$this->level],
+					   $this->error_message_prefix,
+					   $this->userinfo);
+	}
+
+	// }}}
 }
 
 /*

libs/idna_convert/example.php

Indentation +9 added lines, -9 removed lines

@@ -8,24 +8,24 @@
 
 $version_select = '<select size="1" name="idn_version"><option value="2003">IDNA 2003</option><option value="2008"';
 if ($idn_version == 2008) {
-    $version_select .= ' selected="selected"';
+	$version_select .= ' selected="selected"';
 }
 $version_select .= '>IDNA 2008</option></select>';
 
 if (isset($_REQUEST['encode'])) {
-    $decoded = isset($_REQUEST['decoded']) ? stripslashes($_REQUEST['decoded']) : '';
-    $encoded = $IDN->encode($decoded);
+	$decoded = isset($_REQUEST['decoded']) ? stripslashes($_REQUEST['decoded']) : '';
+	$encoded = $IDN->encode($decoded);
 }
 if (isset($_REQUEST['decode'])) {
-    $encoded = isset($_REQUEST['encoded']) ? stripslashes($_REQUEST['encoded']) : '';
-    $decoded = $IDN->decode($encoded);
+	$encoded = isset($_REQUEST['encoded']) ? stripslashes($_REQUEST['encoded']) : '';
+	$decoded = $IDN->decode($encoded);
 }
 $lang = 'en';
 if (isset($_REQUEST['lang'])) {
-    if ('de' == $_REQUEST['lang'] || 'en' == $_REQUEST['lang']) {
-        $lang = $_REQUEST['lang'];
-        $add .= '<input type="hidden" name="lang" value="'.$lang.'" />'."\n";
-    }
+	if ('de' == $_REQUEST['lang'] || 'en' == $_REQUEST['lang']) {
+		$lang = $_REQUEST['lang'];
+		$add .= '<input type="hidden" name="lang" value="'.$lang.'" />'."\n";
+	}
 }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 if (isset($_REQUEST['lang'])) {
     if ('de' == $_REQUEST['lang'] || 'en' == $_REQUEST['lang']) {
         $lang = $_REQUEST['lang'];
-        $add .= '<input type="hidden" name="lang" value="'.$lang.'" />'."\n";
+        $add .= '<input type="hidden" name="lang" value="' . $lang . '" />' . "\n";
     }
 }
 ?>

libs/idna_convert/transcode_wrapper.php

Indentation +85 added lines, -85 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * transcode wrapper functions
- * @package IDNA Convert
- * @subpackage charset transcoding
- * @author Matthias Sommerfeld, <mso@phlylabs.de>
- * @version 0.1.0
- */
+	 * transcode wrapper functions
+	 * @package IDNA Convert
+	 * @subpackage charset transcoding
+	 * @author Matthias Sommerfeld, <mso@phlylabs.de>
+	 * @version 0.1.0
+	 */
 
 /**
  * Convert a string from any of various encodings to UTF-8
@@ -18,29 +18,29 @@ 
  */
 function encode_utf8($string = '', $encoding = 'iso-8859-1', $safe_mode = false)
 {
-    $safe = ($safe_mode) ? $string : false;
-    if (strtoupper($encoding) == 'UTF-8' || strtoupper($encoding) == 'UTF8') {
-        return $string;
-    } elseif (strtoupper($encoding) == 'ISO-8859-1') {
-        return utf8_encode($string);
-    } elseif (strtoupper($encoding) == 'WINDOWS-1252') {
-        return utf8_encode(map_w1252_iso8859_1($string));
-    } elseif (strtoupper($encoding) == 'UNICODE-1-1-UTF-7') {
-        $encoding = 'utf-7';
-    }
-    if (function_exists('mb_convert_encoding')) {
-        $conv = @mb_convert_encoding($string, 'UTF-8', strtoupper($encoding));
-        if ($conv) return $conv;
-    }
-    if (function_exists('iconv')) {
-        $conv = @iconv(strtoupper($encoding), 'UTF-8', $string);
-        if ($conv) return $conv;
-    }
-    if (function_exists('libiconv')) {
-        $conv = @libiconv(strtoupper($encoding), 'UTF-8', $string);
-        if ($conv) return $conv;
-    }
-    return $safe;
+	$safe = ($safe_mode) ? $string : false;
+	if (strtoupper($encoding) == 'UTF-8' || strtoupper($encoding) == 'UTF8') {
+		return $string;
+	} elseif (strtoupper($encoding) == 'ISO-8859-1') {
+		return utf8_encode($string);
+	} elseif (strtoupper($encoding) == 'WINDOWS-1252') {
+		return utf8_encode(map_w1252_iso8859_1($string));
+	} elseif (strtoupper($encoding) == 'UNICODE-1-1-UTF-7') {
+		$encoding = 'utf-7';
+	}
+	if (function_exists('mb_convert_encoding')) {
+		$conv = @mb_convert_encoding($string, 'UTF-8', strtoupper($encoding));
+		if ($conv) return $conv;
+	}
+	if (function_exists('iconv')) {
+		$conv = @iconv(strtoupper($encoding), 'UTF-8', $string);
+		if ($conv) return $conv;
+	}
+	if (function_exists('libiconv')) {
+		$conv = @libiconv(strtoupper($encoding), 'UTF-8', $string);
+		if ($conv) return $conv;
+	}
+	return $safe;
 }
 
 /**
@@ -54,30 +54,30 @@ 
  */
 function decode_utf8($string = '', $encoding = 'iso-8859-1', $safe_mode = false)
 {
-    $safe = ($safe_mode) ? $string : false;
-    if (!$encoding) $encoding = 'ISO-8859-1';
-    if (strtoupper($encoding) == 'UTF-8' || strtoupper($encoding) == 'UTF8') {
-        return $string;
-    } elseif (strtoupper($encoding) == 'ISO-8859-1') {
-        return utf8_decode($string);
-    } elseif (strtoupper($encoding) == 'WINDOWS-1252') {
-        return map_iso8859_1_w1252(utf8_decode($string));
-    } elseif (strtoupper($encoding) == 'UNICODE-1-1-UTF-7') {
-        $encoding = 'utf-7';
-    }
-    if (function_exists('mb_convert_encoding')) {
-        $conv = @mb_convert_encoding($string, strtoupper($encoding), 'UTF-8');
-        if ($conv) return $conv;
-    }
-    if (function_exists('iconv')) {
-        $conv = @iconv('UTF-8', strtoupper($encoding), $string);
-        if ($conv) return $conv;
-    }
-    if (function_exists('libiconv')) {
-        $conv = @libiconv('UTF-8', strtoupper($encoding), $string);
-        if ($conv) return $conv;
-    }
-    return $safe;
+	$safe = ($safe_mode) ? $string : false;
+	if (!$encoding) $encoding = 'ISO-8859-1';
+	if (strtoupper($encoding) == 'UTF-8' || strtoupper($encoding) == 'UTF8') {
+		return $string;
+	} elseif (strtoupper($encoding) == 'ISO-8859-1') {
+		return utf8_decode($string);
+	} elseif (strtoupper($encoding) == 'WINDOWS-1252') {
+		return map_iso8859_1_w1252(utf8_decode($string));
+	} elseif (strtoupper($encoding) == 'UNICODE-1-1-UTF-7') {
+		$encoding = 'utf-7';
+	}
+	if (function_exists('mb_convert_encoding')) {
+		$conv = @mb_convert_encoding($string, strtoupper($encoding), 'UTF-8');
+		if ($conv) return $conv;
+	}
+	if (function_exists('iconv')) {
+		$conv = @iconv('UTF-8', strtoupper($encoding), $string);
+		if ($conv) return $conv;
+	}
+	if (function_exists('libiconv')) {
+		$conv = @libiconv('UTF-8', strtoupper($encoding), $string);
+		if ($conv) return $conv;
+	}
+	return $safe;
 }
 
 /**
@@ -89,22 +89,22 @@ 
  */
 function map_w1252_iso8859_1($string = '')
 {
-    if ($string == '') return '';
-    $return = '';
-    for ($i = 0; $i < strlen($string); ++$i) {
-        $c = ord($string{$i});
-        switch ($c) {
-            case 129: $return .= chr(252); break;
-            case 132: $return .= chr(228); break;
-            case 142: $return .= chr(196); break;
-            case 148: $return .= chr(246); break;
-            case 153: $return .= chr(214); break;
-            case 154: $return .= chr(220); break;
-            case 225: $return .= chr(223); break;
-            default: $return .= chr($c); break;
-        }
-    }
-    return $return;
+	if ($string == '') return '';
+	$return = '';
+	for ($i = 0; $i < strlen($string); ++$i) {
+		$c = ord($string{$i});
+		switch ($c) {
+			case 129: $return .= chr(252); break;
+			case 132: $return .= chr(228); break;
+			case 142: $return .= chr(196); break;
+			case 148: $return .= chr(246); break;
+			case 153: $return .= chr(214); break;
+			case 154: $return .= chr(220); break;
+			case 225: $return .= chr(223); break;
+			default: $return .= chr($c); break;
+		}
+	}
+	return $return;
 }
 
 /**
@@ -116,22 +116,22 @@ 
  */
 function map_iso8859_1_w1252($string = '')
 {
-    if ($string == '') return '';
-    $return = '';
-    for ($i = 0; $i < strlen($string); ++$i) {
-        $c = ord($string{$i});
-        switch ($c) {
-            case 196: $return .= chr(142); break;
-            case 214: $return .= chr(153); break;
-            case 220: $return .= chr(154); break;
-            case 223: $return .= chr(225); break;
-            case 228: $return .= chr(132); break;
-            case 246: $return .= chr(148); break;
-            case 252: $return .= chr(129); break;
-            default: $return .= chr($c); break;
-        }
-    }
-    return $return;
+	if ($string == '') return '';
+	$return = '';
+	for ($i = 0; $i < strlen($string); ++$i) {
+		$c = ord($string{$i});
+		switch ($c) {
+			case 196: $return .= chr(142); break;
+			case 214: $return .= chr(153); break;
+			case 220: $return .= chr(154); break;
+			case 223: $return .= chr(225); break;
+			case 228: $return .= chr(132); break;
+			case 246: $return .= chr(148); break;
+			case 252: $return .= chr(129); break;
+			default: $return .= chr($c); break;
+		}
+	}
+	return $return;
 }
 
 ?>
\ No newline at end of file

Braces +27 added lines, -9 removed lines

@@ -30,15 +30,21 @@ 
     }
     if (function_exists('mb_convert_encoding')) {
         $conv = @mb_convert_encoding($string, 'UTF-8', strtoupper($encoding));
-        if ($conv) return $conv;
+        if ($conv) {
+        	return $conv;
+        }
     }
     if (function_exists('iconv')) {
         $conv = @iconv(strtoupper($encoding), 'UTF-8', $string);
-        if ($conv) return $conv;
+        if ($conv) {
+        	return $conv;
+        }
     }
     if (function_exists('libiconv')) {
         $conv = @libiconv(strtoupper($encoding), 'UTF-8', $string);
-        if ($conv) return $conv;
+        if ($conv) {
+        	return $conv;
+        }
     }
     return $safe;
 }
@@ -55,7 +61,9 @@ 
 function decode_utf8($string = '', $encoding = 'iso-8859-1', $safe_mode = false)
 {
     $safe = ($safe_mode) ? $string : false;
-    if (!$encoding) $encoding = 'ISO-8859-1';
+    if (!$encoding) {
+    	$encoding = 'ISO-8859-1';
+    }
     if (strtoupper($encoding) == 'UTF-8' || strtoupper($encoding) == 'UTF8') {
         return $string;
     } elseif (strtoupper($encoding) == 'ISO-8859-1') {
@@ -67,15 +75,21 @@ 
     }
     if (function_exists('mb_convert_encoding')) {
         $conv = @mb_convert_encoding($string, strtoupper($encoding), 'UTF-8');
-        if ($conv) return $conv;
+        if ($conv) {
+        	return $conv;
+        }
     }
     if (function_exists('iconv')) {
         $conv = @iconv('UTF-8', strtoupper($encoding), $string);
-        if ($conv) return $conv;
+        if ($conv) {
+        	return $conv;
+        }
     }
     if (function_exists('libiconv')) {
         $conv = @libiconv('UTF-8', strtoupper($encoding), $string);
-        if ($conv) return $conv;
+        if ($conv) {
+        	return $conv;
+        }
     }
     return $safe;
 }
@@ -89,7 +103,9 @@ 
  */
 function map_w1252_iso8859_1($string = '')
 {
-    if ($string == '') return '';
+    if ($string == '') {
+    	return '';
+    }
     $return = '';
     for ($i = 0; $i < strlen($string); ++$i) {
         $c = ord($string{$i});
@@ -116,7 +132,9 @@ 
  */
 function map_iso8859_1_w1252($string = '')
 {
-    if ($string == '') return '';
+    if ($string == '') {
+    	return '';
+    }
     $return = '';
     for ($i = 0; $i < strlen($string); ++$i) {
         $c = ord($string{$i});

libs/idna_convert/uctc.php

Indentation +266 added lines, -266 removed lines

@@ -16,285 +16,285 @@
  * @version 0.0.6 2009-05-10
  */
 class uctc {
-    private static $mechs = array('ucs4', /*'ucs4le', 'ucs4be', */'ucs4array', /*'utf16', 'utf16le', 'utf16be', */'utf8', 'utf7', 'utf7imap');
-    private static $allow_overlong = false;
-    private static $safe_mode;
-    private static $safe_char;
+	private static $mechs = array('ucs4', /*'ucs4le', 'ucs4be', */'ucs4array', /*'utf16', 'utf16le', 'utf16be', */'utf8', 'utf7', 'utf7imap');
+	private static $allow_overlong = false;
+	private static $safe_mode;
+	private static $safe_char;
 
-    /**
-     * The actual conversion routine
-     *
-     * @param mixed $data  The data to convert, usually a string, array when converting from UCS-4 array
-     * @param string $from  Original encoding of the data
-     * @param string $to  Target encoding of the data
-     * @param bool $safe_mode  SafeMode tries to correct invalid codepoints
-     * @return mixed  False on failure, String or array on success, depending on target encoding
-     * @access public
-     * @since 0.0.1
-     */
-    public static function convert($data, $from, $to, $safe_mode = false, $safe_char = 0xFFFC)
-    {
-        self::$safe_mode = ($safe_mode) ? true : false;
-        self::$safe_char = ($safe_char) ? $safe_char : 0xFFFC;
-        if (self::$safe_mode) self::$allow_overlong = true;
-        if (!in_array($from, self::$mechs)) throw new Exception('Invalid input format specified');
-        if (!in_array($to, self::$mechs)) throw new Exception('Invalid output format specified');
-        if ($from != 'ucs4array') eval('$data = self::'.$from.'_ucs4array($data);');
-        if ($to != 'ucs4array') eval('$data = self::ucs4array_'.$to.'($data);');
-        return $data;
-    }
+	/**
+	 * The actual conversion routine
+	 *
+	 * @param mixed $data  The data to convert, usually a string, array when converting from UCS-4 array
+	 * @param string $from  Original encoding of the data
+	 * @param string $to  Target encoding of the data
+	 * @param bool $safe_mode  SafeMode tries to correct invalid codepoints
+	 * @return mixed  False on failure, String or array on success, depending on target encoding
+	 * @access public
+	 * @since 0.0.1
+	 */
+	public static function convert($data, $from, $to, $safe_mode = false, $safe_char = 0xFFFC)
+	{
+		self::$safe_mode = ($safe_mode) ? true : false;
+		self::$safe_char = ($safe_char) ? $safe_char : 0xFFFC;
+		if (self::$safe_mode) self::$allow_overlong = true;
+		if (!in_array($from, self::$mechs)) throw new Exception('Invalid input format specified');
+		if (!in_array($to, self::$mechs)) throw new Exception('Invalid output format specified');
+		if ($from != 'ucs4array') eval('$data = self::'.$from.'_ucs4array($data);');
+		if ($to != 'ucs4array') eval('$data = self::ucs4array_'.$to.'($data);');
+		return $data;
+	}
 
-    /**
-     * This converts an UTF-8 encoded string to its UCS-4 representation
-     *
-     * @param string $input  The UTF-8 string to convert
-     * @return array  Array of 32bit values representing each codepoint
-     * @access private
-     */
-    private static function utf8_ucs4array($input)
-    {
-        $output = array();
-        $out_len = 0;
-        $inp_len = strlen($input);
-        $mode = 'next';
-        $test = 'none';
-        for ($k = 0; $k < $inp_len; ++$k) {
-            $v = ord($input{$k}); // Extract byte from input string
+	/**
+	 * This converts an UTF-8 encoded string to its UCS-4 representation
+	 *
+	 * @param string $input  The UTF-8 string to convert
+	 * @return array  Array of 32bit values representing each codepoint
+	 * @access private
+	 */
+	private static function utf8_ucs4array($input)
+	{
+		$output = array();
+		$out_len = 0;
+		$inp_len = strlen($input);
+		$mode = 'next';
+		$test = 'none';
+		for ($k = 0; $k < $inp_len; ++$k) {
+			$v = ord($input{$k}); // Extract byte from input string
 
-            if ($v < 128) { // We found an ASCII char - put into stirng as is
-                $output[$out_len] = $v;
-                ++$out_len;
-                if ('add' == $mode) {
-                    if (self::$safe_mode) {
-                        $output[$out_len-2] = self::$safe_char;
-                        $mode = 'next';
-                    } else {
-                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
-                    }
-                }
-                continue;
-            }
-            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
-                $start_byte = $v;
-                $mode = 'add';
-                $test = 'range';
-                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
-                    $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
-                    $v = ($v - 192) << 6;
-                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 1;
-                    $v = ($v - 224) << 12;
-                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 2;
-                    $v = ($v - 240) << 18;
-                } elseif (self::$safe_mode) {
-                    $mode = 'next';
-                    $output[$out_len] = self::$safe_char;
-                    ++$out_len;
-                    continue;
-                } else {
-                    throw new Exception('This might be UTF-8, but I don\'t understand it at byte '.$k);
-                }
-                if ($inp_len-$k-$next_byte < 2) {
-                    $output[$out_len] = self::$safe_char;
-                    $mode = 'no';
-                    continue;
-                }
+			if ($v < 128) { // We found an ASCII char - put into stirng as is
+				$output[$out_len] = $v;
+				++$out_len;
+				if ('add' == $mode) {
+					if (self::$safe_mode) {
+						$output[$out_len-2] = self::$safe_char;
+						$mode = 'next';
+					} else {
+						throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+					}
+				}
+				continue;
+			}
+			if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+				$start_byte = $v;
+				$mode = 'add';
+				$test = 'range';
+				if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+					$next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
+					$v = ($v - 192) << 6;
+				} elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+					$next_byte = 1;
+					$v = ($v - 224) << 12;
+				} elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+					$next_byte = 2;
+					$v = ($v - 240) << 18;
+				} elseif (self::$safe_mode) {
+					$mode = 'next';
+					$output[$out_len] = self::$safe_char;
+					++$out_len;
+					continue;
+				} else {
+					throw new Exception('This might be UTF-8, but I don\'t understand it at byte '.$k);
+				}
+				if ($inp_len-$k-$next_byte < 2) {
+					$output[$out_len] = self::$safe_char;
+					$mode = 'no';
+					continue;
+				}
 
-                if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
-                    ++$out_len;
-                    continue;
-                }
-            }
-            if ('add' == $mode) {
-                if (!self::$allow_overlong && $test == 'range') {
-                    $test = 'none';
-                    if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
-                        throw new Exception('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
-                    }
-                }
-                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
-                    $v = ($v-128) << ($next_byte*6);
-                    $output[($out_len-1)] += $v;
-                    --$next_byte;
-                } else {
-                    if (self::$safe_mode) {
-                        $output[$out_len-1] = ord(self::$safe_char);
-                        $k--;
-                        $mode = 'next';
-                        continue;
-                    } else {
-                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
-                    }
-                }
-                if ($next_byte < 0) {
-                    $mode = 'next';
-                }
-            }
-        } // for
-        return $output;
-    }
+				if ('add' == $mode) {
+					$output[$out_len] = (int) $v;
+					++$out_len;
+					continue;
+				}
+			}
+			if ('add' == $mode) {
+				if (!self::$allow_overlong && $test == 'range') {
+					$test = 'none';
+					if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
+						throw new Exception('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+					}
+				}
+				if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+					$v = ($v-128) << ($next_byte*6);
+					$output[($out_len-1)] += $v;
+					--$next_byte;
+				} else {
+					if (self::$safe_mode) {
+						$output[$out_len-1] = ord(self::$safe_char);
+						$k--;
+						$mode = 'next';
+						continue;
+					} else {
+						throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+					}
+				}
+				if ($next_byte < 0) {
+					$mode = 'next';
+				}
+			}
+		} // for
+		return $output;
+	}
 
-    /**
-     * Convert UCS-4 string into UTF-8 string
-     * See utf8_ucs4array() for details
-     * @access   private
-     */
-    private static function ucs4array_utf8($input)
-    {
-        $output = '';
-        foreach ($input as $v) {
-            if ($v < 128) { // 7bit are transferred literally
-                $output .= chr($v);
-            } elseif ($v < (1 << 11)) { // 2 bytes
-                $output .= chr(192+($v >> 6)).chr(128+($v & 63));
-            } elseif ($v < (1 << 16)) { // 3 bytes
-                $output .= chr(224+($v >> 12)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
-            } elseif ($v < (1 << 21)) { // 4 bytes
-                $output .= chr(240+($v >> 18)).chr(128+(($v >> 12) & 63)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
-            } elseif (self::$safe_mode) {
-                $output .= self::$safe_char;
-            } else {
-                throw new Exception('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
-            }
-        }
-        return $output;
-    }
+	/**
+	 * Convert UCS-4 string into UTF-8 string
+	 * See utf8_ucs4array() for details
+	 * @access   private
+	 */
+	private static function ucs4array_utf8($input)
+	{
+		$output = '';
+		foreach ($input as $v) {
+			if ($v < 128) { // 7bit are transferred literally
+				$output .= chr($v);
+			} elseif ($v < (1 << 11)) { // 2 bytes
+				$output .= chr(192+($v >> 6)).chr(128+($v & 63));
+			} elseif ($v < (1 << 16)) { // 3 bytes
+				$output .= chr(224+($v >> 12)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+			} elseif ($v < (1 << 21)) { // 4 bytes
+				$output .= chr(240+($v >> 18)).chr(128+(($v >> 12) & 63)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+			} elseif (self::$safe_mode) {
+				$output .= self::$safe_char;
+			} else {
+				throw new Exception('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
+			}
+		}
+		return $output;
+	}
 
-    private static function utf7imap_ucs4array($input)
-    {
-        return self::utf7_ucs4array(str_replace(',', '/', $input), '&');
-    }
+	private static function utf7imap_ucs4array($input)
+	{
+		return self::utf7_ucs4array(str_replace(',', '/', $input), '&');
+	}
 
-    private static function utf7_ucs4array($input, $sc = '+')
-    {
-        $output  = array();
-        $out_len = 0;
-        $inp_len = strlen($input);
-        $mode    = 'd';
-        $b64     = '';
+	private static function utf7_ucs4array($input, $sc = '+')
+	{
+		$output  = array();
+		$out_len = 0;
+		$inp_len = strlen($input);
+		$mode    = 'd';
+		$b64     = '';
 
-        for ($k = 0; $k < $inp_len; ++$k) {
-            $c = $input{$k};
-            if (0 == ord($c)) continue; // Ignore zero bytes
-            if ('b' == $mode) {
-                // Sequence got terminated
-                if (!preg_match('![A-Za-z0-9/'.preg_quote($sc, '!').']!', $c)) {
-                    if ('-' == $c) {
-                        if ($b64 == '') {
-                            $output[$out_len] = ord($sc);
-                            $out_len++;
-                            $mode = 'd';
-                            continue;
-                        }
-                    }
-                    $tmp = base64_decode($b64);
-                    $tmp = substr($tmp, -1 * (strlen($tmp) % 2));
-                    for ($i = 0; $i < strlen($tmp); $i++) {
-                        if ($i % 2) {
-                            $output[$out_len] += ord($tmp{$i});
-                            $out_len++;
-                        } else {
-                            $output[$out_len] = ord($tmp{$i}) << 8;
-                        }
-                    }
-                    $mode = 'd';
-                    $b64 = '';
-                    continue;
-                } else {
-                    $b64 .= $c;
-                }
-            }
-            if ('d' == $mode) {
-                if ($sc == $c) {
-                    $mode = 'b';
-                    continue;
-                }
-                $output[$out_len] = ord($c);
-                $out_len++;
-            }
-        }
-        return $output;
-    }
+		for ($k = 0; $k < $inp_len; ++$k) {
+			$c = $input{$k};
+			if (0 == ord($c)) continue; // Ignore zero bytes
+			if ('b' == $mode) {
+				// Sequence got terminated
+				if (!preg_match('![A-Za-z0-9/'.preg_quote($sc, '!').']!', $c)) {
+					if ('-' == $c) {
+						if ($b64 == '') {
+							$output[$out_len] = ord($sc);
+							$out_len++;
+							$mode = 'd';
+							continue;
+						}
+					}
+					$tmp = base64_decode($b64);
+					$tmp = substr($tmp, -1 * (strlen($tmp) % 2));
+					for ($i = 0; $i < strlen($tmp); $i++) {
+						if ($i % 2) {
+							$output[$out_len] += ord($tmp{$i});
+							$out_len++;
+						} else {
+							$output[$out_len] = ord($tmp{$i}) << 8;
+						}
+					}
+					$mode = 'd';
+					$b64 = '';
+					continue;
+				} else {
+					$b64 .= $c;
+				}
+			}
+			if ('d' == $mode) {
+				if ($sc == $c) {
+					$mode = 'b';
+					continue;
+				}
+				$output[$out_len] = ord($c);
+				$out_len++;
+			}
+		}
+		return $output;
+	}
 
-    private static function ucs4array_utf7imap($input)
-    {
-        return str_replace('/', ',', self::ucs4array_utf7($input, '&'));
-    }
+	private static function ucs4array_utf7imap($input)
+	{
+		return str_replace('/', ',', self::ucs4array_utf7($input, '&'));
+	}
 
-    private static function ucs4array_utf7($input, $sc = '+')
-    {
-        $output = '';
-        $mode = 'd';
-        $b64 = '';
-        while (true) {
-            $v = (!empty($input)) ? array_shift($input) : false;
-            $is_direct = (false !== $v) ? (0x20 <= $v && $v <= 0x7e && $v != ord($sc)) : true;
-            if ($mode == 'b') {
-                if ($is_direct) {
-                    if ($b64 == chr(0).$sc) {
-                        $output .= $sc.'-';
-                        $b64 = '';
-                    } elseif ($b64) {
-                        $output .= $sc.str_replace('=', '', base64_encode($b64)).'-';
-                        $b64 = '';
-                    }
-                    $mode = 'd';
-                } elseif (false !== $v) {
-                    $b64 .= chr(($v >> 8) & 255). chr($v & 255);
-                }
-            }
-            if ($mode == 'd' && false !== $v) {
-                if ($is_direct) {
-                    $output .= chr($v);
-                } else {
-                    $b64 = chr(($v >> 8) & 255). chr($v & 255);
-                    $mode = 'b';
-                }
-            }
-            if (false === $v && $b64 == '') break;
-        }
-        return $output;
-    }
+	private static function ucs4array_utf7($input, $sc = '+')
+	{
+		$output = '';
+		$mode = 'd';
+		$b64 = '';
+		while (true) {
+			$v = (!empty($input)) ? array_shift($input) : false;
+			$is_direct = (false !== $v) ? (0x20 <= $v && $v <= 0x7e && $v != ord($sc)) : true;
+			if ($mode == 'b') {
+				if ($is_direct) {
+					if ($b64 == chr(0).$sc) {
+						$output .= $sc.'-';
+						$b64 = '';
+					} elseif ($b64) {
+						$output .= $sc.str_replace('=', '', base64_encode($b64)).'-';
+						$b64 = '';
+					}
+					$mode = 'd';
+				} elseif (false !== $v) {
+					$b64 .= chr(($v >> 8) & 255). chr($v & 255);
+				}
+			}
+			if ($mode == 'd' && false !== $v) {
+				if ($is_direct) {
+					$output .= chr($v);
+				} else {
+					$b64 = chr(($v >> 8) & 255). chr($v & 255);
+					$mode = 'b';
+				}
+			}
+			if (false === $v && $b64 == '') break;
+		}
+		return $output;
+	}
 
-    /**
-     * Convert UCS-4 array into UCS-4 string (Little Endian at the moment)
-     * @access   private
-     */
-    private static function ucs4array_ucs4($input)
-    {
-        $output = '';
-        foreach ($input as $v) {
-            $output .= chr(($v >> 24) & 255).chr(($v >> 16) & 255).chr(($v >> 8) & 255).chr($v & 255);
-        }
-        return $output;
-    }
+	/**
+	 * Convert UCS-4 array into UCS-4 string (Little Endian at the moment)
+	 * @access   private
+	 */
+	private static function ucs4array_ucs4($input)
+	{
+		$output = '';
+		foreach ($input as $v) {
+			$output .= chr(($v >> 24) & 255).chr(($v >> 16) & 255).chr(($v >> 8) & 255).chr($v & 255);
+		}
+		return $output;
+	}
 
-    /**
-     * Convert UCS-4 string (LE in the moment) into UCS-4 garray
-     * @access   private
-     */
-    private static function ucs4_ucs4array($input)
-    {
-        $output = array();
+	/**
+	 * Convert UCS-4 string (LE in the moment) into UCS-4 garray
+	 * @access   private
+	 */
+	private static function ucs4_ucs4array($input)
+	{
+		$output = array();
 
-        $inp_len = strlen($input);
-        // Input length must be dividable by 4
-        if ($inp_len % 4) {
-            throw new Exception('Input UCS4 string is broken');
-        }
-        // Empty input - return empty output
-        if (!$inp_len) return $output;
+		$inp_len = strlen($input);
+		// Input length must be dividable by 4
+		if ($inp_len % 4) {
+			throw new Exception('Input UCS4 string is broken');
+		}
+		// Empty input - return empty output
+		if (!$inp_len) return $output;
 
-        for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
-            if (!($i % 4)) { // Increment output position every 4 input bytes
-                $out_len++;
-                $output[$out_len] = 0;
-            }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
-        }
-        return $output;
-    }
+		for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
+			if (!($i % 4)) { // Increment output position every 4 input bytes
+				$out_len++;
+				$output[$out_len] = 0;
+			}
+			$output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+		}
+		return $output;
+	}
 }
 ?>
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -39,8 +39,8 @@ 
         if (self::$safe_mode) self::$allow_overlong = true;
         if (!in_array($from, self::$mechs)) throw new Exception('Invalid input format specified');
         if (!in_array($to, self::$mechs)) throw new Exception('Invalid output format specified');
-        if ($from != 'ucs4array') eval('$data = self::'.$from.'_ucs4array($data);');
-        if ($to != 'ucs4array') eval('$data = self::ucs4array_'.$to.'($data);');
+        if ($from != 'ucs4array') eval('$data = self::' . $from . '_ucs4array($data);');
+        if ($to != 'ucs4array') eval('$data = self::ucs4array_' . $to . '($data);');
         return $data;
     }
 
@@ -66,10 +66,10 @@ 
                 ++$out_len;
                 if ('add' == $mode) {
                     if (self::$safe_mode) {
-                        $output[$out_len-2] = self::$safe_char;
+                        $output[$out_len - 2] = self::$safe_char;
                         $mode = 'next';
                     } else {
-                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                     }
                 }
                 continue;
@@ -93,9 +93,9 @@ 
                     ++$out_len;
                     continue;
                 } else {
-                    throw new Exception('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                    throw new Exception('This might be UTF-8, but I don\'t understand it at byte ' . $k);
                 }
-                if ($inp_len-$k-$next_byte < 2) {
+                if ($inp_len - $k - $next_byte < 2) {
                     $output[$out_len] = self::$safe_char;
                     $mode = 'no';
                     continue;
@@ -111,21 +111,21 @@ 
                 if (!self::$allow_overlong && $test == 'range') {
                     $test = 'none';
                     if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
-                        throw new Exception('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                        throw new Exception('Bogus UTF-8 character detected (out of legal range) at byte ' . $k);
                     }
                 }
                 if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
-                    $v = ($v-128) << ($next_byte*6);
-                    $output[($out_len-1)] += $v;
+                    $v = ($v - 128) << ($next_byte * 6);
+                    $output[($out_len - 1)] += $v;
                     --$next_byte;
                 } else {
                     if (self::$safe_mode) {
-                        $output[$out_len-1] = ord(self::$safe_char);
+                        $output[$out_len - 1] = ord(self::$safe_char);
                         $k--;
                         $mode = 'next';
                         continue;
                     } else {
-                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                     }
                 }
                 if ($next_byte < 0) {
@@ -148,15 +148,15 @@ 
             if ($v < 128) { // 7bit are transferred literally
                 $output .= chr($v);
             } elseif ($v < (1 << 11)) { // 2 bytes
-                $output .= chr(192+($v >> 6)).chr(128+($v & 63));
+                $output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
             } elseif ($v < (1 << 16)) { // 3 bytes
-                $output .= chr(224+($v >> 12)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+                $output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
             } elseif ($v < (1 << 21)) { // 4 bytes
-                $output .= chr(240+($v >> 18)).chr(128+(($v >> 12) & 63)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+                $output .= chr(240 + ($v >> 18)) . chr(128 + (($v >> 12) & 63)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
             } elseif (self::$safe_mode) {
                 $output .= self::$safe_char;
             } else {
-                throw new Exception('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
+                throw new Exception('Conversion from UCS-4 to UTF-8 failed: malformed input at byte ' . $k);
             }
         }
         return $output;
@@ -180,7 +180,7 @@ 
             if (0 == ord($c)) continue; // Ignore zero bytes
             if ('b' == $mode) {
                 // Sequence got terminated
-                if (!preg_match('![A-Za-z0-9/'.preg_quote($sc, '!').']!', $c)) {
+                if (!preg_match('![A-Za-z0-9/' . preg_quote($sc, '!') . ']!', $c)) {
                     if ('-' == $c) {
                         if ($b64 == '') {
                             $output[$out_len] = ord($sc);
@@ -233,23 +233,23 @@ 
             $is_direct = (false !== $v) ? (0x20 <= $v && $v <= 0x7e && $v != ord($sc)) : true;
             if ($mode == 'b') {
                 if ($is_direct) {
-                    if ($b64 == chr(0).$sc) {
-                        $output .= $sc.'-';
+                    if ($b64 == chr(0) . $sc) {
+                        $output .= $sc . '-';
                         $b64 = '';
                     } elseif ($b64) {
-                        $output .= $sc.str_replace('=', '', base64_encode($b64)).'-';
+                        $output .= $sc . str_replace('=', '', base64_encode($b64)) . '-';
                         $b64 = '';
                     }
                     $mode = 'd';
                 } elseif (false !== $v) {
-                    $b64 .= chr(($v >> 8) & 255). chr($v & 255);
+                    $b64 .= chr(($v >> 8) & 255) . chr($v & 255);
                 }
             }
             if ($mode == 'd' && false !== $v) {
                 if ($is_direct) {
                     $output .= chr($v);
                 } else {
-                    $b64 = chr(($v >> 8) & 255). chr($v & 255);
+                    $b64 = chr(($v >> 8) & 255) . chr($v & 255);
                     $mode = 'b';
                 }
             }
@@ -266,7 +266,7 @@ 
     {
         $output = '';
         foreach ($input as $v) {
-            $output .= chr(($v >> 24) & 255).chr(($v >> 16) & 255).chr(($v >> 8) & 255).chr($v & 255);
+            $output .= chr(($v >> 24) & 255) . chr(($v >> 16) & 255) . chr(($v >> 8) & 255) . chr($v & 255);
         }
         return $output;
     }
@@ -292,7 +292,7 @@ 
                 $out_len++;
                 $output[$out_len] = 0;
             }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4)));
         }
         return $output;
     }

Braces +25 added lines, -8 removed lines

@@ -36,11 +36,21 @@ 
     {
         self::$safe_mode = ($safe_mode) ? true : false;
         self::$safe_char = ($safe_char) ? $safe_char : 0xFFFC;
-        if (self::$safe_mode) self::$allow_overlong = true;
-        if (!in_array($from, self::$mechs)) throw new Exception('Invalid input format specified');
-        if (!in_array($to, self::$mechs)) throw new Exception('Invalid output format specified');
-        if ($from != 'ucs4array') eval('$data = self::'.$from.'_ucs4array($data);');
-        if ($to != 'ucs4array') eval('$data = self::ucs4array_'.$to.'($data);');
+        if (self::$safe_mode) {
+        	self::$allow_overlong = true;
+        }
+        if (!in_array($from, self::$mechs)) {
+        	throw new Exception('Invalid input format specified');
+        }
+        if (!in_array($to, self::$mechs)) {
+        	throw new Exception('Invalid output format specified');
+        }
+        if ($from != 'ucs4array') {
+        	eval('$data = self::'.$from.'_ucs4array($data);');
+        }
+        if ($to != 'ucs4array') {
+        	eval('$data = self::ucs4array_'.$to.'($data);');
+        }
         return $data;
     }
 
@@ -177,7 +187,10 @@ 
 
         for ($k = 0; $k < $inp_len; ++$k) {
             $c = $input{$k};
-            if (0 == ord($c)) continue; // Ignore zero bytes
+            if (0 == ord($c)) {
+            	continue;
+            }
+            // Ignore zero bytes
             if ('b' == $mode) {
                 // Sequence got terminated
                 if (!preg_match('![A-Za-z0-9/'.preg_quote($sc, '!').']!', $c)) {
@@ -253,7 +266,9 @@ 
                     $mode = 'b';
                 }
             }
-            if (false === $v && $b64 == '') break;
+            if (false === $v && $b64 == '') {
+            	break;
+            }
         }
         return $output;
     }
@@ -285,7 +300,9 @@ 
             throw new Exception('Input UCS4 string is broken');
         }
         // Empty input - return empty output
-        if (!$inp_len) return $output;
+        if (!$inp_len) {
+        	return $output;
+        }
 
         for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
             if (!($i % 4)) { // Increment output position every 4 input bytes