xpressengine / xe-core

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

Indentation +574 added lines, -574 removed lines

@@ -53,579 +53,579 @@
  */

 class HTTP_Request2_Response

 {

-    /**

-     * HTTP protocol version (e.g. 1.0, 1.1)

-     * @var  string

-     */

-    protected $version;

-

-    /**

-     * Status code

-     * @var  integer

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

-     */

-    protected $code;

-

-    /**

-     * Reason phrase

-     * @var  string

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

-     */

-    protected $reasonPhrase;

-

-    /**

-     * Effective URL (may be different from original request URL in case of redirects)

-     * @var  string

-     */

-    protected $effectiveUrl;

-

-    /**

-     * Associative array of response headers

-     * @var  array

-     */

-    protected $headers = array();

-

-    /**

-     * Cookies set in the response

-     * @var  array

-     */

-    protected $cookies = array();

-

-    /**

-     * Name of last header processed by parseHederLine()

-     *

-     * Used to handle the headers that span multiple lines

-     *

-     * @var  string

-     */

-    protected $lastHeader = null;

-

-    /**

-     * Response body

-     * @var  string

-     */

-    protected $body = '';

-

-    /**

-     * Whether the body is still encoded by Content-Encoding

-     *

-     * cURL provides the decoded body to the callback; if we are reading from

-     * socket the body is still gzipped / deflated

-     *

-     * @var  bool

-     */

-    protected $bodyEncoded;

-

-    /**

-     * Associative array of HTTP status code / reason phrase.

-     *

-     * @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',

-

-    );

-

-    /**

-     * Returns the default reason phrase for the given code or all reason phrases

-     *

-     * @param int $code Response code

-     *

-     * @return string|array|null Default reason phrase for $code if $code is given

-     *                           (null if no phrase is available), array of all

-     *                           reason phrases if $code is null

-     * @link   http://pear.php.net/bugs/18716

-     */

-    public static function getDefaultReasonPhrase($code = null)

-    {

-        if (null === $code) {

-            return self::$phrases;

-        } else {

-            return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;

-        }

-    }

-

-    /**

-     * Constructor, parses the response status line

-     *

-     * @param string $statusLine   Response status line (e.g. "HTTP/1.1 200 OK")

-     * @param bool   $bodyEncoded  Whether body is still encoded by Content-Encoding

-     * @param string $effectiveUrl Effective URL of the response

-     *

-     * @throws   HTTP_Request2_MessageException if status line is invalid according to spec

-     */

-    public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)

-    {

-        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {

-            throw new HTTP_Request2_MessageException(

-                "Malformed response: {$statusLine}",

-                HTTP_Request2_Exception::MALFORMED_RESPONSE

-            );

-        }

-        $this->version      = $m[1];

-        $this->code         = intval($m[2]);

-        $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);

-        $this->bodyEncoded  = (bool)$bodyEncoded;

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

-    }

-

-    /**

-     * Parses the line from HTTP response filling $headers array

-     *

-     * The method should be called after reading the line from socket or receiving

-     * it into cURL callback. Passing an empty string here indicates the end of

-     * response headers and triggers additional processing, so be sure to pass an

-     * empty string in the end.

-     *

-     * @param string $headerLine Line from HTTP response

-     */

-    public function parseHeaderLine($headerLine)

-    {

-        $headerLine = trim($headerLine, "\r\n");

-

-        if ('' == $headerLine) {

-            // empty string signals the end of headers, process the received ones

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

-                }

-            }

-

-        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {

-            // string of the form header-name: header value

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

-

-        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {

-            // continuation of a previous header

-            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

-     *

-     * @param string $cookieString 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

-        );

-

-        if (!strpos($cookieString, ';')) {

-            // Only a name=value pair

-            $pos = strpos($cookieString, '=');

-            $cookie['name']  = trim(substr($cookieString, 0, $pos));

-            $cookie['value'] = trim(substr($cookieString, $pos + 1));

-

-        } else {

-            // Some optional parameters are supplied

-            $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 $bodyChunk part of response body

-     */

-    public function appendBody($bodyChunk)

-    {

-        $this->body .= $bodyChunk;

-    }

-

-    /**

-     * Returns the effective URL of the response

-     *

-     * This may be different from the request URL if redirects were followed.

-     *

-     * @return string

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

-     */

-    public function getEffectiveUrl()

-    {

-        return $this->effectiveUrl;

-    }

-

-    /**

-     * Returns the status code

-     *

-     * @return   integer

-     */

-    public function getStatus()

-    {

-        return $this->code;

-    }

-

-    /**

-     * Returns the reason phrase

-     *

-     * @return   string

-     */

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

-    }

-

-    /**

-     * Returns either the named header or all response headers

-     *

-     * @param string $headerName Name of header to return

-     *

-     * @return   string|array    Value of $headerName header (null if header is

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

-        }

-    }

-

-    /**

-     * Returns cookies set in response

-     *

-     * @return   array

-     */

-    public function getCookies()

-    {

-        return $this->cookies;

-    }

-

-    /**

-     * Returns the body of the response

-     *

-     * @return   string

-     * @throws   HTTP_Request2_Exception if body cannot be decoded

-     */

-    public function getBody()

-    {

-        if (0 == strlen($this->body) || !$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('8bit');

-            }

-

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

-    }

-

-    /**

-     * Decodes the message-body encoded by gzip

-     *

-     * The real decoding work is done by gzinflate() built-in function, this

-     * method only parses the header and checks data for compliance with

-     * RFC 1952

-     *

-     * @param string $data gzip-encoded data

-     *

-     * @return   string  decoded data

-     * @throws   HTTP_Request2_LogicException

-     * @throws   HTTP_Request2_MessageException

-     * @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_LogicException(

-                'Unable to decode body: gzip extension not available',

-                HTTP_Request2_Exception::MISCONFIGURATION

-            );

-        }

-        $method = ord(substr($data, 2, 1));

-        if (8 != $method) {

-            throw new HTTP_Request2_MessageException(

-                'Error parsing gzip header: unknown compression method',

-                HTTP_Request2_Exception::DECODE_ERROR

-            );

-        }

-        $flags = ord(substr($data, 3, 1));

-        if ($flags & 224) {

-            throw new HTTP_Request2_MessageException(

-                'Error parsing gzip header: reserved bits are set',

-                HTTP_Request2_Exception::DECODE_ERROR

-            );

-        }

-

-        // 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_MessageException(

-                    'Error parsing gzip header: data too short',

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            }

-            $extraLength = unpack('v', substr($data, 10, 2));

-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {

-                throw new HTTP_Request2_MessageException(

-                    'Error parsing gzip header: data too short',

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            }

-            $headerLength += $extraLength[1] + 2;

-        }

-        // file name, need to skip that

-        if ($flags & 8) {

-            if ($length - $headerLength - 1 < 8) {

-                throw new HTTP_Request2_MessageException(

-                    'Error parsing gzip header: data too short',

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            }

-            $filenameLength = strpos(substr($data, $headerLength), chr(0));

-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {

-                throw new HTTP_Request2_MessageException(

-                    'Error parsing gzip header: data too short',

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            }

-            $headerLength += $filenameLength + 1;

-        }

-        // comment, need to skip that also

-        if ($flags & 16) {

-            if ($length - $headerLength - 1 < 8) {

-                throw new HTTP_Request2_MessageException(

-                    'Error parsing gzip header: data too short',

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            }

-            $commentLength = strpos(substr($data, $headerLength), chr(0));

-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {

-                throw new HTTP_Request2_MessageException(

-                    'Error parsing gzip header: data too short',

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            }

-            $headerLength += $commentLength + 1;

-        }

-        // have a CRC for header. let's check

-        if ($flags & 2) {

-            if ($length - $headerLength - 2 < 8) {

-                throw new HTTP_Request2_MessageException(

-                    'Error parsing gzip header: data too short',

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            }

-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));

-            $crcStored = unpack('v', substr($data, $headerLength, 2));

-            if ($crcReal != $crcStored[1]) {

-                throw new HTTP_Request2_MessageException(

-                    'Header CRC check failed',

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            }

-            $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_MessageException(

-                'gzinflate() call failed',

-                HTTP_Request2_Exception::DECODE_ERROR

-            );

-        } elseif ($dataSize != strlen($unpacked)) {

-            throw new HTTP_Request2_MessageException(

-                'Data size check failed',

-                HTTP_Request2_Exception::DECODE_ERROR

-            );

-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {

-            throw new HTTP_Request2_Exception(

-                'Data CRC check failed',

-                HTTP_Request2_Exception::DECODE_ERROR

-            );

-        }

-        return $unpacked;

-    }

-

-    /**

-     * Decodes the message-body encoded by deflate

-     *

-     * @param string $data deflate-encoded data

-     *

-     * @return   string  decoded data

-     * @throws   HTTP_Request2_LogicException

-     */

-    public static function decodeDeflate($data)

-    {

-        if (!function_exists('gzuncompress')) {

-            throw new HTTP_Request2_LogicException(

-                'Unable to decode body: gzip extension not available',

-                HTTP_Request2_Exception::MISCONFIGURATION

-            );

-        }

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

-    }

+	/**

+	 * HTTP protocol version (e.g. 1.0, 1.1)

+	 * @var  string

+	 */

+	protected $version;

+

+	/**

+	 * Status code

+	 * @var  integer

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

+	 */

+	protected $code;

+

+	/**

+	 * Reason phrase

+	 * @var  string

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

+	 */

+	protected $reasonPhrase;

+

+	/**

+	 * Effective URL (may be different from original request URL in case of redirects)

+	 * @var  string

+	 */

+	protected $effectiveUrl;

+

+	/**

+	 * Associative array of response headers

+	 * @var  array

+	 */

+	protected $headers = array();

+

+	/**

+	 * Cookies set in the response

+	 * @var  array

+	 */

+	protected $cookies = array();

+

+	/**

+	 * Name of last header processed by parseHederLine()

+	 *

+	 * Used to handle the headers that span multiple lines

+	 *

+	 * @var  string

+	 */

+	protected $lastHeader = null;

+

+	/**

+	 * Response body

+	 * @var  string

+	 */

+	protected $body = '';

+

+	/**

+	 * Whether the body is still encoded by Content-Encoding

+	 *

+	 * cURL provides the decoded body to the callback; if we are reading from

+	 * socket the body is still gzipped / deflated

+	 *

+	 * @var  bool

+	 */

+	protected $bodyEncoded;

+

+	/**

+	 * Associative array of HTTP status code / reason phrase.

+	 *

+	 * @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',

+

+	);

+

+	/**

+	 * Returns the default reason phrase for the given code or all reason phrases

+	 *

+	 * @param int $code Response code

+	 *

+	 * @return string|array|null Default reason phrase for $code if $code is given

+	 *                           (null if no phrase is available), array of all

+	 *                           reason phrases if $code is null

+	 * @link   http://pear.php.net/bugs/18716

+	 */

+	public static function getDefaultReasonPhrase($code = null)

+	{

+		if (null === $code) {

+			return self::$phrases;

+		} else {

+			return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;

+		}

+	}

+

+	/**

+	 * Constructor, parses the response status line

+	 *

+	 * @param string $statusLine   Response status line (e.g. "HTTP/1.1 200 OK")

+	 * @param bool   $bodyEncoded  Whether body is still encoded by Content-Encoding

+	 * @param string $effectiveUrl Effective URL of the response

+	 *

+	 * @throws   HTTP_Request2_MessageException if status line is invalid according to spec

+	 */

+	public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)

+	{

+		if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {

+			throw new HTTP_Request2_MessageException(

+				"Malformed response: {$statusLine}",

+				HTTP_Request2_Exception::MALFORMED_RESPONSE

+			);

+		}

+		$this->version      = $m[1];

+		$this->code         = intval($m[2]);

+		$this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);

+		$this->bodyEncoded  = (bool)$bodyEncoded;

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

+	}

+

+	/**

+	 * Parses the line from HTTP response filling $headers array

+	 *

+	 * The method should be called after reading the line from socket or receiving

+	 * it into cURL callback. Passing an empty string here indicates the end of

+	 * response headers and triggers additional processing, so be sure to pass an

+	 * empty string in the end.

+	 *

+	 * @param string $headerLine Line from HTTP response

+	 */

+	public function parseHeaderLine($headerLine)

+	{

+		$headerLine = trim($headerLine, "\r\n");

+

+		if ('' == $headerLine) {

+			// empty string signals the end of headers, process the received ones

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

+				}

+			}

+

+		} elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {

+			// string of the form header-name: header value

+			$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;

+

+		} elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {

+			// continuation of a previous header

+			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

+	 *

+	 * @param string $cookieString 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

+		);

+

+		if (!strpos($cookieString, ';')) {

+			// Only a name=value pair

+			$pos = strpos($cookieString, '=');

+			$cookie['name']  = trim(substr($cookieString, 0, $pos));

+			$cookie['value'] = trim(substr($cookieString, $pos + 1));

+

+		} else {

+			// Some optional parameters are supplied

+			$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 $bodyChunk part of response body

+	 */

+	public function appendBody($bodyChunk)

+	{

+		$this->body .= $bodyChunk;

+	}

+

+	/**

+	 * Returns the effective URL of the response

+	 *

+	 * This may be different from the request URL if redirects were followed.

+	 *

+	 * @return string

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

+	 */

+	public function getEffectiveUrl()

+	{

+		return $this->effectiveUrl;

+	}

+

+	/**

+	 * Returns the status code

+	 *

+	 * @return   integer

+	 */

+	public function getStatus()

+	{

+		return $this->code;

+	}

+

+	/**

+	 * Returns the reason phrase

+	 *

+	 * @return   string

+	 */

+	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']);

+	}

+

+	/**

+	 * Returns either the named header or all response headers

+	 *

+	 * @param string $headerName Name of header to return

+	 *

+	 * @return   string|array    Value of $headerName header (null if header is

+	 *                           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;

+		}

+	}

+

+	/**

+	 * Returns cookies set in response

+	 *

+	 * @return   array

+	 */

+	public function getCookies()

+	{

+		return $this->cookies;

+	}

+

+	/**

+	 * Returns the body of the response

+	 *

+	 * @return   string

+	 * @throws   HTTP_Request2_Exception if body cannot be decoded

+	 */

+	public function getBody()

+	{

+		if (0 == strlen($this->body) || !$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('8bit');

+			}

+

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

+	}

+

+	/**

+	 * Decodes the message-body encoded by gzip

+	 *

+	 * The real decoding work is done by gzinflate() built-in function, this

+	 * method only parses the header and checks data for compliance with

+	 * RFC 1952

+	 *

+	 * @param string $data gzip-encoded data

+	 *

+	 * @return   string  decoded data

+	 * @throws   HTTP_Request2_LogicException

+	 * @throws   HTTP_Request2_MessageException

+	 * @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_LogicException(

+				'Unable to decode body: gzip extension not available',

+				HTTP_Request2_Exception::MISCONFIGURATION

+			);

+		}

+		$method = ord(substr($data, 2, 1));

+		if (8 != $method) {

+			throw new HTTP_Request2_MessageException(

+				'Error parsing gzip header: unknown compression method',

+				HTTP_Request2_Exception::DECODE_ERROR

+			);

+		}

+		$flags = ord(substr($data, 3, 1));

+		if ($flags & 224) {

+			throw new HTTP_Request2_MessageException(

+				'Error parsing gzip header: reserved bits are set',

+				HTTP_Request2_Exception::DECODE_ERROR

+			);

+		}

+

+		// 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_MessageException(

+					'Error parsing gzip header: data too short',

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			}

+			$extraLength = unpack('v', substr($data, 10, 2));

+			if ($length - $headerLength - 2 - $extraLength[1] < 8) {

+				throw new HTTP_Request2_MessageException(

+					'Error parsing gzip header: data too short',

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			}

+			$headerLength += $extraLength[1] + 2;

+		}

+		// file name, need to skip that

+		if ($flags & 8) {

+			if ($length - $headerLength - 1 < 8) {

+				throw new HTTP_Request2_MessageException(

+					'Error parsing gzip header: data too short',

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			}

+			$filenameLength = strpos(substr($data, $headerLength), chr(0));

+			if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {

+				throw new HTTP_Request2_MessageException(

+					'Error parsing gzip header: data too short',

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			}

+			$headerLength += $filenameLength + 1;

+		}

+		// comment, need to skip that also

+		if ($flags & 16) {

+			if ($length - $headerLength - 1 < 8) {

+				throw new HTTP_Request2_MessageException(

+					'Error parsing gzip header: data too short',

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			}

+			$commentLength = strpos(substr($data, $headerLength), chr(0));

+			if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {

+				throw new HTTP_Request2_MessageException(

+					'Error parsing gzip header: data too short',

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			}

+			$headerLength += $commentLength + 1;

+		}

+		// have a CRC for header. let's check

+		if ($flags & 2) {

+			if ($length - $headerLength - 2 < 8) {

+				throw new HTTP_Request2_MessageException(

+					'Error parsing gzip header: data too short',

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			}

+			$crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));

+			$crcStored = unpack('v', substr($data, $headerLength, 2));

+			if ($crcReal != $crcStored[1]) {

+				throw new HTTP_Request2_MessageException(

+					'Header CRC check failed',

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			}

+			$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_MessageException(

+				'gzinflate() call failed',

+				HTTP_Request2_Exception::DECODE_ERROR

+			);

+		} elseif ($dataSize != strlen($unpacked)) {

+			throw new HTTP_Request2_MessageException(

+				'Data size check failed',

+				HTTP_Request2_Exception::DECODE_ERROR

+			);

+		} elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {

+			throw new HTTP_Request2_Exception(

+				'Data CRC check failed',

+				HTTP_Request2_Exception::DECODE_ERROR

+			);

+		}

+		return $unpacked;

+	}

+

+	/**

+	 * Decodes the message-body encoded by deflate

+	 *

+	 * @param string $data deflate-encoded data

+	 *

+	 * @return   string  decoded data

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public static function decodeDeflate($data)

+	{

+		if (!function_exists('gzuncompress')) {

+			throw new HTTP_Request2_LogicException(

+				'Unable to decode body: gzip extension not available',

+				HTTP_Request2_Exception::MISCONFIGURATION

+			);

+		}

+		// 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

Switch Indentation +5 added lines, -5 removed lines

@@ -435,11 +435,11 @@
 

             try {

                 switch (strtolower($this->getHeader('content-encoding'))) {

-                case 'gzip':

-                    $decoded = self::decodeGzip($this->body);

-                    break;

-                case 'deflate':

-                    $decoded = self::decodeDeflate($this->body);

+                	case 'gzip':

+                    	$decoded = self::decodeGzip($this->body);

+                    	break;

+                	case 'deflate':

+                    	$decoded = self::decodeDeflate($this->body);

                 }

             } catch (Exception $e) {

             }

Spacing +9 added lines, -10 removed lines

@@ -142,7 +142,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',

@@ -220,8 +220,8 @@ 
         $this->version      = $m[1];

         $this->code         = intval($m[2]);

         $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);

-        $this->bodyEncoded  = (bool)$bodyEncoded;

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

+        $this->bodyEncoded  = (bool) $bodyEncoded;

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

     }

 

     /**

@@ -241,9 +241,8 @@ 
         if ('' == $headerLine) {

             // empty string signals the end of headers, process the received ones

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

                 }

@@ -272,10 +271,10 @@ 
         } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {

             // continuation of a previous header

             if (!is_array($this->headers[$this->lastHeader])) {

-                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);

+                $this->headers[$this->lastHeader] .= ' '.trim($m[1]);

             } else {

                 $key = count($this->headers[$this->lastHeader]) - 1;

-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);

+                $this->headers[$this->lastHeader][$key] .= ' '.trim($m[1]);

             }

         }

     }

@@ -400,7 +399,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;

         }

     }

 

@@ -625,7 +624,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.1.9.5/HTTP/Request2/SOCKS5.php

Switch Indentation +8 added lines, -8 removed lines

@@ -68,14 +68,14 @@
             );

         }

         switch ($response['method']) {

-        case 2:

-            $this->performAuthentication($username, $password);

-        case 0:

-            break;

-        default:

-            throw new HTTP_Request2_ConnectionException(

-                "Connection rejected by proxy due to unsupported auth method"

-            );

+        	case 2:

+            	$this->performAuthentication($username, $password);

+        	case 0:

+            	break;

+        	default:

+            	throw new HTTP_Request2_ConnectionException(

+                	"Connection rejected by proxy due to unsupported auth method"

+            	);

         }

     }

 

Indentation +91 added lines, -91 removed lines

@@ -35,101 +35,101 @@
  */

 class HTTP_Request2_SOCKS5 extends HTTP_Request2_SocketWrapper

 {

-    /**

-     * Constructor, tries to connect and authenticate to a SOCKS5 proxy

-     *

-     * @param string $address        Proxy address, e.g. 'tcp://localhost:1080'

-     * @param int    $timeout        Connection timeout (seconds)

-     * @param array  $contextOptions Stream context options

-     * @param string $username       Proxy user name

-     * @param string $password       Proxy password

-     *

-     * @throws HTTP_Request2_LogicException

-     * @throws HTTP_Request2_ConnectionException

-     * @throws HTTP_Request2_MessageException

-     */

-    public function __construct(

-        $address, $timeout = 10, array $contextOptions = array(),

-        $username = null, $password = null

-    ) {

-        parent::__construct($address, $timeout, $contextOptions);

+	/**

+	 * Constructor, tries to connect and authenticate to a SOCKS5 proxy

+	 *

+	 * @param string $address        Proxy address, e.g. 'tcp://localhost:1080'

+	 * @param int    $timeout        Connection timeout (seconds)

+	 * @param array  $contextOptions Stream context options

+	 * @param string $username       Proxy user name

+	 * @param string $password       Proxy password

+	 *

+	 * @throws HTTP_Request2_LogicException

+	 * @throws HTTP_Request2_ConnectionException

+	 * @throws HTTP_Request2_MessageException

+	 */

+	public function __construct(

+		$address, $timeout = 10, array $contextOptions = array(),

+		$username = null, $password = null

+	) {

+		parent::__construct($address, $timeout, $contextOptions);

 

-        if (strlen($username)) {

-            $request = pack('C4', 5, 2, 0, 2);

-        } else {

-            $request = pack('C3', 5, 1, 0);

-        }

-        $this->write($request);

-        $response = unpack('Cversion/Cmethod', $this->read(3));

-        if (5 != $response['version']) {

-            throw new HTTP_Request2_MessageException(

-                'Invalid version received from SOCKS5 proxy: ' . $response['version'],

-                HTTP_Request2_Exception::MALFORMED_RESPONSE

-            );

-        }

-        switch ($response['method']) {

-        case 2:

-            $this->performAuthentication($username, $password);

-        case 0:

-            break;

-        default:

-            throw new HTTP_Request2_ConnectionException(

-                "Connection rejected by proxy due to unsupported auth method"

-            );

-        }

-    }

+		if (strlen($username)) {

+			$request = pack('C4', 5, 2, 0, 2);

+		} else {

+			$request = pack('C3', 5, 1, 0);

+		}

+		$this->write($request);

+		$response = unpack('Cversion/Cmethod', $this->read(3));

+		if (5 != $response['version']) {

+			throw new HTTP_Request2_MessageException(

+				'Invalid version received from SOCKS5 proxy: ' . $response['version'],

+				HTTP_Request2_Exception::MALFORMED_RESPONSE

+			);

+		}

+		switch ($response['method']) {

+		case 2:

+			$this->performAuthentication($username, $password);

+		case 0:

+			break;

+		default:

+			throw new HTTP_Request2_ConnectionException(

+				"Connection rejected by proxy due to unsupported auth method"

+			);

+		}

+	}

 

-    /**

-     * Performs username/password authentication for SOCKS5

-     *

-     * @param string $username Proxy user name

-     * @param string $password Proxy password

-     *

-     * @throws HTTP_Request2_ConnectionException

-     * @throws HTTP_Request2_MessageException

-     * @link http://tools.ietf.org/html/rfc1929

-     */

-    protected function performAuthentication($username, $password)

-    {

-        $request  = pack('C2', 1, strlen($username)) . $username

-                    . pack('C', strlen($password)) . $password;

+	/**

+	 * Performs username/password authentication for SOCKS5

+	 *

+	 * @param string $username Proxy user name

+	 * @param string $password Proxy password

+	 *

+	 * @throws HTTP_Request2_ConnectionException

+	 * @throws HTTP_Request2_MessageException

+	 * @link http://tools.ietf.org/html/rfc1929

+	 */

+	protected function performAuthentication($username, $password)

+	{

+		$request  = pack('C2', 1, strlen($username)) . $username

+					. pack('C', strlen($password)) . $password;

 

-        $this->write($request);

-        $response = unpack('Cvn/Cstatus', $this->read(3));

-        if (1 != $response['vn'] || 0 != $response['status']) {

-            throw new HTTP_Request2_ConnectionException(

-                'Connection rejected by proxy due to invalid username and/or password'

-            );

-        }

-    }

+		$this->write($request);

+		$response = unpack('Cvn/Cstatus', $this->read(3));

+		if (1 != $response['vn'] || 0 != $response['status']) {

+			throw new HTTP_Request2_ConnectionException(

+				'Connection rejected by proxy due to invalid username and/or password'

+			);

+		}

+	}

 

-    /**

-     * Connects to a remote host via proxy

-     *

-     * @param string $remoteHost Remote host

-     * @param int    $remotePort Remote port

-     *

-     * @throws HTTP_Request2_ConnectionException

-     * @throws HTTP_Request2_MessageException

-     */

-    public function connect($remoteHost, $remotePort)

-    {

-        $request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))

-                   . $remoteHost . pack('n', $remotePort);

+	/**

+	 * Connects to a remote host via proxy

+	 *

+	 * @param string $remoteHost Remote host

+	 * @param int    $remotePort Remote port

+	 *

+	 * @throws HTTP_Request2_ConnectionException

+	 * @throws HTTP_Request2_MessageException

+	 */

+	public function connect($remoteHost, $remotePort)

+	{

+		$request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))

+				   . $remoteHost . pack('n', $remotePort);

 

-        $this->write($request);

-        $response = unpack('Cversion/Creply/Creserved', $this->read(1024));

-        if (5 != $response['version'] || 0 != $response['reserved']) {

-            throw new HTTP_Request2_MessageException(

-                'Invalid response received from SOCKS5 proxy',

-                HTTP_Request2_Exception::MALFORMED_RESPONSE

-            );

-        } elseif (0 != $response['reply']) {

-            throw new HTTP_Request2_ConnectionException(

-                "Unable to connect to {$remoteHost}:{$remotePort} through SOCKS5 proxy",

-                0, $response['reply']

-            );

-        }

-    }

+		$this->write($request);

+		$response = unpack('Cversion/Creply/Creserved', $this->read(1024));

+		if (5 != $response['version'] || 0 != $response['reserved']) {

+			throw new HTTP_Request2_MessageException(

+				'Invalid response received from SOCKS5 proxy',

+				HTTP_Request2_Exception::MALFORMED_RESPONSE

+			);

+		} elseif (0 != $response['reply']) {

+			throw new HTTP_Request2_ConnectionException(

+				"Unable to connect to {$remoteHost}:{$remotePort} through SOCKS5 proxy",

+				0, $response['reply']

+			);

+		}

+	}

 }

 ?>
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
         $response = unpack('Cversion/Cmethod', $this->read(3));

         if (5 != $response['version']) {

             throw new HTTP_Request2_MessageException(

-                'Invalid version received from SOCKS5 proxy: ' . $response['version'],

+                'Invalid version received from SOCKS5 proxy: '.$response['version'],

                 HTTP_Request2_Exception::MALFORMED_RESPONSE

             );

         }

@@ -91,8 +91,8 @@ 
      */

     protected function performAuthentication($username, $password)

     {

-        $request  = pack('C2', 1, strlen($username)) . $username

-                    . pack('C', strlen($password)) . $password;

+        $request = pack('C2', 1, strlen($username)).$username

+                    . pack('C', strlen($password)).$password;

 

         $this->write($request);

         $response = unpack('Cvn/Cstatus', $this->read(3));

@@ -115,7 +115,7 @@ 
     public function connect($remoteHost, $remotePort)

     {

         $request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))

-                   . $remoteHost . pack('n', $remotePort);

+                   . $remoteHost.pack('n', $remotePort);

 

         $this->write($request);

         $response = unpack('Cversion/Creply/Creserved', $this->read(1024));

libs/PEAR.1.9.5/HTTP/Request2/SocketWrapper.php

Spacing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
                 // reset socket timeout if we don't have request timeout specified,

                 // prevents further calls failing with a bogus Exception

                 if (!$this->deadline) {

-                    $default = (int)@ini_get('default_socket_timeout');

+                    $default = (int) @ini_get('default_socket_timeout');

                     stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);

                 }

                 if ($info['timed_out']) {

Indentation +238 added lines, -238 removed lines

@@ -38,260 +38,260 @@
  */

 class HTTP_Request2_SocketWrapper

 {

-    /**

-     * PHP warning messages raised during stream_socket_client() call

-     * @var array

-     */

-    protected $connectionWarnings = array();

+	/**

+	 * PHP warning messages raised during stream_socket_client() call

+	 * @var array

+	 */

+	protected $connectionWarnings = array();

 

-    /**

-     * Connected socket

-     * @var resource

-     */

-    protected $socket;

+	/**

+	 * Connected socket

+	 * @var resource

+	 */

+	protected $socket;

 

-    /**

-     * Sum of start time and global timeout, exception will be thrown if request continues past this time

-     * @var  integer

-     */

-    protected $deadline;

+	/**

+	 * Sum of start time and global timeout, exception will be thrown if request continues past this time

+	 * @var  integer

+	 */

+	protected $deadline;

 

-    /**

-     * Global timeout value, mostly for exception messages

-     * @var integer

-     */

-    protected $timeout;

+	/**

+	 * Global timeout value, mostly for exception messages

+	 * @var integer

+	 */

+	protected $timeout;

 

-    /**

-     * Class constructor, tries to establish connection

-     *

-     * @param string $address        Address for stream_socket_client() call,

-     *                               e.g. 'tcp://localhost:80'

-     * @param int    $timeout        Connection timeout (seconds)

-     * @param array  $contextOptions Context options

-     *

-     * @throws HTTP_Request2_LogicException

-     * @throws HTTP_Request2_ConnectionException

-     */

-    public function __construct($address, $timeout, array $contextOptions = array())

-    {

-        if (!empty($contextOptions)

-            && !isset($contextOptions['socket']) && !isset($contextOptions['ssl'])

-        ) {

-            // Backwards compatibility with 2.1.0 and 2.1.1 releases

-            $contextOptions = array('ssl' => $contextOptions);

-        }

-        $context = stream_context_create();

-        foreach ($contextOptions as $wrapper => $options) {

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

-                if (!stream_context_set_option($context, $wrapper, $name, $value)) {

-                    throw new HTTP_Request2_LogicException(

-                        "Error setting '{$wrapper}' wrapper context option '{$name}'"

-                    );

-                }

-            }

-        }

-        set_error_handler(array($this, 'connectionWarningsHandler'));

-        $this->socket = stream_socket_client(

-            $address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context

-        );

-        restore_error_handler();

-        // if we fail to bind to a specified local address (see request #19515),

-        // connection still succeeds, albeit with a warning. Throw an Exception

-        // with the warning text in this case as that connection is unlikely

-        // to be what user wants and as Curl throws an error in similar case.

-        if ($this->connectionWarnings) {

-            if ($this->socket) {

-                fclose($this->socket);

-            }

-            $error = $errstr ? $errstr : implode("\n", $this->connectionWarnings);

-            throw new HTTP_Request2_ConnectionException(

-                "Unable to connect to {$address}. Error: {$error}", 0, $errno

-            );

-        }

-    }

+	/**

+	 * Class constructor, tries to establish connection

+	 *

+	 * @param string $address        Address for stream_socket_client() call,

+	 *                               e.g. 'tcp://localhost:80'

+	 * @param int    $timeout        Connection timeout (seconds)

+	 * @param array  $contextOptions Context options

+	 *

+	 * @throws HTTP_Request2_LogicException

+	 * @throws HTTP_Request2_ConnectionException

+	 */

+	public function __construct($address, $timeout, array $contextOptions = array())

+	{

+		if (!empty($contextOptions)

+			&& !isset($contextOptions['socket']) && !isset($contextOptions['ssl'])

+		) {

+			// Backwards compatibility with 2.1.0 and 2.1.1 releases

+			$contextOptions = array('ssl' => $contextOptions);

+		}

+		$context = stream_context_create();

+		foreach ($contextOptions as $wrapper => $options) {

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

+				if (!stream_context_set_option($context, $wrapper, $name, $value)) {

+					throw new HTTP_Request2_LogicException(

+						"Error setting '{$wrapper}' wrapper context option '{$name}'"

+					);

+				}

+			}

+		}

+		set_error_handler(array($this, 'connectionWarningsHandler'));

+		$this->socket = stream_socket_client(

+			$address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context

+		);

+		restore_error_handler();

+		// if we fail to bind to a specified local address (see request #19515),

+		// connection still succeeds, albeit with a warning. Throw an Exception

+		// with the warning text in this case as that connection is unlikely

+		// to be what user wants and as Curl throws an error in similar case.

+		if ($this->connectionWarnings) {

+			if ($this->socket) {

+				fclose($this->socket);

+			}

+			$error = $errstr ? $errstr : implode("\n", $this->connectionWarnings);

+			throw new HTTP_Request2_ConnectionException(

+				"Unable to connect to {$address}. Error: {$error}", 0, $errno

+			);

+		}

+	}

 

-    /**

-     * Destructor, disconnects socket

-     */

-    public function __destruct()

-    {

-        fclose($this->socket);

-    }

+	/**

+	 * Destructor, disconnects socket

+	 */

+	public function __destruct()

+	{

+		fclose($this->socket);

+	}

 

-    /**

-     * Wrapper around fread(), handles global request timeout

-     *

-     * @param int $length Reads up to this number of bytes

-     *

-     * @return   string Data read from socket

-     * @throws   HTTP_Request2_MessageException     In case of timeout

-     */

-    public function read($length)

-    {

-        if ($this->deadline) {

-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));

-        }

-        $data = fread($this->socket, $length);

-        $this->checkTimeout();

-        return $data;

-    }

+	/**

+	 * Wrapper around fread(), handles global request timeout

+	 *

+	 * @param int $length Reads up to this number of bytes

+	 *

+	 * @return   string Data read from socket

+	 * @throws   HTTP_Request2_MessageException     In case of timeout

+	 */

+	public function read($length)

+	{

+		if ($this->deadline) {

+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));

+		}

+		$data = fread($this->socket, $length);

+		$this->checkTimeout();

+		return $data;

+	}

 

-    /**

-     * Reads until either the end of the socket or a newline, whichever comes first

-     *

-     * Strips the trailing newline from the returned data, handles global

-     * request timeout. Method idea borrowed from Net_Socket PEAR package.

-     *

-     * @param int $bufferSize   buffer size to use for reading

-     * @param int $localTimeout timeout value to use just for this call

-     *                          (used when waiting for "100 Continue" response)

-     *

-     * @return   string Available data up to the newline (not including newline)

-     * @throws   HTTP_Request2_MessageException     In case of timeout

-     */

-    public function readLine($bufferSize, $localTimeout = null)

-    {

-        $line = '';

-        while (!feof($this->socket)) {

-            if (null !== $localTimeout) {

-                stream_set_timeout($this->socket, $localTimeout);

-            } elseif ($this->deadline) {

-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));

-            }

+	/**

+	 * Reads until either the end of the socket or a newline, whichever comes first

+	 *

+	 * Strips the trailing newline from the returned data, handles global

+	 * request timeout. Method idea borrowed from Net_Socket PEAR package.

+	 *

+	 * @param int $bufferSize   buffer size to use for reading

+	 * @param int $localTimeout timeout value to use just for this call

+	 *                          (used when waiting for "100 Continue" response)

+	 *

+	 * @return   string Available data up to the newline (not including newline)

+	 * @throws   HTTP_Request2_MessageException     In case of timeout

+	 */

+	public function readLine($bufferSize, $localTimeout = null)

+	{

+		$line = '';

+		while (!feof($this->socket)) {

+			if (null !== $localTimeout) {

+				stream_set_timeout($this->socket, $localTimeout);

+			} elseif ($this->deadline) {

+				stream_set_timeout($this->socket, max($this->deadline - time(), 1));

+			}

 

-            $line .= @fgets($this->socket, $bufferSize);

+			$line .= @fgets($this->socket, $bufferSize);

 

-            if (null === $localTimeout) {

-                $this->checkTimeout();

+			if (null === $localTimeout) {

+				$this->checkTimeout();

 

-            } else {

-                $info = stream_get_meta_data($this->socket);

-                // reset socket timeout if we don't have request timeout specified,

-                // prevents further calls failing with a bogus Exception

-                if (!$this->deadline) {

-                    $default = (int)@ini_get('default_socket_timeout');

-                    stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);

-                }

-                if ($info['timed_out']) {

-                    throw new HTTP_Request2_MessageException(

-                        "readLine() call timed out", HTTP_Request2_Exception::TIMEOUT

-                    );

-                }

-            }

-            if (substr($line, -1) == "\n") {

-                return rtrim($line, "\r\n");

-            }

-        }

-        return $line;

-    }

+			} else {

+				$info = stream_get_meta_data($this->socket);

+				// reset socket timeout if we don't have request timeout specified,

+				// prevents further calls failing with a bogus Exception

+				if (!$this->deadline) {

+					$default = (int)@ini_get('default_socket_timeout');

+					stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);

+				}

+				if ($info['timed_out']) {

+					throw new HTTP_Request2_MessageException(

+						"readLine() call timed out", HTTP_Request2_Exception::TIMEOUT

+					);

+				}

+			}

+			if (substr($line, -1) == "\n") {

+				return rtrim($line, "\r\n");

+			}

+		}

+		return $line;

+	}

 

-    /**

-     * Wrapper around fwrite(), handles global request timeout

-     *

-     * @param string $data String to be written

-     *

-     * @return int

-     * @throws HTTP_Request2_MessageException

-     */

-    public function write($data)

-    {

-        if ($this->deadline) {

-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));

-        }

-        $written = fwrite($this->socket, $data);

-        $this->checkTimeout();

-        // http://www.php.net/manual/en/function.fwrite.php#96951

-        if ($written < strlen($data)) {

-            throw new HTTP_Request2_MessageException('Error writing request');

-        }

-        return $written;

-    }

+	/**

+	 * Wrapper around fwrite(), handles global request timeout

+	 *

+	 * @param string $data String to be written

+	 *

+	 * @return int

+	 * @throws HTTP_Request2_MessageException

+	 */

+	public function write($data)

+	{

+		if ($this->deadline) {

+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));

+		}

+		$written = fwrite($this->socket, $data);

+		$this->checkTimeout();

+		// http://www.php.net/manual/en/function.fwrite.php#96951

+		if ($written < strlen($data)) {

+			throw new HTTP_Request2_MessageException('Error writing request');

+		}

+		return $written;

+	}

 

-    /**

-     * Tests for end-of-file on a socket

-     *

-     * @return bool

-     */

-    public function eof()

-    {

-        return feof($this->socket);

-    }

+	/**

+	 * Tests for end-of-file on a socket

+	 *

+	 * @return bool

+	 */

+	public function eof()

+	{

+		return feof($this->socket);

+	}

 

-    /**

-     * Sets request deadline

-     *

-     * @param int $deadline Exception will be thrown if request continues

-     *                      past this time

-     * @param int $timeout  Original request timeout value, to use in

-     *                      Exception message

-     */

-    public function setDeadline($deadline, $timeout)

-    {

-        $this->deadline = $deadline;

-        $this->timeout  = $timeout;

-    }

+	/**

+	 * Sets request deadline

+	 *

+	 * @param int $deadline Exception will be thrown if request continues

+	 *                      past this time

+	 * @param int $timeout  Original request timeout value, to use in

+	 *                      Exception message

+	 */

+	public function setDeadline($deadline, $timeout)

+	{

+		$this->deadline = $deadline;

+		$this->timeout  = $timeout;

+	}

 

-    /**

-     * Turns on encryption on a socket

-     *

-     * @throws HTTP_Request2_ConnectionException

-     */

-    public function enableCrypto()

-    {

-        $modes = array(

-            STREAM_CRYPTO_METHOD_TLS_CLIENT,

-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,

-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,

-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT

-        );

+	/**

+	 * Turns on encryption on a socket

+	 *

+	 * @throws HTTP_Request2_ConnectionException

+	 */

+	public function enableCrypto()

+	{

+		$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_ConnectionException(

-            'Failed to enable secure connection when connecting through proxy'

-        );

-    }

+		foreach ($modes as $mode) {

+			if (stream_socket_enable_crypto($this->socket, true, $mode)) {

+				return;

+			}

+		}

+		throw new HTTP_Request2_ConnectionException(

+			'Failed to enable secure connection when connecting through proxy'

+		);

+	}

 

-    /**

-     * Throws an Exception if stream timed out

-     *

-     * @throws HTTP_Request2_MessageException

-     */

-    protected function checkTimeout()

-    {

-        $info = stream_get_meta_data($this->socket);

-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {

-            $reason = $this->deadline

-                ? "after {$this->timeout} second(s)"

-                : 'due to default_socket_timeout php.ini setting';

-            throw new HTTP_Request2_MessageException(

-                "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT

-            );

-        }

-    }

+	/**

+	 * Throws an Exception if stream timed out

+	 *

+	 * @throws HTTP_Request2_MessageException

+	 */

+	protected function checkTimeout()

+	{

+		$info = stream_get_meta_data($this->socket);

+		if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {

+			$reason = $this->deadline

+				? "after {$this->timeout} second(s)"

+				: 'due to default_socket_timeout php.ini setting';

+			throw new HTTP_Request2_MessageException(

+				"Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT

+			);

+		}

+	}

 

-    /**

-     * Error handler to use during stream_socket_client() call

-     *

-     * One stream_socket_client() call may produce *multiple* PHP warnings

-     * (especially OpenSSL-related), we keep them in an array to later use for

-     * the message of HTTP_Request2_ConnectionException

-     *

-     * @param int    $errno  error level

-     * @param string $errstr error message

-     *

-     * @return bool

-     */

-    protected function connectionWarningsHandler($errno, $errstr)

-    {

-        if ($errno & E_WARNING) {

-            array_unshift($this->connectionWarnings, $errstr);

-        }

-        return true;

-    }

+	/**

+	 * Error handler to use during stream_socket_client() call

+	 *

+	 * One stream_socket_client() call may produce *multiple* PHP warnings

+	 * (especially OpenSSL-related), we keep them in an array to later use for

+	 * the message of HTTP_Request2_ConnectionException

+	 *

+	 * @param int    $errno  error level

+	 * @param string $errstr error message

+	 *

+	 * @return bool

+	 */

+	protected function connectionWarningsHandler($errno, $errstr)

+	{

+		if ($errno & E_WARNING) {

+			array_unshift($this->connectionWarnings, $errstr);

+		}

+		return true;

+	}

 }

 ?>

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

Indentation +126 added lines, -126 removed lines

@@ -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;
+		}
+	}
 }
 ?>

Spacing +7 added lines, -7 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];
@@ -152,7 +152,7 @@ 
     public function getBoundary()
     {
         if (empty($this->_boundary)) {
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
+            $this->_boundary = '--'.md5('PEAR-HTTP_Request2-'.microtime());
         }
         return $this->_boundary;
     }
@@ -173,8 +173,8 @@ 
             $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";
+                                 $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);
 
@@ -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);
@@ -201,7 +201,7 @@ 
                 }
 
             } else {
-                $closing  = '--' . $boundary . "--\r\n";
+                $closing  = '--'.$boundary."--\r\n";
                 $ret     .= substr($closing, $this->_pos[1], $length);
                 $length  -= min(strlen($closing) - $this->_pos[1], $length);
             }
@@ -261,7 +261,7 @@ 
                 if (empty($name)) {
                     $newName = $k;
                 } elseif ($useBrackets) {
-                    $newName = $name . '[' . $k . ']';
+                    $newName = $name.'['.$k.']';
                 } else {
                     $newName = $name;
                 }

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

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

Indentation +108 added lines, -108 removed lines

@@ -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

Spacing +5 added lines, -5 removed lines

@@ -158,17 +158,17 @@ 
 
         switch ($event['name']) {
         case 'connect':
-            $this->log('* Connected to ' . $event['data']);
+            $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);
+                $this->log('> '.$header);
             }
             break;
         case 'sentBodyPart':
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
+            $this->log('> '.$event['data'].' byte(s) sent');
             break;
         case 'receivedHeaders':
             $this->log(sprintf('< HTTP/%s %s %s',
@@ -177,7 +177,7 @@ 
                 $event['data']->getReasonPhrase()));
             $headers = $event['data']->getHeader();
             foreach ($headers as $key => $val) {
-                $this->log('< ' . $key . ': ' . $val);
+                $this->log('< '.$key.': '.$val);
             }
             $this->log('< ');
             break;
@@ -205,7 +205,7 @@ 
         if ($this->target instanceof Log) {
             $this->target->debug($message);
         } elseif (is_resource($this->target)) {
-            fwrite($this->target, $message . "\r\n");
+            fwrite($this->target, $message."\r\n");
         }
     }
 

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 +8 added lines, -9 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);
                 }
@@ -267,10 +266,10 @@ 
         // 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]);
+                $this->headers[$this->lastHeader] .= ' '.trim($m[1]);
             } else {
                 $key = count($this->headers[$this->lastHeader]) - 1;
-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
+                $this->headers[$this->lastHeader][$key] .= ' '.trim($m[1]);
             }
         }
     }
@@ -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.1.9/PEAR/Exception.php

Indentation +275 added lines, -275 removed lines

@@ -96,296 +96,296 @@
  */
 class PEAR_Exception extends Exception
 {
-    const OBSERVER_PRINT = -2;
-    const OBSERVER_TRIGGER = -4;
-    const OBSERVER_DIE = -8;
-    protected $cause;
-    private static $_observers = array();
-    private static $_uniqueid = 0;
-    private $_trace;
+	const OBSERVER_PRINT = -2;
+	const OBSERVER_TRIGGER = -4;
+	const OBSERVER_DIE = -8;
+	protected $cause;
+	private static $_observers = array();
+	private static $_uniqueid = 0;
+	private $_trace;
 
-    /**
-     * Supported signatures:
-     *  - PEAR_Exception(string $message);
-     *  - PEAR_Exception(string $message, int $code);
-     *  - PEAR_Exception(string $message, Exception $cause);
-     *  - PEAR_Exception(string $message, Exception $cause, int $code);
-     *  - PEAR_Exception(string $message, PEAR_Error $cause);
-     *  - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
-     *  - PEAR_Exception(string $message, array $causes);
-     *  - PEAR_Exception(string $message, array $causes, int $code);
-     * @param string exception message
-     * @param int|Exception|PEAR_Error|array|null exception cause
-     * @param int|null exception code or null
-     */
-    public function __construct($message, $p2 = null, $p3 = null)
-    {
-        if (is_int($p2)) {
-            $code = $p2;
-            $this->cause = null;
-        } elseif (is_object($p2) || is_array($p2)) {
-            // using is_object allows both Exception and PEAR_Error
-            if (is_object($p2) && !($p2 instanceof Exception)) {
-                if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
-                    throw new PEAR_Exception('exception cause must be Exception, ' .
-                        'array, or PEAR_Error');
-                }
-            }
-            $code = $p3;
-            if (is_array($p2) && isset($p2['message'])) {
-                // fix potential problem of passing in a single warning
-                $p2 = array($p2);
-            }
-            $this->cause = $p2;
-        } else {
-            $code = null;
-            $this->cause = null;
-        }
-        parent::__construct($message, $code);
-        $this->signal();
-    }
+	/**
+	 * Supported signatures:
+	 *  - PEAR_Exception(string $message);
+	 *  - PEAR_Exception(string $message, int $code);
+	 *  - PEAR_Exception(string $message, Exception $cause);
+	 *  - PEAR_Exception(string $message, Exception $cause, int $code);
+	 *  - PEAR_Exception(string $message, PEAR_Error $cause);
+	 *  - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
+	 *  - PEAR_Exception(string $message, array $causes);
+	 *  - PEAR_Exception(string $message, array $causes, int $code);
+	 * @param string exception message
+	 * @param int|Exception|PEAR_Error|array|null exception cause
+	 * @param int|null exception code or null
+	 */
+	public function __construct($message, $p2 = null, $p3 = null)
+	{
+		if (is_int($p2)) {
+			$code = $p2;
+			$this->cause = null;
+		} elseif (is_object($p2) || is_array($p2)) {
+			// using is_object allows both Exception and PEAR_Error
+			if (is_object($p2) && !($p2 instanceof Exception)) {
+				if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
+					throw new PEAR_Exception('exception cause must be Exception, ' .
+						'array, or PEAR_Error');
+				}
+			}
+			$code = $p3;
+			if (is_array($p2) && isset($p2['message'])) {
+				// fix potential problem of passing in a single warning
+				$p2 = array($p2);
+			}
+			$this->cause = $p2;
+		} else {
+			$code = null;
+			$this->cause = null;
+		}
+		parent::__construct($message, $code);
+		$this->signal();
+	}
 
-    /**
-     * @param mixed $callback  - A valid php callback, see php func is_callable()
-     *                         - A PEAR_Exception::OBSERVER_* constant
-     *                         - An array(const PEAR_Exception::OBSERVER_*,
-     *                           mixed $options)
-     * @param string $label    The name of the observer. Use this if you want
-     *                         to remove it later with removeObserver()
-     */
-    public static function addObserver($callback, $label = 'default')
-    {
-        self::$_observers[$label] = $callback;
-    }
+	/**
+	 * @param mixed $callback  - A valid php callback, see php func is_callable()
+	 *                         - A PEAR_Exception::OBSERVER_* constant
+	 *                         - An array(const PEAR_Exception::OBSERVER_*,
+	 *                           mixed $options)
+	 * @param string $label    The name of the observer. Use this if you want
+	 *                         to remove it later with removeObserver()
+	 */
+	public static function addObserver($callback, $label = 'default')
+	{
+		self::$_observers[$label] = $callback;
+	}
 
-    public static function removeObserver($label = 'default')
-    {
-        unset(self::$_observers[$label]);
-    }
+	public static function removeObserver($label = 'default')
+	{
+		unset(self::$_observers[$label]);
+	}
 
-    /**
-     * @return int unique identifier for an observer
-     */
-    public static function getUniqueId()
-    {
-        return self::$_uniqueid++;
-    }
+	/**
+	 * @return int unique identifier for an observer
+	 */
+	public static function getUniqueId()
+	{
+		return self::$_uniqueid++;
+	}
 
-    private function signal()
-    {
-        foreach (self::$_observers as $func) {
-            if (is_callable($func)) {
-                call_user_func($func, $this);
-                continue;
-            }
-            settype($func, 'array');
-            switch ($func[0]) {
-                case self::OBSERVER_PRINT :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    printf($f, $this->getMessage());
-                    break;
-                case self::OBSERVER_TRIGGER :
-                    $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
-                    trigger_error($this->getMessage(), $f);
-                    break;
-                case self::OBSERVER_DIE :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    die(printf($f, $this->getMessage()));
-                    break;
-                default:
-                    trigger_error('invalid observer type', E_USER_WARNING);
-            }
-        }
-    }
+	private function signal()
+	{
+		foreach (self::$_observers as $func) {
+			if (is_callable($func)) {
+				call_user_func($func, $this);
+				continue;
+			}
+			settype($func, 'array');
+			switch ($func[0]) {
+				case self::OBSERVER_PRINT :
+					$f = (isset($func[1])) ? $func[1] : '%s';
+					printf($f, $this->getMessage());
+					break;
+				case self::OBSERVER_TRIGGER :
+					$f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
+					trigger_error($this->getMessage(), $f);
+					break;
+				case self::OBSERVER_DIE :
+					$f = (isset($func[1])) ? $func[1] : '%s';
+					die(printf($f, $this->getMessage()));
+					break;
+				default:
+					trigger_error('invalid observer type', E_USER_WARNING);
+			}
+		}
+	}
 
-    /**
-     * Return specific error information that can be used for more detailed
-     * error messages or translation.
-     *
-     * This method may be overridden in child exception classes in order
-     * to add functionality not present in PEAR_Exception and is a placeholder
-     * to define API
-     *
-     * The returned array must be an associative array of parameter => value like so:
-     * <pre>
-     * array('name' => $name, 'context' => array(...))
-     * </pre>
-     * @return array
-     */
-    public function getErrorData()
-    {
-        return array();
-    }
+	/**
+	 * Return specific error information that can be used for more detailed
+	 * error messages or translation.
+	 *
+	 * This method may be overridden in child exception classes in order
+	 * to add functionality not present in PEAR_Exception and is a placeholder
+	 * to define API
+	 *
+	 * The returned array must be an associative array of parameter => value like so:
+	 * <pre>
+	 * array('name' => $name, 'context' => array(...))
+	 * </pre>
+	 * @return array
+	 */
+	public function getErrorData()
+	{
+		return array();
+	}
 
-    /**
-     * Returns the exception that caused this exception to be thrown
-     * @access public
-     * @return Exception|array The context of the exception
-     */
-    public function getCause()
-    {
-        return $this->cause;
-    }
+	/**
+	 * Returns the exception that caused this exception to be thrown
+	 * @access public
+	 * @return Exception|array The context of the exception
+	 */
+	public function getCause()
+	{
+		return $this->cause;
+	}
 
-    /**
-     * Function must be public to call on caused exceptions
-     * @param array
-     */
-    public function getCauseMessage(&$causes)
-    {
-        $trace = $this->getTraceSafe();
-        $cause = array('class'   => get_class($this),
-                       'message' => $this->message,
-                       'file' => 'unknown',
-                       'line' => 'unknown');
-        if (isset($trace[0])) {
-            if (isset($trace[0]['file'])) {
-                $cause['file'] = $trace[0]['file'];
-                $cause['line'] = $trace[0]['line'];
-            }
-        }
-        $causes[] = $cause;
-        if ($this->cause instanceof PEAR_Exception) {
-            $this->cause->getCauseMessage($causes);
-        } elseif ($this->cause instanceof Exception) {
-            $causes[] = array('class'   => get_class($this->cause),
-                              'message' => $this->cause->getMessage(),
-                              'file' => $this->cause->getFile(),
-                              'line' => $this->cause->getLine());
-        } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
-            $causes[] = array('class' => get_class($this->cause),
-                              'message' => $this->cause->getMessage(),
-                              'file' => 'unknown',
-                              'line' => 'unknown');
-        } elseif (is_array($this->cause)) {
-            foreach ($this->cause as $cause) {
-                if ($cause instanceof PEAR_Exception) {
-                    $cause->getCauseMessage($causes);
-                } elseif ($cause instanceof Exception) {
-                    $causes[] = array('class'   => get_class($cause),
-                                   'message' => $cause->getMessage(),
-                                   'file' => $cause->getFile(),
-                                   'line' => $cause->getLine());
-                } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
-                    $causes[] = array('class' => get_class($cause),
-                                      'message' => $cause->getMessage(),
-                                      'file' => 'unknown',
-                                      'line' => 'unknown');
-                } elseif (is_array($cause) && isset($cause['message'])) {
-                    // PEAR_ErrorStack warning
-                    $causes[] = array(
-                        'class' => $cause['package'],
-                        'message' => $cause['message'],
-                        'file' => isset($cause['context']['file']) ?
-                                            $cause['context']['file'] :
-                                            'unknown',
-                        'line' => isset($cause['context']['line']) ?
-                                            $cause['context']['line'] :
-                                            'unknown',
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * Function must be public to call on caused exceptions
+	 * @param array
+	 */
+	public function getCauseMessage(&$causes)
+	{
+		$trace = $this->getTraceSafe();
+		$cause = array('class'   => get_class($this),
+					   'message' => $this->message,
+					   'file' => 'unknown',
+					   'line' => 'unknown');
+		if (isset($trace[0])) {
+			if (isset($trace[0]['file'])) {
+				$cause['file'] = $trace[0]['file'];
+				$cause['line'] = $trace[0]['line'];
+			}
+		}
+		$causes[] = $cause;
+		if ($this->cause instanceof PEAR_Exception) {
+			$this->cause->getCauseMessage($causes);
+		} elseif ($this->cause instanceof Exception) {
+			$causes[] = array('class'   => get_class($this->cause),
+							  'message' => $this->cause->getMessage(),
+							  'file' => $this->cause->getFile(),
+							  'line' => $this->cause->getLine());
+		} elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
+			$causes[] = array('class' => get_class($this->cause),
+							  'message' => $this->cause->getMessage(),
+							  'file' => 'unknown',
+							  'line' => 'unknown');
+		} elseif (is_array($this->cause)) {
+			foreach ($this->cause as $cause) {
+				if ($cause instanceof PEAR_Exception) {
+					$cause->getCauseMessage($causes);
+				} elseif ($cause instanceof Exception) {
+					$causes[] = array('class'   => get_class($cause),
+								   'message' => $cause->getMessage(),
+								   'file' => $cause->getFile(),
+								   'line' => $cause->getLine());
+				} elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
+					$causes[] = array('class' => get_class($cause),
+									  'message' => $cause->getMessage(),
+									  'file' => 'unknown',
+									  'line' => 'unknown');
+				} elseif (is_array($cause) && isset($cause['message'])) {
+					// PEAR_ErrorStack warning
+					$causes[] = array(
+						'class' => $cause['package'],
+						'message' => $cause['message'],
+						'file' => isset($cause['context']['file']) ?
+											$cause['context']['file'] :
+											'unknown',
+						'line' => isset($cause['context']['line']) ?
+											$cause['context']['line'] :
+											'unknown',
+					);
+				}
+			}
+		}
+	}
 
-    public function getTraceSafe()
-    {   
-        if (!isset($this->_trace)) {
-            $this->_trace = $this->getTrace();
-            if (empty($this->_trace)) {
-                $backtrace = debug_backtrace();
-                $this->_trace = array($backtrace[count($backtrace)-1]);
-            }
-        }
-        return $this->_trace;
-    }
+	public function getTraceSafe()
+	{   
+		if (!isset($this->_trace)) {
+			$this->_trace = $this->getTrace();
+			if (empty($this->_trace)) {
+				$backtrace = debug_backtrace();
+				$this->_trace = array($backtrace[count($backtrace)-1]);
+			}
+		}
+		return $this->_trace;
+	}
 
-    public function getErrorClass()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['class'];
-    }
+	public function getErrorClass()
+	{
+		$trace = $this->getTraceSafe();
+		return $trace[0]['class'];
+	}
 
-    public function getErrorMethod()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['function'];
-    }
+	public function getErrorMethod()
+	{
+		$trace = $this->getTraceSafe();
+		return $trace[0]['function'];
+	}
 
-    public function __toString()
-    {
-        if (isset($_SERVER['REQUEST_URI'])) {
-            return $this->toHtml();
-        }
-        return $this->toText();
-    }
+	public function __toString()
+	{
+		if (isset($_SERVER['REQUEST_URI'])) {
+			return $this->toHtml();
+		}
+		return $this->toText();
+	}
 
-    public function toHtml()
-    {
-        $trace = $this->getTraceSafe();
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $html =  '<table border="1" cellspacing="0">' . "\n";
-        foreach ($causes as $i => $cause) {
-            $html .= '<tr><td colspan="3" bgcolor="#ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
-               . "</td></tr>\n";
-        }
-        $html .= '<tr><td colspan="3" bgcolor="#aaaaaa" align="center"><b>Exception trace</b></td></tr>' . "\n"
-               . '<tr><td align="center" bgcolor="#cccccc" width="20"><b>#</b></td>'
-               . '<td align="center" bgcolor="#cccccc"><b>Function</b></td>'
-               . '<td align="center" bgcolor="#cccccc"><b>Location</b></td></tr>' . "\n";
+	public function toHtml()
+	{
+		$trace = $this->getTraceSafe();
+		$causes = array();
+		$this->getCauseMessage($causes);
+		$html =  '<table border="1" cellspacing="0">' . "\n";
+		foreach ($causes as $i => $cause) {
+			$html .= '<tr><td colspan="3" bgcolor="#ff9999">'
+			   . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
+			   . htmlspecialchars($cause['message'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' in <b>' . $cause['file'] . '</b> '
+			   . 'on line <b>' . $cause['line'] . '</b>'
+			   . "</td></tr>\n";
+		}
+		$html .= '<tr><td colspan="3" bgcolor="#aaaaaa" align="center"><b>Exception trace</b></td></tr>' . "\n"
+			   . '<tr><td align="center" bgcolor="#cccccc" width="20"><b>#</b></td>'
+			   . '<td align="center" bgcolor="#cccccc"><b>Function</b></td>'
+			   . '<td align="center" bgcolor="#cccccc"><b>Location</b></td></tr>' . "\n";
 
-        foreach ($trace as $k => $v) {
-            $html .= '<tr><td align="center">' . $k . '</td>'
-                   . '<td>';
-            if (!empty($v['class'])) {
-                $html .= $v['class'] . $v['type'];
-            }
-            $html .= $v['function'];
-            $args = array();
-            if (!empty($v['args'])) {
-                foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
-                        $arg = (string)$arg;
-                        $str = htmlspecialchars(substr($arg, 0, 16), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-                        if (strlen($arg) > 16) $str .= '&hellip;';
-                        $args[] = "'" . $str . "'";
-                    }
-                }
-            }
-            $html .= '(' . implode(', ',$args) . ')'
-                   . '</td>'
-                   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
-                   . '</td></tr>' . "\n";
-        }
-        $html .= '<tr><td align="center">' . ($k+1) . '</td>'
-               . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
-               . '</table>';
-        return $html;
-    }
+		foreach ($trace as $k => $v) {
+			$html .= '<tr><td align="center">' . $k . '</td>'
+				   . '<td>';
+			if (!empty($v['class'])) {
+				$html .= $v['class'] . $v['type'];
+			}
+			$html .= $v['function'];
+			$args = array();
+			if (!empty($v['args'])) {
+				foreach ($v['args'] as $arg) {
+					if (is_null($arg)) $args[] = 'null';
+					elseif (is_array($arg)) $args[] = 'Array';
+					elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
+					elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
+					elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
+					else {
+						$arg = (string)$arg;
+						$str = htmlspecialchars(substr($arg, 0, 16), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+						if (strlen($arg) > 16) $str .= '&hellip;';
+						$args[] = "'" . $str . "'";
+					}
+				}
+			}
+			$html .= '(' . implode(', ',$args) . ')'
+				   . '</td>'
+				   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
+				   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
+				   . '</td></tr>' . "\n";
+		}
+		$html .= '<tr><td align="center">' . ($k+1) . '</td>'
+			   . '<td>{main}</td>'
+			   . '<td>&nbsp;</td></tr>' . "\n"
+			   . '</table>';
+		return $html;
+	}
 
-    public function toText()
-    {
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $causeMsg = '';
-        foreach ($causes as $i => $cause) {
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
-                   . $cause['message'] . ' in ' . $cause['file']
-                   . ' on line ' . $cause['line'] . "\n";
-        }
-        return $causeMsg . $this->getTraceAsString();
-    }
+	public function toText()
+	{
+		$causes = array();
+		$this->getCauseMessage($causes);
+		$causeMsg = '';
+		foreach ($causes as $i => $cause) {
+			$causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
+				   . $cause['message'] . ' in ' . $cause['file']
+				   . ' on line ' . $cause['line'] . "\n";
+		}
+		return $causeMsg . $this->getTraceAsString();
+	}
 }
 
 ?>

Braces +14 added lines, -7 removed lines

@@ -348,15 +348,22 @@
             $args = array();
             if (!empty($v['args'])) {
                 foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
+                    if (is_null($arg)) {
+                    	$args[] = 'null';
+                    } elseif (is_array($arg)) {
+                    	$args[] = 'Array';
+                    } elseif (is_object($arg)) {
+                    	$args[] = 'Object('.get_class($arg).')';
+                    } elseif (is_bool($arg)) {
+                    	$args[] = $arg ? 'true' : 'false';
+                    } elseif (is_int($arg) || is_double($arg)) {
+                    	$args[] = $arg;
+                    } else {
                         $arg = (string)$arg;
                         $str = htmlspecialchars(substr($arg, 0, 16), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-                        if (strlen($arg) > 16) $str .= '…';
+                        if (strlen($arg) > 16) {
+                        	$str .= '…';
+                        }
                         $args[] = "'" . $str . "'";
                     }
                 }

Spacing +24 added lines, -26 removed lines

@@ -127,7 +127,7 @@ 
             // using is_object allows both Exception and PEAR_Error
             if (is_object($p2) && !($p2 instanceof Exception)) {
                 if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
-                    throw new PEAR_Exception('exception cause must be Exception, ' .
+                    throw new PEAR_Exception('exception cause must be Exception, '.
                         'array, or PEAR_Error');
                 }
             }
@@ -277,11 +277,9 @@ 
                         'class' => $cause['package'],
                         'message' => $cause['message'],
                         'file' => isset($cause['context']['file']) ?
-                                            $cause['context']['file'] :
-                                            'unknown',
+                                            $cause['context']['file'] : 'unknown',
                         'line' => isset($cause['context']['line']) ?
-                                            $cause['context']['line'] :
-                                            'unknown',
+                                            $cause['context']['line'] : 'unknown',
                     );
                 }
             }
@@ -294,7 +292,7 @@ 
             $this->_trace = $this->getTrace();
             if (empty($this->_trace)) {
                 $backtrace = debug_backtrace();
-                $this->_trace = array($backtrace[count($backtrace)-1]);
+                $this->_trace = array($backtrace[count($backtrace) - 1]);
             }
         }
         return $this->_trace;
@@ -325,24 +323,24 @@ 
         $trace = $this->getTraceSafe();
         $causes = array();
         $this->getCauseMessage($causes);
-        $html =  '<table border="1" cellspacing="0">' . "\n";
+        $html = '<table border="1" cellspacing="0">'."\n";
         foreach ($causes as $i => $cause) {
             $html .= '<tr><td colspan="3" bgcolor="#ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
+               . str_repeat('-', $i).' <b>'.$cause['class'].'</b>: '
+               . htmlspecialchars($cause['message'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false).' in <b>'.$cause['file'].'</b> '
+               . 'on line <b>'.$cause['line'].'</b>'
                . "</td></tr>\n";
         }
-        $html .= '<tr><td colspan="3" bgcolor="#aaaaaa" align="center"><b>Exception trace</b></td></tr>' . "\n"
+        $html .= '<tr><td colspan="3" bgcolor="#aaaaaa" align="center"><b>Exception trace</b></td></tr>'."\n"
                . '<tr><td align="center" bgcolor="#cccccc" width="20"><b>#</b></td>'
                . '<td align="center" bgcolor="#cccccc"><b>Function</b></td>'
-               . '<td align="center" bgcolor="#cccccc"><b>Location</b></td></tr>' . "\n";
+               . '<td align="center" bgcolor="#cccccc"><b>Location</b></td></tr>'."\n";
 
         foreach ($trace as $k => $v) {
-            $html .= '<tr><td align="center">' . $k . '</td>'
+            $html .= '<tr><td align="center">'.$k.'</td>'
                    . '<td>';
             if (!empty($v['class'])) {
-                $html .= $v['class'] . $v['type'];
+                $html .= $v['class'].$v['type'];
             }
             $html .= $v['function'];
             $args = array();
@@ -354,22 +352,22 @@ 
                     elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
                     elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
                     else {
-                        $arg = (string)$arg;
+                        $arg = (string) $arg;
                         $str = htmlspecialchars(substr($arg, 0, 16), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
                         if (strlen($arg) > 16) $str .= '&hellip;';
-                        $args[] = "'" . $str . "'";
+                        $args[] = "'".$str."'";
                     }
                 }
             }
-            $html .= '(' . implode(', ',$args) . ')'
+            $html .= '('.implode(', ', $args).')'
                    . '</td>'
-                   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
-                   . '</td></tr>' . "\n";
+                   . '<td>'.(isset($v['file']) ? $v['file'] : 'unknown')
+                   . ':'.(isset($v['line']) ? $v['line'] : 'unknown')
+                   . '</td></tr>'."\n";
         }
-        $html .= '<tr><td align="center">' . ($k+1) . '</td>'
+        $html .= '<tr><td align="center">'.($k + 1).'</td>'
                . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
+               . '<td>&nbsp;</td></tr>'."\n"
                . '</table>';
         return $html;
     }
@@ -380,11 +378,11 @@ 
         $this->getCauseMessage($causes);
         $causeMsg = '';
         foreach ($causes as $i => $cause) {
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
-                   . $cause['message'] . ' in ' . $cause['file']
-                   . ' on line ' . $cause['line'] . "\n";
+            $causeMsg .= str_repeat(' ', $i).$cause['class'].': '
+                   . $cause['message'].' in '.$cause['file']
+                   . ' on line '.$cause['line']."\n";
         }
-        return $causeMsg . $this->getTraceAsString();
+        return $causeMsg.$this->getTraceAsString();
     }
 }
 

Doc Comments +2 added lines

@@ -117,6 +117,8 @@
      * @param string exception message
      * @param int|Exception|PEAR_Error|array|null exception cause
      * @param int|null exception code or null
+     * @param string|null $message
+     * @param integer $p2
      */
     public function __construct($message, $p2 = null, $p3 = null)
     {

libs/PEAR.1.9/PEAR5.php

Indentation +23 added lines, -23 removed lines

@@ -5,29 +5,29 @@
  */
 class PEAR5
 {
-    /**
-    * 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 = &PEAR5::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.
-    */
-    static function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
+	/**
+	 * 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 = &PEAR5::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.
+	 */
+	static function &getStaticProperty($class, $var)
+	{
+		static $properties;
+		if (!isset($properties[$class])) {
+			$properties[$class] = array();
+		}
 
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
+		if (!array_key_exists($var, $properties[$class])) {
+			$properties[$class][$var] = null;
+		}
 
-        return $properties[$class][$var];
-    }
+		return $properties[$class][$var];
+	}
 }
\ 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 +3 added lines, -3 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);
 
@@ -323,7 +323,7 @@ 
             return $this->raiseError('not connected');
         }
 
-        return fwrite($this->fp, $data . "\r\n");
+        return fwrite($this->fp, $data."\r\n");
     }
 
     /**
@@ -402,7 +402,7 @@ 
         }
 
         $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00")  {
+        while (($char = @fread($this->fp, 1)) != "\x00") {
             $string .= $char;
         }
         return $string;