Inspection of "Merge branch 'release/1.9.0'" - xpressengine/xe-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( b130b6...8a2f54 )

by gyeong-won

created 2017-11-30 04:09 UTC

Status

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -425,7 +425,7 @@
 block discarded – undo
      *
      * @param string $domain domain name
      *
-     * @return string|bool   registered domain, will return false if $domain is
+     * @return false|string   registered domain, will return false if $domain is
      *                       either invalid or a TLD itself
      */
     public static function getRegisteredDomain($domain)

Please login to merge, or discard this patch.

Indentation +457 added lines, -457 removed lines patch added patch discarded remove patch

@@ -33,462 +33,462 @@
 block discarded – undo
  */
 class HTTP_Request2_CookieJar implements Serializable
 {
-    /**
-     * Array of stored cookies
-     *
-     * The array is indexed by domain, path and cookie name
-     *   .example.com
-     *     /
-     *       some_cookie => cookie data
-     *     /subdir
-     *       other_cookie => cookie data
-     *   .example.org
-     *     ...
-     *
-     * @var array
-     */
-    protected $cookies = array();
-
-    /**
-     * Whether session cookies should be serialized when serializing the jar
-     * @var bool
-     */
-    protected $serializeSession = false;
-
-    /**
-     * Whether Public Suffix List should be used for domain matching
-     * @var bool
-     */
-    protected $useList = true;
-
-    /**
-     * Array with Public Suffix List data
-     * @var  array
-     * @link http://publicsuffix.org/
-     */
-    protected static $psl = array();
-
-    /**
-     * Class constructor, sets various options
-     *
-     * @param bool $serializeSessionCookies Controls serializing session cookies,
-     *                                      see {@link serializeSessionCookies()}
-     * @param bool $usePublicSuffixList     Controls using Public Suffix List,
-     *                                      see {@link usePublicSuffixList()}
-     */
-    public function __construct(
-        $serializeSessionCookies = false, $usePublicSuffixList = true
-    ) {
-        $this->serializeSessionCookies($serializeSessionCookies);
-        $this->usePublicSuffixList($usePublicSuffixList);
-    }
-
-    /**
-     * Returns current time formatted in ISO-8601 at UTC timezone
-     *
-     * @return string
-     */
-    protected function now()
-    {
-        $dt = new DateTime();
-        $dt->setTimezone(new DateTimeZone('UTC'));
-        return $dt->format(DateTime::ISO8601);
-    }
-
-    /**
-     * Checks cookie array for correctness, possibly updating its 'domain', 'path' and 'expires' fields
-     *
-     * The checks are as follows:
-     *   - cookie array should contain 'name' and 'value' fields;
-     *   - name and value should not contain disallowed symbols;
-     *   - 'expires' should be either empty parseable by DateTime;
-     *   - 'domain' and 'path' should be either not empty or an URL where
-     *     cookie was set should be provided.
-     *   - if $setter is provided, then document at that URL should be allowed
-     *     to set a cookie for that 'domain'. If $setter is not provided,
-     *     then no domain checks will be made.
-     *
-     * 'expires' field will be converted to ISO8601 format from COOKIE format,
-     * 'domain' and 'path' will be set from setter URL if empty.
-     *
-     * @param array    $cookie cookie data, as returned by
-     *                         {@link HTTP_Request2_Response::getCookies()}
-     * @param Net_URL2 $setter URL of the document that sent Set-Cookie header
-     *
-     * @return   array    Updated cookie array
-     * @throws   HTTP_Request2_LogicException
-     * @throws   HTTP_Request2_MessageException
-     */
-    protected function checkAndUpdateFields(array $cookie, Net_URL2 $setter = null)
-    {
-        if ($missing = array_diff(array('name', 'value'), array_keys($cookie))) {
-            throw new HTTP_Request2_LogicException(
-                "Cookie array should contain 'name' and 'value' fields",
-                HTTP_Request2_Exception::MISSING_VALUE
-            );
-        }
-        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['name'])) {
-            throw new HTTP_Request2_LogicException(
-                "Invalid cookie name: '{$cookie['name']}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['value'])) {
-            throw new HTTP_Request2_LogicException(
-                "Invalid cookie value: '{$cookie['value']}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $cookie += array('domain' => '', 'path' => '', 'expires' => null, 'secure' => false);
-
-        // Need ISO-8601 date @ UTC timezone
-        if (!empty($cookie['expires'])
-            && !preg_match('/^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+0000$/', $cookie['expires'])
-        ) {
-            try {
-                $dt = new DateTime($cookie['expires']);
-                $dt->setTimezone(new DateTimeZone('UTC'));
-                $cookie['expires'] = $dt->format(DateTime::ISO8601);
-            } catch (Exception $e) {
-                throw new HTTP_Request2_LogicException($e->getMessage());
-            }
-        }
-
-        if (empty($cookie['domain']) || empty($cookie['path'])) {
-            if (!$setter) {
-                throw new HTTP_Request2_LogicException(
-                    'Cookie misses domain and/or path component, cookie setter URL needed',
-                    HTTP_Request2_Exception::MISSING_VALUE
-                );
-            }
-            if (empty($cookie['domain'])) {
-                if ($host = $setter->getHost()) {
-                    $cookie['domain'] = $host;
-                } else {
-                    throw new HTTP_Request2_LogicException(
-                        'Setter URL does not contain host part, can\'t set cookie domain',
-                        HTTP_Request2_Exception::MISSING_VALUE
-                    );
-                }
-            }
-            if (empty($cookie['path'])) {
-                $path = $setter->getPath();
-                $cookie['path'] = empty($path)? '/': substr($path, 0, strrpos($path, '/') + 1);
-            }
-        }
-
-        if ($setter && !$this->domainMatch($setter->getHost(), $cookie['domain'])) {
-            throw new HTTP_Request2_MessageException(
-                "Domain " . $setter->getHost() . " cannot set cookies for "
-                . $cookie['domain']
-            );
-        }
-
-        return $cookie;
-    }
-
-    /**
-     * Stores a cookie in the jar
-     *
-     * @param array    $cookie cookie data, as returned by
-     *                         {@link HTTP_Request2_Response::getCookies()}
-     * @param Net_URL2 $setter URL of the document that sent Set-Cookie header
-     *
-     * @throws   HTTP_Request2_Exception
-     */
-    public function store(array $cookie, Net_URL2 $setter = null)
-    {
-        $cookie = $this->checkAndUpdateFields($cookie, $setter);
-
-        if (strlen($cookie['value'])
-            && (is_null($cookie['expires']) || $cookie['expires'] > $this->now())
-        ) {
-            if (!isset($this->cookies[$cookie['domain']])) {
-                $this->cookies[$cookie['domain']] = array();
-            }
-            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
-                $this->cookies[$cookie['domain']][$cookie['path']] = array();
-            }
-            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
-
-        } elseif (isset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']])) {
-            unset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']]);
-        }
-    }
-
-    /**
-     * Adds cookies set in HTTP response to the jar
-     *
-     * @param HTTP_Request2_Response $response HTTP response message
-     * @param Net_URL2               $setter   original request URL, needed for
-     *                               setting default domain/path
-     */
-    public function addCookiesFromResponse(HTTP_Request2_Response $response, Net_URL2 $setter)
-    {
-        foreach ($response->getCookies() as $cookie) {
-            $this->store($cookie, $setter);
-        }
-    }
-
-    /**
-     * Returns all cookies matching a given request URL
-     *
-     * The following checks are made:
-     *   - cookie domain should match request host
-     *   - cookie path should be a prefix for request path
-     *   - 'secure' cookies will only be sent for HTTPS requests
-     *
-     * @param Net_URL2 $url      Request url
-     * @param bool     $asString Whether to return cookies as string for "Cookie: " header
-     *
-     * @return array|string Matching cookies
-     */
-    public function getMatching(Net_URL2 $url, $asString = false)
-    {
-        $host   = $url->getHost();
-        $path   = $url->getPath();
-        $secure = 0 == strcasecmp($url->getScheme(), 'https');
-
-        $matched = $ret = array();
-        foreach (array_keys($this->cookies) as $domain) {
-            if ($this->domainMatch($host, $domain)) {
-                foreach (array_keys($this->cookies[$domain]) as $cPath) {
-                    if (0 === strpos($path, $cPath)) {
-                        foreach ($this->cookies[$domain][$cPath] as $name => $cookie) {
-                            if (!$cookie['secure'] || $secure) {
-                                $matched[$name][strlen($cookie['path'])] = $cookie;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        foreach ($matched as $cookies) {
-            krsort($cookies);
-            $ret = array_merge($ret, $cookies);
-        }
-        if (!$asString) {
-            return $ret;
-        } else {
-            $str = '';
-            foreach ($ret as $c) {
-                $str .= (empty($str)? '': '; ') . $c['name'] . '=' . $c['value'];
-            }
-            return $str;
-        }
-    }
-
-    /**
-     * Returns all cookies stored in a jar
-     *
-     * @return array
-     */
-    public function getAll()
-    {
-        $cookies = array();
-        foreach (array_keys($this->cookies) as $domain) {
-            foreach (array_keys($this->cookies[$domain]) as $path) {
-                foreach ($this->cookies[$domain][$path] as $name => $cookie) {
-                    $cookies[] = $cookie;
-                }
-            }
-        }
-        return $cookies;
-    }
-
-    /**
-     * Sets whether session cookies should be serialized when serializing the jar
-     *
-     * @param boolean $serialize serialize?
-     */
-    public function serializeSessionCookies($serialize)
-    {
-        $this->serializeSession = (bool)$serialize;
-    }
-
-    /**
-     * Sets whether Public Suffix List should be used for restricting cookie-setting
-     *
-     * Without PSL {@link domainMatch()} will only prevent setting cookies for
-     * top-level domains like '.com' or '.org'. However, it will not prevent
-     * setting a cookie for '.co.uk' even though only third-level registrations
-     * are possible in .uk domain.
-     *
-     * With the List it is possible to find the highest level at which a domain
-     * may be registered for a particular top-level domain and consequently
-     * prevent cookies set for '.co.uk' or '.msk.ru'. The same list is used by
-     * Firefox, Chrome and Opera browsers to restrict cookie setting.
-     *
-     * Note that PSL is licensed differently to HTTP_Request2 package (refer to
-     * the license information in public-suffix-list.php), so you can disable
-     * its use if this is an issue for you.
-     *
-     * @param boolean $useList use the list?
-     *
-     * @link     http://publicsuffix.org/learn/
-     */
-    public function usePublicSuffixList($useList)
-    {
-        $this->useList = (bool)$useList;
-    }
-
-    /**
-     * Returns string representation of object
-     *
-     * @return string
-     *
-     * @see    Serializable::serialize()
-     */
-    public function serialize()
-    {
-        $cookies = $this->getAll();
-        if (!$this->serializeSession) {
-            for ($i = count($cookies) - 1; $i >= 0; $i--) {
-                if (empty($cookies[$i]['expires'])) {
-                    unset($cookies[$i]);
-                }
-            }
-        }
-        return serialize(array(
-            'cookies'          => $cookies,
-            'serializeSession' => $this->serializeSession,
-            'useList'          => $this->useList
-        ));
-    }
-
-    /**
-     * Constructs the object from serialized string
-     *
-     * @param string $serialized string representation
-     *
-     * @see   Serializable::unserialize()
-     */
-    public function unserialize($serialized)
-    {
-        $data = unserialize($serialized);
-        $now  = $this->now();
-        $this->serializeSessionCookies($data['serializeSession']);
-        $this->usePublicSuffixList($data['useList']);
-        foreach ($data['cookies'] as $cookie) {
-            if (!empty($cookie['expires']) && $cookie['expires'] <= $now) {
-                continue;
-            }
-            if (!isset($this->cookies[$cookie['domain']])) {
-                $this->cookies[$cookie['domain']] = array();
-            }
-            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
-                $this->cookies[$cookie['domain']][$cookie['path']] = array();
-            }
-            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
-        }
-    }
-
-    /**
-     * Checks whether a cookie domain matches a request host.
-     *
-     * The method is used by {@link store()} to check for whether a document
-     * at given URL can set a cookie with a given domain attribute and by
-     * {@link getMatching()} to find cookies matching the request URL.
-     *
-     * @param string $requestHost  request host
-     * @param string $cookieDomain cookie domain
-     *
-     * @return   bool    match success
-     */
-    public function domainMatch($requestHost, $cookieDomain)
-    {
-        if ($requestHost == $cookieDomain) {
-            return true;
-        }
-        // IP address, we require exact match
-        if (preg_match('/^(?:\d{1,3}\.){3}\d{1,3}$/', $requestHost)) {
-            return false;
-        }
-        if ('.' != $cookieDomain[0]) {
-            $cookieDomain = '.' . $cookieDomain;
-        }
-        // prevents setting cookies for '.com' and similar domains
-        if (!$this->useList && substr_count($cookieDomain, '.') < 2
-            || $this->useList && !self::getRegisteredDomain($cookieDomain)
-        ) {
-            return false;
-        }
-        return substr('.' . $requestHost, -strlen($cookieDomain)) == $cookieDomain;
-    }
-
-    /**
-     * Removes subdomains to get the registered domain (the first after top-level)
-     *
-     * The method will check Public Suffix List to find out where top-level
-     * domain ends and registered domain starts. It will remove domain parts
-     * to the left of registered one.
-     *
-     * @param string $domain domain name
-     *
-     * @return string|bool   registered domain, will return false if $domain is
-     *                       either invalid or a TLD itself
-     */
-    public static function getRegisteredDomain($domain)
-    {
-        $domainParts = explode('.', ltrim($domain, '.'));
-
-        // load the list if needed
-        if (empty(self::$psl)) {
-            $path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
-            if (0 === strpos($path, '@' . 'data_dir@')) {
-                $path = realpath(
-                    dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
-                    . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data'
-                );
-            }
-            self::$psl = include_once $path . DIRECTORY_SEPARATOR . 'public-suffix-list.php';
-        }
-
-        if (!($result = self::checkDomainsList($domainParts, self::$psl))) {
-            // known TLD, invalid domain name
-            return false;
-        }
-
-        // unknown TLD
-        if (!strpos($result, '.')) {
-            // fallback to checking that domain "has at least two dots"
-            if (2 > ($count = count($domainParts))) {
-                return false;
-            }
-            return $domainParts[$count - 2] . '.' . $domainParts[$count - 1];
-        }
-        return $result;
-    }
-
-    /**
-     * Recursive helper method for {@link getRegisteredDomain()}
-     *
-     * @param array $domainParts remaining domain parts
-     * @param mixed $listNode    node in {@link HTTP_Request2_CookieJar::$psl} to check
-     *
-     * @return string|null   concatenated domain parts, null in case of error
-     */
-    protected static function checkDomainsList(array $domainParts, $listNode)
-    {
-        $sub    = array_pop($domainParts);
-        $result = null;
-
-        if (!is_array($listNode) || is_null($sub)
-            || array_key_exists('!' . $sub, $listNode)
-        ) {
-            return $sub;
-
-        } elseif (array_key_exists($sub, $listNode)) {
-            $result = self::checkDomainsList($domainParts, $listNode[$sub]);
-
-        } elseif (array_key_exists('*', $listNode)) {
-            $result = self::checkDomainsList($domainParts, $listNode['*']);
-
-        } else {
-            return $sub;
-        }
-
-        return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
-    }
+	/**
+	 * Array of stored cookies
+	 *
+	 * The array is indexed by domain, path and cookie name
+	 *   .example.com
+	 *     /
+	 *       some_cookie => cookie data
+	 *     /subdir
+	 *       other_cookie => cookie data
+	 *   .example.org
+	 *     ...
+	 *
+	 * @var array
+	 */
+	protected $cookies = array();
+
+	/**
+	 * Whether session cookies should be serialized when serializing the jar
+	 * @var bool
+	 */
+	protected $serializeSession = false;
+
+	/**
+	 * Whether Public Suffix List should be used for domain matching
+	 * @var bool
+	 */
+	protected $useList = true;
+
+	/**
+	 * Array with Public Suffix List data
+	 * @var  array
+	 * @link http://publicsuffix.org/
+	 */
+	protected static $psl = array();
+
+	/**
+	 * Class constructor, sets various options
+	 *
+	 * @param bool $serializeSessionCookies Controls serializing session cookies,
+	 *                                      see {@link serializeSessionCookies()}
+	 * @param bool $usePublicSuffixList     Controls using Public Suffix List,
+	 *                                      see {@link usePublicSuffixList()}
+	 */
+	public function __construct(
+		$serializeSessionCookies = false, $usePublicSuffixList = true
+	) {
+		$this->serializeSessionCookies($serializeSessionCookies);
+		$this->usePublicSuffixList($usePublicSuffixList);
+	}
+
+	/**
+	 * Returns current time formatted in ISO-8601 at UTC timezone
+	 *
+	 * @return string
+	 */
+	protected function now()
+	{
+		$dt = new DateTime();
+		$dt->setTimezone(new DateTimeZone('UTC'));
+		return $dt->format(DateTime::ISO8601);
+	}
+
+	/**
+	 * Checks cookie array for correctness, possibly updating its 'domain', 'path' and 'expires' fields
+	 *
+	 * The checks are as follows:
+	 *   - cookie array should contain 'name' and 'value' fields;
+	 *   - name and value should not contain disallowed symbols;
+	 *   - 'expires' should be either empty parseable by DateTime;
+	 *   - 'domain' and 'path' should be either not empty or an URL where
+	 *     cookie was set should be provided.
+	 *   - if $setter is provided, then document at that URL should be allowed
+	 *     to set a cookie for that 'domain'. If $setter is not provided,
+	 *     then no domain checks will be made.
+	 *
+	 * 'expires' field will be converted to ISO8601 format from COOKIE format,
+	 * 'domain' and 'path' will be set from setter URL if empty.
+	 *
+	 * @param array    $cookie cookie data, as returned by
+	 *                         {@link HTTP_Request2_Response::getCookies()}
+	 * @param Net_URL2 $setter URL of the document that sent Set-Cookie header
+	 *
+	 * @return   array    Updated cookie array
+	 * @throws   HTTP_Request2_LogicException
+	 * @throws   HTTP_Request2_MessageException
+	 */
+	protected function checkAndUpdateFields(array $cookie, Net_URL2 $setter = null)
+	{
+		if ($missing = array_diff(array('name', 'value'), array_keys($cookie))) {
+			throw new HTTP_Request2_LogicException(
+				"Cookie array should contain 'name' and 'value' fields",
+				HTTP_Request2_Exception::MISSING_VALUE
+			);
+		}
+		if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['name'])) {
+			throw new HTTP_Request2_LogicException(
+				"Invalid cookie name: '{$cookie['name']}'",
+				HTTP_Request2_Exception::INVALID_ARGUMENT
+			);
+		}
+		if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['value'])) {
+			throw new HTTP_Request2_LogicException(
+				"Invalid cookie value: '{$cookie['value']}'",
+				HTTP_Request2_Exception::INVALID_ARGUMENT
+			);
+		}
+		$cookie += array('domain' => '', 'path' => '', 'expires' => null, 'secure' => false);
+
+		// Need ISO-8601 date @ UTC timezone
+		if (!empty($cookie['expires'])
+			&& !preg_match('/^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+0000$/', $cookie['expires'])
+		) {
+			try {
+				$dt = new DateTime($cookie['expires']);
+				$dt->setTimezone(new DateTimeZone('UTC'));
+				$cookie['expires'] = $dt->format(DateTime::ISO8601);
+			} catch (Exception $e) {
+				throw new HTTP_Request2_LogicException($e->getMessage());
+			}
+		}
+
+		if (empty($cookie['domain']) || empty($cookie['path'])) {
+			if (!$setter) {
+				throw new HTTP_Request2_LogicException(
+					'Cookie misses domain and/or path component, cookie setter URL needed',
+					HTTP_Request2_Exception::MISSING_VALUE
+				);
+			}
+			if (empty($cookie['domain'])) {
+				if ($host = $setter->getHost()) {
+					$cookie['domain'] = $host;
+				} else {
+					throw new HTTP_Request2_LogicException(
+						'Setter URL does not contain host part, can\'t set cookie domain',
+						HTTP_Request2_Exception::MISSING_VALUE
+					);
+				}
+			}
+			if (empty($cookie['path'])) {
+				$path = $setter->getPath();
+				$cookie['path'] = empty($path)? '/': substr($path, 0, strrpos($path, '/') + 1);
+			}
+		}
+
+		if ($setter && !$this->domainMatch($setter->getHost(), $cookie['domain'])) {
+			throw new HTTP_Request2_MessageException(
+				"Domain " . $setter->getHost() . " cannot set cookies for "
+				. $cookie['domain']
+			);
+		}
+
+		return $cookie;
+	}
+
+	/**
+	 * Stores a cookie in the jar
+	 *
+	 * @param array    $cookie cookie data, as returned by
+	 *                         {@link HTTP_Request2_Response::getCookies()}
+	 * @param Net_URL2 $setter URL of the document that sent Set-Cookie header
+	 *
+	 * @throws   HTTP_Request2_Exception
+	 */
+	public function store(array $cookie, Net_URL2 $setter = null)
+	{
+		$cookie = $this->checkAndUpdateFields($cookie, $setter);
+
+		if (strlen($cookie['value'])
+			&& (is_null($cookie['expires']) || $cookie['expires'] > $this->now())
+		) {
+			if (!isset($this->cookies[$cookie['domain']])) {
+				$this->cookies[$cookie['domain']] = array();
+			}
+			if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
+				$this->cookies[$cookie['domain']][$cookie['path']] = array();
+			}
+			$this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
+
+		} elseif (isset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']])) {
+			unset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']]);
+		}
+	}
+
+	/**
+	 * Adds cookies set in HTTP response to the jar
+	 *
+	 * @param HTTP_Request2_Response $response HTTP response message
+	 * @param Net_URL2               $setter   original request URL, needed for
+	 *                               setting default domain/path
+	 */
+	public function addCookiesFromResponse(HTTP_Request2_Response $response, Net_URL2 $setter)
+	{
+		foreach ($response->getCookies() as $cookie) {
+			$this->store($cookie, $setter);
+		}
+	}
+
+	/**
+	 * Returns all cookies matching a given request URL
+	 *
+	 * The following checks are made:
+	 *   - cookie domain should match request host
+	 *   - cookie path should be a prefix for request path
+	 *   - 'secure' cookies will only be sent for HTTPS requests
+	 *
+	 * @param Net_URL2 $url      Request url
+	 * @param bool     $asString Whether to return cookies as string for "Cookie: " header
+	 *
+	 * @return array|string Matching cookies
+	 */
+	public function getMatching(Net_URL2 $url, $asString = false)
+	{
+		$host   = $url->getHost();
+		$path   = $url->getPath();
+		$secure = 0 == strcasecmp($url->getScheme(), 'https');
+
+		$matched = $ret = array();
+		foreach (array_keys($this->cookies) as $domain) {
+			if ($this->domainMatch($host, $domain)) {
+				foreach (array_keys($this->cookies[$domain]) as $cPath) {
+					if (0 === strpos($path, $cPath)) {
+						foreach ($this->cookies[$domain][$cPath] as $name => $cookie) {
+							if (!$cookie['secure'] || $secure) {
+								$matched[$name][strlen($cookie['path'])] = $cookie;
+							}
+						}
+					}
+				}
+			}
+		}
+		foreach ($matched as $cookies) {
+			krsort($cookies);
+			$ret = array_merge($ret, $cookies);
+		}
+		if (!$asString) {
+			return $ret;
+		} else {
+			$str = '';
+			foreach ($ret as $c) {
+				$str .= (empty($str)? '': '; ') . $c['name'] . '=' . $c['value'];
+			}
+			return $str;
+		}
+	}
+
+	/**
+	 * Returns all cookies stored in a jar
+	 *
+	 * @return array
+	 */
+	public function getAll()
+	{
+		$cookies = array();
+		foreach (array_keys($this->cookies) as $domain) {
+			foreach (array_keys($this->cookies[$domain]) as $path) {
+				foreach ($this->cookies[$domain][$path] as $name => $cookie) {
+					$cookies[] = $cookie;
+				}
+			}
+		}
+		return $cookies;
+	}
+
+	/**
+	 * Sets whether session cookies should be serialized when serializing the jar
+	 *
+	 * @param boolean $serialize serialize?
+	 */
+	public function serializeSessionCookies($serialize)
+	{
+		$this->serializeSession = (bool)$serialize;
+	}
+
+	/**
+	 * Sets whether Public Suffix List should be used for restricting cookie-setting
+	 *
+	 * Without PSL {@link domainMatch()} will only prevent setting cookies for
+	 * top-level domains like '.com' or '.org'. However, it will not prevent
+	 * setting a cookie for '.co.uk' even though only third-level registrations
+	 * are possible in .uk domain.
+	 *
+	 * With the List it is possible to find the highest level at which a domain
+	 * may be registered for a particular top-level domain and consequently
+	 * prevent cookies set for '.co.uk' or '.msk.ru'. The same list is used by
+	 * Firefox, Chrome and Opera browsers to restrict cookie setting.
+	 *
+	 * Note that PSL is licensed differently to HTTP_Request2 package (refer to
+	 * the license information in public-suffix-list.php), so you can disable
+	 * its use if this is an issue for you.
+	 *
+	 * @param boolean $useList use the list?
+	 *
+	 * @link     http://publicsuffix.org/learn/
+	 */
+	public function usePublicSuffixList($useList)
+	{
+		$this->useList = (bool)$useList;
+	}
+
+	/**
+	 * Returns string representation of object
+	 *
+	 * @return string
+	 *
+	 * @see    Serializable::serialize()
+	 */
+	public function serialize()
+	{
+		$cookies = $this->getAll();
+		if (!$this->serializeSession) {
+			for ($i = count($cookies) - 1; $i >= 0; $i--) {
+				if (empty($cookies[$i]['expires'])) {
+					unset($cookies[$i]);
+				}
+			}
+		}
+		return serialize(array(
+			'cookies'          => $cookies,
+			'serializeSession' => $this->serializeSession,
+			'useList'          => $this->useList
+		));
+	}
+
+	/**
+	 * Constructs the object from serialized string
+	 *
+	 * @param string $serialized string representation
+	 *
+	 * @see   Serializable::unserialize()
+	 */
+	public function unserialize($serialized)
+	{
+		$data = unserialize($serialized);
+		$now  = $this->now();
+		$this->serializeSessionCookies($data['serializeSession']);
+		$this->usePublicSuffixList($data['useList']);
+		foreach ($data['cookies'] as $cookie) {
+			if (!empty($cookie['expires']) && $cookie['expires'] <= $now) {
+				continue;
+			}
+			if (!isset($this->cookies[$cookie['domain']])) {
+				$this->cookies[$cookie['domain']] = array();
+			}
+			if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
+				$this->cookies[$cookie['domain']][$cookie['path']] = array();
+			}
+			$this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
+		}
+	}
+
+	/**
+	 * Checks whether a cookie domain matches a request host.
+	 *
+	 * The method is used by {@link store()} to check for whether a document
+	 * at given URL can set a cookie with a given domain attribute and by
+	 * {@link getMatching()} to find cookies matching the request URL.
+	 *
+	 * @param string $requestHost  request host
+	 * @param string $cookieDomain cookie domain
+	 *
+	 * @return   bool    match success
+	 */
+	public function domainMatch($requestHost, $cookieDomain)
+	{
+		if ($requestHost == $cookieDomain) {
+			return true;
+		}
+		// IP address, we require exact match
+		if (preg_match('/^(?:\d{1,3}\.){3}\d{1,3}$/', $requestHost)) {
+			return false;
+		}
+		if ('.' != $cookieDomain[0]) {
+			$cookieDomain = '.' . $cookieDomain;
+		}
+		// prevents setting cookies for '.com' and similar domains
+		if (!$this->useList && substr_count($cookieDomain, '.') < 2
+			|| $this->useList && !self::getRegisteredDomain($cookieDomain)
+		) {
+			return false;
+		}
+		return substr('.' . $requestHost, -strlen($cookieDomain)) == $cookieDomain;
+	}
+
+	/**
+	 * Removes subdomains to get the registered domain (the first after top-level)
+	 *
+	 * The method will check Public Suffix List to find out where top-level
+	 * domain ends and registered domain starts. It will remove domain parts
+	 * to the left of registered one.
+	 *
+	 * @param string $domain domain name
+	 *
+	 * @return string|bool   registered domain, will return false if $domain is
+	 *                       either invalid or a TLD itself
+	 */
+	public static function getRegisteredDomain($domain)
+	{
+		$domainParts = explode('.', ltrim($domain, '.'));
+
+		// load the list if needed
+		if (empty(self::$psl)) {
+			$path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
+			if (0 === strpos($path, '@' . 'data_dir@')) {
+				$path = realpath(
+					dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
+					. DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data'
+				);
+			}
+			self::$psl = include_once $path . DIRECTORY_SEPARATOR . 'public-suffix-list.php';
+		}
+
+		if (!($result = self::checkDomainsList($domainParts, self::$psl))) {
+			// known TLD, invalid domain name
+			return false;
+		}
+
+		// unknown TLD
+		if (!strpos($result, '.')) {
+			// fallback to checking that domain "has at least two dots"
+			if (2 > ($count = count($domainParts))) {
+				return false;
+			}
+			return $domainParts[$count - 2] . '.' . $domainParts[$count - 1];
+		}
+		return $result;
+	}
+
+	/**
+	 * Recursive helper method for {@link getRegisteredDomain()}
+	 *
+	 * @param array $domainParts remaining domain parts
+	 * @param mixed $listNode    node in {@link HTTP_Request2_CookieJar::$psl} to check
+	 *
+	 * @return string|null   concatenated domain parts, null in case of error
+	 */
+	protected static function checkDomainsList(array $domainParts, $listNode)
+	{
+		$sub    = array_pop($domainParts);
+		$result = null;
+
+		if (!is_array($listNode) || is_null($sub)
+			|| array_key_exists('!' . $sub, $listNode)
+		) {
+			return $sub;
+
+		} elseif (array_key_exists($sub, $listNode)) {
+			$result = self::checkDomainsList($domainParts, $listNode[$sub]);
+
+		} elseif (array_key_exists('*', $listNode)) {
+			$result = self::checkDomainsList($domainParts, $listNode['*']);
+
+		} else {
+			return $sub;
+		}
+
+		return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -173,13 +173,13 @@  discard block
 block discarded – undo
             }
             if (empty($cookie['path'])) {
                 $path = $setter->getPath();
-                $cookie['path'] = empty($path)? '/': substr($path, 0, strrpos($path, '/') + 1);
+                $cookie['path'] = empty($path) ? '/' : substr($path, 0, strrpos($path, '/') + 1);
             }
         }
 
         if ($setter && !$this->domainMatch($setter->getHost(), $cookie['domain'])) {
             throw new HTTP_Request2_MessageException(
-                "Domain " . $setter->getHost() . " cannot set cookies for "
+                "Domain ".$setter->getHost()." cannot set cookies for "
                 . $cookie['domain']
             );
         }
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
         } else {
             $str = '';
             foreach ($ret as $c) {
-                $str .= (empty($str)? '': '; ') . $c['name'] . '=' . $c['value'];
+                $str .= (empty($str) ? '' : '; ').$c['name'].'='.$c['value'];
             }
             return $str;
         }
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
      */
     public function serializeSessionCookies($serialize)
     {
-        $this->serializeSession = (bool)$serialize;
+        $this->serializeSession = (bool) $serialize;
     }
 
     /**
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
      */
     public function usePublicSuffixList($useList)
     {
-        $this->useList = (bool)$useList;
+        $this->useList = (bool) $useList;
     }
 
     /**
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
             return false;
         }
         if ('.' != $cookieDomain[0]) {
-            $cookieDomain = '.' . $cookieDomain;
+            $cookieDomain = '.'.$cookieDomain;
         }
         // prevents setting cookies for '.com' and similar domains
         if (!$this->useList && substr_count($cookieDomain, '.') < 2
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
         ) {
             return false;
         }
-        return substr('.' . $requestHost, -strlen($cookieDomain)) == $cookieDomain;
+        return substr('.'.$requestHost, -strlen($cookieDomain)) == $cookieDomain;
     }
 
     /**
@@ -434,14 +434,14 @@  discard block
 block discarded – undo
 
         // load the list if needed
         if (empty(self::$psl)) {
-            $path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
-            if (0 === strpos($path, '@' . 'data_dir@')) {
+            $path = '@data_dir@'.DIRECTORY_SEPARATOR.'HTTP_Request2';
+            if (0 === strpos($path, '@'.'data_dir@')) {
                 $path = realpath(
-                    dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
-                    . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data'
+                    dirname(__FILE__).DIRECTORY_SEPARATOR.'..'
+                    . DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'data'
                 );
             }
-            self::$psl = include_once $path . DIRECTORY_SEPARATOR . 'public-suffix-list.php';
+            self::$psl = include_once $path.DIRECTORY_SEPARATOR.'public-suffix-list.php';
         }
 
         if (!($result = self::checkDomainsList($domainParts, self::$psl))) {
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
             if (2 > ($count = count($domainParts))) {
                 return false;
             }
-            return $domainParts[$count - 2] . '.' . $domainParts[$count - 1];
+            return $domainParts[$count - 2].'.'.$domainParts[$count - 1];
         }
         return $result;
     }
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
         $result = null;
 
         if (!is_array($listNode) || is_null($sub)
-            || array_key_exists('!' . $sub, $listNode)
+            || array_key_exists('!'.$sub, $listNode)
         ) {
             return $sub;
 
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
             return $sub;
         }
 
-        return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
+        return (strlen($result) > 0) ? ($result.'.'.$sub) : null;
     }
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

libs/PEAR.1.9.5/Net/URL2.php 3 patches

Doc Comments +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -229,7 +229,7 @@  discard block
 block discarded – undo
      * Returns the user part of the userinfo part (the part preceding the first
      *  ":"), or false if there is no userinfo part.
      *
-     * @return string|bool
+     * @return string|false
      */
     public function getUser()
     {
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
      * contain "@" in front of the hostname) or the userinfo part does not
      * contain ":".
      *
-     * @return string|bool
+     * @return string|false
      */
     public function getPassword()
     {
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
      * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
      * false if there is no authority.
      *
-     * @return string|bool
+     * @return false|string
      */
     public function getAuthority()
     {
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
      * Returns an Net_URL2 instance representing an absolute URL relative to
      * this URL.
      *
-     * @param Net_URL2|string $reference relative URL
+     * @param Net_URL2 $reference relative URL
      *
      * @throws Exception
      * @return $this
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
      * currently executing PHP script.
      *
      * @throws Exception
-     * @return string
+     * @return Net_URL2
      */
     public static function getCanonical()
     {
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
      *
      * @param string $optionName The name of the option to retrieve
      *
-     * @return mixed
+     * @return string
      */
     public function getOption($optionName)
     {

Please login to merge, or discard this patch.

Indentation +1160 added lines, -1160 removed lines patch added patch discarded remove patch

@@ -56,1164 +56,1164 @@
 block discarded – undo
  */
 class Net_URL2
 {
-    /**
-     * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
-     * is true.
-     */
-    const OPTION_STRICT = 'strict';
-
-    /**
-     * Represent arrays in query using PHP's [] notation. Default is true.
-     */
-    const OPTION_USE_BRACKETS = 'use_brackets';
-
-    /**
-     * Drop zero-based integer sequences in query using PHP's [] notation. Default
-     * is true.
-     */
-    const OPTION_DROP_SEQUENCE = 'drop_sequence';
-
-    /**
-     * URL-encode query variable keys. Default is true.
-     */
-    const OPTION_ENCODE_KEYS = 'encode_keys';
-
-    /**
-     * Query variable separators when parsing the query string. Every character
-     * is considered a separator. Default is "&".
-     */
-    const OPTION_SEPARATOR_INPUT = 'input_separator';
-
-    /**
-     * Query variable separator used when generating the query string. Default
-     * is "&".
-     */
-    const OPTION_SEPARATOR_OUTPUT = 'output_separator';
-
-    /**
-     * Default options corresponds to how PHP handles $_GET.
-     */
-    private $_options = array(
-        self::OPTION_STRICT           => true,
-        self::OPTION_USE_BRACKETS     => true,
-        self::OPTION_DROP_SEQUENCE    => true,
-        self::OPTION_ENCODE_KEYS      => true,
-        self::OPTION_SEPARATOR_INPUT  => '&',
-        self::OPTION_SEPARATOR_OUTPUT => '&',
-        );
-
-    /**
-     * @var  string|bool
-     */
-    private $_scheme = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_userinfo = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_host = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_port = false;
-
-    /**
-     * @var  string
-     */
-    private $_path = '';
-
-    /**
-     * @var  string|bool
-     */
-    private $_query = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_fragment = false;
-
-    /**
-     * Constructor.
-     *
-     * @param string $url     an absolute or relative URL
-     * @param array  $options an array of OPTION_xxx constants
-     *
-     * @uses   self::parseUrl()
-     */
-    public function __construct($url, array $options = array())
-    {
-        foreach ($options as $optionName => $value) {
-            if (array_key_exists($optionName, $this->_options)) {
-                $this->_options[$optionName] = $value;
-            }
-        }
-
-        $this->parseUrl($url);
-    }
-
-    /**
-     * Magic Setter.
-     *
-     * This method will magically set the value of a private variable ($var)
-     * with the value passed as the args
-     *
-     * @param string $var The private variable to set.
-     * @param mixed  $arg An argument of any type.
-     *
-     * @return void
-     */
-    public function __set($var, $arg)
-    {
-        $method = 'set' . $var;
-        if (method_exists($this, $method)) {
-            $this->$method($arg);
-        }
-    }
-
-    /**
-     * Magic Getter.
-     *
-     * This is the magic get method to retrieve the private variable
-     * that was set by either __set() or it's setter...
-     *
-     * @param string $var The property name to retrieve.
-     *
-     * @return mixed  $this->$var Either a boolean false if the
-     *                            property is not set or the value
-     *                            of the private property.
-     */
-    public function __get($var)
-    {
-        $method = 'get' . $var;
-        if (method_exists($this, $method)) {
-            return $this->$method();
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the scheme, e.g. "http" or "urn", or false if there is no
-     * scheme specified, i.e. if this is a relative URL.
-     *
-     * @return string|bool
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
-     * scheme specified, i.e. if this is a relative URL.
-     *
-     * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
-     *                            scheme specified, i.e. if this is a relative
-     *                            URL
-     *
-     * @return $this
-     * @see    getScheme
-     */
-    public function setScheme($scheme)
-    {
-        $this->_scheme = $scheme;
-        return $this;
-    }
-
-    /**
-     * Returns the user part of the userinfo part (the part preceding the first
-     *  ":"), or false if there is no userinfo part.
-     *
-     * @return string|bool
-     */
-    public function getUser()
-    {
-        return $this->_userinfo !== false
-            ? preg_replace('(:.*$)', '', $this->_userinfo)
-            : false;
-    }
-
-    /**
-     * Returns the password part of the userinfo part (the part after the first
-     *  ":"), or false if there is no userinfo part (i.e. the URL does not
-     * contain "@" in front of the hostname) or the userinfo part does not
-     * contain ":".
-     *
-     * @return string|bool
-     */
-    public function getPassword()
-    {
-        return $this->_userinfo !== false
-            ? substr(strstr($this->_userinfo, ':'), 1)
-            : false;
-    }
-
-    /**
-     * Returns the userinfo part, or false if there is none, i.e. if the
-     * authority part does not contain "@".
-     *
-     * @return string|bool
-     */
-    public function getUserinfo()
-    {
-        return $this->_userinfo;
-    }
-
-    /**
-     * Sets the userinfo part. If two arguments are passed, they are combined
-     * in the userinfo part as username ":" password.
-     *
-     * @param string|bool $userinfo userinfo or username
-     * @param string|bool $password optional password, or false
-     *
-     * @return $this
-     */
-    public function setUserinfo($userinfo, $password = false)
-    {
-        if ($password !== false) {
-            $userinfo .= ':' . $password;
-        }
-
-        if ($userinfo !== false) {
-            $userinfo = $this->_encodeData($userinfo);
-        }
-
-        $this->_userinfo = $userinfo;
-        return $this;
-    }
-
-    /**
-     * Returns the host part, or false if there is no authority part, e.g.
-     * relative URLs.
-     *
-     * @return string|bool a hostname, an IP address, or false
-     */
-    public function getHost()
-    {
-        return $this->_host;
-    }
-
-    /**
-     * Sets the host part. Specify false if there is no authority part, e.g.
-     * relative URLs.
-     *
-     * @param string|bool $host a hostname, an IP address, or false
-     *
-     * @return $this
-     */
-    public function setHost($host)
-    {
-        $this->_host = $host;
-        return $this;
-    }
-
-    /**
-     * Returns the port number, or false if there is no port number specified,
-     * i.e. if the default port is to be used.
-     *
-     * @return string|bool
-     */
-    public function getPort()
-    {
-        return $this->_port;
-    }
-
-    /**
-     * Sets the port number. Specify false if there is no port number specified,
-     * i.e. if the default port is to be used.
-     *
-     * @param string|bool $port a port number, or false
-     *
-     * @return $this
-     */
-    public function setPort($port)
-    {
-        $this->_port = $port;
-        return $this;
-    }
-
-    /**
-     * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
-     * false if there is no authority.
-     *
-     * @return string|bool
-     */
-    public function getAuthority()
-    {
-        if (false === $this->_host) {
-            return false;
-        }
-
-        $authority = '';
-
-        if (strlen($this->_userinfo)) {
-            $authority .= $this->_userinfo . '@';
-        }
-
-        $authority .= $this->_host;
-
-        if ($this->_port !== false) {
-            $authority .= ':' . $this->_port;
-        }
-
-        return $authority;
-    }
-
-    /**
-     * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
-     * false if there is no authority.
-     *
-     * @param string|bool $authority a hostname or an IP address, possibly
-     *                                with userinfo prefixed and port number
-     *                                appended, e.g. "foo:[email protected]:81".
-     *
-     * @return $this
-     */
-    public function setAuthority($authority)
-    {
-        $this->_userinfo = false;
-        $this->_host     = false;
-        $this->_port     = false;
-
-        if ('' === $authority) {
-            $this->_host = $authority;
-            return $this;
-        }
-
-        if (!preg_match('(^(([^\@]*)\@)?(.+?)(:(\d*))?$)', $authority, $matches)) {
-            return $this;
-        }
-
-        if ($matches[1]) {
-            $this->_userinfo = $this->_encodeData($matches[2]);
-        }
-
-        $this->_host = $matches[3];
-
-        if (isset($matches[5]) && strlen($matches[5])) {
-            $this->_port = $matches[5];
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the path part (possibly an empty string).
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->_path;
-    }
-
-    /**
-     * Sets the path part (possibly an empty string).
-     *
-     * @param string $path a path
-     *
-     * @return $this
-     */
-    public function setPath($path)
-    {
-        $this->_path = $path;
-        return $this;
-    }
-
-    /**
-     * Returns the query string (excluding the leading "?"), or false if "?"
-     * is not present in the URL.
-     *
-     * @return  string|bool
-     * @see     getQueryVariables
-     */
-    public function getQuery()
-    {
-        return $this->_query;
-    }
-
-    /**
-     * Sets the query string (excluding the leading "?"). Specify false if "?"
-     * is not present in the URL.
-     *
-     * @param string|bool $query a query string, e.g. "foo=1&bar=2"
-     *
-     * @return $this
-     * @see    setQueryVariables
-     */
-    public function setQuery($query)
-    {
-        $this->_query = $query;
-        return $this;
-    }
-
-    /**
-     * Returns the fragment name, or false if "#" is not present in the URL.
-     *
-     * @return string|bool
-     */
-    public function getFragment()
-    {
-        return $this->_fragment;
-    }
-
-    /**
-     * Sets the fragment name. Specify false if "#" is not present in the URL.
-     *
-     * @param string|bool $fragment a fragment excluding the leading "#", or
-     *                              false
-     *
-     * @return $this
-     */
-    public function setFragment($fragment)
-    {
-        $this->_fragment = $fragment;
-        return $this;
-    }
-
-    /**
-     * Returns the query string like an array as the variables would appear in
-     * $_GET in a PHP script. If the URL does not contain a "?", an empty array
-     * is returned.
-     *
-     * @return array
-     */
-    public function getQueryVariables()
-    {
-        $separator   = $this->getOption(self::OPTION_SEPARATOR_INPUT);
-        $encodeKeys  = $this->getOption(self::OPTION_ENCODE_KEYS);
-        $useBrackets = $this->getOption(self::OPTION_USE_BRACKETS);
-
-        $return  = array();
-
-        for ($part = strtok($this->_query, $separator);
-            strlen($part);
-            $part = strtok($separator)
-        ) {
-            list($key, $value) = explode('=', $part, 2) + array(1 => '');
-
-            if ($encodeKeys) {
-                $key = rawurldecode($key);
-            }
-            $value = rawurldecode($value);
-
-            if ($useBrackets) {
-                $return = $this->_queryArrayByKey($key, $value, $return);
-            } else {
-                if (isset($return[$key])) {
-                    $return[$key]  = (array) $return[$key];
-                    $return[$key][] = $value;
-                } else {
-                    $return[$key] = $value;
-                }
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Parse a single query key=value pair into an existing php array
-     *
-     * @param string $key   query-key
-     * @param string $value query-value
-     * @param array  $array of existing query variables (if any)
-     *
-     * @return mixed
-     */
-    private function _queryArrayByKey($key, $value, array $array = array())
-    {
-        if (!strlen($key)) {
-            return $array;
-        }
-
-        $offset = $this->_queryKeyBracketOffset($key);
-        if ($offset === false) {
-            $name = $key;
-        } else {
-            $name = substr($key, 0, $offset);
-        }
-
-        if (!strlen($name)) {
-            return $array;
-        }
-
-        if (!$offset) {
-            // named value
-            $array[$name] = $value;
-        } else {
-            // array
-            $brackets = substr($key, $offset);
-            if (!isset($array[$name])) {
-                $array[$name] = null;
-            }
-            $array[$name] = $this->_queryArrayByBrackets(
-                $brackets, $value, $array[$name]
-            );
-        }
-
-        return $array;
-    }
-
-    /**
-     * Parse a key-buffer to place value in array
-     *
-     * @param string $buffer to consume all keys from
-     * @param string $value  to be set/add
-     * @param array  $array  to traverse and set/add value in
-     *
-     * @throws Exception
-     * @return array
-     */
-    private function _queryArrayByBrackets($buffer, $value, array $array = null)
-    {
-        $entry = &$array;
-
-        for ($iteration = 0; strlen($buffer); $iteration++) {
-            $open = $this->_queryKeyBracketOffset($buffer);
-            if ($open !== 0) {
-                // Opening bracket [ must exist at offset 0, if not, there is
-                // no bracket to parse and the value dropped.
-                // if this happens in the first iteration, this is flawed, see
-                // as well the second exception below.
-                if ($iteration) {
-                    break;
-                }
-                // @codeCoverageIgnoreStart
-                throw new Exception(
-                    'Net_URL2 Internal Error: '. __METHOD__ .'(): ' .
-                    'Opening bracket [ must exist at offset 0'
-                );
-                // @codeCoverageIgnoreEnd
-            }
-
-            $close = strpos($buffer, ']', 1);
-            if (!$close) {
-                // this error condition should never be reached as this is a
-                // private method and bracket pairs are checked beforehand.
-                // See as well the first exception for the opening bracket.
-                // @codeCoverageIgnoreStart
-                throw new Exception(
-                    'Net_URL2 Internal Error: '. __METHOD__ .'(): ' .
-                    'Closing bracket ] must exist, not found'
-                );
-                // @codeCoverageIgnoreEnd
-            }
-
-            $index = substr($buffer, 1, $close - 1);
-            if (strlen($index)) {
-                $entry = &$entry[$index];
-            } else {
-                if (!is_array($entry)) {
-                    $entry = array();
-                }
-                $entry[] = &$new;
-                $entry = &$new;
-                unset($new);
-            }
-            $buffer = substr($buffer, $close + 1);
-        }
-
-        $entry = $value;
-
-        return $array;
-    }
-
-    /**
-     * Query-key has brackets ("...[]")
-     *
-     * @param string $key query-key
-     *
-     * @return bool|int offset of opening bracket, false if no brackets
-     */
-    private function _queryKeyBracketOffset($key)
-    {
-        if (false !== $open = strpos($key, '[')
-            and false === strpos($key, ']', $open + 1)
-        ) {
-            $open = false;
-        }
-
-        return $open;
-    }
-
-    /**
-     * Sets the query string to the specified variable in the query string.
-     *
-     * @param array $array (name => value) array
-     *
-     * @return $this
-     */
-    public function setQueryVariables(array $array)
-    {
-        if (!$array) {
-            $this->_query = false;
-        } else {
-            $this->_query = $this->buildQuery(
-                $array,
-                $this->getOption(self::OPTION_SEPARATOR_OUTPUT)
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Sets the specified variable in the query string.
-     *
-     * @param string $name  variable name
-     * @param mixed  $value variable value
-     *
-     * @return $this
-     */
-    public function setQueryVariable($name, $value)
-    {
-        $array = $this->getQueryVariables();
-        $array[$name] = $value;
-        $this->setQueryVariables($array);
-        return $this;
-    }
-
-    /**
-     * Removes the specified variable from the query string.
-     *
-     * @param string $name a query string variable, e.g. "foo" in "?foo=1"
-     *
-     * @return void
-     */
-    public function unsetQueryVariable($name)
-    {
-        $array = $this->getQueryVariables();
-        unset($array[$name]);
-        $this->setQueryVariables($array);
-    }
-
-    /**
-     * Returns a string representation of this URL.
-     *
-     * @return string
-     */
-    public function getURL()
-    {
-        // See RFC 3986, section 5.3
-        $url = '';
-
-        if ($this->_scheme !== false) {
-            $url .= $this->_scheme . ':';
-        }
-
-        $authority = $this->getAuthority();
-        if ($authority === false && strtolower($this->_scheme) === 'file') {
-            $authority = '';
-        }
-
-        $url .= $this->_buildAuthorityAndPath($authority, $this->_path);
-
-        if ($this->_query !== false) {
-            $url .= '?' . $this->_query;
-        }
-
-        if ($this->_fragment !== false) {
-            $url .= '#' . $this->_fragment;
-        }
-
-        return $url;
-    }
-
-    /**
-     * Put authority and path together, wrapping authority
-     * into proper separators/terminators.
-     *
-     * @param string|bool $authority authority
-     * @param string      $path      path
-     *
-     * @return string
-     */
-    private function _buildAuthorityAndPath($authority, $path)
-    {
-        if ($authority === false) {
-            return $path;
-        }
-
-        $terminator = ($path !== '' && $path[0] !== '/') ? '/' : '';
-
-        return '//' . $authority . $terminator . $path;
-    }
-
-    /**
-     * Returns a string representation of this URL.
-     *
-     * @return string
-     * @link https://php.net/language.oop5.magic#object.tostring
-     */
-    public function __toString()
-    {
-        return $this->getURL();
-    }
-
-    /**
-     * Returns a normalized string representation of this URL. This is useful
-     * for comparison of URLs.
-     *
-     * @return string
-     */
-    public function getNormalizedURL()
-    {
-        $url = clone $this;
-        $url->normalize();
-        return $url->getUrl();
-    }
-
-    /**
-     * Normalizes the URL
-     *
-     * See RFC 3986, Section 6.  Normalization and Comparison
-     *
-     * @link https://tools.ietf.org/html/rfc3986#section-6
-     *
-     * @return void
-     */
-    public function normalize()
-    {
-        // See RFC 3986, section 6
-
-        // Scheme is case-insensitive
-        if ($this->_scheme) {
-            $this->_scheme = strtolower($this->_scheme);
-        }
-
-        // Hostname is case-insensitive
-        if ($this->_host) {
-            $this->_host = strtolower($this->_host);
-        }
-
-        // Remove default port number for known schemes (RFC 3986, section 6.2.3)
-        if ('' === $this->_port
-            || $this->_port
-            && $this->_scheme
-            && $this->_port == getservbyname($this->_scheme, 'tcp')
-        ) {
-            $this->_port = false;
-        }
-
-        // Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
-        // Normalize percentage-encoded unreserved characters (section 6.2.2.2)
-        $fields = array(&$this->_userinfo, &$this->_host, &$this->_path,
-                        &$this->_query, &$this->_fragment);
-        foreach ($fields as &$field) {
-            if ($field !== false) {
-                $field = $this->_normalize("$field");
-            }
-        }
-        unset($field);
-
-        // Path segment normalization (RFC 3986, section 6.2.2.3)
-        $this->_path = self::removeDotSegments($this->_path);
-
-        // Scheme based normalization (RFC 3986, section 6.2.3)
-        if (false !== $this->_host && '' === $this->_path) {
-            $this->_path = '/';
-        }
-
-        // path should start with '/' if there is authority (section 3.3.)
-        if (strlen($this->getAuthority())
-            && strlen($this->_path)
-            && $this->_path[0] !== '/'
-        ) {
-            $this->_path = '/' . $this->_path;
-        }
-    }
-
-    /**
-     * Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
-     * Normalize percentage-encoded unreserved characters (section 6.2.2.2)
-     *
-     * @param string|array $mixed string or array of strings to normalize
-     *
-     * @return string|array
-     * @see normalize
-     * @see _normalizeCallback()
-     */
-    private function _normalize($mixed)
-    {
-        return preg_replace_callback(
-            '((?:%[0-9a-fA-Z]{2})+)', array($this, '_normalizeCallback'),
-            $mixed
-        );
-    }
-
-    /**
-     * Callback for _normalize() of %XX percentage-encodings
-     *
-     * @param array $matches as by preg_replace_callback
-     *
-     * @return string
-     * @see normalize
-     * @see _normalize
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function _normalizeCallback($matches)
-    {
-        return self::urlencode(urldecode($matches[0]));
-    }
-
-    /**
-     * Returns whether this instance represents an absolute URL.
-     *
-     * @return bool
-     */
-    public function isAbsolute()
-    {
-        return (bool) $this->_scheme;
-    }
-
-    /**
-     * Returns an Net_URL2 instance representing an absolute URL relative to
-     * this URL.
-     *
-     * @param Net_URL2|string $reference relative URL
-     *
-     * @throws Exception
-     * @return $this
-     */
-    public function resolve($reference)
-    {
-        if (!$reference instanceof Net_URL2) {
-            $reference = new self($reference);
-        }
-        if (!$reference->_isFragmentOnly() && !$this->isAbsolute()) {
-            throw new Exception(
-                'Base-URL must be absolute if reference is not fragment-only'
-            );
-        }
-
-        // A non-strict parser may ignore a scheme in the reference if it is
-        // identical to the base URI's scheme.
-        if (!$this->getOption(self::OPTION_STRICT)
-            && $reference->_scheme == $this->_scheme
-        ) {
-            $reference->_scheme = false;
-        }
-
-        $target = new self('');
-        if ($reference->_scheme !== false) {
-            $target->_scheme = $reference->_scheme;
-            $target->setAuthority($reference->getAuthority());
-            $target->_path  = self::removeDotSegments($reference->_path);
-            $target->_query = $reference->_query;
-        } else {
-            $authority = $reference->getAuthority();
-            if ($authority !== false) {
-                $target->setAuthority($authority);
-                $target->_path  = self::removeDotSegments($reference->_path);
-                $target->_query = $reference->_query;
-            } else {
-                if ($reference->_path == '') {
-                    $target->_path = $this->_path;
-                    if ($reference->_query !== false) {
-                        $target->_query = $reference->_query;
-                    } else {
-                        $target->_query = $this->_query;
-                    }
-                } else {
-                    if (substr($reference->_path, 0, 1) == '/') {
-                        $target->_path = self::removeDotSegments($reference->_path);
-                    } else {
-                        // Merge paths (RFC 3986, section 5.2.3)
-                        if ($this->_host !== false && $this->_path == '') {
-                            $target->_path = '/' . $reference->_path;
-                        } else {
-                            $i = strrpos($this->_path, '/');
-                            if ($i !== false) {
-                                $target->_path = substr($this->_path, 0, $i + 1);
-                            }
-                            $target->_path .= $reference->_path;
-                        }
-                        $target->_path = self::removeDotSegments($target->_path);
-                    }
-                    $target->_query = $reference->_query;
-                }
-                $target->setAuthority($this->getAuthority());
-            }
-            $target->_scheme = $this->_scheme;
-        }
-
-        $target->_fragment = $reference->_fragment;
-
-        return $target;
-    }
-
-    /**
-     * URL is fragment-only
-     *
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     * @return bool
-     */
-    private function _isFragmentOnly()
-    {
-        return (
-            $this->_fragment !== false
-            && $this->_query === false
-            && $this->_path === ''
-            && $this->_port === false
-            && $this->_host === false
-            && $this->_userinfo === false
-            && $this->_scheme === false
-        );
-    }
-
-    /**
-     * Removes dots as described in RFC 3986, section 5.2.4, e.g.
-     * "/foo/../bar/baz" => "/bar/baz"
-     *
-     * @param string $path a path
-     *
-     * @return string a path
-     */
-    public static function removeDotSegments($path)
-    {
-        $path = (string) $path;
-        $output = '';
-
-        // Make sure not to be trapped in an infinite loop due to a bug in this
-        // method
-        $loopLimit = 256;
-        $j = 0;
-        while ('' !== $path && $j++ < $loopLimit) {
-            if (substr($path, 0, 2) === './') {
-                // Step 2.A
-                $path = substr($path, 2);
-            } elseif (substr($path, 0, 3) === '../') {
-                // Step 2.A
-                $path = substr($path, 3);
-            } elseif (substr($path, 0, 3) === '/./' || $path === '/.') {
-                // Step 2.B
-                $path = '/' . substr($path, 3);
-            } elseif (substr($path, 0, 4) === '/../' || $path === '/..') {
-                // Step 2.C
-                $path   = '/' . substr($path, 4);
-                $i      = strrpos($output, '/');
-                $output = $i === false ? '' : substr($output, 0, $i);
-            } elseif ($path === '.' || $path === '..') {
-                // Step 2.D
-                $path = '';
-            } else {
-                // Step 2.E
-                $i = strpos($path, '/', $path[0] === '/');
-                if ($i === false) {
-                    $output .= $path;
-                    $path = '';
-                    break;
-                }
-                $output .= substr($path, 0, $i);
-                $path = substr($path, $i);
-            }
-        }
-
-        if ($path !== '') {
-            $message = sprintf(
-                'Unable to remove dot segments; hit loop limit %d (left: %s)',
-                $j, var_export($path, true)
-            );
-            trigger_error($message, E_USER_WARNING);
-        }
-
-        return $output;
-    }
-
-    /**
-     * Percent-encodes all non-alphanumeric characters except these: _ . - ~
-     * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
-     * 5.2.x and earlier.
-     *
-     * @param string $string string to encode
-     *
-     * @return string
-     */
-    public static function urlencode($string)
-    {
-        $encoded = rawurlencode($string);
-
-        // This is only necessary in PHP < 5.3.
-        $encoded = str_replace('%7E', '~', $encoded);
-        return $encoded;
-    }
-
-    /**
-     * Returns a Net_URL2 instance representing the canonical URL of the
-     * currently executing PHP script.
-     *
-     * @throws Exception
-     * @return string
-     */
-    public static function getCanonical()
-    {
-        if (!isset($_SERVER['REQUEST_METHOD'])) {
-            // ALERT - no current URL
-            throw new Exception('Script was not called through a webserver');
-        }
-
-        // Begin with a relative URL
-        $url = new self($_SERVER['PHP_SELF']);
-        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        $url->_host   = $_SERVER['SERVER_NAME'];
-        $port = $_SERVER['SERVER_PORT'];
-        if ($url->_scheme == 'http' && $port != 80
-            || $url->_scheme == 'https' && $port != 443
-        ) {
-            $url->_port = $port;
-        }
-        return $url;
-    }
-
-    /**
-     * Returns the URL used to retrieve the current request.
-     *
-     * @return  string
-     */
-    public static function getRequestedURL()
-    {
-        return self::getRequested()->getUrl();
-    }
-
-    /**
-     * Returns a Net_URL2 instance representing the URL used to retrieve the
-     * current request.
-     *
-     * @throws Exception
-     * @return $this
-     */
-    public static function getRequested()
-    {
-        if (!isset($_SERVER['REQUEST_METHOD'])) {
-            // ALERT - no current URL
-            throw new Exception('Script was not called through a webserver');
-        }
-
-        // Begin with a relative URL
-        $url = new self($_SERVER['REQUEST_URI']);
-        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        // Set host and possibly port
-        $url->setAuthority($_SERVER['HTTP_HOST']);
-        return $url;
-    }
-
-    /**
-     * Returns the value of the specified option.
-     *
-     * @param string $optionName The name of the option to retrieve
-     *
-     * @return mixed
-     */
-    public function getOption($optionName)
-    {
-        return isset($this->_options[$optionName])
-            ? $this->_options[$optionName] : false;
-    }
-
-    /**
-     * A simple version of http_build_query in userland. The encoded string is
-     * percentage encoded according to RFC 3986.
-     *
-     * @param array  $data      An array, which has to be converted into
-     *                          QUERY_STRING. Anything is possible.
-     * @param string $separator Separator {@link self::OPTION_SEPARATOR_OUTPUT}
-     * @param string $key       For stacked values (arrays in an array).
-     *
-     * @return string
-     */
-    protected function buildQuery(array $data, $separator, $key = null)
-    {
-        $query = array();
-        $drop_names = (
-            $this->_options[self::OPTION_DROP_SEQUENCE] === true
-            && array_keys($data) === array_keys(array_values($data))
-        );
-        foreach ($data as $name => $value) {
-            if ($this->getOption(self::OPTION_ENCODE_KEYS) === true) {
-                $name = rawurlencode($name);
-            }
-            if ($key !== null) {
-                if ($this->getOption(self::OPTION_USE_BRACKETS) === true) {
-                    $drop_names && $name = '';
-                    $name = $key . '[' . $name . ']';
-                } else {
-                    $name = $key;
-                }
-            }
-            if (is_array($value)) {
-                $query[] = $this->buildQuery($value, $separator, $name);
-            } else {
-                $query[] = $name . '=' . rawurlencode($value);
-            }
-        }
-        return implode($separator, $query);
-    }
-
-    /**
-     * This method uses a regex to parse the url into the designated parts.
-     *
-     * @param string $url URL
-     *
-     * @return void
-     * @uses   self::$_scheme, self::setAuthority(), self::$_path, self::$_query,
-     *         self::$_fragment
-     * @see    __construct
-     */
-    protected function parseUrl($url)
-    {
-        // The regular expression is copied verbatim from RFC 3986, appendix B.
-        // The expression does not validate the URL but matches any string.
-        preg_match(
-            '(^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)',
-            $url, $matches
-        );
-
-        // "path" is always present (possibly as an empty string); the rest
-        // are optional.
-        $this->_scheme   = !empty($matches[1]) ? $matches[2] : false;
-        $this->setAuthority(!empty($matches[3]) ? $matches[4] : false);
-        $this->_path     = $this->_encodeData($matches[5]);
-        $this->_query    = !empty($matches[6])
-                           ? $this->_encodeData($matches[7])
-                           : false
-            ;
-        $this->_fragment = !empty($matches[8]) ? $matches[9] : false;
-    }
-
-    /**
-     * Encode characters that might have been forgotten to encode when passing
-     * in an URL. Applied onto Userinfo, Path and Query.
-     *
-     * @param string $url URL
-     *
-     * @return string
-     * @see parseUrl
-     * @see setAuthority
-     * @link https://pear.php.net/bugs/bug.php?id=20425
-     */
-    private function _encodeData($url)
-    {
-        return preg_replace_callback(
-            '([\x-\x20\x22\x3C\x3E\x7F-\xFF]+)',
-            array($this, '_encodeCallback'), $url
-        );
-    }
-
-    /**
-     * callback for encoding character data
-     *
-     * @param array $matches Matches
-     *
-     * @return string
-     * @see _encodeData
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function _encodeCallback(array $matches)
-    {
-        return rawurlencode($matches[0]);
-    }
+	/**
+	 * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
+	 * is true.
+	 */
+	const OPTION_STRICT = 'strict';
+
+	/**
+	 * Represent arrays in query using PHP's [] notation. Default is true.
+	 */
+	const OPTION_USE_BRACKETS = 'use_brackets';
+
+	/**
+	 * Drop zero-based integer sequences in query using PHP's [] notation. Default
+	 * is true.
+	 */
+	const OPTION_DROP_SEQUENCE = 'drop_sequence';
+
+	/**
+	 * URL-encode query variable keys. Default is true.
+	 */
+	const OPTION_ENCODE_KEYS = 'encode_keys';
+
+	/**
+	 * Query variable separators when parsing the query string. Every character
+	 * is considered a separator. Default is "&".
+	 */
+	const OPTION_SEPARATOR_INPUT = 'input_separator';
+
+	/**
+	 * Query variable separator used when generating the query string. Default
+	 * is "&".
+	 */
+	const OPTION_SEPARATOR_OUTPUT = 'output_separator';
+
+	/**
+	 * Default options corresponds to how PHP handles $_GET.
+	 */
+	private $_options = array(
+		self::OPTION_STRICT           => true,
+		self::OPTION_USE_BRACKETS     => true,
+		self::OPTION_DROP_SEQUENCE    => true,
+		self::OPTION_ENCODE_KEYS      => true,
+		self::OPTION_SEPARATOR_INPUT  => '&',
+		self::OPTION_SEPARATOR_OUTPUT => '&',
+		);
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_scheme = false;
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_userinfo = false;
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_host = false;
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_port = false;
+
+	/**
+	 * @var  string
+	 */
+	private $_path = '';
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_query = false;
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_fragment = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $url     an absolute or relative URL
+	 * @param array  $options an array of OPTION_xxx constants
+	 *
+	 * @uses   self::parseUrl()
+	 */
+	public function __construct($url, array $options = array())
+	{
+		foreach ($options as $optionName => $value) {
+			if (array_key_exists($optionName, $this->_options)) {
+				$this->_options[$optionName] = $value;
+			}
+		}
+
+		$this->parseUrl($url);
+	}
+
+	/**
+	 * Magic Setter.
+	 *
+	 * This method will magically set the value of a private variable ($var)
+	 * with the value passed as the args
+	 *
+	 * @param string $var The private variable to set.
+	 * @param mixed  $arg An argument of any type.
+	 *
+	 * @return void
+	 */
+	public function __set($var, $arg)
+	{
+		$method = 'set' . $var;
+		if (method_exists($this, $method)) {
+			$this->$method($arg);
+		}
+	}
+
+	/**
+	 * Magic Getter.
+	 *
+	 * This is the magic get method to retrieve the private variable
+	 * that was set by either __set() or it's setter...
+	 *
+	 * @param string $var The property name to retrieve.
+	 *
+	 * @return mixed  $this->$var Either a boolean false if the
+	 *                            property is not set or the value
+	 *                            of the private property.
+	 */
+	public function __get($var)
+	{
+		$method = 'get' . $var;
+		if (method_exists($this, $method)) {
+			return $this->$method();
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the scheme, e.g. "http" or "urn", or false if there is no
+	 * scheme specified, i.e. if this is a relative URL.
+	 *
+	 * @return string|bool
+	 */
+	public function getScheme()
+	{
+		return $this->_scheme;
+	}
+
+	/**
+	 * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
+	 * scheme specified, i.e. if this is a relative URL.
+	 *
+	 * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
+	 *                            scheme specified, i.e. if this is a relative
+	 *                            URL
+	 *
+	 * @return $this
+	 * @see    getScheme
+	 */
+	public function setScheme($scheme)
+	{
+		$this->_scheme = $scheme;
+		return $this;
+	}
+
+	/**
+	 * Returns the user part of the userinfo part (the part preceding the first
+	 *  ":"), or false if there is no userinfo part.
+	 *
+	 * @return string|bool
+	 */
+	public function getUser()
+	{
+		return $this->_userinfo !== false
+			? preg_replace('(:.*$)', '', $this->_userinfo)
+			: false;
+	}
+
+	/**
+	 * Returns the password part of the userinfo part (the part after the first
+	 *  ":"), or false if there is no userinfo part (i.e. the URL does not
+	 * contain "@" in front of the hostname) or the userinfo part does not
+	 * contain ":".
+	 *
+	 * @return string|bool
+	 */
+	public function getPassword()
+	{
+		return $this->_userinfo !== false
+			? substr(strstr($this->_userinfo, ':'), 1)
+			: false;
+	}
+
+	/**
+	 * Returns the userinfo part, or false if there is none, i.e. if the
+	 * authority part does not contain "@".
+	 *
+	 * @return string|bool
+	 */
+	public function getUserinfo()
+	{
+		return $this->_userinfo;
+	}
+
+	/**
+	 * Sets the userinfo part. If two arguments are passed, they are combined
+	 * in the userinfo part as username ":" password.
+	 *
+	 * @param string|bool $userinfo userinfo or username
+	 * @param string|bool $password optional password, or false
+	 *
+	 * @return $this
+	 */
+	public function setUserinfo($userinfo, $password = false)
+	{
+		if ($password !== false) {
+			$userinfo .= ':' . $password;
+		}
+
+		if ($userinfo !== false) {
+			$userinfo = $this->_encodeData($userinfo);
+		}
+
+		$this->_userinfo = $userinfo;
+		return $this;
+	}
+
+	/**
+	 * Returns the host part, or false if there is no authority part, e.g.
+	 * relative URLs.
+	 *
+	 * @return string|bool a hostname, an IP address, or false
+	 */
+	public function getHost()
+	{
+		return $this->_host;
+	}
+
+	/**
+	 * Sets the host part. Specify false if there is no authority part, e.g.
+	 * relative URLs.
+	 *
+	 * @param string|bool $host a hostname, an IP address, or false
+	 *
+	 * @return $this
+	 */
+	public function setHost($host)
+	{
+		$this->_host = $host;
+		return $this;
+	}
+
+	/**
+	 * Returns the port number, or false if there is no port number specified,
+	 * i.e. if the default port is to be used.
+	 *
+	 * @return string|bool
+	 */
+	public function getPort()
+	{
+		return $this->_port;
+	}
+
+	/**
+	 * Sets the port number. Specify false if there is no port number specified,
+	 * i.e. if the default port is to be used.
+	 *
+	 * @param string|bool $port a port number, or false
+	 *
+	 * @return $this
+	 */
+	public function setPort($port)
+	{
+		$this->_port = $port;
+		return $this;
+	}
+
+	/**
+	 * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
+	 * false if there is no authority.
+	 *
+	 * @return string|bool
+	 */
+	public function getAuthority()
+	{
+		if (false === $this->_host) {
+			return false;
+		}
+
+		$authority = '';
+
+		if (strlen($this->_userinfo)) {
+			$authority .= $this->_userinfo . '@';
+		}
+
+		$authority .= $this->_host;
+
+		if ($this->_port !== false) {
+			$authority .= ':' . $this->_port;
+		}
+
+		return $authority;
+	}
+
+	/**
+	 * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
+	 * false if there is no authority.
+	 *
+	 * @param string|bool $authority a hostname or an IP address, possibly
+	 *                                with userinfo prefixed and port number
+	 *                                appended, e.g. "foo:[email protected]:81".
+	 *
+	 * @return $this
+	 */
+	public function setAuthority($authority)
+	{
+		$this->_userinfo = false;
+		$this->_host     = false;
+		$this->_port     = false;
+
+		if ('' === $authority) {
+			$this->_host = $authority;
+			return $this;
+		}
+
+		if (!preg_match('(^(([^\@]*)\@)?(.+?)(:(\d*))?$)', $authority, $matches)) {
+			return $this;
+		}
+
+		if ($matches[1]) {
+			$this->_userinfo = $this->_encodeData($matches[2]);
+		}
+
+		$this->_host = $matches[3];
+
+		if (isset($matches[5]) && strlen($matches[5])) {
+			$this->_port = $matches[5];
+		}
+		return $this;
+	}
+
+	/**
+	 * Returns the path part (possibly an empty string).
+	 *
+	 * @return string
+	 */
+	public function getPath()
+	{
+		return $this->_path;
+	}
+
+	/**
+	 * Sets the path part (possibly an empty string).
+	 *
+	 * @param string $path a path
+	 *
+	 * @return $this
+	 */
+	public function setPath($path)
+	{
+		$this->_path = $path;
+		return $this;
+	}
+
+	/**
+	 * Returns the query string (excluding the leading "?"), or false if "?"
+	 * is not present in the URL.
+	 *
+	 * @return  string|bool
+	 * @see     getQueryVariables
+	 */
+	public function getQuery()
+	{
+		return $this->_query;
+	}
+
+	/**
+	 * Sets the query string (excluding the leading "?"). Specify false if "?"
+	 * is not present in the URL.
+	 *
+	 * @param string|bool $query a query string, e.g. "foo=1&bar=2"
+	 *
+	 * @return $this
+	 * @see    setQueryVariables
+	 */
+	public function setQuery($query)
+	{
+		$this->_query = $query;
+		return $this;
+	}
+
+	/**
+	 * Returns the fragment name, or false if "#" is not present in the URL.
+	 *
+	 * @return string|bool
+	 */
+	public function getFragment()
+	{
+		return $this->_fragment;
+	}
+
+	/**
+	 * Sets the fragment name. Specify false if "#" is not present in the URL.
+	 *
+	 * @param string|bool $fragment a fragment excluding the leading "#", or
+	 *                              false
+	 *
+	 * @return $this
+	 */
+	public function setFragment($fragment)
+	{
+		$this->_fragment = $fragment;
+		return $this;
+	}
+
+	/**
+	 * Returns the query string like an array as the variables would appear in
+	 * $_GET in a PHP script. If the URL does not contain a "?", an empty array
+	 * is returned.
+	 *
+	 * @return array
+	 */
+	public function getQueryVariables()
+	{
+		$separator   = $this->getOption(self::OPTION_SEPARATOR_INPUT);
+		$encodeKeys  = $this->getOption(self::OPTION_ENCODE_KEYS);
+		$useBrackets = $this->getOption(self::OPTION_USE_BRACKETS);
+
+		$return  = array();
+
+		for ($part = strtok($this->_query, $separator);
+			strlen($part);
+			$part = strtok($separator)
+		) {
+			list($key, $value) = explode('=', $part, 2) + array(1 => '');
+
+			if ($encodeKeys) {
+				$key = rawurldecode($key);
+			}
+			$value = rawurldecode($value);
+
+			if ($useBrackets) {
+				$return = $this->_queryArrayByKey($key, $value, $return);
+			} else {
+				if (isset($return[$key])) {
+					$return[$key]  = (array) $return[$key];
+					$return[$key][] = $value;
+				} else {
+					$return[$key] = $value;
+				}
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Parse a single query key=value pair into an existing php array
+	 *
+	 * @param string $key   query-key
+	 * @param string $value query-value
+	 * @param array  $array of existing query variables (if any)
+	 *
+	 * @return mixed
+	 */
+	private function _queryArrayByKey($key, $value, array $array = array())
+	{
+		if (!strlen($key)) {
+			return $array;
+		}
+
+		$offset = $this->_queryKeyBracketOffset($key);
+		if ($offset === false) {
+			$name = $key;
+		} else {
+			$name = substr($key, 0, $offset);
+		}
+
+		if (!strlen($name)) {
+			return $array;
+		}
+
+		if (!$offset) {
+			// named value
+			$array[$name] = $value;
+		} else {
+			// array
+			$brackets = substr($key, $offset);
+			if (!isset($array[$name])) {
+				$array[$name] = null;
+			}
+			$array[$name] = $this->_queryArrayByBrackets(
+				$brackets, $value, $array[$name]
+			);
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Parse a key-buffer to place value in array
+	 *
+	 * @param string $buffer to consume all keys from
+	 * @param string $value  to be set/add
+	 * @param array  $array  to traverse and set/add value in
+	 *
+	 * @throws Exception
+	 * @return array
+	 */
+	private function _queryArrayByBrackets($buffer, $value, array $array = null)
+	{
+		$entry = &$array;
+
+		for ($iteration = 0; strlen($buffer); $iteration++) {
+			$open = $this->_queryKeyBracketOffset($buffer);
+			if ($open !== 0) {
+				// Opening bracket [ must exist at offset 0, if not, there is
+				// no bracket to parse and the value dropped.
+				// if this happens in the first iteration, this is flawed, see
+				// as well the second exception below.
+				if ($iteration) {
+					break;
+				}
+				// @codeCoverageIgnoreStart
+				throw new Exception(
+					'Net_URL2 Internal Error: '. __METHOD__ .'(): ' .
+					'Opening bracket [ must exist at offset 0'
+				);
+				// @codeCoverageIgnoreEnd
+			}
+
+			$close = strpos($buffer, ']', 1);
+			if (!$close) {
+				// this error condition should never be reached as this is a
+				// private method and bracket pairs are checked beforehand.
+				// See as well the first exception for the opening bracket.
+				// @codeCoverageIgnoreStart
+				throw new Exception(
+					'Net_URL2 Internal Error: '. __METHOD__ .'(): ' .
+					'Closing bracket ] must exist, not found'
+				);
+				// @codeCoverageIgnoreEnd
+			}
+
+			$index = substr($buffer, 1, $close - 1);
+			if (strlen($index)) {
+				$entry = &$entry[$index];
+			} else {
+				if (!is_array($entry)) {
+					$entry = array();
+				}
+				$entry[] = &$new;
+				$entry = &$new;
+				unset($new);
+			}
+			$buffer = substr($buffer, $close + 1);
+		}
+
+		$entry = $value;
+
+		return $array;
+	}
+
+	/**
+	 * Query-key has brackets ("...[]")
+	 *
+	 * @param string $key query-key
+	 *
+	 * @return bool|int offset of opening bracket, false if no brackets
+	 */
+	private function _queryKeyBracketOffset($key)
+	{
+		if (false !== $open = strpos($key, '[')
+			and false === strpos($key, ']', $open + 1)
+		) {
+			$open = false;
+		}
+
+		return $open;
+	}
+
+	/**
+	 * Sets the query string to the specified variable in the query string.
+	 *
+	 * @param array $array (name => value) array
+	 *
+	 * @return $this
+	 */
+	public function setQueryVariables(array $array)
+	{
+		if (!$array) {
+			$this->_query = false;
+		} else {
+			$this->_query = $this->buildQuery(
+				$array,
+				$this->getOption(self::OPTION_SEPARATOR_OUTPUT)
+			);
+		}
+		return $this;
+	}
+
+	/**
+	 * Sets the specified variable in the query string.
+	 *
+	 * @param string $name  variable name
+	 * @param mixed  $value variable value
+	 *
+	 * @return $this
+	 */
+	public function setQueryVariable($name, $value)
+	{
+		$array = $this->getQueryVariables();
+		$array[$name] = $value;
+		$this->setQueryVariables($array);
+		return $this;
+	}
+
+	/**
+	 * Removes the specified variable from the query string.
+	 *
+	 * @param string $name a query string variable, e.g. "foo" in "?foo=1"
+	 *
+	 * @return void
+	 */
+	public function unsetQueryVariable($name)
+	{
+		$array = $this->getQueryVariables();
+		unset($array[$name]);
+		$this->setQueryVariables($array);
+	}
+
+	/**
+	 * Returns a string representation of this URL.
+	 *
+	 * @return string
+	 */
+	public function getURL()
+	{
+		// See RFC 3986, section 5.3
+		$url = '';
+
+		if ($this->_scheme !== false) {
+			$url .= $this->_scheme . ':';
+		}
+
+		$authority = $this->getAuthority();
+		if ($authority === false && strtolower($this->_scheme) === 'file') {
+			$authority = '';
+		}
+
+		$url .= $this->_buildAuthorityAndPath($authority, $this->_path);
+
+		if ($this->_query !== false) {
+			$url .= '?' . $this->_query;
+		}
+
+		if ($this->_fragment !== false) {
+			$url .= '#' . $this->_fragment;
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Put authority and path together, wrapping authority
+	 * into proper separators/terminators.
+	 *
+	 * @param string|bool $authority authority
+	 * @param string      $path      path
+	 *
+	 * @return string
+	 */
+	private function _buildAuthorityAndPath($authority, $path)
+	{
+		if ($authority === false) {
+			return $path;
+		}
+
+		$terminator = ($path !== '' && $path[0] !== '/') ? '/' : '';
+
+		return '//' . $authority . $terminator . $path;
+	}
+
+	/**
+	 * Returns a string representation of this URL.
+	 *
+	 * @return string
+	 * @link https://php.net/language.oop5.magic#object.tostring
+	 */
+	public function __toString()
+	{
+		return $this->getURL();
+	}
+
+	/**
+	 * Returns a normalized string representation of this URL. This is useful
+	 * for comparison of URLs.
+	 *
+	 * @return string
+	 */
+	public function getNormalizedURL()
+	{
+		$url = clone $this;
+		$url->normalize();
+		return $url->getUrl();
+	}
+
+	/**
+	 * Normalizes the URL
+	 *
+	 * See RFC 3986, Section 6.  Normalization and Comparison
+	 *
+	 * @link https://tools.ietf.org/html/rfc3986#section-6
+	 *
+	 * @return void
+	 */
+	public function normalize()
+	{
+		// See RFC 3986, section 6
+
+		// Scheme is case-insensitive
+		if ($this->_scheme) {
+			$this->_scheme = strtolower($this->_scheme);
+		}
+
+		// Hostname is case-insensitive
+		if ($this->_host) {
+			$this->_host = strtolower($this->_host);
+		}
+
+		// Remove default port number for known schemes (RFC 3986, section 6.2.3)
+		if ('' === $this->_port
+			|| $this->_port
+			&& $this->_scheme
+			&& $this->_port == getservbyname($this->_scheme, 'tcp')
+		) {
+			$this->_port = false;
+		}
+
+		// Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
+		// Normalize percentage-encoded unreserved characters (section 6.2.2.2)
+		$fields = array(&$this->_userinfo, &$this->_host, &$this->_path,
+						&$this->_query, &$this->_fragment);
+		foreach ($fields as &$field) {
+			if ($field !== false) {
+				$field = $this->_normalize("$field");
+			}
+		}
+		unset($field);
+
+		// Path segment normalization (RFC 3986, section 6.2.2.3)
+		$this->_path = self::removeDotSegments($this->_path);
+
+		// Scheme based normalization (RFC 3986, section 6.2.3)
+		if (false !== $this->_host && '' === $this->_path) {
+			$this->_path = '/';
+		}
+
+		// path should start with '/' if there is authority (section 3.3.)
+		if (strlen($this->getAuthority())
+			&& strlen($this->_path)
+			&& $this->_path[0] !== '/'
+		) {
+			$this->_path = '/' . $this->_path;
+		}
+	}
+
+	/**
+	 * Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
+	 * Normalize percentage-encoded unreserved characters (section 6.2.2.2)
+	 *
+	 * @param string|array $mixed string or array of strings to normalize
+	 *
+	 * @return string|array
+	 * @see normalize
+	 * @see _normalizeCallback()
+	 */
+	private function _normalize($mixed)
+	{
+		return preg_replace_callback(
+			'((?:%[0-9a-fA-Z]{2})+)', array($this, '_normalizeCallback'),
+			$mixed
+		);
+	}
+
+	/**
+	 * Callback for _normalize() of %XX percentage-encodings
+	 *
+	 * @param array $matches as by preg_replace_callback
+	 *
+	 * @return string
+	 * @see normalize
+	 * @see _normalize
+	 * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+	 */
+	private function _normalizeCallback($matches)
+	{
+		return self::urlencode(urldecode($matches[0]));
+	}
+
+	/**
+	 * Returns whether this instance represents an absolute URL.
+	 *
+	 * @return bool
+	 */
+	public function isAbsolute()
+	{
+		return (bool) $this->_scheme;
+	}
+
+	/**
+	 * Returns an Net_URL2 instance representing an absolute URL relative to
+	 * this URL.
+	 *
+	 * @param Net_URL2|string $reference relative URL
+	 *
+	 * @throws Exception
+	 * @return $this
+	 */
+	public function resolve($reference)
+	{
+		if (!$reference instanceof Net_URL2) {
+			$reference = new self($reference);
+		}
+		if (!$reference->_isFragmentOnly() && !$this->isAbsolute()) {
+			throw new Exception(
+				'Base-URL must be absolute if reference is not fragment-only'
+			);
+		}
+
+		// A non-strict parser may ignore a scheme in the reference if it is
+		// identical to the base URI's scheme.
+		if (!$this->getOption(self::OPTION_STRICT)
+			&& $reference->_scheme == $this->_scheme
+		) {
+			$reference->_scheme = false;
+		}
+
+		$target = new self('');
+		if ($reference->_scheme !== false) {
+			$target->_scheme = $reference->_scheme;
+			$target->setAuthority($reference->getAuthority());
+			$target->_path  = self::removeDotSegments($reference->_path);
+			$target->_query = $reference->_query;
+		} else {
+			$authority = $reference->getAuthority();
+			if ($authority !== false) {
+				$target->setAuthority($authority);
+				$target->_path  = self::removeDotSegments($reference->_path);
+				$target->_query = $reference->_query;
+			} else {
+				if ($reference->_path == '') {
+					$target->_path = $this->_path;
+					if ($reference->_query !== false) {
+						$target->_query = $reference->_query;
+					} else {
+						$target->_query = $this->_query;
+					}
+				} else {
+					if (substr($reference->_path, 0, 1) == '/') {
+						$target->_path = self::removeDotSegments($reference->_path);
+					} else {
+						// Merge paths (RFC 3986, section 5.2.3)
+						if ($this->_host !== false && $this->_path == '') {
+							$target->_path = '/' . $reference->_path;
+						} else {
+							$i = strrpos($this->_path, '/');
+							if ($i !== false) {
+								$target->_path = substr($this->_path, 0, $i + 1);
+							}
+							$target->_path .= $reference->_path;
+						}
+						$target->_path = self::removeDotSegments($target->_path);
+					}
+					$target->_query = $reference->_query;
+				}
+				$target->setAuthority($this->getAuthority());
+			}
+			$target->_scheme = $this->_scheme;
+		}
+
+		$target->_fragment = $reference->_fragment;
+
+		return $target;
+	}
+
+	/**
+	 * URL is fragment-only
+	 *
+	 * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+	 * @return bool
+	 */
+	private function _isFragmentOnly()
+	{
+		return (
+			$this->_fragment !== false
+			&& $this->_query === false
+			&& $this->_path === ''
+			&& $this->_port === false
+			&& $this->_host === false
+			&& $this->_userinfo === false
+			&& $this->_scheme === false
+		);
+	}
+
+	/**
+	 * Removes dots as described in RFC 3986, section 5.2.4, e.g.
+	 * "/foo/../bar/baz" => "/bar/baz"
+	 *
+	 * @param string $path a path
+	 *
+	 * @return string a path
+	 */
+	public static function removeDotSegments($path)
+	{
+		$path = (string) $path;
+		$output = '';
+
+		// Make sure not to be trapped in an infinite loop due to a bug in this
+		// method
+		$loopLimit = 256;
+		$j = 0;
+		while ('' !== $path && $j++ < $loopLimit) {
+			if (substr($path, 0, 2) === './') {
+				// Step 2.A
+				$path = substr($path, 2);
+			} elseif (substr($path, 0, 3) === '../') {
+				// Step 2.A
+				$path = substr($path, 3);
+			} elseif (substr($path, 0, 3) === '/./' || $path === '/.') {
+				// Step 2.B
+				$path = '/' . substr($path, 3);
+			} elseif (substr($path, 0, 4) === '/../' || $path === '/..') {
+				// Step 2.C
+				$path   = '/' . substr($path, 4);
+				$i      = strrpos($output, '/');
+				$output = $i === false ? '' : substr($output, 0, $i);
+			} elseif ($path === '.' || $path === '..') {
+				// Step 2.D
+				$path = '';
+			} else {
+				// Step 2.E
+				$i = strpos($path, '/', $path[0] === '/');
+				if ($i === false) {
+					$output .= $path;
+					$path = '';
+					break;
+				}
+				$output .= substr($path, 0, $i);
+				$path = substr($path, $i);
+			}
+		}
+
+		if ($path !== '') {
+			$message = sprintf(
+				'Unable to remove dot segments; hit loop limit %d (left: %s)',
+				$j, var_export($path, true)
+			);
+			trigger_error($message, E_USER_WARNING);
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Percent-encodes all non-alphanumeric characters except these: _ . - ~
+	 * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
+	 * 5.2.x and earlier.
+	 *
+	 * @param string $string string to encode
+	 *
+	 * @return string
+	 */
+	public static function urlencode($string)
+	{
+		$encoded = rawurlencode($string);
+
+		// This is only necessary in PHP < 5.3.
+		$encoded = str_replace('%7E', '~', $encoded);
+		return $encoded;
+	}
+
+	/**
+	 * Returns a Net_URL2 instance representing the canonical URL of the
+	 * currently executing PHP script.
+	 *
+	 * @throws Exception
+	 * @return string
+	 */
+	public static function getCanonical()
+	{
+		if (!isset($_SERVER['REQUEST_METHOD'])) {
+			// ALERT - no current URL
+			throw new Exception('Script was not called through a webserver');
+		}
+
+		// Begin with a relative URL
+		$url = new self($_SERVER['PHP_SELF']);
+		$url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+		$url->_host   = $_SERVER['SERVER_NAME'];
+		$port = $_SERVER['SERVER_PORT'];
+		if ($url->_scheme == 'http' && $port != 80
+			|| $url->_scheme == 'https' && $port != 443
+		) {
+			$url->_port = $port;
+		}
+		return $url;
+	}
+
+	/**
+	 * Returns the URL used to retrieve the current request.
+	 *
+	 * @return  string
+	 */
+	public static function getRequestedURL()
+	{
+		return self::getRequested()->getUrl();
+	}
+
+	/**
+	 * Returns a Net_URL2 instance representing the URL used to retrieve the
+	 * current request.
+	 *
+	 * @throws Exception
+	 * @return $this
+	 */
+	public static function getRequested()
+	{
+		if (!isset($_SERVER['REQUEST_METHOD'])) {
+			// ALERT - no current URL
+			throw new Exception('Script was not called through a webserver');
+		}
+
+		// Begin with a relative URL
+		$url = new self($_SERVER['REQUEST_URI']);
+		$url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+		// Set host and possibly port
+		$url->setAuthority($_SERVER['HTTP_HOST']);
+		return $url;
+	}
+
+	/**
+	 * Returns the value of the specified option.
+	 *
+	 * @param string $optionName The name of the option to retrieve
+	 *
+	 * @return mixed
+	 */
+	public function getOption($optionName)
+	{
+		return isset($this->_options[$optionName])
+			? $this->_options[$optionName] : false;
+	}
+
+	/**
+	 * A simple version of http_build_query in userland. The encoded string is
+	 * percentage encoded according to RFC 3986.
+	 *
+	 * @param array  $data      An array, which has to be converted into
+	 *                          QUERY_STRING. Anything is possible.
+	 * @param string $separator Separator {@link self::OPTION_SEPARATOR_OUTPUT}
+	 * @param string $key       For stacked values (arrays in an array).
+	 *
+	 * @return string
+	 */
+	protected function buildQuery(array $data, $separator, $key = null)
+	{
+		$query = array();
+		$drop_names = (
+			$this->_options[self::OPTION_DROP_SEQUENCE] === true
+			&& array_keys($data) === array_keys(array_values($data))
+		);
+		foreach ($data as $name => $value) {
+			if ($this->getOption(self::OPTION_ENCODE_KEYS) === true) {
+				$name = rawurlencode($name);
+			}
+			if ($key !== null) {
+				if ($this->getOption(self::OPTION_USE_BRACKETS) === true) {
+					$drop_names && $name = '';
+					$name = $key . '[' . $name . ']';
+				} else {
+					$name = $key;
+				}
+			}
+			if (is_array($value)) {
+				$query[] = $this->buildQuery($value, $separator, $name);
+			} else {
+				$query[] = $name . '=' . rawurlencode($value);
+			}
+		}
+		return implode($separator, $query);
+	}
+
+	/**
+	 * This method uses a regex to parse the url into the designated parts.
+	 *
+	 * @param string $url URL
+	 *
+	 * @return void
+	 * @uses   self::$_scheme, self::setAuthority(), self::$_path, self::$_query,
+	 *         self::$_fragment
+	 * @see    __construct
+	 */
+	protected function parseUrl($url)
+	{
+		// The regular expression is copied verbatim from RFC 3986, appendix B.
+		// The expression does not validate the URL but matches any string.
+		preg_match(
+			'(^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)',
+			$url, $matches
+		);
+
+		// "path" is always present (possibly as an empty string); the rest
+		// are optional.
+		$this->_scheme   = !empty($matches[1]) ? $matches[2] : false;
+		$this->setAuthority(!empty($matches[3]) ? $matches[4] : false);
+		$this->_path     = $this->_encodeData($matches[5]);
+		$this->_query    = !empty($matches[6])
+						   ? $this->_encodeData($matches[7])
+						   : false
+			;
+		$this->_fragment = !empty($matches[8]) ? $matches[9] : false;
+	}
+
+	/**
+	 * Encode characters that might have been forgotten to encode when passing
+	 * in an URL. Applied onto Userinfo, Path and Query.
+	 *
+	 * @param string $url URL
+	 *
+	 * @return string
+	 * @see parseUrl
+	 * @see setAuthority
+	 * @link https://pear.php.net/bugs/bug.php?id=20425
+	 */
+	private function _encodeData($url)
+	{
+		return preg_replace_callback(
+			'([\x-\x20\x22\x3C\x3E\x7F-\xFF]+)',
+			array($this, '_encodeCallback'), $url
+		);
+	}
+
+	/**
+	 * callback for encoding character data
+	 *
+	 * @param array $matches Matches
+	 *
+	 * @return string
+	 * @see _encodeData
+	 * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+	 */
+	private function _encodeCallback(array $matches)
+	{
+		return rawurlencode($matches[0]);
+	}
 }

Please login to merge, or discard this patch.

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -169,7 +169,7 @@  discard block
 block discarded – undo
      */
     public function __set($var, $arg)
     {
-        $method = 'set' . $var;
+        $method = 'set'.$var;
         if (method_exists($this, $method)) {
             $this->$method($arg);
         }
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
      */
     public function __get($var)
     {
-        $method = 'get' . $var;
+        $method = 'get'.$var;
         if (method_exists($this, $method)) {
             return $this->$method();
         }
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
     public function setUserinfo($userinfo, $password = false)
     {
         if ($password !== false) {
-            $userinfo .= ':' . $password;
+            $userinfo .= ':'.$password;
         }
 
         if ($userinfo !== false) {
@@ -352,13 +352,13 @@  discard block
 block discarded – undo
         $authority = '';
 
         if (strlen($this->_userinfo)) {
-            $authority .= $this->_userinfo . '@';
+            $authority .= $this->_userinfo.'@';
         }
 
         $authority .= $this->_host;
 
         if ($this->_port !== false) {
-            $authority .= ':' . $this->_port;
+            $authority .= ':'.$this->_port;
         }
 
         return $authority;
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
         $encodeKeys  = $this->getOption(self::OPTION_ENCODE_KEYS);
         $useBrackets = $this->getOption(self::OPTION_USE_BRACKETS);
 
-        $return  = array();
+        $return = array();
 
         for ($part = strtok($this->_query, $separator);
             strlen($part);
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
                 $return = $this->_queryArrayByKey($key, $value, $return);
             } else {
                 if (isset($return[$key])) {
-                    $return[$key]  = (array) $return[$key];
+                    $return[$key] = (array) $return[$key];
                     $return[$key][] = $value;
                 } else {
                     $return[$key] = $value;
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
                 }
                 // @codeCoverageIgnoreStart
                 throw new Exception(
-                    'Net_URL2 Internal Error: '. __METHOD__ .'(): ' .
+                    'Net_URL2 Internal Error: '.__METHOD__.'(): '.
                     'Opening bracket [ must exist at offset 0'
                 );
                 // @codeCoverageIgnoreEnd
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
                 // See as well the first exception for the opening bracket.
                 // @codeCoverageIgnoreStart
                 throw new Exception(
-                    'Net_URL2 Internal Error: '. __METHOD__ .'(): ' .
+                    'Net_URL2 Internal Error: '.__METHOD__.'(): '.
                     'Closing bracket ] must exist, not found'
                 );
                 // @codeCoverageIgnoreEnd
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
         $url = '';
 
         if ($this->_scheme !== false) {
-            $url .= $this->_scheme . ':';
+            $url .= $this->_scheme.':';
         }
 
         $authority = $this->getAuthority();
@@ -713,11 +713,11 @@  discard block
 block discarded – undo
         $url .= $this->_buildAuthorityAndPath($authority, $this->_path);
 
         if ($this->_query !== false) {
-            $url .= '?' . $this->_query;
+            $url .= '?'.$this->_query;
         }
 
         if ($this->_fragment !== false) {
-            $url .= '#' . $this->_fragment;
+            $url .= '#'.$this->_fragment;
         }
 
         return $url;
@@ -740,7 +740,7 @@  discard block
 block discarded – undo
 
         $terminator = ($path !== '' && $path[0] !== '/') ? '/' : '';
 
-        return '//' . $authority . $terminator . $path;
+        return '//'.$authority.$terminator.$path;
     }
 
     /**
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
             && strlen($this->_path)
             && $this->_path[0] !== '/'
         ) {
-            $this->_path = '/' . $this->_path;
+            $this->_path = '/'.$this->_path;
         }
     }
 
@@ -924,7 +924,7 @@  discard block
 block discarded – undo
                     } else {
                         // Merge paths (RFC 3986, section 5.2.3)
                         if ($this->_host !== false && $this->_path == '') {
-                            $target->_path = '/' . $reference->_path;
+                            $target->_path = '/'.$reference->_path;
                         } else {
                             $i = strrpos($this->_path, '/');
                             if ($i !== false) {
@@ -991,10 +991,10 @@  discard block
 block discarded – undo
                 $path = substr($path, 3);
             } elseif (substr($path, 0, 3) === '/./' || $path === '/.') {
                 // Step 2.B
-                $path = '/' . substr($path, 3);
+                $path = '/'.substr($path, 3);
             } elseif (substr($path, 0, 4) === '/../' || $path === '/..') {
                 // Step 2.C
-                $path   = '/' . substr($path, 4);
+                $path   = '/'.substr($path, 4);
                 $i      = strrpos($output, '/');
                 $output = $i === false ? '' : substr($output, 0, $i);
             } elseif ($path === '.' || $path === '..') {
@@ -1139,7 +1139,7 @@  discard block
 block discarded – undo
             if ($key !== null) {
                 if ($this->getOption(self::OPTION_USE_BRACKETS) === true) {
                     $drop_names && $name = '';
-                    $name = $key . '[' . $name . ']';
+                    $name = $key.'['.$name.']';
                 } else {
                     $name = $key;
                 }
@@ -1147,7 +1147,7 @@  discard block
 block discarded – undo
             if (is_array($value)) {
                 $query[] = $this->buildQuery($value, $separator, $name);
             } else {
-                $query[] = $name . '=' . rawurlencode($value);
+                $query[] = $name.'='.rawurlencode($value);
             }
         }
         return implode($separator, $query);

Please login to merge, or discard this patch.

libs/PEAR.1.9.5/PEAR/Exception.php 4 patches

Doc Comments +2 added lines patch added patch discarded remove patch

@@ -117,6 +117,8 @@
 block discarded – undo
      * @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)
     {

Please login to merge, or discard this patch.

Indentation +275 added lines, -275 removed lines patch added patch discarded remove patch

@@ -96,294 +96,294 @@
 block discarded – undo
  */
 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 style="border: 1px" cellspacing="0">' . "\n";
-        foreach ($causes as $i => $cause) {
-            $html .= '<tr><td colspan="3" style="background: #ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
-               . "</td></tr>\n";
-        }
-        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
-               . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
+	public function toHtml()
+	{
+		$trace = $this->getTraceSafe();
+		$causes = array();
+		$this->getCauseMessage($causes);
+		$html =  '<table style="border: 1px" cellspacing="0">' . "\n";
+		foreach ($causes as $i => $cause) {
+			$html .= '<tr><td colspan="3" style="background: #ff9999">'
+			   . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
+			   . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
+			   . 'on line <b>' . $cause['line'] . '</b>'
+			   . "</td></tr>\n";
+		}
+		$html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
+			   . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
+			   . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
+			   . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
 
-        foreach ($trace as $k => $v) {
-            $html .= '<tr><td style="text-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));
-                        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 style="text-align: center;">' . ($k+1) . '</td>'
-               . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
-               . '</table>';
-        return $html;
-    }
+		foreach ($trace as $k => $v) {
+			$html .= '<tr><td style="text-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));
+						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 style="text-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();
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +14 added lines, -7 removed lines patch added patch discarded remove patch

@@ -348,15 +348,22 @@
 block discarded – undo
             $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));
-                        if (strlen($arg) > 16) $str .= '&hellip;';
+                        if (strlen($arg) > 16) {
+                        	$str .= '&hellip;';
+                        }
                         $args[] = "'" . $str . "'";
                     }
                 }

Please login to merge, or discard this patch.

Spacing +24 added lines, -26 removed lines patch added patch discarded remove patch

@@ -127,7 +127,7 @@  discard block
 block discarded – undo
             // 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 @@  discard block
 block discarded – undo
                         '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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
         $trace = $this->getTraceSafe();
         $causes = array();
         $this->getCauseMessage($causes);
-        $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
+        $html = '<table style="border: 1px" cellspacing="0">'."\n";
         foreach ($causes as $i => $cause) {
             $html .= '<tr><td colspan="3" style="background: #ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
+               . str_repeat('-', $i).' <b>'.$cause['class'].'</b>: '
+               . htmlspecialchars($cause['message']).' in <b>'.$cause['file'].'</b> '
+               . 'on line <b>'.$cause['line'].'</b>'
                . "</td></tr>\n";
         }
-        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
+        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>'."\n"
                . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
                . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
+               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>'."\n";
 
         foreach ($trace as $k => $v) {
-            $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
+            $html .= '<tr><td style="text-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 @@  discard block
 block discarded – undo
                     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));
                         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 style="text-align: center;">' . ($k+1) . '</td>'
+        $html .= '<tr><td style="text-align: center;">'.($k + 1).'</td>'
                . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
+               . '<td>&nbsp;</td></tr>'."\n"
                . '</table>';
         return $html;
     }
@@ -380,10 +378,10 @@  discard block
 block discarded – undo
         $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();
     }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

libs/PEAR.1.9/HTTP/Request2.php 3 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -269,7 +269,7 @@
 block discarded – undo
    /**
     * Returns the request URL
     *
-    * @return   Net_URL2
+    * @return   string
     */
     public function getUrl()
     {

Please login to merge, or discard this patch.

Indentation +405 added lines, -405 removed lines patch added patch discarded remove patch

@@ -67,14 +67,14 @@  discard block
 block discarded – undo
     *
     * @link http://tools.ietf.org/html/rfc2616#section-5.1.1
     */
-    const METHOD_OPTIONS = 'OPTIONS';
-    const METHOD_GET     = 'GET';
-    const METHOD_HEAD    = 'HEAD';
-    const METHOD_POST    = 'POST';
-    const METHOD_PUT     = 'PUT';
-    const METHOD_DELETE  = 'DELETE';
-    const METHOD_TRACE   = 'TRACE';
-    const METHOD_CONNECT = 'CONNECT';
+	const METHOD_OPTIONS = 'OPTIONS';
+	const METHOD_GET     = 'GET';
+	const METHOD_HEAD    = 'HEAD';
+	const METHOD_POST    = 'POST';
+	const METHOD_PUT     = 'PUT';
+	const METHOD_DELETE  = 'DELETE';
+	const METHOD_TRACE   = 'TRACE';
+	const METHOD_CONNECT = 'CONNECT';
    /**#@-*/
 
    /**#@+
@@ -82,129 +82,129 @@  discard block
 block discarded – undo
     *
     * @link http://tools.ietf.org/html/rfc2617
     */
-    const AUTH_BASIC  = 'basic';
-    const AUTH_DIGEST = 'digest';
+	const AUTH_BASIC  = 'basic';
+	const AUTH_DIGEST = 'digest';
    /**#@-*/
 
    /**
     * Regular expression used to check for invalid symbols in RFC 2616 tokens
     * @link http://pear.php.net/bugs/bug.php?id=15630
     */
-    const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';
+	const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';
 
    /**
     * Regular expression used to check for invalid symbols in cookie strings
     * @link http://pear.php.net/bugs/bug.php?id=15630
     * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
     */
-    const REGEXP_INVALID_COOKIE = '/[\s,;]/';
+	const REGEXP_INVALID_COOKIE = '/[\s,;]/';
 
    /**
     * Fileinfo magic database resource
     * @var  resource
     * @see  detectMimeType()
     */
-    private static $_fileinfoDb;
+	private static $_fileinfoDb;
 
    /**
     * Observers attached to the request (instances of SplObserver)
     * @var  array
     */
-    protected $observers = array();
+	protected $observers = array();
 
    /**
     * Request URL
     * @var  Net_URL2
     */
-    protected $url;
+	protected $url;
 
    /**
     * Request method
     * @var  string
     */
-    protected $method = self::METHOD_GET;
+	protected $method = self::METHOD_GET;
 
    /**
     * Authentication data
     * @var  array
     * @see  getAuth()
     */
-    protected $auth;
+	protected $auth;
 
    /**
     * Request headers
     * @var  array
     */
-    protected $headers = array();
+	protected $headers = array();
 
    /**
     * Configuration parameters
     * @var  array
     * @see  setConfig()
     */
-    protected $config = array(
-        'adapter'           => 'HTTP_Request2_Adapter_Socket',
-        'connect_timeout'   => 10,
-        'timeout'           => 0,
-        'use_brackets'      => true,
-        'protocol_version'  => '1.1',
-        'buffer_size'       => 16384,
-        'store_body'        => true,
+	protected $config = array(
+		'adapter'           => 'HTTP_Request2_Adapter_Socket',
+		'connect_timeout'   => 10,
+		'timeout'           => 0,
+		'use_brackets'      => true,
+		'protocol_version'  => '1.1',
+		'buffer_size'       => 16384,
+		'store_body'        => true,
 
-        'proxy_host'        => '',
-        'proxy_port'        => '',
-        'proxy_user'        => '',
-        'proxy_password'    => '',
-        'proxy_auth_scheme' => self::AUTH_BASIC,
+		'proxy_host'        => '',
+		'proxy_port'        => '',
+		'proxy_user'        => '',
+		'proxy_password'    => '',
+		'proxy_auth_scheme' => self::AUTH_BASIC,
 
-        'ssl_verify_peer'   => true,
-        'ssl_verify_host'   => true,
-        'ssl_cafile'        => null,
-        'ssl_capath'        => null,
-        'ssl_local_cert'    => null,
-        'ssl_passphrase'    => null,
+		'ssl_verify_peer'   => true,
+		'ssl_verify_host'   => true,
+		'ssl_cafile'        => null,
+		'ssl_capath'        => null,
+		'ssl_local_cert'    => null,
+		'ssl_passphrase'    => null,
 
-        'digest_compat_ie'  => false,
+		'digest_compat_ie'  => false,
 
-        'follow_redirects'  => false,
-        'max_redirects'     => 5,
-        'strict_redirects'  => false
-    );
+		'follow_redirects'  => false,
+		'max_redirects'     => 5,
+		'strict_redirects'  => false
+	);
 
    /**
     * Last event in request / response handling, intended for observers
     * @var  array
     * @see  getLastEvent()
     */
-    protected $lastEvent = array(
-        'name' => 'start',
-        'data' => null
-    );
+	protected $lastEvent = array(
+		'name' => 'start',
+		'data' => null
+	);
 
    /**
     * Request body
     * @var  string|resource
     * @see  setBody()
     */
-    protected $body = '';
+	protected $body = '';
 
    /**
     * Array of POST parameters
     * @var  array
     */
-    protected $postParams = array();
+	protected $postParams = array();
 
    /**
     * Array of file uploads (for multipart/form-data POST requests)
     * @var  array
     */
-    protected $uploads = array();
+	protected $uploads = array();
 
    /**
     * Adapter used to perform actual HTTP request
     * @var  HTTP_Request2_Adapter
     */
-    protected $adapter;
+	protected $adapter;
 
 
    /**
@@ -216,19 +216,19 @@  discard block
 block discarded – undo
     * @param    string              Request method
     * @param    array               Configuration for this Request instance
     */
-    public function __construct($url = null, $method = self::METHOD_GET, array $config = array())
-    {
-        $this->setConfig($config);
-        if (!empty($url)) {
-            $this->setUrl($url);
-        }
-        if (!empty($method)) {
-            $this->setMethod($method);
-        }
-        $this->setHeader('user-agent', 'HTTP_Request2/0.5.2 ' .
-                         '(http://pear.php.net/package/http_request2) ' .
-                         'PHP/' . phpversion());
-    }
+	public function __construct($url = null, $method = self::METHOD_GET, array $config = array())
+	{
+		$this->setConfig($config);
+		if (!empty($url)) {
+			$this->setUrl($url);
+		}
+		if (!empty($method)) {
+			$this->setMethod($method);
+		}
+		$this->setHeader('user-agent', 'HTTP_Request2/0.5.2 ' .
+						 '(http://pear.php.net/package/http_request2) ' .
+						 'PHP/' . phpversion());
+	}
 
    /**
     * Sets the URL for this request
@@ -241,40 +241,40 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2
     * @throws   HTTP_Request2_Exception
     */
-    public function setUrl($url)
-    {
-        if (is_string($url)) {
-            $url = new Net_URL2(
-                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])
-            );
-        }
-        if (!$url instanceof Net_URL2) {
-            throw new HTTP_Request2_Exception('Parameter is not a valid HTTP URL');
-        }
-        // URL contains username / password?
-        if ($url->getUserinfo()) {
-            $username = $url->getUser();
-            $password = $url->getPassword();
-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
-            $url->setUserinfo('');
-        }
-        if ('' == $url->getPath()) {
-            $url->setPath('/');
-        }
-        $this->url = $url;
-
-        return $this;
-    }
+	public function setUrl($url)
+	{
+		if (is_string($url)) {
+			$url = new Net_URL2(
+				$url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])
+			);
+		}
+		if (!$url instanceof Net_URL2) {
+			throw new HTTP_Request2_Exception('Parameter is not a valid HTTP URL');
+		}
+		// URL contains username / password?
+		if ($url->getUserinfo()) {
+			$username = $url->getUser();
+			$password = $url->getPassword();
+			$this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
+			$url->setUserinfo('');
+		}
+		if ('' == $url->getPath()) {
+			$url->setPath('/');
+		}
+		$this->url = $url;
+
+		return $this;
+	}
 
    /**
     * Returns the request URL
     *
     * @return   Net_URL2
     */
-    public function getUrl()
-    {
-        return $this->url;
-    }
+	public function getUrl()
+	{
+		return $this->url;
+	}
 
    /**
     * Sets the request method
@@ -283,26 +283,26 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2
     * @throws   HTTP_Request2_Exception if the method name is invalid
     */
-    public function setMethod($method)
-    {
-        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1
-        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {
-            throw new HTTP_Request2_Exception("Invalid request method '{$method}'");
-        }
-        $this->method = $method;
+	public function setMethod($method)
+	{
+		// Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1
+		if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {
+			throw new HTTP_Request2_Exception("Invalid request method '{$method}'");
+		}
+		$this->method = $method;
 
-        return $this;
-    }
+		return $this;
+	}
 
    /**
     * Returns the request method
     *
     * @return   string
     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
+	public function getMethod()
+	{
+		return $this->method;
+	}
 
    /**
     * Sets the configuration parameter(s)
@@ -352,24 +352,24 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2
     * @throws   HTTP_Request2_Exception If the parameter is unknown
     */
-    public function setConfig($nameOrConfig, $value = null)
-    {
-        if (is_array($nameOrConfig)) {
-            foreach ($nameOrConfig as $name => $value) {
-                $this->setConfig($name, $value);
-            }
+	public function setConfig($nameOrConfig, $value = null)
+	{
+		if (is_array($nameOrConfig)) {
+			foreach ($nameOrConfig as $name => $value) {
+				$this->setConfig($name, $value);
+			}
 
-        } else {
-            if (!array_key_exists($nameOrConfig, $this->config)) {
-                throw new HTTP_Request2_Exception(
-                    "Unknown configuration parameter '{$nameOrConfig}'"
-                );
-            }
-            $this->config[$nameOrConfig] = $value;
-        }
+		} else {
+			if (!array_key_exists($nameOrConfig, $this->config)) {
+				throw new HTTP_Request2_Exception(
+					"Unknown configuration parameter '{$nameOrConfig}'"
+				);
+			}
+			$this->config[$nameOrConfig] = $value;
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
    /**
     * Returns the value(s) of the configuration parameter(s)
@@ -379,17 +379,17 @@  discard block
 block discarded – undo
     *                   parameters if $name is not given
     * @throws   HTTP_Request2_Exception If the parameter is unknown
     */
-    public function getConfig($name = null)
-    {
-        if (null === $name) {
-            return $this->config;
-        } elseif (!array_key_exists($name, $this->config)) {
-            throw new HTTP_Request2_Exception(
-                "Unknown configuration parameter '{$name}'"
-            );
-        }
-        return $this->config[$name];
-    }
+	public function getConfig($name = null)
+	{
+		if (null === $name) {
+			return $this->config;
+		} elseif (!array_key_exists($name, $this->config)) {
+			throw new HTTP_Request2_Exception(
+				"Unknown configuration parameter '{$name}'"
+			);
+		}
+		return $this->config[$name];
+	}
 
    /**
     * Sets the autentification data
@@ -399,20 +399,20 @@  discard block
 block discarded – undo
     * @param    string  authentication scheme
     * @return   HTTP_Request2
     */
-    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
-    {
-        if (empty($user)) {
-            $this->auth = null;
-        } else {
-            $this->auth = array(
-                'user'     => (string)$user,
-                'password' => (string)$password,
-                'scheme'   => $scheme
-            );
-        }
+	public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
+	{
+		if (empty($user)) {
+			$this->auth = null;
+		} else {
+			$this->auth = array(
+				'user'     => (string)$user,
+				'password' => (string)$password,
+				'scheme'   => $scheme
+			);
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
    /**
     * Returns the authentication data
@@ -422,10 +422,10 @@  discard block
 block discarded – undo
     *
     * @return   array
     */
-    public function getAuth()
-    {
-        return $this->auth;
-    }
+	public function getAuth()
+	{
+		return $this->auth;
+	}
 
    /**
     * Sets request header(s)
@@ -451,35 +451,35 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2
     * @throws   HTTP_Request2_Exception
     */
-    public function setHeader($name, $value = null)
-    {
-        if (is_array($name)) {
-            foreach ($name as $k => $v) {
-                if (is_string($k)) {
-                    $this->setHeader($k, $v);
-                } else {
-                    $this->setHeader($v);
-                }
-            }
-        } else {
-            if (null === $value && strpos($name, ':')) {
-                list($name, $value) = array_map('trim', explode(':', $name, 2));
-            }
-            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2
-            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {
-                throw new HTTP_Request2_Exception("Invalid header name '{$name}'");
-            }
-            // Header names are case insensitive anyway
-            $name = strtolower($name);
-            if (null === $value) {
-                unset($this->headers[$name]);
-            } else {
-                $this->headers[$name] = $value;
-            }
-        }
-
-        return $this;
-    }
+	public function setHeader($name, $value = null)
+	{
+		if (is_array($name)) {
+			foreach ($name as $k => $v) {
+				if (is_string($k)) {
+					$this->setHeader($k, $v);
+				} else {
+					$this->setHeader($v);
+				}
+			}
+		} else {
+			if (null === $value && strpos($name, ':')) {
+				list($name, $value) = array_map('trim', explode(':', $name, 2));
+			}
+			// Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2
+			if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {
+				throw new HTTP_Request2_Exception("Invalid header name '{$name}'");
+			}
+			// Header names are case insensitive anyway
+			$name = strtolower($name);
+			if (null === $value) {
+				unset($this->headers[$name]);
+			} else {
+				$this->headers[$name] = $value;
+			}
+		}
+
+		return $this;
+	}
 
    /**
     * Returns the request headers
@@ -489,10 +489,10 @@  discard block
 block discarded – undo
     *
     * @return   array
     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
+	public function getHeaders()
+	{
+		return $this->headers;
+	}
 
    /**
     * Appends a cookie to "Cookie:" header
@@ -502,17 +502,17 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2
     * @throws   HTTP_Request2_Exception
     */
-    public function addCookie($name, $value)
-    {
-        $cookie = $name . '=' . $value;
-        if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
-            throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");
-        }
-        $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
-        $this->setHeader('cookie', $cookies . $cookie);
+	public function addCookie($name, $value)
+	{
+		$cookie = $name . '=' . $value;
+		if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
+			throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");
+		}
+		$cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
+		$this->setHeader('cookie', $cookies . $cookie);
 
-        return $this;
-    }
+		return $this;
+	}
 
    /**
     * Sets the request body
@@ -522,55 +522,55 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2
     * @throws   HTTP_Request2_Exception
     */
-    public function setBody($body, $isFilename = false)
-    {
-        if (!$isFilename) {
-            if (!$body instanceof HTTP_Request2_MultipartBody) {
-                $this->body = (string)$body;
-            } else {
-                $this->body = $body;
-            }
-        } else {
-            if (!($fp = @fopen($body, 'rb'))) {
-                throw new HTTP_Request2_Exception("Cannot open file {$body}");
-            }
-            $this->body = $fp;
-            if (empty($this->headers['content-type'])) {
-                $this->setHeader('content-type', self::detectMimeType($body));
-            }
-        }
-        $this->postParams = $this->uploads = array();
-
-        return $this;
-    }
+	public function setBody($body, $isFilename = false)
+	{
+		if (!$isFilename) {
+			if (!$body instanceof HTTP_Request2_MultipartBody) {
+				$this->body = (string)$body;
+			} else {
+				$this->body = $body;
+			}
+		} else {
+			if (!($fp = @fopen($body, 'rb'))) {
+				throw new HTTP_Request2_Exception("Cannot open file {$body}");
+			}
+			$this->body = $fp;
+			if (empty($this->headers['content-type'])) {
+				$this->setHeader('content-type', self::detectMimeType($body));
+			}
+		}
+		$this->postParams = $this->uploads = array();
+
+		return $this;
+	}
 
    /**
     * Returns the request body
     *
     * @return   string|resource|HTTP_Request2_MultipartBody
     */
-    public function getBody()
-    {
-        if (self::METHOD_POST == $this->method &&
-            (!empty($this->postParams) || !empty($this->uploads))
-        ) {
-            if ('application/x-www-form-urlencoded' == $this->headers['content-type']) {
-                $body = http_build_query($this->postParams, '', '&');
-                if (!$this->getConfig('use_brackets')) {
-                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);
-                }
-                // support RFC 3986 by not encoding '~' symbol (request #15368)
-                return str_replace('%7E', '~', $body);
-
-            } elseif ('multipart/form-data' == $this->headers['content-type']) {
-                require_once 'HTTP/Request2/MultipartBody.php';
-                return new HTTP_Request2_MultipartBody(
-                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')
-                );
-            }
-        }
-        return $this->body;
-    }
+	public function getBody()
+	{
+		if (self::METHOD_POST == $this->method &&
+			(!empty($this->postParams) || !empty($this->uploads))
+		) {
+			if ('application/x-www-form-urlencoded' == $this->headers['content-type']) {
+				$body = http_build_query($this->postParams, '', '&');
+				if (!$this->getConfig('use_brackets')) {
+					$body = preg_replace('/%5B\d+%5D=/', '=', $body);
+				}
+				// support RFC 3986 by not encoding '~' symbol (request #15368)
+				return str_replace('%7E', '~', $body);
+
+			} elseif ('multipart/form-data' == $this->headers['content-type']) {
+				require_once 'HTTP/Request2/MultipartBody.php';
+				return new HTTP_Request2_MultipartBody(
+					$this->postParams, $this->uploads, $this->getConfig('use_brackets')
+				);
+			}
+		}
+		return $this->body;
+	}
 
    /**
     * Adds a file to form-based file upload
@@ -588,45 +588,45 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2
     * @throws   HTTP_Request2_Exception
     */
-    public function addUpload($fieldName, $filename, $sendFilename = null,
-                              $contentType = null)
-    {
-        if (!is_array($filename)) {
-            if (!($fp = @fopen($filename, 'rb'))) {
-                throw new HTTP_Request2_Exception("Cannot open file {$filename}");
-            }
-            $this->uploads[$fieldName] = array(
-                'fp'        => $fp,
-                'filename'  => empty($sendFilename)? basename($filename): $sendFilename,
-                'size'      => filesize($filename),
-                'type'      => empty($contentType)? self::detectMimeType($filename): $contentType
-            );
-        } else {
-            $fps = $names = $sizes = $types = array();
-            foreach ($filename as $f) {
-                if (!is_array($f)) {
-                    $f = array($f);
-                }
-                if (!($fp = @fopen($f[0], 'rb'))) {
-                    throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");
-                }
-                $fps[]   = $fp;
-                $names[] = empty($f[1])? basename($f[0]): $f[1];
-                $sizes[] = filesize($f[0]);
-                $types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];
-            }
-            $this->uploads[$fieldName] = array(
-                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
-            );
-        }
-        if (empty($this->headers['content-type']) ||
-            'application/x-www-form-urlencoded' == $this->headers['content-type']
-        ) {
-            $this->setHeader('content-type', 'multipart/form-data');
-        }
-
-        return $this;
-    }
+	public function addUpload($fieldName, $filename, $sendFilename = null,
+							  $contentType = null)
+	{
+		if (!is_array($filename)) {
+			if (!($fp = @fopen($filename, 'rb'))) {
+				throw new HTTP_Request2_Exception("Cannot open file {$filename}");
+			}
+			$this->uploads[$fieldName] = array(
+				'fp'        => $fp,
+				'filename'  => empty($sendFilename)? basename($filename): $sendFilename,
+				'size'      => filesize($filename),
+				'type'      => empty($contentType)? self::detectMimeType($filename): $contentType
+			);
+		} else {
+			$fps = $names = $sizes = $types = array();
+			foreach ($filename as $f) {
+				if (!is_array($f)) {
+					$f = array($f);
+				}
+				if (!($fp = @fopen($f[0], 'rb'))) {
+					throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");
+				}
+				$fps[]   = $fp;
+				$names[] = empty($f[1])? basename($f[0]): $f[1];
+				$sizes[] = filesize($f[0]);
+				$types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];
+			}
+			$this->uploads[$fieldName] = array(
+				'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
+			);
+		}
+		if (empty($this->headers['content-type']) ||
+			'application/x-www-form-urlencoded' == $this->headers['content-type']
+		) {
+			$this->setHeader('content-type', 'multipart/form-data');
+		}
+
+		return $this;
+	}
 
    /**
     * Adds POST parameter(s) to the request.
@@ -635,61 +635,61 @@  discard block
 block discarded – undo
     * @param    mixed           parameter value (can be an array)
     * @return   HTTP_Request2
     */
-    public function addPostParameter($name, $value = null)
-    {
-        if (!is_array($name)) {
-            $this->postParams[$name] = $value;
-        } else {
-            foreach ($name as $k => $v) {
-                $this->addPostParameter($k, $v);
-            }
-        }
-        if (empty($this->headers['content-type'])) {
-            $this->setHeader('content-type', 'application/x-www-form-urlencoded');
-        }
+	public function addPostParameter($name, $value = null)
+	{
+		if (!is_array($name)) {
+			$this->postParams[$name] = $value;
+		} else {
+			foreach ($name as $k => $v) {
+				$this->addPostParameter($k, $v);
+			}
+		}
+		if (empty($this->headers['content-type'])) {
+			$this->setHeader('content-type', 'application/x-www-form-urlencoded');
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
    /**
     * Attaches a new observer
     *
     * @param    SplObserver
     */
-    public function attach(SplObserver $observer)
-    {
-        foreach ($this->observers as $attached) {
-            if ($attached === $observer) {
-                return;
-            }
-        }
-        $this->observers[] = $observer;
-    }
+	public function attach(SplObserver $observer)
+	{
+		foreach ($this->observers as $attached) {
+			if ($attached === $observer) {
+				return;
+			}
+		}
+		$this->observers[] = $observer;
+	}
 
    /**
     * Detaches an existing observer
     *
     * @param    SplObserver
     */
-    public function detach(SplObserver $observer)
-    {
-        foreach ($this->observers as $key => $attached) {
-            if ($attached === $observer) {
-                unset($this->observers[$key]);
-                return;
-            }
-        }
-    }
+	public function detach(SplObserver $observer)
+	{
+		foreach ($this->observers as $key => $attached) {
+			if ($attached === $observer) {
+				unset($this->observers[$key]);
+				return;
+			}
+		}
+	}
 
    /**
     * Notifies all observers
     */
-    public function notify()
-    {
-        foreach ($this->observers as $observer) {
-            $observer->update($this);
-        }
-    }
+	public function notify()
+	{
+		foreach ($this->observers as $observer) {
+			$observer->update($this);
+		}
+	}
 
    /**
     * Sets the last event
@@ -700,14 +700,14 @@  discard block
 block discarded – undo
     * @param    string  event name
     * @param    mixed   event data
     */
-    public function setLastEvent($name, $data = null)
-    {
-        $this->lastEvent = array(
-            'name' => $name,
-            'data' => $data
-        );
-        $this->notify();
-    }
+	public function setLastEvent($name, $data = null)
+	{
+		$this->lastEvent = array(
+			'name' => $name,
+			'data' => $data
+		);
+		$this->notify();
+	}
 
    /**
     * Returns the last event
@@ -736,10 +736,10 @@  discard block
 block discarded – undo
     *
     * @return   array   The array has two keys: 'name' and 'data'
     */
-    public function getLastEvent()
-    {
-        return $this->lastEvent;
-    }
+	public function getLastEvent()
+	{
+		return $this->lastEvent;
+	}
 
    /**
     * Sets the adapter used to actually perform the request
@@ -757,29 +757,29 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2
     * @throws   HTTP_Request2_Exception
     */
-    public function setAdapter($adapter)
-    {
-        if (is_string($adapter)) {
-            if (!class_exists($adapter, false)) {
-                if (false === strpos($adapter, '_')) {
-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
-                }
-                if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
-                }
-                if (!class_exists($adapter, false)) {
-                    throw new HTTP_Request2_Exception("Class {$adapter} not found");
-                }
-            }
-            $adapter = new $adapter;
-        }
-        if (!$adapter instanceof HTTP_Request2_Adapter) {
-            throw new HTTP_Request2_Exception('Parameter is not a HTTP request adapter');
-        }
-        $this->adapter = $adapter;
-
-        return $this;
-    }
+	public function setAdapter($adapter)
+	{
+		if (is_string($adapter)) {
+			if (!class_exists($adapter, false)) {
+				if (false === strpos($adapter, '_')) {
+					$adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
+				}
+				if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
+					include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
+				}
+				if (!class_exists($adapter, false)) {
+					throw new HTTP_Request2_Exception("Class {$adapter} not found");
+				}
+			}
+			$adapter = new $adapter;
+		}
+		if (!$adapter instanceof HTTP_Request2_Adapter) {
+			throw new HTTP_Request2_Exception('Parameter is not a HTTP request adapter');
+		}
+		$this->adapter = $adapter;
+
+		return $this;
+	}
 
    /**
     * Sends the request and returns the response
@@ -787,48 +787,48 @@  discard block
 block discarded – undo
     * @throws   HTTP_Request2_Exception
     * @return   HTTP_Request2_Response
     */
-    public function send()
-    {
-        // Sanity check for URL
-        if (!$this->url instanceof Net_URL2) {
-            throw new HTTP_Request2_Exception('No URL given');
-        } elseif (!$this->url->isAbsolute()) {
-            throw new HTTP_Request2_Exception('Absolute URL required');
-        } elseif (!in_array(strtolower($this->url->getScheme()), array('https', 'http'))) {
-            throw new HTTP_Request2_Exception('Not a HTTP URL');
-        }
-        if (empty($this->adapter)) {
-            $this->setAdapter($this->getConfig('adapter'));
-        }
-        // magic_quotes_runtime may break file uploads and chunked response
-        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.
-        if ($magicQuotes = get_magic_quotes_runtime()) {
-            set_magic_quotes_runtime(false);
-        }
-        // force using single byte encoding if mbstring extension overloads
-        // strlen() and substr(); see bug #1781, bug #10605
-        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-            $oldEncoding = mb_internal_encoding();
-            mb_internal_encoding('iso-8859-1');
-        }
-
-        try {
-            $response = $this->adapter->sendRequest($this);
-        } catch (Exception $e) {
-        }
-        // cleanup in either case (poor man's "finally" clause)
-        if ($magicQuotes) {
-            set_magic_quotes_runtime(true);
-        }
-        if (!empty($oldEncoding)) {
-            mb_internal_encoding($oldEncoding);
-        }
-        // rethrow the exception
-        if (!empty($e)) {
-            throw $e;
-        }
-        return $response;
-    }
+	public function send()
+	{
+		// Sanity check for URL
+		if (!$this->url instanceof Net_URL2) {
+			throw new HTTP_Request2_Exception('No URL given');
+		} elseif (!$this->url->isAbsolute()) {
+			throw new HTTP_Request2_Exception('Absolute URL required');
+		} elseif (!in_array(strtolower($this->url->getScheme()), array('https', 'http'))) {
+			throw new HTTP_Request2_Exception('Not a HTTP URL');
+		}
+		if (empty($this->adapter)) {
+			$this->setAdapter($this->getConfig('adapter'));
+		}
+		// magic_quotes_runtime may break file uploads and chunked response
+		// processing; see bug #4543. Don't use ini_get() here; see bug #16440.
+		if ($magicQuotes = get_magic_quotes_runtime()) {
+			set_magic_quotes_runtime(false);
+		}
+		// force using single byte encoding if mbstring extension overloads
+		// strlen() and substr(); see bug #1781, bug #10605
+		if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+			$oldEncoding = mb_internal_encoding();
+			mb_internal_encoding('iso-8859-1');
+		}
+
+		try {
+			$response = $this->adapter->sendRequest($this);
+		} catch (Exception $e) {
+		}
+		// cleanup in either case (poor man's "finally" clause)
+		if ($magicQuotes) {
+			set_magic_quotes_runtime(true);
+		}
+		if (!empty($oldEncoding)) {
+			mb_internal_encoding($oldEncoding);
+		}
+		// rethrow the exception
+		if (!empty($e)) {
+			throw $e;
+		}
+		return $response;
+	}
 
    /**
     * Tries to detect MIME type of a file
@@ -840,22 +840,22 @@  discard block
 block discarded – undo
     * @param    string  filename
     * @return   string  file MIME type
     */
-    protected static function detectMimeType($filename)
-    {
-        // finfo extension from PECL available
-        if (function_exists('finfo_open')) {
-            if (!isset(self::$_fileinfoDb)) {
-                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);
-            }
-            if (self::$_fileinfoDb) {
-                $info = finfo_file(self::$_fileinfoDb, $filename);
-            }
-        }
-        // (deprecated) mime_content_type function available
-        if (empty($info) && function_exists('mime_content_type')) {
-            return mime_content_type($filename);
-        }
-        return empty($info)? 'application/octet-stream': $info;
-    }
+	protected static function detectMimeType($filename)
+	{
+		// finfo extension from PECL available
+		if (function_exists('finfo_open')) {
+			if (!isset(self::$_fileinfoDb)) {
+				self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);
+			}
+			if (self::$_fileinfoDb) {
+				$info = finfo_file(self::$_fileinfoDb, $filename);
+			}
+		}
+		// (deprecated) mime_content_type function available
+		if (empty($info) && function_exists('mime_content_type')) {
+			return mime_content_type($filename);
+		}
+		return empty($info)? 'application/octet-stream': $info;
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -225,9 +225,9 @@  discard block
 block discarded – undo
         if (!empty($method)) {
             $this->setMethod($method);
         }
-        $this->setHeader('user-agent', 'HTTP_Request2/0.5.2 ' .
-                         '(http://pear.php.net/package/http_request2) ' .
-                         'PHP/' . phpversion());
+        $this->setHeader('user-agent', 'HTTP_Request2/0.5.2 '.
+                         '(http://pear.php.net/package/http_request2) '.
+                         'PHP/'.phpversion());
     }
 
    /**
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
         if ($url->getUserinfo()) {
             $username = $url->getUser();
             $password = $url->getPassword();
-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
+            $this->setAuth(rawurldecode($username), $password ? rawurldecode($password) : '');
             $url->setUserinfo('');
         }
         if ('' == $url->getPath()) {
@@ -405,8 +405,8 @@  discard block
 block discarded – undo
             $this->auth = null;
         } else {
             $this->auth = array(
-                'user'     => (string)$user,
-                'password' => (string)$password,
+                'user'     => (string) $user,
+                'password' => (string) $password,
                 'scheme'   => $scheme
             );
         }
@@ -504,12 +504,12 @@  discard block
 block discarded – undo
     */
     public function addCookie($name, $value)
     {
-        $cookie = $name . '=' . $value;
+        $cookie = $name.'='.$value;
         if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
             throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");
         }
-        $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
-        $this->setHeader('cookie', $cookies . $cookie);
+        $cookies = empty($this->headers['cookie']) ? '' : $this->headers['cookie'].'; ';
+        $this->setHeader('cookie', $cookies.$cookie);
 
         return $this;
     }
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
     {
         if (!$isFilename) {
             if (!$body instanceof HTTP_Request2_MultipartBody) {
-                $this->body = (string)$body;
+                $this->body = (string) $body;
             } else {
                 $this->body = $body;
             }
@@ -597,9 +597,9 @@  discard block
 block discarded – undo
             }
             $this->uploads[$fieldName] = array(
                 'fp'        => $fp,
-                'filename'  => empty($sendFilename)? basename($filename): $sendFilename,
+                'filename'  => empty($sendFilename) ? basename($filename) : $sendFilename,
                 'size'      => filesize($filename),
-                'type'      => empty($contentType)? self::detectMimeType($filename): $contentType
+                'type'      => empty($contentType) ? self::detectMimeType($filename) : $contentType
             );
         } else {
             $fps = $names = $sizes = $types = array();
@@ -611,9 +611,9 @@  discard block
 block discarded – undo
                     throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");
                 }
                 $fps[]   = $fp;
-                $names[] = empty($f[1])? basename($f[0]): $f[1];
+                $names[] = empty($f[1]) ? basename($f[0]) : $f[1];
                 $sizes[] = filesize($f[0]);
-                $types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];
+                $types[] = empty($f[2]) ? self::detectMimeType($f[0]) : $f[2];
             }
             $this->uploads[$fieldName] = array(
                 'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
@@ -762,10 +762,10 @@  discard block
 block discarded – undo
         if (is_string($adapter)) {
             if (!class_exists($adapter, false)) {
                 if (false === strpos($adapter, '_')) {
-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
+                    $adapter = 'HTTP_Request2_Adapter_'.ucfirst($adapter);
                 }
                 if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
+                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter).'.php';
                 }
                 if (!class_exists($adapter, false)) {
                     throw new HTTP_Request2_Exception("Class {$adapter} not found");
@@ -855,7 +855,7 @@  discard block
 block discarded – undo
         if (empty($info) && function_exists('mime_content_type')) {
             return mime_content_type($filename);
         }
-        return empty($info)? 'application/octet-stream': $info;
+        return empty($info) ? 'application/octet-stream' : $info;
     }
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

libs/PEAR.1.9/HTTP/Request2/Adapter/Curl.php 3 patches

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -379,7 +379,7 @@  discard block
 block discarded – undo
     * Callback function called by cURL for saving the response headers
     *
     * @param    resource    cURL handle
-    * @param    string      response header (with trailing CRLF)
+    * @param    string      string header (with trailing CRLF)
     * @return   integer     number of bytes saved
     * @see      HTTP_Request2_Response::parseHeaderLine()
     */
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
     * Callback function called by cURL for saving the response body
     *
     * @param    resource    cURL handle (not used)
-    * @param    string      part of the response body
+    * @param    string      string of the response body
     * @return   integer     number of bytes saved
     * @see      HTTP_Request2_Response::appendBody()
     */

Please login to merge, or discard this patch.

Indentation +306 added lines, -306 removed lines patch added patch discarded remove patch

@@ -60,55 +60,55 @@  discard block
 block discarded – undo
     * Mapping of header names to cURL options
     * @var  array
     */
-    protected static $headerMap = array(
-        'accept-encoding' => CURLOPT_ENCODING,
-        'cookie'          => CURLOPT_COOKIE,
-        'referer'         => CURLOPT_REFERER,
-        'user-agent'      => CURLOPT_USERAGENT
-    );
+	protected static $headerMap = array(
+		'accept-encoding' => CURLOPT_ENCODING,
+		'cookie'          => CURLOPT_COOKIE,
+		'referer'         => CURLOPT_REFERER,
+		'user-agent'      => CURLOPT_USERAGENT
+	);
 
    /**
     * Mapping of SSL context options to cURL options
     * @var  array
     */
-    protected static $sslContextMap = array(
-        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,
-        'ssl_cafile'      => CURLOPT_CAINFO,
-        'ssl_capath'      => CURLOPT_CAPATH,
-        'ssl_local_cert'  => CURLOPT_SSLCERT,
-        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD
+	protected static $sslContextMap = array(
+		'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,
+		'ssl_cafile'      => CURLOPT_CAINFO,
+		'ssl_capath'      => CURLOPT_CAPATH,
+		'ssl_local_cert'  => CURLOPT_SSLCERT,
+		'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD
    );
 
    /**
     * Response being received
     * @var  HTTP_Request2_Response
     */
-    protected $response;
+	protected $response;
 
    /**
     * Whether 'sentHeaders' event was sent to observers
     * @var  boolean
     */
-    protected $eventSentHeaders = false;
+	protected $eventSentHeaders = false;
 
    /**
     * Whether 'receivedHeaders' event was sent to observers
     * @var boolean
     */
-    protected $eventReceivedHeaders = false;
+	protected $eventReceivedHeaders = false;
 
    /**
     * Position within request body
     * @var  integer
     * @see  callbackReadBody()
     */
-    protected $position = 0;
+	protected $position = 0;
 
    /**
     * Information about last transfer, as returned by curl_getinfo()
     * @var  array
     */
-    protected $lastInfo;
+	protected $lastInfo;
 
    /**
     * Sends request to the remote server and returns its response
@@ -117,52 +117,52 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (!extension_loaded('curl')) {
-            throw new HTTP_Request2_Exception('cURL extension not available');
-        }
-
-        $this->request              = $request;
-        $this->response             = null;
-        $this->position             = 0;
-        $this->eventSentHeaders     = false;
-        $this->eventReceivedHeaders = false;
-
-        try {
-            if (false === curl_exec($ch = $this->createCurlHandle())) {
-                $errorMessage = 'Error sending request: #' . curl_errno($ch) .
-                                                       ' ' . curl_error($ch);
-            }
-        } catch (Exception $e) {
-        }
-        $this->lastInfo = curl_getinfo($ch);
-        curl_close($ch);
-
-        $response = $this->response;
-        unset($this->request, $this->requestBody, $this->response);
-
-        if (!empty($e)) {
-            throw $e;
-        } elseif (!empty($errorMessage)) {
-            throw new HTTP_Request2_Exception($errorMessage);
-        }
-
-        if (0 < $this->lastInfo['size_download']) {
-            $request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
+	public function sendRequest(HTTP_Request2 $request)
+	{
+		if (!extension_loaded('curl')) {
+			throw new HTTP_Request2_Exception('cURL extension not available');
+		}
+
+		$this->request              = $request;
+		$this->response             = null;
+		$this->position             = 0;
+		$this->eventSentHeaders     = false;
+		$this->eventReceivedHeaders = false;
+
+		try {
+			if (false === curl_exec($ch = $this->createCurlHandle())) {
+				$errorMessage = 'Error sending request: #' . curl_errno($ch) .
+													   ' ' . curl_error($ch);
+			}
+		} catch (Exception $e) {
+		}
+		$this->lastInfo = curl_getinfo($ch);
+		curl_close($ch);
+
+		$response = $this->response;
+		unset($this->request, $this->requestBody, $this->response);
+
+		if (!empty($e)) {
+			throw $e;
+		} elseif (!empty($errorMessage)) {
+			throw new HTTP_Request2_Exception($errorMessage);
+		}
+
+		if (0 < $this->lastInfo['size_download']) {
+			$request->setLastEvent('receivedBody', $response);
+		}
+		return $response;
+	}
 
    /**
     * Returns information about last transfer
     *
     * @return   array   associative array as returned by curl_getinfo()
     */
-    public function getInfo()
-    {
-        return $this->lastInfo;
-    }
+	public function getInfo()
+	{
+		return $this->lastInfo;
+	}
 
    /**
     * Creates a new cURL handle and populates it with data from the request
@@ -170,140 +170,140 @@  discard block
 block discarded – undo
     * @return   resource    a cURL handle, as created by curl_init()
     * @throws   HTTP_Request2_Exception
     */
-    protected function createCurlHandle()
-    {
-        $ch = curl_init();
-
-        curl_setopt_array($ch, array(
-            // setup write callbacks
-            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),
-            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),
-            // buffer size
-            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
-            // connection timeout
-            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),
-            // save full outgoing headers, in case someone is interested
-            CURLINFO_HEADER_OUT    => true,
-            // request url
-            CURLOPT_URL            => $this->request->getUrl()->getUrl()
-        ));
-
-        // set up redirects
-        if (!$this->request->getConfig('follow_redirects')) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
-        } else {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));
-            // limit redirects to http(s), works in 5.2.10+
-            if (defined('CURLOPT_REDIR_PROTOCOLS')) {
-                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-            }
-            // works sometime after 5.3.0, http://bugs.php.net/bug.php?id=49571
-            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR ')) {
-                curl_setopt($ch, CURLOPT_POSTREDIR, 3);
-            }
-        }
-
-        // request timeout
-        if ($timeout = $this->request->getConfig('timeout')) {
-            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-        }
-
-        // set HTTP version
-        switch ($this->request->getConfig('protocol_version')) {
-            case '1.0':
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-                break;
-            case '1.1':
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-        }
-
-        // set request method
-        switch ($this->request->getMethod()) {
-            case HTTP_Request2::METHOD_GET:
-                curl_setopt($ch, CURLOPT_HTTPGET, true);
-                break;
-            case HTTP_Request2::METHOD_POST:
-                curl_setopt($ch, CURLOPT_POST, true);
-                break;
-            case HTTP_Request2::METHOD_HEAD:
-                curl_setopt($ch, CURLOPT_NOBODY, true);
-                break;
-            default:
-                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());
-        }
-
-        // set proxy, if needed
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_Exception('Proxy port not provided');
-            }
-            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
-            if ($user = $this->request->getConfig('proxy_user')) {
-                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
-                            $this->request->getConfig('proxy_password'));
-                switch ($this->request->getConfig('proxy_auth_scheme')) {
-                    case HTTP_Request2::AUTH_BASIC:
-                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
-                        break;
-                    case HTTP_Request2::AUTH_DIGEST:
-                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
-                }
-            }
-        }
-
-        // set authentication data
-        if ($auth = $this->request->getAuth()) {
-            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
-            switch ($auth['scheme']) {
-                case HTTP_Request2::AUTH_BASIC:
-                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-                    break;
-                case HTTP_Request2::AUTH_DIGEST:
-                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-            }
-        }
-
-        // set SSL options
-        if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_verify_host' == $name && null !== $value) {
-                    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
-                } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
-                    curl_setopt($ch, self::$sslContextMap[$name], $value);
-                }
-            }
-        }
-
-        $headers = $this->request->getHeaders();
-        // make cURL automagically send proper header
-        if (!isset($headers['accept-encoding'])) {
-            $headers['accept-encoding'] = '';
-        }
-
-        // set headers having special cURL keys
-        foreach (self::$headerMap as $name => $option) {
-            if (isset($headers[$name])) {
-                curl_setopt($ch, $option, $headers[$name]);
-                unset($headers[$name]);
-            }
-        }
-
-        $this->calculateRequestLength($headers);
-        if (isset($headers['content-length'])) {
-            $this->workaroundPhpBug47204($ch, $headers);
-        }
-
-        // set headers not having special keys
-        $headersFmt = array();
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersFmt[]  = $canonicalName . ': ' . $value;
-        }
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
-
-        return $ch;
-    }
+	protected function createCurlHandle()
+	{
+		$ch = curl_init();
+
+		curl_setopt_array($ch, array(
+			// setup write callbacks
+			CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),
+			CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),
+			// buffer size
+			CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
+			// connection timeout
+			CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),
+			// save full outgoing headers, in case someone is interested
+			CURLINFO_HEADER_OUT    => true,
+			// request url
+			CURLOPT_URL            => $this->request->getUrl()->getUrl()
+		));
+
+		// set up redirects
+		if (!$this->request->getConfig('follow_redirects')) {
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
+		} else {
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+			curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));
+			// limit redirects to http(s), works in 5.2.10+
+			if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+				curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+			}
+			// works sometime after 5.3.0, http://bugs.php.net/bug.php?id=49571
+			if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR ')) {
+				curl_setopt($ch, CURLOPT_POSTREDIR, 3);
+			}
+		}
+
+		// request timeout
+		if ($timeout = $this->request->getConfig('timeout')) {
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		}
+
+		// set HTTP version
+		switch ($this->request->getConfig('protocol_version')) {
+			case '1.0':
+				curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+				break;
+			case '1.1':
+				curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+		}
+
+		// set request method
+		switch ($this->request->getMethod()) {
+			case HTTP_Request2::METHOD_GET:
+				curl_setopt($ch, CURLOPT_HTTPGET, true);
+				break;
+			case HTTP_Request2::METHOD_POST:
+				curl_setopt($ch, CURLOPT_POST, true);
+				break;
+			case HTTP_Request2::METHOD_HEAD:
+				curl_setopt($ch, CURLOPT_NOBODY, true);
+				break;
+			default:
+				curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());
+		}
+
+		// set proxy, if needed
+		if ($host = $this->request->getConfig('proxy_host')) {
+			if (!($port = $this->request->getConfig('proxy_port'))) {
+				throw new HTTP_Request2_Exception('Proxy port not provided');
+			}
+			curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
+			if ($user = $this->request->getConfig('proxy_user')) {
+				curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
+							$this->request->getConfig('proxy_password'));
+				switch ($this->request->getConfig('proxy_auth_scheme')) {
+					case HTTP_Request2::AUTH_BASIC:
+						curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
+						break;
+					case HTTP_Request2::AUTH_DIGEST:
+						curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
+				}
+			}
+		}
+
+		// set authentication data
+		if ($auth = $this->request->getAuth()) {
+			curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
+			switch ($auth['scheme']) {
+				case HTTP_Request2::AUTH_BASIC:
+					curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+					break;
+				case HTTP_Request2::AUTH_DIGEST:
+					curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+			}
+		}
+
+		// set SSL options
+		if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {
+			foreach ($this->request->getConfig() as $name => $value) {
+				if ('ssl_verify_host' == $name && null !== $value) {
+					curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
+				} elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
+					curl_setopt($ch, self::$sslContextMap[$name], $value);
+				}
+			}
+		}
+
+		$headers = $this->request->getHeaders();
+		// make cURL automagically send proper header
+		if (!isset($headers['accept-encoding'])) {
+			$headers['accept-encoding'] = '';
+		}
+
+		// set headers having special cURL keys
+		foreach (self::$headerMap as $name => $option) {
+			if (isset($headers[$name])) {
+				curl_setopt($ch, $option, $headers[$name]);
+				unset($headers[$name]);
+			}
+		}
+
+		$this->calculateRequestLength($headers);
+		if (isset($headers['content-length'])) {
+			$this->workaroundPhpBug47204($ch, $headers);
+		}
+
+		// set headers not having special keys
+		$headersFmt = array();
+		foreach ($headers as $name => $value) {
+			$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+			$headersFmt[]  = $canonicalName . ': ' . $value;
+		}
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
+
+		return $ch;
+	}
 
    /**
     * Workaround for PHP bug #47204 that prevents rewinding request body
@@ -315,32 +315,32 @@  discard block
 block discarded – undo
     * @param    resource    cURL handle
     * @param    array       Request headers
     */
-    protected function workaroundPhpBug47204($ch, &$headers)
-    {
-        // no redirects, no digest auth -> probably no rewind needed
-        if (!$this->request->getConfig('follow_redirects')
-            && (!($auth = $this->request->getAuth())
-                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])
-        ) {
-            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
-
-        // rewind may be needed, read the whole body into memory
-        } else {
-            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {
-                $this->requestBody = $this->requestBody->__toString();
-
-            } elseif (is_resource($this->requestBody)) {
-                $fp = $this->requestBody;
-                $this->requestBody = '';
-                while (!feof($fp)) {
-                    $this->requestBody .= fread($fp, 16384);
-                }
-            }
-            // curl hangs up if content-length is present
-            unset($headers['content-length']);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);
-        }
-    }
+	protected function workaroundPhpBug47204($ch, &$headers)
+	{
+		// no redirects, no digest auth -> probably no rewind needed
+		if (!$this->request->getConfig('follow_redirects')
+			&& (!($auth = $this->request->getAuth())
+				|| HTTP_Request2::AUTH_DIGEST != $auth['scheme'])
+		) {
+			curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
+
+		// rewind may be needed, read the whole body into memory
+		} else {
+			if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {
+				$this->requestBody = $this->requestBody->__toString();
+
+			} elseif (is_resource($this->requestBody)) {
+				$fp = $this->requestBody;
+				$this->requestBody = '';
+				while (!feof($fp)) {
+					$this->requestBody .= fread($fp, 16384);
+				}
+			}
+			// curl hangs up if content-length is present
+			unset($headers['content-length']);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);
+		}
+	}
 
    /**
     * Callback function called by cURL for reading the request body
@@ -350,30 +350,30 @@  discard block
 block discarded – undo
     * @param    integer     maximum length of data to return
     * @return   string      part of the request body, up to $length bytes
     */
-    protected function callbackReadBody($ch, $fd, $length)
-    {
-        if (!$this->eventSentHeaders) {
-            $this->request->setLastEvent(
-                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
-            );
-            $this->eventSentHeaders = true;
-        }
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength || $this->position >= $this->contentLength
-        ) {
-            return '';
-        }
-        if (is_string($this->requestBody)) {
-            $string = substr($this->requestBody, $this->position, $length);
-        } elseif (is_resource($this->requestBody)) {
-            $string = fread($this->requestBody, $length);
-        } else {
-            $string = $this->requestBody->read($length);
-        }
-        $this->request->setLastEvent('sentBodyPart', strlen($string));
-        $this->position += strlen($string);
-        return $string;
-    }
+	protected function callbackReadBody($ch, $fd, $length)
+	{
+		if (!$this->eventSentHeaders) {
+			$this->request->setLastEvent(
+				'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
+			);
+			$this->eventSentHeaders = true;
+		}
+		if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+			0 == $this->contentLength || $this->position >= $this->contentLength
+		) {
+			return '';
+		}
+		if (is_string($this->requestBody)) {
+			$string = substr($this->requestBody, $this->position, $length);
+		} elseif (is_resource($this->requestBody)) {
+			$string = fread($this->requestBody, $length);
+		} else {
+			$string = $this->requestBody->read($length);
+		}
+		$this->request->setLastEvent('sentBodyPart', strlen($string));
+		$this->position += strlen($string);
+		return $string;
+	}
 
    /**
     * Callback function called by cURL for saving the response headers
@@ -383,58 +383,58 @@  discard block
 block discarded – undo
     * @return   integer     number of bytes saved
     * @see      HTTP_Request2_Response::parseHeaderLine()
     */
-    protected function callbackWriteHeader($ch, $string)
-    {
-        // we may receive a second set of headers if doing e.g. digest auth
-        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {
-            // don't bother with 100-Continue responses (bug #15785)
-            if (!$this->eventSentHeaders ||
-                $this->response->getStatus() >= 200
-            ) {
-                $this->request->setLastEvent(
-                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
-                );
-            }
-            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);
-            // if body wasn't read by a callback, send event with total body size
-            if ($upload > $this->position) {
-                $this->request->setLastEvent(
-                    'sentBodyPart', $upload - $this->position
-                );
-                $this->position = $upload;
-            }
-            $this->eventSentHeaders = true;
-            // we'll need a new response object
-            if ($this->eventReceivedHeaders) {
-                $this->eventReceivedHeaders = false;
-                $this->response             = null;
-            }
-        }
-        if (empty($this->response)) {
-            $this->response = new HTTP_Request2_Response($string, false);
-        } else {
-            $this->response->parseHeaderLine($string);
-            if ('' == trim($string)) {
-                // don't bother with 100-Continue responses (bug #15785)
-                if (200 <= $this->response->getStatus()) {
-                    $this->request->setLastEvent('receivedHeaders', $this->response);
-                }
-                // for versions lower than 5.2.10, check the redirection URL protocol
-                if ($this->request->getConfig('follow_redirects') && !defined('CURLOPT_REDIR_PROTOCOLS')
-                    && $this->response->isRedirect()
-                ) {
-                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));
-                    if ($redirectUrl->isAbsolute()
-                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-                    ) {
-                        return -1;
-                    }
-                }
-                $this->eventReceivedHeaders = true;
-            }
-        }
-        return strlen($string);
-    }
+	protected function callbackWriteHeader($ch, $string)
+	{
+		// we may receive a second set of headers if doing e.g. digest auth
+		if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {
+			// don't bother with 100-Continue responses (bug #15785)
+			if (!$this->eventSentHeaders ||
+				$this->response->getStatus() >= 200
+			) {
+				$this->request->setLastEvent(
+					'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
+				);
+			}
+			$upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);
+			// if body wasn't read by a callback, send event with total body size
+			if ($upload > $this->position) {
+				$this->request->setLastEvent(
+					'sentBodyPart', $upload - $this->position
+				);
+				$this->position = $upload;
+			}
+			$this->eventSentHeaders = true;
+			// we'll need a new response object
+			if ($this->eventReceivedHeaders) {
+				$this->eventReceivedHeaders = false;
+				$this->response             = null;
+			}
+		}
+		if (empty($this->response)) {
+			$this->response = new HTTP_Request2_Response($string, false);
+		} else {
+			$this->response->parseHeaderLine($string);
+			if ('' == trim($string)) {
+				// don't bother with 100-Continue responses (bug #15785)
+				if (200 <= $this->response->getStatus()) {
+					$this->request->setLastEvent('receivedHeaders', $this->response);
+				}
+				// for versions lower than 5.2.10, check the redirection URL protocol
+				if ($this->request->getConfig('follow_redirects') && !defined('CURLOPT_REDIR_PROTOCOLS')
+					&& $this->response->isRedirect()
+				) {
+					$redirectUrl = new Net_URL2($this->response->getHeader('location'));
+					if ($redirectUrl->isAbsolute()
+						&& !in_array($redirectUrl->getScheme(), array('http', 'https'))
+					) {
+						return -1;
+					}
+				}
+				$this->eventReceivedHeaders = true;
+			}
+		}
+		return strlen($string);
+	}
 
    /**
     * Callback function called by cURL for saving the response body
@@ -444,18 +444,18 @@  discard block
 block discarded – undo
     * @return   integer     number of bytes saved
     * @see      HTTP_Request2_Response::appendBody()
     */
-    protected function callbackWriteBody($ch, $string)
-    {
-        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if
-        // response doesn't start with proper HTTP status line (see bug #15716)
-        if (empty($this->response)) {
-            throw new HTTP_Request2_Exception("Malformed response: {$string}");
-        }
-        if ($this->request->getConfig('store_body')) {
-            $this->response->appendBody($string);
-        }
-        $this->request->setLastEvent('receivedBodyPart', $string);
-        return strlen($string);
-    }
+	protected function callbackWriteBody($ch, $string)
+	{
+		// cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if
+		// response doesn't start with proper HTTP status line (see bug #15716)
+		if (empty($this->response)) {
+			throw new HTTP_Request2_Exception("Malformed response: {$string}");
+		}
+		if ($this->request->getConfig('store_body')) {
+			$this->response->appendBody($string);
+		}
+		$this->request->setLastEvent('receivedBodyPart', $string);
+		return strlen($string);
+	}
 }
 ?>

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -131,8 +131,8 @@  discard block
 block discarded – undo
 
         try {
             if (false === curl_exec($ch = $this->createCurlHandle())) {
-                $errorMessage = 'Error sending request: #' . curl_errno($ch) .
-                                                       ' ' . curl_error($ch);
+                $errorMessage = 'Error sending request: #'.curl_errno($ch).
+                                                       ' '.curl_error($ch);
             }
         } catch (Exception $e) {
         }
@@ -238,9 +238,9 @@  discard block
 block discarded – undo
             if (!($port = $this->request->getConfig('proxy_port'))) {
                 throw new HTTP_Request2_Exception('Proxy port not provided');
             }
-            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
+            curl_setopt($ch, CURLOPT_PROXY, $host.':'.$port);
             if ($user = $this->request->getConfig('proxy_user')) {
-                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user.':'.
                             $this->request->getConfig('proxy_password'));
                 switch ($this->request->getConfig('proxy_auth_scheme')) {
                     case HTTP_Request2::AUTH_BASIC:
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
 
         // set authentication data
         if ($auth = $this->request->getAuth()) {
-            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
+            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'].':'.$auth['password']);
             switch ($auth['scheme']) {
                 case HTTP_Request2::AUTH_BASIC:
                     curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
         if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {
             foreach ($this->request->getConfig() as $name => $value) {
                 if ('ssl_verify_host' == $name && null !== $value) {
-                    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
+                    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value ? 2 : 0);
                 } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
                     curl_setopt($ch, self::$sslContextMap[$name], $value);
                 }
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
         $headersFmt = array();
         foreach ($headers as $name => $value) {
             $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersFmt[]  = $canonicalName . ': ' . $value;
+            $headersFmt[]  = $canonicalName.': '.$value;
         }
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
 

Please login to merge, or discard this patch.

libs/PEAR.1.9/Net/URL2.php 3 patches

Doc Comments +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -229,7 +229,7 @@  discard block
 block discarded – undo
      * Returns the user part of the userinfo part (the part preceding the first
      *  ":"), or false if there is no userinfo part.
      *
-     * @return  string|bool
+     * @return  string|false
      */
     public function getUser()
     {
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
      * contain "@" in front of the hostname) or the userinfo part does not
      * contain ":".
      *
-     * @return  string|bool
+     * @return  string|false
      */
     public function getPassword()
     {
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
      * @param string|bool $userinfo userinfo or username
      * @param string|bool $password optional password, or false
      *
-     * @return void
+     * @return Net_URL2
      */
     public function setUserinfo($userinfo, $password = false)
     {
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
      * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
      * false if there is no authority.
      *
-     * @return string|bool
+     * @return false|string
      */
     public function getAuthority()
     {
@@ -360,11 +360,11 @@  discard block
 block discarded – undo
      * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
      * false if there is no authority.
      *
-     * @param string|false $authority a hostname or an IP addresse, possibly
+     * @param string|boolean $authority a hostname or an IP addresse, possibly
      *                                with userinfo prefixed and port number
      *                                appended, e.g. "foo:[email protected]:81".
      *
-     * @return void
+     * @return Net_URL2
      */
     public function setAuthority($authority)
     {
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
      *
      * @param array $array (name => value) array
      *
-     * @return void
+     * @return Net_URL2
      */
     public function setQueryVariables(array $array)
     {
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
      * @param string $name  variable name
      * @param mixed  $value variable value
      *
-     * @return  array
+     * @return  Net_URL2
      */
     public function setQueryVariable($name, $value)
     {
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
      * Returns an Net_URL2 instance representing an absolute URL relative to
      * this URL.
      *
-     * @param Net_URL2|string $reference relative URL
+     * @param Net_URL2 $reference relative URL
      *
      * @return Net_URL2
      */
@@ -826,7 +826,7 @@  discard block
 block discarded – undo
      * Returns a Net_URL2 instance representing the canonical URL of the
      * currently executing PHP script.
      * 
-     * @return  string
+     * @return  Net_URL2
      */
     public static function getCanonical()
     {
@@ -884,7 +884,7 @@  discard block
 block discarded – undo
      *
      * @param string $optionName The name of the option to retrieve
      *
-     * @return  mixed
+     * @return  string
      */
     function getOption($optionName)
     {

Please login to merge, or discard this patch.

Indentation +828 added lines, -828 removed lines patch added patch discarded remove patch

@@ -56,839 +56,839 @@
 block discarded – undo
  */
 class Net_URL2
 {
-    /**
-     * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
-     * is true.
-     */
-    const OPTION_STRICT = 'strict';
-
-    /**
-     * Represent arrays in query using PHP's [] notation. Default is true.
-     */
-    const OPTION_USE_BRACKETS = 'use_brackets';
-
-    /**
-     * URL-encode query variable keys. Default is true.
-     */
-    const OPTION_ENCODE_KEYS = 'encode_keys';
-
-    /**
-     * Query variable separators when parsing the query string. Every character
-     * is considered a separator. Default is "&".
-     */
-    const OPTION_SEPARATOR_INPUT = 'input_separator';
-
-    /**
-     * Query variable separator used when generating the query string. Default
-     * is "&".
-     */
-    const OPTION_SEPARATOR_OUTPUT = 'output_separator';
-
-    /**
-     * Default options corresponds to how PHP handles $_GET.
-     */
-    private $_options = array(
-        self::OPTION_STRICT           => true,
-        self::OPTION_USE_BRACKETS     => true,
-        self::OPTION_ENCODE_KEYS      => true,
-        self::OPTION_SEPARATOR_INPUT  => '&',
-        self::OPTION_SEPARATOR_OUTPUT => '&',
-        );
-
-    /**
-     * @var  string|bool
-     */
-    private $_scheme = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_userinfo = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_host = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_port = false;
-
-    /**
-     * @var  string
-     */
-    private $_path = '';
-
-    /**
-     * @var  string|bool
-     */
-    private $_query = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_fragment = false;
-
-    /**
-     * Constructor.
-     *
-     * @param string $url     an absolute or relative URL
-     * @param array  $options an array of OPTION_xxx constants
-     */
-    public function __construct($url, array $options = array())
-    {
-        foreach ($options as $optionName => $value) {
-            if (array_key_exists($optionName, $this->_options)) {
-                $this->_options[$optionName] = $value;
-            }
-        }
-
-        // The regular expression is copied verbatim from RFC 3986, appendix B.
-        // The expression does not validate the URL but matches any string.
-        preg_match('!^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?!',
-                   $url,
-                   $matches);
-
-        // "path" is always present (possibly as an empty string); the rest
-        // are optional.
-        $this->_scheme = !empty($matches[1]) ? $matches[2] : false;
-        $this->setAuthority(!empty($matches[3]) ? $matches[4] : false);
-        $this->_path = $matches[5];
-        $this->_query = !empty($matches[6]) ? $matches[7] : false;
-        $this->_fragment = !empty($matches[8]) ? $matches[9] : false;
-    }
-
-    /**
-     * Magic Setter.
-     *
-     * This method will magically set the value of a private variable ($var)
-     * with the value passed as the args
-     *
-     * @param  string $var      The private variable to set.
-     * @param  mixed  $arg      An argument of any type.
-     * @return void
-     */
-    public function __set($var, $arg)
-    {
-        $method = 'set' . $var;
-        if (method_exists($this, $method)) {
-            $this->$method($arg);
-        }
-    }
+	/**
+	 * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
+	 * is true.
+	 */
+	const OPTION_STRICT = 'strict';
+
+	/**
+	 * Represent arrays in query using PHP's [] notation. Default is true.
+	 */
+	const OPTION_USE_BRACKETS = 'use_brackets';
+
+	/**
+	 * URL-encode query variable keys. Default is true.
+	 */
+	const OPTION_ENCODE_KEYS = 'encode_keys';
+
+	/**
+	 * Query variable separators when parsing the query string. Every character
+	 * is considered a separator. Default is "&".
+	 */
+	const OPTION_SEPARATOR_INPUT = 'input_separator';
+
+	/**
+	 * Query variable separator used when generating the query string. Default
+	 * is "&".
+	 */
+	const OPTION_SEPARATOR_OUTPUT = 'output_separator';
+
+	/**
+	 * Default options corresponds to how PHP handles $_GET.
+	 */
+	private $_options = array(
+		self::OPTION_STRICT           => true,
+		self::OPTION_USE_BRACKETS     => true,
+		self::OPTION_ENCODE_KEYS      => true,
+		self::OPTION_SEPARATOR_INPUT  => '&',
+		self::OPTION_SEPARATOR_OUTPUT => '&',
+		);
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_scheme = false;
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_userinfo = false;
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_host = false;
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_port = false;
+
+	/**
+	 * @var  string
+	 */
+	private $_path = '';
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_query = false;
+
+	/**
+	 * @var  string|bool
+	 */
+	private $_fragment = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $url     an absolute or relative URL
+	 * @param array  $options an array of OPTION_xxx constants
+	 */
+	public function __construct($url, array $options = array())
+	{
+		foreach ($options as $optionName => $value) {
+			if (array_key_exists($optionName, $this->_options)) {
+				$this->_options[$optionName] = $value;
+			}
+		}
+
+		// The regular expression is copied verbatim from RFC 3986, appendix B.
+		// The expression does not validate the URL but matches any string.
+		preg_match('!^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?!',
+				   $url,
+				   $matches);
+
+		// "path" is always present (possibly as an empty string); the rest
+		// are optional.
+		$this->_scheme = !empty($matches[1]) ? $matches[2] : false;
+		$this->setAuthority(!empty($matches[3]) ? $matches[4] : false);
+		$this->_path = $matches[5];
+		$this->_query = !empty($matches[6]) ? $matches[7] : false;
+		$this->_fragment = !empty($matches[8]) ? $matches[9] : false;
+	}
+
+	/**
+	 * Magic Setter.
+	 *
+	 * This method will magically set the value of a private variable ($var)
+	 * with the value passed as the args
+	 *
+	 * @param  string $var      The private variable to set.
+	 * @param  mixed  $arg      An argument of any type.
+	 * @return void
+	 */
+	public function __set($var, $arg)
+	{
+		$method = 'set' . $var;
+		if (method_exists($this, $method)) {
+			$this->$method($arg);
+		}
+	}
     
-    /**
-     * Magic Getter.
-     *
-     * This is the magic get method to retrieve the private variable 
-     * that was set by either __set() or it's setter...
-     * 
-     * @param  string $var         The property name to retrieve.
-     * @return mixed  $this->$var  Either a boolean false if the
-     *                             property is not set or the value
-     *                             of the private property.
-     */
-    public function __get($var)
-    {
-        $method = 'get' . $var;
-        if (method_exists($this, $method)) {
-            return $this->$method();
-        }
+	/**
+	 * Magic Getter.
+	 *
+	 * This is the magic get method to retrieve the private variable 
+	 * that was set by either __set() or it's setter...
+	 * 
+	 * @param  string $var         The property name to retrieve.
+	 * @return mixed  $this->$var  Either a boolean false if the
+	 *                             property is not set or the value
+	 *                             of the private property.
+	 */
+	public function __get($var)
+	{
+		$method = 'get' . $var;
+		if (method_exists($this, $method)) {
+			return $this->$method();
+		}
         
-        return false;
-    }
+		return false;
+	}
     
-    /**
-     * Returns the scheme, e.g. "http" or "urn", or false if there is no
-     * scheme specified, i.e. if this is a relative URL.
-     *
-     * @return  string|bool
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
-     * scheme specified, i.e. if this is a relative URL.
-     *
-     * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
-     *                            scheme specified, i.e. if this is a relative
-     *                            URL
-     *
-     * @return void
-     * @see    getScheme()
-     */
-    public function setScheme($scheme)
-    {
-        $this->_scheme = $scheme;
-    }
-
-    /**
-     * Returns the user part of the userinfo part (the part preceding the first
-     *  ":"), or false if there is no userinfo part.
-     *
-     * @return  string|bool
-     */
-    public function getUser()
-    {
-        return $this->_userinfo !== false
-            ? preg_replace('@:.*$@', '', $this->_userinfo)
-            : false;
-    }
-
-    /**
-     * Returns the password part of the userinfo part (the part after the first
-     *  ":"), or false if there is no userinfo part (i.e. the URL does not
-     * contain "@" in front of the hostname) or the userinfo part does not
-     * contain ":".
-     *
-     * @return  string|bool
-     */
-    public function getPassword()
-    {
-        return $this->_userinfo !== false
-            ? substr(strstr($this->_userinfo, ':'), 1)
-            : false;
-    }
-
-    /**
-     * Returns the userinfo part, or false if there is none, i.e. if the
-     * authority part does not contain "@".
-     *
-     * @return  string|bool
-     */
-    public function getUserinfo()
-    {
-        return $this->_userinfo;
-    }
-
-    /**
-     * Sets the userinfo part. If two arguments are passed, they are combined
-     * in the userinfo part as username ":" password.
-     *
-     * @param string|bool $userinfo userinfo or username
-     * @param string|bool $password optional password, or false
-     *
-     * @return void
-     */
-    public function setUserinfo($userinfo, $password = false)
-    {
-        $this->_userinfo = $userinfo;
-        if ($password !== false) {
-            $this->_userinfo .= ':' . $password;
-        }
-    }
-
-    /**
-     * Returns the host part, or false if there is no authority part, e.g.
-     * relative URLs.
-     *
-     * @return  string|bool a hostname, an IP address, or false
-     */
-    public function getHost()
-    {
-        return $this->_host;
-    }
-
-    /**
-     * Sets the host part. Specify false if there is no authority part, e.g.
-     * relative URLs.
-     *
-     * @param string|bool $host a hostname, an IP address, or false
-     *
-     * @return void
-     */
-    public function setHost($host)
-    {
-        $this->_host = $host;
-    }
-
-    /**
-     * Returns the port number, or false if there is no port number specified,
-     * i.e. if the default port is to be used.
-     *
-     * @return  string|bool
-     */
-    public function getPort()
-    {
-        return $this->_port;
-    }
-
-    /**
-     * Sets the port number. Specify false if there is no port number specified,
-     * i.e. if the default port is to be used.
-     *
-     * @param string|bool $port a port number, or false
-     *
-     * @return void
-     */
-    public function setPort($port)
-    {
-        $this->_port = $port;
-    }
-
-    /**
-     * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
-     * false if there is no authority.
-     *
-     * @return string|bool
-     */
-    public function getAuthority()
-    {
-        if (!$this->_host) {
-            return false;
-        }
-
-        $authority = '';
-
-        if ($this->_userinfo !== false) {
-            $authority .= $this->_userinfo . '@';
-        }
-
-        $authority .= $this->_host;
-
-        if ($this->_port !== false) {
-            $authority .= ':' . $this->_port;
-        }
-
-        return $authority;
-    }
-
-    /**
-     * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
-     * false if there is no authority.
-     *
-     * @param string|false $authority a hostname or an IP addresse, possibly
-     *                                with userinfo prefixed and port number
-     *                                appended, e.g. "foo:[email protected]:81".
-     *
-     * @return void
-     */
-    public function setAuthority($authority)
-    {
-        $this->_userinfo = false;
-        $this->_host     = false;
-        $this->_port     = false;
-        if (preg_match('@^(([^\@]*)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
-            if ($reg[1]) {
-                $this->_userinfo = $reg[2];
-            }
-
-            $this->_host = $reg[3];
-            if (isset($reg[5])) {
-                $this->_port = $reg[5];
-            }
-        }
-    }
-
-    /**
-     * Returns the path part (possibly an empty string).
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->_path;
-    }
-
-    /**
-     * Sets the path part (possibly an empty string).
-     *
-     * @param string $path a path
-     *
-     * @return void
-     */
-    public function setPath($path)
-    {
-        $this->_path = $path;
-    }
-
-    /**
-     * Returns the query string (excluding the leading "?"), or false if "?"
-     * is not present in the URL.
-     *
-     * @return  string|bool
-     * @see     self::getQueryVariables()
-     */
-    public function getQuery()
-    {
-        return $this->_query;
-    }
-
-    /**
-     * Sets the query string (excluding the leading "?"). Specify false if "?"
-     * is not present in the URL.
-     *
-     * @param string|bool $query a query string, e.g. "foo=1&bar=2"
-     *
-     * @return void
-     * @see   self::setQueryVariables()
-     */
-    public function setQuery($query)
-    {
-        $this->_query = $query;
-    }
-
-    /**
-     * Returns the fragment name, or false if "#" is not present in the URL.
-     *
-     * @return  string|bool
-     */
-    public function getFragment()
-    {
-        return $this->_fragment;
-    }
-
-    /**
-     * Sets the fragment name. Specify false if "#" is not present in the URL.
-     *
-     * @param string|bool $fragment a fragment excluding the leading "#", or
-     *                              false
-     *
-     * @return void
-     */
-    public function setFragment($fragment)
-    {
-        $this->_fragment = $fragment;
-    }
-
-    /**
-     * Returns the query string like an array as the variables would appear in
-     * $_GET in a PHP script. If the URL does not contain a "?", an empty array
-     * is returned.
-     *
-     * @return  array
-     */
-    public function getQueryVariables()
-    {
-        $pattern = '/[' .
-                   preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
-                   ']/';
-        $parts   = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
-        $return  = array();
-
-        foreach ($parts as $part) {
-            if (strpos($part, '=') !== false) {
-                list($key, $value) = explode('=', $part, 2);
-            } else {
-                $key   = $part;
-                $value = null;
-            }
-
-            if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
-                $key = rawurldecode($key);
-            }
-            $value = rawurldecode($value);
-
-            if ($this->getOption(self::OPTION_USE_BRACKETS) &&
-                preg_match('#^(.*)\[([0-9a-z_-]*)\]#i', $key, $matches)) {
-
-                $key = $matches[1];
-                $idx = $matches[2];
-
-                // Ensure is an array
-                if (empty($return[$key]) || !is_array($return[$key])) {
-                    $return[$key] = array();
-                }
-
-                // Add data
-                if ($idx === '') {
-                    $return[$key][] = $value;
-                } else {
-                    $return[$key][$idx] = $value;
-                }
-            } elseif (!$this->getOption(self::OPTION_USE_BRACKETS)
-                      && !empty($return[$key])
-            ) {
-                $return[$key]   = (array) $return[$key];
-                $return[$key][] = $value;
-            } else {
-                $return[$key] = $value;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Sets the query string to the specified variable in the query string.
-     *
-     * @param array $array (name => value) array
-     *
-     * @return void
-     */
-    public function setQueryVariables(array $array)
-    {
-        if (!$array) {
-            $this->_query = false;
-        } else {
-            foreach ($array as $name => $value) {
-                if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
-                    $name = self::urlencode($name);
-                }
-
-                if (is_array($value)) {
-                    foreach ($value as $k => $v) {
-                        $parts[] = $this->getOption(self::OPTION_USE_BRACKETS)
-                            ? sprintf('%s[%s]=%s', $name, $k, $v)
-                            : ($name . '=' . $v);
-                    }
-                } elseif (!is_null($value)) {
-                    $parts[] = $name . '=' . self::urlencode($value);
-                } else {
-                    $parts[] = $name;
-                }
-            }
-            $this->_query = implode($this->getOption(self::OPTION_SEPARATOR_OUTPUT),
-                                    $parts);
-        }
-    }
-
-    /**
-     * Sets the specified variable in the query string.
-     *
-     * @param string $name  variable name
-     * @param mixed  $value variable value
-     *
-     * @return  array
-     */
-    public function setQueryVariable($name, $value)
-    {
-        $array = $this->getQueryVariables();
-        $array[$name] = $value;
-        $this->setQueryVariables($array);
-    }
-
-    /**
-     * Removes the specifed variable from the query string.
-     *
-     * @param string $name a query string variable, e.g. "foo" in "?foo=1"
-     *
-     * @return void
-     */
-    public function unsetQueryVariable($name)
-    {
-        $array = $this->getQueryVariables();
-        unset($array[$name]);
-        $this->setQueryVariables($array);
-    }
-
-    /**
-     * Returns a string representation of this URL.
-     *
-     * @return  string
-     */
-    public function getURL()
-    {
-        // See RFC 3986, section 5.3
-        $url = "";
-
-        if ($this->_scheme !== false) {
-            $url .= $this->_scheme . ':';
-        }
-
-        $authority = $this->getAuthority();
-        if ($authority !== false) {
-            $url .= '//' . $authority;
-        }
-        $url .= $this->_path;
-
-        if ($this->_query !== false) {
-            $url .= '?' . $this->_query;
-        }
-
-        if ($this->_fragment !== false) {
-            $url .= '#' . $this->_fragment;
-        }
+	/**
+	 * Returns the scheme, e.g. "http" or "urn", or false if there is no
+	 * scheme specified, i.e. if this is a relative URL.
+	 *
+	 * @return  string|bool
+	 */
+	public function getScheme()
+	{
+		return $this->_scheme;
+	}
+
+	/**
+	 * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
+	 * scheme specified, i.e. if this is a relative URL.
+	 *
+	 * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
+	 *                            scheme specified, i.e. if this is a relative
+	 *                            URL
+	 *
+	 * @return void
+	 * @see    getScheme()
+	 */
+	public function setScheme($scheme)
+	{
+		$this->_scheme = $scheme;
+	}
+
+	/**
+	 * Returns the user part of the userinfo part (the part preceding the first
+	 *  ":"), or false if there is no userinfo part.
+	 *
+	 * @return  string|bool
+	 */
+	public function getUser()
+	{
+		return $this->_userinfo !== false
+			? preg_replace('@:.*$@', '', $this->_userinfo)
+			: false;
+	}
+
+	/**
+	 * Returns the password part of the userinfo part (the part after the first
+	 *  ":"), or false if there is no userinfo part (i.e. the URL does not
+	 * contain "@" in front of the hostname) or the userinfo part does not
+	 * contain ":".
+	 *
+	 * @return  string|bool
+	 */
+	public function getPassword()
+	{
+		return $this->_userinfo !== false
+			? substr(strstr($this->_userinfo, ':'), 1)
+			: false;
+	}
+
+	/**
+	 * Returns the userinfo part, or false if there is none, i.e. if the
+	 * authority part does not contain "@".
+	 *
+	 * @return  string|bool
+	 */
+	public function getUserinfo()
+	{
+		return $this->_userinfo;
+	}
+
+	/**
+	 * Sets the userinfo part. If two arguments are passed, they are combined
+	 * in the userinfo part as username ":" password.
+	 *
+	 * @param string|bool $userinfo userinfo or username
+	 * @param string|bool $password optional password, or false
+	 *
+	 * @return void
+	 */
+	public function setUserinfo($userinfo, $password = false)
+	{
+		$this->_userinfo = $userinfo;
+		if ($password !== false) {
+			$this->_userinfo .= ':' . $password;
+		}
+	}
+
+	/**
+	 * Returns the host part, or false if there is no authority part, e.g.
+	 * relative URLs.
+	 *
+	 * @return  string|bool a hostname, an IP address, or false
+	 */
+	public function getHost()
+	{
+		return $this->_host;
+	}
+
+	/**
+	 * Sets the host part. Specify false if there is no authority part, e.g.
+	 * relative URLs.
+	 *
+	 * @param string|bool $host a hostname, an IP address, or false
+	 *
+	 * @return void
+	 */
+	public function setHost($host)
+	{
+		$this->_host = $host;
+	}
+
+	/**
+	 * Returns the port number, or false if there is no port number specified,
+	 * i.e. if the default port is to be used.
+	 *
+	 * @return  string|bool
+	 */
+	public function getPort()
+	{
+		return $this->_port;
+	}
+
+	/**
+	 * Sets the port number. Specify false if there is no port number specified,
+	 * i.e. if the default port is to be used.
+	 *
+	 * @param string|bool $port a port number, or false
+	 *
+	 * @return void
+	 */
+	public function setPort($port)
+	{
+		$this->_port = $port;
+	}
+
+	/**
+	 * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
+	 * false if there is no authority.
+	 *
+	 * @return string|bool
+	 */
+	public function getAuthority()
+	{
+		if (!$this->_host) {
+			return false;
+		}
+
+		$authority = '';
+
+		if ($this->_userinfo !== false) {
+			$authority .= $this->_userinfo . '@';
+		}
+
+		$authority .= $this->_host;
+
+		if ($this->_port !== false) {
+			$authority .= ':' . $this->_port;
+		}
+
+		return $authority;
+	}
+
+	/**
+	 * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
+	 * false if there is no authority.
+	 *
+	 * @param string|false $authority a hostname or an IP addresse, possibly
+	 *                                with userinfo prefixed and port number
+	 *                                appended, e.g. "foo:[email protected]:81".
+	 *
+	 * @return void
+	 */
+	public function setAuthority($authority)
+	{
+		$this->_userinfo = false;
+		$this->_host     = false;
+		$this->_port     = false;
+		if (preg_match('@^(([^\@]*)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
+			if ($reg[1]) {
+				$this->_userinfo = $reg[2];
+			}
+
+			$this->_host = $reg[3];
+			if (isset($reg[5])) {
+				$this->_port = $reg[5];
+			}
+		}
+	}
+
+	/**
+	 * Returns the path part (possibly an empty string).
+	 *
+	 * @return string
+	 */
+	public function getPath()
+	{
+		return $this->_path;
+	}
+
+	/**
+	 * Sets the path part (possibly an empty string).
+	 *
+	 * @param string $path a path
+	 *
+	 * @return void
+	 */
+	public function setPath($path)
+	{
+		$this->_path = $path;
+	}
+
+	/**
+	 * Returns the query string (excluding the leading "?"), or false if "?"
+	 * is not present in the URL.
+	 *
+	 * @return  string|bool
+	 * @see     self::getQueryVariables()
+	 */
+	public function getQuery()
+	{
+		return $this->_query;
+	}
+
+	/**
+	 * Sets the query string (excluding the leading "?"). Specify false if "?"
+	 * is not present in the URL.
+	 *
+	 * @param string|bool $query a query string, e.g. "foo=1&bar=2"
+	 *
+	 * @return void
+	 * @see   self::setQueryVariables()
+	 */
+	public function setQuery($query)
+	{
+		$this->_query = $query;
+	}
+
+	/**
+	 * Returns the fragment name, or false if "#" is not present in the URL.
+	 *
+	 * @return  string|bool
+	 */
+	public function getFragment()
+	{
+		return $this->_fragment;
+	}
+
+	/**
+	 * Sets the fragment name. Specify false if "#" is not present in the URL.
+	 *
+	 * @param string|bool $fragment a fragment excluding the leading "#", or
+	 *                              false
+	 *
+	 * @return void
+	 */
+	public function setFragment($fragment)
+	{
+		$this->_fragment = $fragment;
+	}
+
+	/**
+	 * Returns the query string like an array as the variables would appear in
+	 * $_GET in a PHP script. If the URL does not contain a "?", an empty array
+	 * is returned.
+	 *
+	 * @return  array
+	 */
+	public function getQueryVariables()
+	{
+		$pattern = '/[' .
+				   preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
+				   ']/';
+		$parts   = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
+		$return  = array();
+
+		foreach ($parts as $part) {
+			if (strpos($part, '=') !== false) {
+				list($key, $value) = explode('=', $part, 2);
+			} else {
+				$key   = $part;
+				$value = null;
+			}
+
+			if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
+				$key = rawurldecode($key);
+			}
+			$value = rawurldecode($value);
+
+			if ($this->getOption(self::OPTION_USE_BRACKETS) &&
+				preg_match('#^(.*)\[([0-9a-z_-]*)\]#i', $key, $matches)) {
+
+				$key = $matches[1];
+				$idx = $matches[2];
+
+				// Ensure is an array
+				if (empty($return[$key]) || !is_array($return[$key])) {
+					$return[$key] = array();
+				}
+
+				// Add data
+				if ($idx === '') {
+					$return[$key][] = $value;
+				} else {
+					$return[$key][$idx] = $value;
+				}
+			} elseif (!$this->getOption(self::OPTION_USE_BRACKETS)
+					  && !empty($return[$key])
+			) {
+				$return[$key]   = (array) $return[$key];
+				$return[$key][] = $value;
+			} else {
+				$return[$key] = $value;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Sets the query string to the specified variable in the query string.
+	 *
+	 * @param array $array (name => value) array
+	 *
+	 * @return void
+	 */
+	public function setQueryVariables(array $array)
+	{
+		if (!$array) {
+			$this->_query = false;
+		} else {
+			foreach ($array as $name => $value) {
+				if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
+					$name = self::urlencode($name);
+				}
+
+				if (is_array($value)) {
+					foreach ($value as $k => $v) {
+						$parts[] = $this->getOption(self::OPTION_USE_BRACKETS)
+							? sprintf('%s[%s]=%s', $name, $k, $v)
+							: ($name . '=' . $v);
+					}
+				} elseif (!is_null($value)) {
+					$parts[] = $name . '=' . self::urlencode($value);
+				} else {
+					$parts[] = $name;
+				}
+			}
+			$this->_query = implode($this->getOption(self::OPTION_SEPARATOR_OUTPUT),
+									$parts);
+		}
+	}
+
+	/**
+	 * Sets the specified variable in the query string.
+	 *
+	 * @param string $name  variable name
+	 * @param mixed  $value variable value
+	 *
+	 * @return  array
+	 */
+	public function setQueryVariable($name, $value)
+	{
+		$array = $this->getQueryVariables();
+		$array[$name] = $value;
+		$this->setQueryVariables($array);
+	}
+
+	/**
+	 * Removes the specifed variable from the query string.
+	 *
+	 * @param string $name a query string variable, e.g. "foo" in "?foo=1"
+	 *
+	 * @return void
+	 */
+	public function unsetQueryVariable($name)
+	{
+		$array = $this->getQueryVariables();
+		unset($array[$name]);
+		$this->setQueryVariables($array);
+	}
+
+	/**
+	 * Returns a string representation of this URL.
+	 *
+	 * @return  string
+	 */
+	public function getURL()
+	{
+		// See RFC 3986, section 5.3
+		$url = "";
+
+		if ($this->_scheme !== false) {
+			$url .= $this->_scheme . ':';
+		}
+
+		$authority = $this->getAuthority();
+		if ($authority !== false) {
+			$url .= '//' . $authority;
+		}
+		$url .= $this->_path;
+
+		if ($this->_query !== false) {
+			$url .= '?' . $this->_query;
+		}
+
+		if ($this->_fragment !== false) {
+			$url .= '#' . $this->_fragment;
+		}
     
-        return $url;
-    }
-
-    /**
-     * Returns a string representation of this URL.
-     *
-     * @return  string
-     * @see toString()
-     */
-    public function __toString()
-    {
-        return $this->getURL();
-    }
-
-    /** 
-     * Returns a normalized string representation of this URL. This is useful
-     * for comparison of URLs.
-     *
-     * @return  string
-     */
-    public function getNormalizedURL()
-    {
-        $url = clone $this;
-        $url->normalize();
-        return $url->getUrl();
-    }
-
-    /** 
-     * Returns a normalized Net_URL2 instance.
-     *
-     * @return  Net_URL2
-     */
-    public function normalize()
-    {
-        // See RFC 3886, section 6
-
-        // Schemes are case-insensitive
-        if ($this->_scheme) {
-            $this->_scheme = strtolower($this->_scheme);
-        }
-
-        // Hostnames are case-insensitive
-        if ($this->_host) {
-            $this->_host = strtolower($this->_host);
-        }
-
-        // Remove default port number for known schemes (RFC 3986, section 6.2.3)
-        if ($this->_port &&
-            $this->_scheme &&
-            $this->_port == getservbyname($this->_scheme, 'tcp')) {
-
-            $this->_port = false;
-        }
-
-        // Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
-        foreach (array('_userinfo', '_host', '_path') as $part) {
-            if ($this->$part) {
-                $this->$part = preg_replace('/%[0-9a-f]{2}/ie',
-                                            'strtoupper("\0")',
-                                            $this->$part);
-            }
-        }
-
-        // Path segment normalization (RFC 3986, section 6.2.2.3)
-        $this->_path = self::removeDotSegments($this->_path);
-
-        // Scheme based normalization (RFC 3986, section 6.2.3)
-        if ($this->_host && !$this->_path) {
-            $this->_path = '/';
-        }
-    }
-
-    /**
-     * Returns whether this instance represents an absolute URL.
-     *
-     * @return  bool
-     */
-    public function isAbsolute()
-    {
-        return (bool) $this->_scheme;
-    }
-
-    /**
-     * Returns an Net_URL2 instance representing an absolute URL relative to
-     * this URL.
-     *
-     * @param Net_URL2|string $reference relative URL
-     *
-     * @return Net_URL2
-     */
-    public function resolve($reference)
-    {
-        if (!$reference instanceof Net_URL2) {
-            $reference = new self($reference);
-        }
-        if (!$this->isAbsolute()) {
-            throw new Exception('Base-URL must be absolute');
-        }
-
-        // A non-strict parser may ignore a scheme in the reference if it is
-        // identical to the base URI's scheme.
-        if (!$this->getOption(self::OPTION_STRICT) && $reference->_scheme == $this->_scheme) {
-            $reference->_scheme = false;
-        }
-
-        $target = new self('');
-        if ($reference->_scheme !== false) {
-            $target->_scheme = $reference->_scheme;
-            $target->setAuthority($reference->getAuthority());
-            $target->_path  = self::removeDotSegments($reference->_path);
-            $target->_query = $reference->_query;
-        } else {
-            $authority = $reference->getAuthority();
-            if ($authority !== false) {
-                $target->setAuthority($authority);
-                $target->_path  = self::removeDotSegments($reference->_path);
-                $target->_query = $reference->_query;
-            } else {
-                if ($reference->_path == '') {
-                    $target->_path = $this->_path;
-                    if ($reference->_query !== false) {
-                        $target->_query = $reference->_query;
-                    } else {
-                        $target->_query = $this->_query;
-                    }
-                } else {
-                    if (substr($reference->_path, 0, 1) == '/') {
-                        $target->_path = self::removeDotSegments($reference->_path);
-                    } else {
-                        // Merge paths (RFC 3986, section 5.2.3)
-                        if ($this->_host !== false && $this->_path == '') {
-                            $target->_path = '/' . $this->_path;
-                        } else {
-                            $i = strrpos($this->_path, '/');
-                            if ($i !== false) {
-                                $target->_path = substr($this->_path, 0, $i + 1);
-                            }
-                            $target->_path .= $reference->_path;
-                        }
-                        $target->_path = self::removeDotSegments($target->_path);
-                    }
-                    $target->_query = $reference->_query;
-                }
-                $target->setAuthority($this->getAuthority());
-            }
-            $target->_scheme = $this->_scheme;
-        }
-
-        $target->_fragment = $reference->_fragment;
-
-        return $target;
-    }
-
-    /**
-     * Removes dots as described in RFC 3986, section 5.2.4, e.g.
-     * "/foo/../bar/baz" => "/bar/baz"
-     *
-     * @param string $path a path
-     *
-     * @return string a path
-     */
-    public static function removeDotSegments($path)
-    {
-        $output = '';
-
-        // Make sure not to be trapped in an infinite loop due to a bug in this
-        // method
-        $j = 0; 
-        while ($path && $j++ < 100) {
-            if (substr($path, 0, 2) == './') {
-                // Step 2.A
-                $path = substr($path, 2);
-            } elseif (substr($path, 0, 3) == '../') {
-                // Step 2.A
-                $path = substr($path, 3);
-            } elseif (substr($path, 0, 3) == '/./' || $path == '/.') {
-                // Step 2.B
-                $path = '/' . substr($path, 3);
-            } elseif (substr($path, 0, 4) == '/../' || $path == '/..') {
-                // Step 2.C
-                $path   = '/' . substr($path, 4);
-                $i      = strrpos($output, '/');
-                $output = $i === false ? '' : substr($output, 0, $i);
-            } elseif ($path == '.' || $path == '..') {
-                // Step 2.D
-                $path = '';
-            } else {
-                // Step 2.E
-                $i = strpos($path, '/');
-                if ($i === 0) {
-                    $i = strpos($path, '/', 1);
-                }
-                if ($i === false) {
-                    $i = strlen($path);
-                }
-                $output .= substr($path, 0, $i);
-                $path = substr($path, $i);
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Percent-encodes all non-alphanumeric characters except these: _ . - ~
-     * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
-     * 5.2.x and earlier.
-     *
-     * @param  $raw the string to encode
-     * @return string
-     */
-    public static function urlencode($string)
-    {
-    	$encoded = rawurlencode($string);
+		return $url;
+	}
+
+	/**
+	 * Returns a string representation of this URL.
+	 *
+	 * @return  string
+	 * @see toString()
+	 */
+	public function __toString()
+	{
+		return $this->getURL();
+	}
+
+	/** 
+	 * Returns a normalized string representation of this URL. This is useful
+	 * for comparison of URLs.
+	 *
+	 * @return  string
+	 */
+	public function getNormalizedURL()
+	{
+		$url = clone $this;
+		$url->normalize();
+		return $url->getUrl();
+	}
+
+	/** 
+	 * Returns a normalized Net_URL2 instance.
+	 *
+	 * @return  Net_URL2
+	 */
+	public function normalize()
+	{
+		// See RFC 3886, section 6
+
+		// Schemes are case-insensitive
+		if ($this->_scheme) {
+			$this->_scheme = strtolower($this->_scheme);
+		}
+
+		// Hostnames are case-insensitive
+		if ($this->_host) {
+			$this->_host = strtolower($this->_host);
+		}
+
+		// Remove default port number for known schemes (RFC 3986, section 6.2.3)
+		if ($this->_port &&
+			$this->_scheme &&
+			$this->_port == getservbyname($this->_scheme, 'tcp')) {
+
+			$this->_port = false;
+		}
+
+		// Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
+		foreach (array('_userinfo', '_host', '_path') as $part) {
+			if ($this->$part) {
+				$this->$part = preg_replace('/%[0-9a-f]{2}/ie',
+											'strtoupper("\0")',
+											$this->$part);
+			}
+		}
+
+		// Path segment normalization (RFC 3986, section 6.2.2.3)
+		$this->_path = self::removeDotSegments($this->_path);
+
+		// Scheme based normalization (RFC 3986, section 6.2.3)
+		if ($this->_host && !$this->_path) {
+			$this->_path = '/';
+		}
+	}
+
+	/**
+	 * Returns whether this instance represents an absolute URL.
+	 *
+	 * @return  bool
+	 */
+	public function isAbsolute()
+	{
+		return (bool) $this->_scheme;
+	}
+
+	/**
+	 * Returns an Net_URL2 instance representing an absolute URL relative to
+	 * this URL.
+	 *
+	 * @param Net_URL2|string $reference relative URL
+	 *
+	 * @return Net_URL2
+	 */
+	public function resolve($reference)
+	{
+		if (!$reference instanceof Net_URL2) {
+			$reference = new self($reference);
+		}
+		if (!$this->isAbsolute()) {
+			throw new Exception('Base-URL must be absolute');
+		}
+
+		// A non-strict parser may ignore a scheme in the reference if it is
+		// identical to the base URI's scheme.
+		if (!$this->getOption(self::OPTION_STRICT) && $reference->_scheme == $this->_scheme) {
+			$reference->_scheme = false;
+		}
+
+		$target = new self('');
+		if ($reference->_scheme !== false) {
+			$target->_scheme = $reference->_scheme;
+			$target->setAuthority($reference->getAuthority());
+			$target->_path  = self::removeDotSegments($reference->_path);
+			$target->_query = $reference->_query;
+		} else {
+			$authority = $reference->getAuthority();
+			if ($authority !== false) {
+				$target->setAuthority($authority);
+				$target->_path  = self::removeDotSegments($reference->_path);
+				$target->_query = $reference->_query;
+			} else {
+				if ($reference->_path == '') {
+					$target->_path = $this->_path;
+					if ($reference->_query !== false) {
+						$target->_query = $reference->_query;
+					} else {
+						$target->_query = $this->_query;
+					}
+				} else {
+					if (substr($reference->_path, 0, 1) == '/') {
+						$target->_path = self::removeDotSegments($reference->_path);
+					} else {
+						// Merge paths (RFC 3986, section 5.2.3)
+						if ($this->_host !== false && $this->_path == '') {
+							$target->_path = '/' . $this->_path;
+						} else {
+							$i = strrpos($this->_path, '/');
+							if ($i !== false) {
+								$target->_path = substr($this->_path, 0, $i + 1);
+							}
+							$target->_path .= $reference->_path;
+						}
+						$target->_path = self::removeDotSegments($target->_path);
+					}
+					$target->_query = $reference->_query;
+				}
+				$target->setAuthority($this->getAuthority());
+			}
+			$target->_scheme = $this->_scheme;
+		}
+
+		$target->_fragment = $reference->_fragment;
+
+		return $target;
+	}
+
+	/**
+	 * Removes dots as described in RFC 3986, section 5.2.4, e.g.
+	 * "/foo/../bar/baz" => "/bar/baz"
+	 *
+	 * @param string $path a path
+	 *
+	 * @return string a path
+	 */
+	public static function removeDotSegments($path)
+	{
+		$output = '';
+
+		// Make sure not to be trapped in an infinite loop due to a bug in this
+		// method
+		$j = 0; 
+		while ($path && $j++ < 100) {
+			if (substr($path, 0, 2) == './') {
+				// Step 2.A
+				$path = substr($path, 2);
+			} elseif (substr($path, 0, 3) == '../') {
+				// Step 2.A
+				$path = substr($path, 3);
+			} elseif (substr($path, 0, 3) == '/./' || $path == '/.') {
+				// Step 2.B
+				$path = '/' . substr($path, 3);
+			} elseif (substr($path, 0, 4) == '/../' || $path == '/..') {
+				// Step 2.C
+				$path   = '/' . substr($path, 4);
+				$i      = strrpos($output, '/');
+				$output = $i === false ? '' : substr($output, 0, $i);
+			} elseif ($path == '.' || $path == '..') {
+				// Step 2.D
+				$path = '';
+			} else {
+				// Step 2.E
+				$i = strpos($path, '/');
+				if ($i === 0) {
+					$i = strpos($path, '/', 1);
+				}
+				if ($i === false) {
+					$i = strlen($path);
+				}
+				$output .= substr($path, 0, $i);
+				$path = substr($path, $i);
+			}
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Percent-encodes all non-alphanumeric characters except these: _ . - ~
+	 * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
+	 * 5.2.x and earlier.
+	 *
+	 * @param  $raw the string to encode
+	 * @return string
+	 */
+	public static function urlencode($string)
+	{
+		$encoded = rawurlencode($string);
 	// This is only necessary in PHP < 5.3.
 	$encoded = str_replace('%7E', '~', $encoded);
 	return $encoded;
-    }
-
-    /**
-     * Returns a Net_URL2 instance representing the canonical URL of the
-     * currently executing PHP script.
-     * 
-     * @return  string
-     */
-    public static function getCanonical()
-    {
-        if (!isset($_SERVER['REQUEST_METHOD'])) {
-            // ALERT - no current URL
-            throw new Exception('Script was not called through a webserver');
-        }
-
-        // Begin with a relative URL
-        $url = new self($_SERVER['PHP_SELF']);
-        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        $url->_host   = $_SERVER['SERVER_NAME'];
-        $port = $_SERVER['SERVER_PORT'];
-        if ($url->_scheme == 'http' && $port != 80 ||
-            $url->_scheme == 'https' && $port != 443) {
-
-            $url->_port = $port;
-        }
-        return $url;
-    }
-
-    /**
-     * Returns the URL used to retrieve the current request.
-     *
-     * @return  string
-     */
-    public static function getRequestedURL()
-    {
-        return self::getRequested()->getUrl();
-    }
-
-    /**
-     * Returns a Net_URL2 instance representing the URL used to retrieve the
-     * current request.
-     *
-     * @return  Net_URL2
-     */
-    public static function getRequested()
-    {
-        if (!isset($_SERVER['REQUEST_METHOD'])) {
-            // ALERT - no current URL
-            throw new Exception('Script was not called through a webserver');
-        }
-
-        // Begin with a relative URL
-        $url = new self($_SERVER['REQUEST_URI']);
-        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        // Set host and possibly port
-        $url->setAuthority($_SERVER['HTTP_HOST']);
-        return $url;
-    }
-
-    /**
-     * Returns the value of the specified option.
-     *
-     * @param string $optionName The name of the option to retrieve
-     *
-     * @return  mixed
-     */
-    function getOption($optionName)
-    {
-        return isset($this->_options[$optionName])
-            ? $this->_options[$optionName] : false;
-    }
+	}
+
+	/**
+	 * Returns a Net_URL2 instance representing the canonical URL of the
+	 * currently executing PHP script.
+	 * 
+	 * @return  string
+	 */
+	public static function getCanonical()
+	{
+		if (!isset($_SERVER['REQUEST_METHOD'])) {
+			// ALERT - no current URL
+			throw new Exception('Script was not called through a webserver');
+		}
+
+		// Begin with a relative URL
+		$url = new self($_SERVER['PHP_SELF']);
+		$url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+		$url->_host   = $_SERVER['SERVER_NAME'];
+		$port = $_SERVER['SERVER_PORT'];
+		if ($url->_scheme == 'http' && $port != 80 ||
+			$url->_scheme == 'https' && $port != 443) {
+
+			$url->_port = $port;
+		}
+		return $url;
+	}
+
+	/**
+	 * Returns the URL used to retrieve the current request.
+	 *
+	 * @return  string
+	 */
+	public static function getRequestedURL()
+	{
+		return self::getRequested()->getUrl();
+	}
+
+	/**
+	 * Returns a Net_URL2 instance representing the URL used to retrieve the
+	 * current request.
+	 *
+	 * @return  Net_URL2
+	 */
+	public static function getRequested()
+	{
+		if (!isset($_SERVER['REQUEST_METHOD'])) {
+			// ALERT - no current URL
+			throw new Exception('Script was not called through a webserver');
+		}
+
+		// Begin with a relative URL
+		$url = new self($_SERVER['REQUEST_URI']);
+		$url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+		// Set host and possibly port
+		$url->setAuthority($_SERVER['HTTP_HOST']);
+		return $url;
+	}
+
+	/**
+	 * Returns the value of the specified option.
+	 *
+	 * @param string $optionName The name of the option to retrieve
+	 *
+	 * @return  mixed
+	 */
+	function getOption($optionName)
+	{
+		return isset($this->_options[$optionName])
+			? $this->_options[$optionName] : false;
+	}
 }

Please login to merge, or discard this patch.

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -171,7 +171,7 @@  discard block
 block discarded – undo
      */
     public function __set($var, $arg)
     {
-        $method = 'set' . $var;
+        $method = 'set'.$var;
         if (method_exists($this, $method)) {
             $this->$method($arg);
         }
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
      */
     public function __get($var)
     {
-        $method = 'get' . $var;
+        $method = 'get'.$var;
         if (method_exists($this, $method)) {
             return $this->$method();
         }
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
     {
         $this->_userinfo = $userinfo;
         if ($password !== false) {
-            $this->_userinfo .= ':' . $password;
+            $this->_userinfo .= ':'.$password;
         }
     }
 
@@ -344,13 +344,13 @@  discard block
 block discarded – undo
         $authority = '';
 
         if ($this->_userinfo !== false) {
-            $authority .= $this->_userinfo . '@';
+            $authority .= $this->_userinfo.'@';
         }
 
         $authority .= $this->_host;
 
         if ($this->_port !== false) {
-            $authority .= ':' . $this->_port;
+            $authority .= ':'.$this->_port;
         }
 
         return $authority;
@@ -463,8 +463,8 @@  discard block
 block discarded – undo
      */
     public function getQueryVariables()
     {
-        $pattern = '/[' .
-                   preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
+        $pattern = '/['.
+                   preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/').
                    ']/';
         $parts   = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
         $return  = array();
@@ -533,10 +533,10 @@  discard block
 block discarded – undo
                     foreach ($value as $k => $v) {
                         $parts[] = $this->getOption(self::OPTION_USE_BRACKETS)
                             ? sprintf('%s[%s]=%s', $name, $k, $v)
-                            : ($name . '=' . $v);
+                            : ($name.'='.$v);
                     }
                 } elseif (!is_null($value)) {
-                    $parts[] = $name . '=' . self::urlencode($value);
+                    $parts[] = $name.'='.self::urlencode($value);
                 } else {
                     $parts[] = $name;
                 }
@@ -586,21 +586,21 @@  discard block
 block discarded – undo
         $url = "";
 
         if ($this->_scheme !== false) {
-            $url .= $this->_scheme . ':';
+            $url .= $this->_scheme.':';
         }
 
         $authority = $this->getAuthority();
         if ($authority !== false) {
-            $url .= '//' . $authority;
+            $url .= '//'.$authority;
         }
         $url .= $this->_path;
 
         if ($this->_query !== false) {
-            $url .= '?' . $this->_query;
+            $url .= '?'.$this->_query;
         }
 
         if ($this->_fragment !== false) {
-            $url .= '#' . $this->_fragment;
+            $url .= '#'.$this->_fragment;
         }
     
         return $url;
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
                     } else {
                         // Merge paths (RFC 3986, section 5.2.3)
                         if ($this->_host !== false && $this->_path == '') {
-                            $target->_path = '/' . $this->_path;
+                            $target->_path = '/'.$this->_path;
                         } else {
                             $i = strrpos($this->_path, '/');
                             if ($i !== false) {
@@ -780,10 +780,10 @@  discard block
 block discarded – undo
                 $path = substr($path, 3);
             } elseif (substr($path, 0, 3) == '/./' || $path == '/.') {
                 // Step 2.B
-                $path = '/' . substr($path, 3);
+                $path = '/'.substr($path, 3);
             } elseif (substr($path, 0, 4) == '/../' || $path == '/..') {
                 // Step 2.C
-                $path   = '/' . substr($path, 4);
+                $path   = '/'.substr($path, 4);
                 $i      = strrpos($output, '/');
                 $output = $i === false ? '' : substr($output, 0, $i);
             } elseif ($path == '.' || $path == '..') {

Please login to merge, or discard this patch.

libs/PEAR/HTTP/Request.php 3 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -1267,6 +1267,7 @@  discard block
 block discarded – undo
     *
     * @access private
     * @param  string    value of Set-Cookie header
+    * @param string $headervalue
     */
     function _parseCookie($headervalue)
     {
@@ -1349,6 +1350,7 @@  discard block
 block discarded – undo
     * 
     * @param    string  Event name
     * @param    mixed   Additional data
+    * @param string $event
     * @access   private
     * @see HTTP_Request::_notify()
     */
@@ -1369,6 +1371,7 @@  discard block
 block discarded – undo
     *
     * @access   private
     * @param    string  gzip-encoded data
+    * @param string $data
     * @return   string  decoded data
     */
     function _decodeGzip($data)

Please login to merge, or discard this patch.

Indentation +1104 added lines, -1104 removed lines patch added patch discarded remove patch

@@ -80,12 +80,12 @@  discard block
 block discarded – undo
    /**
     * Whether string functions are overloaded by their mbstring equivalents 
     */
-    define('HTTP_REQUEST_MBSTRING', true);
+	define('HTTP_REQUEST_MBSTRING', true);
 } else {
    /**
     * @ignore
     */
-    define('HTTP_REQUEST_MBSTRING', false);
+	define('HTTP_REQUEST_MBSTRING', false);
 }
 
 /**
@@ -109,297 +109,297 @@  discard block
 block discarded – undo
    /**#@+
     * @access private
     */
-    /**
-    * Instance of Net_URL
-    * @var Net_URL
-    */
-    var $_url;
-
-    /**
-    * Type of request
-    * @var string
-    */
-    var $_method;
-
-    /**
-    * HTTP Version
-    * @var string
-    */
-    var $_http;
-
-    /**
-    * Request headers
-    * @var array
-    */
-    var $_requestHeaders;
-
-    /**
-    * Basic Auth Username
-    * @var string
-    */
-    var $_user;
+	/**
+	 * Instance of Net_URL
+	 * @var Net_URL
+	 */
+	var $_url;
+
+	/**
+	 * Type of request
+	 * @var string
+	 */
+	var $_method;
+
+	/**
+	 * HTTP Version
+	 * @var string
+	 */
+	var $_http;
+
+	/**
+	 * Request headers
+	 * @var array
+	 */
+	var $_requestHeaders;
+
+	/**
+	 * Basic Auth Username
+	 * @var string
+	 */
+	var $_user;
     
-    /**
-    * Basic Auth Password
-    * @var string
-    */
-    var $_pass;
-
-    /**
-    * Socket object
-    * @var Net_Socket
-    */
-    var $_sock;
+	/**
+	 * Basic Auth Password
+	 * @var string
+	 */
+	var $_pass;
+
+	/**
+	 * Socket object
+	 * @var Net_Socket
+	 */
+	var $_sock;
     
-    /**
-    * Proxy server
-    * @var string
-    */
-    var $_proxy_host;
+	/**
+	 * Proxy server
+	 * @var string
+	 */
+	var $_proxy_host;
     
-    /**
-    * Proxy port
-    * @var integer
-    */
-    var $_proxy_port;
+	/**
+	 * Proxy port
+	 * @var integer
+	 */
+	var $_proxy_port;
     
-    /**
-    * Proxy username
-    * @var string
-    */
-    var $_proxy_user;
+	/**
+	 * Proxy username
+	 * @var string
+	 */
+	var $_proxy_user;
     
-    /**
-    * Proxy password
-    * @var string
-    */
-    var $_proxy_pass;
-
-    /**
-    * Post data
-    * @var array
-    */
-    var $_postData;
+	/**
+	 * Proxy password
+	 * @var string
+	 */
+	var $_proxy_pass;
+
+	/**
+	 * Post data
+	 * @var array
+	 */
+	var $_postData;
 
    /**
     * Request body  
     * @var string
     */
-    var $_body;
+	var $_body;
 
    /**
     * A list of methods that MUST NOT have a request body, per RFC 2616
     * @var array
     */
-    var $_bodyDisallowed = array('TRACE');
+	var $_bodyDisallowed = array('TRACE');
 
    /**
     * Files to post 
     * @var array
     */
-    var $_postFiles = array();
+	var $_postFiles = array();
 
-    /**
-    * Connection timeout.
-    * @var float
-    */
-    var $_timeout;
+	/**
+	 * Connection timeout.
+	 * @var float
+	 */
+	var $_timeout;
     
-    /**
-    * HTTP_Response object
-    * @var HTTP_Response
-    */
-    var $_response;
+	/**
+	 * HTTP_Response object
+	 * @var HTTP_Response
+	 */
+	var $_response;
     
-    /**
-    * Whether to allow redirects
-    * @var boolean
-    */
-    var $_allowRedirects;
+	/**
+	 * Whether to allow redirects
+	 * @var boolean
+	 */
+	var $_allowRedirects;
     
-    /**
-    * Maximum redirects allowed
-    * @var integer
-    */
-    var $_maxRedirects;
+	/**
+	 * Maximum redirects allowed
+	 * @var integer
+	 */
+	var $_maxRedirects;
     
-    /**
-    * Current number of redirects
-    * @var integer
-    */
-    var $_redirects;
+	/**
+	 * Current number of redirects
+	 * @var integer
+	 */
+	var $_redirects;
 
    /**
     * Whether to append brackets [] to array variables
     * @var bool
     */
-    var $_useBrackets = true;
+	var $_useBrackets = true;
 
    /**
     * Attached listeners
     * @var array
     */
-    var $_listeners = array();
+	var $_listeners = array();
 
    /**
     * Whether to save response body in response object property  
     * @var bool
     */
-    var $_saveBody = true;
+	var $_saveBody = true;
 
    /**
     * Timeout for reading from socket (array(seconds, microseconds))
     * @var array
     */
-    var $_readTimeout = null;
+	var $_readTimeout = null;
 
    /**
     * Options to pass to Net_Socket::connect. See stream_context_create
     * @var array
     */
-    var $_socketOptions = null;
+	var $_socketOptions = null;
    /**#@-*/
 
-    /**
-    * Constructor
-    *
-    * Sets up the object
-    * @param    string  The url to fetch/access
-    * @param    array   Associative array of parameters which can have the following keys:
-    * <ul>
-    *   <li>method         - Method to use, GET, POST etc (string)</li>
-    *   <li>http           - HTTP Version to use, 1.0 or 1.1 (string)</li>
-    *   <li>user           - Basic Auth username (string)</li>
-    *   <li>pass           - Basic Auth password (string)</li>
-    *   <li>proxy_host     - Proxy server host (string)</li>
-    *   <li>proxy_port     - Proxy server port (integer)</li>
-    *   <li>proxy_user     - Proxy auth username (string)</li>
-    *   <li>proxy_pass     - Proxy auth password (string)</li>
-    *   <li>timeout        - Connection timeout in seconds (float)</li>
-    *   <li>allowRedirects - Whether to follow redirects or not (bool)</li>
-    *   <li>maxRedirects   - Max number of redirects to follow (integer)</li>
-    *   <li>useBrackets    - Whether to append [] to array variable names (bool)</li>
-    *   <li>saveBody       - Whether to save response body in response object property (bool)</li>
-    *   <li>readTimeout    - Timeout for reading / writing data over the socket (array (seconds, microseconds))</li>
-    *   <li>socketOptions  - Options to pass to Net_Socket object (array)</li>
-    * </ul>
-    * @access public
-    */
-    function HTTP_Request($url = '', $params = array())
-    {
-        $this->_method         =  HTTP_REQUEST_METHOD_GET;
-        $this->_http           =  HTTP_REQUEST_HTTP_VER_1_1;
-        $this->_requestHeaders = array();
-        $this->_postData       = array();
-        $this->_body           = null;
-
-        $this->_user = null;
-        $this->_pass = null;
-
-        $this->_proxy_host = null;
-        $this->_proxy_port = null;
-        $this->_proxy_user = null;
-        $this->_proxy_pass = null;
-
-        $this->_allowRedirects = false;
-        $this->_maxRedirects   = 3;
-        $this->_redirects      = 0;
-
-        $this->_timeout  = null;
-        $this->_response = null;
-
-        foreach ($params as $key => $value) {
-            $this->{'_' . $key} = $value;
-        }
-
-        if (!empty($url)) {
-            $this->setURL($url);
-        }
-
-        // Default useragent
-        $this->addHeader('User-Agent', 'PEAR HTTP_Request class ( http://pear.php.net/ )');
-
-        // We don't do keep-alives by default
-        $this->addHeader('Connection', 'close');
-
-        // Basic authentication
-        if (!empty($this->_user)) {
-            $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
-        }
-
-        // Proxy authentication (see bug #5913)
-        if (!empty($this->_proxy_user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
-        }
-
-        // Use gzip encoding if possible
-        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib')) {
-            $this->addHeader('Accept-Encoding', 'gzip');
-        }
-    }
+	/**
+	 * Constructor
+	 *
+	 * Sets up the object
+	 * @param    string  The url to fetch/access
+	 * @param    array   Associative array of parameters which can have the following keys:
+	 * <ul>
+	 *   <li>method         - Method to use, GET, POST etc (string)</li>
+	 *   <li>http           - HTTP Version to use, 1.0 or 1.1 (string)</li>
+	 *   <li>user           - Basic Auth username (string)</li>
+	 *   <li>pass           - Basic Auth password (string)</li>
+	 *   <li>proxy_host     - Proxy server host (string)</li>
+	 *   <li>proxy_port     - Proxy server port (integer)</li>
+	 *   <li>proxy_user     - Proxy auth username (string)</li>
+	 *   <li>proxy_pass     - Proxy auth password (string)</li>
+	 *   <li>timeout        - Connection timeout in seconds (float)</li>
+	 *   <li>allowRedirects - Whether to follow redirects or not (bool)</li>
+	 *   <li>maxRedirects   - Max number of redirects to follow (integer)</li>
+	 *   <li>useBrackets    - Whether to append [] to array variable names (bool)</li>
+	 *   <li>saveBody       - Whether to save response body in response object property (bool)</li>
+	 *   <li>readTimeout    - Timeout for reading / writing data over the socket (array (seconds, microseconds))</li>
+	 *   <li>socketOptions  - Options to pass to Net_Socket object (array)</li>
+	 * </ul>
+	 * @access public
+	 */
+	function HTTP_Request($url = '', $params = array())
+	{
+		$this->_method         =  HTTP_REQUEST_METHOD_GET;
+		$this->_http           =  HTTP_REQUEST_HTTP_VER_1_1;
+		$this->_requestHeaders = array();
+		$this->_postData       = array();
+		$this->_body           = null;
+
+		$this->_user = null;
+		$this->_pass = null;
+
+		$this->_proxy_host = null;
+		$this->_proxy_port = null;
+		$this->_proxy_user = null;
+		$this->_proxy_pass = null;
+
+		$this->_allowRedirects = false;
+		$this->_maxRedirects   = 3;
+		$this->_redirects      = 0;
+
+		$this->_timeout  = null;
+		$this->_response = null;
+
+		foreach ($params as $key => $value) {
+			$this->{'_' . $key} = $value;
+		}
+
+		if (!empty($url)) {
+			$this->setURL($url);
+		}
+
+		// Default useragent
+		$this->addHeader('User-Agent', 'PEAR HTTP_Request class ( http://pear.php.net/ )');
+
+		// We don't do keep-alives by default
+		$this->addHeader('Connection', 'close');
+
+		// Basic authentication
+		if (!empty($this->_user)) {
+			$this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
+		}
+
+		// Proxy authentication (see bug #5913)
+		if (!empty($this->_proxy_user)) {
+			$this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
+		}
+
+		// Use gzip encoding if possible
+		if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib')) {
+			$this->addHeader('Accept-Encoding', 'gzip');
+		}
+	}
     
-    /**
-    * Generates a Host header for HTTP/1.1 requests
-    *
-    * @access private
-    * @return string
-    */
-    function _generateHostHeader()
-    {
-        if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-
-        } elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-
-        } elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
-            $host = $this->_url->host . ':' . $this->_url->port;
+	/**
+	 * Generates a Host header for HTTP/1.1 requests
+	 *
+	 * @access private
+	 * @return string
+	 */
+	function _generateHostHeader()
+	{
+		if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
+			$host = $this->_url->host . ':' . $this->_url->port;
+
+		} elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
+			$host = $this->_url->host . ':' . $this->_url->port;
+
+		} elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
+			$host = $this->_url->host . ':' . $this->_url->port;
         
-        } else {
-            $host = $this->_url->host;
-        }
+		} else {
+			$host = $this->_url->host;
+		}
 
-        return $host;
-    }
+		return $host;
+	}
     
-    /**
-    * Resets the object to its initial state (DEPRECATED).
-    * Takes the same parameters as the constructor.
-    *
-    * @param  string $url    The url to be requested
-    * @param  array  $params Associative array of parameters
-    *                        (see constructor for details)
-    * @access public
-    * @deprecated deprecated since 1.2, call the constructor if this is necessary
-    */
-    function reset($url, $params = array())
-    {
-        $this->HTTP_Request($url, $params);
-    }
-
-    /**
-    * Sets the URL to be requested
-    *
-    * @param  string The url to be requested
-    * @access public
-    */
-    function setURL($url)
-    {
-        $this->_url = &new Net_URL($url, $this->_useBrackets);
-
-        if (!empty($this->_url->user) || !empty($this->_url->pass)) {
-            $this->setBasicAuth($this->_url->user, $this->_url->pass);
-        }
-
-        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http) {
-            $this->addHeader('Host', $this->_generateHostHeader());
-        }
-
-        // set '/' instead of empty path rather than check later (see bug #8662)
-        if (empty($this->_url->path)) {
-            $this->_url->path = '/';
-        } 
-    }
+	/**
+	 * Resets the object to its initial state (DEPRECATED).
+	 * Takes the same parameters as the constructor.
+	 *
+	 * @param  string $url    The url to be requested
+	 * @param  array  $params Associative array of parameters
+	 *                        (see constructor for details)
+	 * @access public
+	 * @deprecated deprecated since 1.2, call the constructor if this is necessary
+	 */
+	function reset($url, $params = array())
+	{
+		$this->HTTP_Request($url, $params);
+	}
+
+	/**
+	 * Sets the URL to be requested
+	 *
+	 * @param  string The url to be requested
+	 * @access public
+	 */
+	function setURL($url)
+	{
+		$this->_url = &new Net_URL($url, $this->_useBrackets);
+
+		if (!empty($this->_url->user) || !empty($this->_url->pass)) {
+			$this->setBasicAuth($this->_url->user, $this->_url->pass);
+		}
+
+		if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http) {
+			$this->addHeader('Host', $this->_generateHostHeader());
+		}
+
+		// set '/' instead of empty path rather than check later (see bug #8662)
+		if (empty($this->_url->path)) {
+			$this->_url->path = '/';
+		} 
+	}
     
    /**
     * Returns the current request URL  
@@ -407,134 +407,134 @@  discard block
 block discarded – undo
     * @return   string  Current request URL
     * @access   public
     */
-    function getUrl()
-    {
-        return empty($this->_url)? '': $this->_url->getUrl();
-    }
-
-    /**
-    * Sets a proxy to be used
-    *
-    * @param string     Proxy host
-    * @param int        Proxy port
-    * @param string     Proxy username
-    * @param string     Proxy password
-    * @access public
-    */
-    function setProxy($host, $port = 8080, $user = null, $pass = null)
-    {
-        $this->_proxy_host = $host;
-        $this->_proxy_port = $port;
-        $this->_proxy_user = $user;
-        $this->_proxy_pass = $pass;
-
-        if (!empty($user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
-        }
-    }
-
-    /**
-    * Sets basic authentication parameters
-    *
-    * @param string     Username
-    * @param string     Password
-    */
-    function setBasicAuth($user, $pass)
-    {
-        $this->_user = $user;
-        $this->_pass = $pass;
-
-        $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
-    }
-
-    /**
-    * Sets the method to be used, GET, POST etc.
-    *
-    * @param string     Method to use. Use the defined constants for this
-    * @access public
-    */
-    function setMethod($method)
-    {
-        $this->_method = $method;
-    }
-
-    /**
-    * Sets the HTTP version to use, 1.0 or 1.1
-    *
-    * @param string     Version to use. Use the defined constants for this
-    * @access public
-    */
-    function setHttpVer($http)
-    {
-        $this->_http = $http;
-    }
-
-    /**
-    * Adds a request header
-    *
-    * @param string     Header name
-    * @param string     Header value
-    * @access public
-    */
-    function addHeader($name, $value)
-    {
-        $this->_requestHeaders[strtolower($name)] = $value;
-    }
-
-    /**
-    * Removes a request header
-    *
-    * @param string     Header name to remove
-    * @access public
-    */
-    function removeHeader($name)
-    {
-        if (isset($this->_requestHeaders[strtolower($name)])) {
-            unset($this->_requestHeaders[strtolower($name)]);
-        }
-    }
-
-    /**
-    * Adds a querystring parameter
-    *
-    * @param string     Querystring parameter name
-    * @param string     Querystring parameter value
-    * @param bool       Whether the value is already urlencoded or not, default = not
-    * @access public
-    */
-    function addQueryString($name, $value, $preencoded = false)
-    {
-        $this->_url->addQueryString($name, $value, $preencoded);
-    }    
+	function getUrl()
+	{
+		return empty($this->_url)? '': $this->_url->getUrl();
+	}
+
+	/**
+	 * Sets a proxy to be used
+	 *
+	 * @param string     Proxy host
+	 * @param int        Proxy port
+	 * @param string     Proxy username
+	 * @param string     Proxy password
+	 * @access public
+	 */
+	function setProxy($host, $port = 8080, $user = null, $pass = null)
+	{
+		$this->_proxy_host = $host;
+		$this->_proxy_port = $port;
+		$this->_proxy_user = $user;
+		$this->_proxy_pass = $pass;
+
+		if (!empty($user)) {
+			$this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+		}
+	}
+
+	/**
+	 * Sets basic authentication parameters
+	 *
+	 * @param string     Username
+	 * @param string     Password
+	 */
+	function setBasicAuth($user, $pass)
+	{
+		$this->_user = $user;
+		$this->_pass = $pass;
+
+		$this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+	}
+
+	/**
+	 * Sets the method to be used, GET, POST etc.
+	 *
+	 * @param string     Method to use. Use the defined constants for this
+	 * @access public
+	 */
+	function setMethod($method)
+	{
+		$this->_method = $method;
+	}
+
+	/**
+	 * Sets the HTTP version to use, 1.0 or 1.1
+	 *
+	 * @param string     Version to use. Use the defined constants for this
+	 * @access public
+	 */
+	function setHttpVer($http)
+	{
+		$this->_http = $http;
+	}
+
+	/**
+	 * Adds a request header
+	 *
+	 * @param string     Header name
+	 * @param string     Header value
+	 * @access public
+	 */
+	function addHeader($name, $value)
+	{
+		$this->_requestHeaders[strtolower($name)] = $value;
+	}
+
+	/**
+	 * Removes a request header
+	 *
+	 * @param string     Header name to remove
+	 * @access public
+	 */
+	function removeHeader($name)
+	{
+		if (isset($this->_requestHeaders[strtolower($name)])) {
+			unset($this->_requestHeaders[strtolower($name)]);
+		}
+	}
+
+	/**
+	 * Adds a querystring parameter
+	 *
+	 * @param string     Querystring parameter name
+	 * @param string     Querystring parameter value
+	 * @param bool       Whether the value is already urlencoded or not, default = not
+	 * @access public
+	 */
+	function addQueryString($name, $value, $preencoded = false)
+	{
+		$this->_url->addQueryString($name, $value, $preencoded);
+	}    
     
-    /**
-    * Sets the querystring to literally what you supply
-    *
-    * @param string     The querystring data. Should be of the format foo=bar&x=y etc
-    * @param bool       Whether data is already urlencoded or not, default = already encoded
-    * @access public
-    */
-    function addRawQueryString($querystring, $preencoded = true)
-    {
-        $this->_url->addRawQueryString($querystring, $preencoded);
-    }
-
-    /**
-    * Adds postdata items
-    *
-    * @param string     Post data name
-    * @param string     Post data value
-    * @param bool       Whether data is already urlencoded or not, default = not
-    * @access public
-    */
-    function addPostData($name, $value, $preencoded = false)
-    {
-        if ($preencoded) {
-            $this->_postData[$name] = $value;
-        } else {
-            $this->_postData[$name] = $this->_arrayMapRecursive('urlencode', $value);
-        }
-    }
+	/**
+	 * Sets the querystring to literally what you supply
+	 *
+	 * @param string     The querystring data. Should be of the format foo=bar&x=y etc
+	 * @param bool       Whether data is already urlencoded or not, default = already encoded
+	 * @access public
+	 */
+	function addRawQueryString($querystring, $preencoded = true)
+	{
+		$this->_url->addRawQueryString($querystring, $preencoded);
+	}
+
+	/**
+	 * Adds postdata items
+	 *
+	 * @param string     Post data name
+	 * @param string     Post data value
+	 * @param bool       Whether data is already urlencoded or not, default = not
+	 * @access public
+	 */
+	function addPostData($name, $value, $preencoded = false)
+	{
+		if ($preencoded) {
+			$this->_postData[$name] = $value;
+		} else {
+			$this->_postData[$name] = $this->_arrayMapRecursive('urlencode', $value);
+		}
+	}
 
    /**
     * Recursively applies the callback function to the value
@@ -544,18 +544,18 @@  discard block
 block discarded – undo
     * @access   private
     * @return   mixed   Processed value
     */
-    function _arrayMapRecursive($callback, $value)
-    {
-        if (!is_array($value)) {
-            return call_user_func($callback, $value);
-        } else {
-            $map = array();
-            foreach ($value as $k => $v) {
-                $map[$k] = $this->_arrayMapRecursive($callback, $v);
-            }
-            return $map;
-        }
-    }
+	function _arrayMapRecursive($callback, $value)
+	{
+		if (!is_array($value)) {
+			return call_user_func($callback, $value);
+		} else {
+			$map = array();
+			foreach ($value as $k => $v) {
+				$map[$k] = $this->_arrayMapRecursive($callback, $v);
+			}
+			return $map;
+		}
+	}
 
    /**
     * Adds a file to upload
@@ -569,37 +569,37 @@  discard block
 block discarded – undo
     * @return bool      true on success
     * @throws PEAR_Error
     */
-    function addFile($inputName, $fileName, $contentType = 'application/octet-stream')
-    {
-        if (!is_array($fileName) && !is_readable($fileName)) {
-            return PEAR::raiseError("File '{$fileName}' is not readable");
-        } elseif (is_array($fileName)) {
-            foreach ($fileName as $name) {
-                if (!is_readable($name)) {
-                    return PEAR::raiseError("File '{$name}' is not readable");
-                }
-            }
-        }
-        $this->addHeader('Content-Type', 'multipart/form-data');
-        $this->_postFiles[$inputName] = array(
-            'name' => $fileName,
-            'type' => $contentType
-        );
-        return true;
-    }
-
-    /**
-    * Adds raw postdata (DEPRECATED)
-    *
-    * @param string     The data
-    * @param bool       Whether data is preencoded or not, default = already encoded
-    * @access public
-    * @deprecated       deprecated since 1.3.0, method setBody() should be used instead
-    */
-    function addRawPostData($postdata, $preencoded = true)
-    {
-        $this->_body = $preencoded ? $postdata : urlencode($postdata);
-    }
+	function addFile($inputName, $fileName, $contentType = 'application/octet-stream')
+	{
+		if (!is_array($fileName) && !is_readable($fileName)) {
+			return PEAR::raiseError("File '{$fileName}' is not readable");
+		} elseif (is_array($fileName)) {
+			foreach ($fileName as $name) {
+				if (!is_readable($name)) {
+					return PEAR::raiseError("File '{$name}' is not readable");
+				}
+			}
+		}
+		$this->addHeader('Content-Type', 'multipart/form-data');
+		$this->_postFiles[$inputName] = array(
+			'name' => $fileName,
+			'type' => $contentType
+		);
+		return true;
+	}
+
+	/**
+	 * Adds raw postdata (DEPRECATED)
+	 *
+	 * @param string     The data
+	 * @param bool       Whether data is preencoded or not, default = already encoded
+	 * @access public
+	 * @deprecated       deprecated since 1.3.0, method setBody() should be used instead
+	 */
+	function addRawPostData($postdata, $preencoded = true)
+	{
+		$this->_body = $preencoded ? $postdata : urlencode($postdata);
+	}
 
    /**
     * Sets the request body (for POST, PUT and similar requests)
@@ -607,370 +607,370 @@  discard block
 block discarded – undo
     * @param    string  Request body
     * @access   public
     */
-    function setBody($body)
-    {
-        $this->_body = $body;
-    }
-
-    /**
-    * Clears any postdata that has been added (DEPRECATED). 
-    * 
-    * Useful for multiple request scenarios.
-    *
-    * @access public
-    * @deprecated deprecated since 1.2
-    */
-    function clearPostData()
-    {
-        $this->_postData = null;
-    }
-
-    /**
-    * Appends a cookie to "Cookie:" header
-    * 
-    * @param string $name cookie name
-    * @param string $value cookie value
-    * @access public
-    */
-    function addCookie($name, $value)
-    {
-        $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
-        $this->addHeader('Cookie', $cookies . $name . '=' . $value);
-    }
+	function setBody($body)
+	{
+		$this->_body = $body;
+	}
+
+	/**
+	 * Clears any postdata that has been added (DEPRECATED). 
+	 * 
+	 * Useful for multiple request scenarios.
+	 *
+	 * @access public
+	 * @deprecated deprecated since 1.2
+	 */
+	function clearPostData()
+	{
+		$this->_postData = null;
+	}
+
+	/**
+	 * Appends a cookie to "Cookie:" header
+	 * 
+	 * @param string $name cookie name
+	 * @param string $value cookie value
+	 * @access public
+	 */
+	function addCookie($name, $value)
+	{
+		$cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
+		$this->addHeader('Cookie', $cookies . $name . '=' . $value);
+	}
     
-    /**
-    * Clears any cookies that have been added (DEPRECATED). 
-    * 
-    * Useful for multiple request scenarios
-    *
-    * @access public
-    * @deprecated deprecated since 1.2
-    */
-    function clearCookies()
-    {
-        $this->removeHeader('Cookie');
-    }
-
-    /**
-    * Sends the request
-    *
-    * @access public
-    * @param  bool   Whether to store response body in Response object property,
-    *                set this to false if downloading a LARGE file and using a Listener
-    * @return mixed  PEAR error on error, true otherwise
-    */
-    function sendRequest($saveBody = true)
-    {
-        if (!is_a($this->_url, 'Net_URL')) {
-            return PEAR::raiseError('No URL given.');
-        }
-
-        $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
-        $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
-
-        // 4.3.0 supports SSL connections using OpenSSL. The function test determines
-        // we running on at least 4.3.0
-        if (strcasecmp($this->_url->protocol, 'https') == 0 AND function_exists('file_get_contents') AND extension_loaded('openssl')) {
-            if (isset($this->_proxy_host)) {
-                return PEAR::raiseError('HTTPS proxies are not supported.');
-            }
-            $host = 'ssl://' . $host;
-        }
-
-        // magic quotes may fuck up file uploads and chunked response processing
-        $magicQuotes = ini_get('magic_quotes_runtime');
-        ini_set('magic_quotes_runtime', false);
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive 
-        // connection token to a proxy server...
-        if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
-            'Keep-Alive' == $this->_requestHeaders['connection'])
-        {
-            $this->removeHeader('connection');
-        }
-
-        $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
-                     (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
-        $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
-        $sockKey   = $host . ':' . $port;
-        unset($this->_sock);
-
-        // There is a connected socket in the "static" property?
-        if ($keepAlive && !empty($sockets[$sockKey]) &&
-            !empty($sockets[$sockKey]->fp)) 
-        {
-            $this->_sock =& $sockets[$sockKey];
-            $err = null;
-        } else {
-            $this->_notify('connect');
-            $this->_sock =& new Net_Socket();
-            $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
-        }
-        PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
-
-        if (!PEAR::isError($err)) {
-            if (!empty($this->_readTimeout)) {
-                $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
-            }
-
-            $this->_notify('sentRequest');
-
-            // Read the response
-            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
-            $err = $this->_response->process(
-                $this->_saveBody && $saveBody,
-                HTTP_REQUEST_METHOD_HEAD != $this->_method
-            );
-
-            if ($keepAlive) {
-                $keepAlive = (isset($this->_response->_headers['content-length'])
-                              || (isset($this->_response->_headers['transfer-encoding'])
-                                  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
-                if ($keepAlive) {
-                    if (isset($this->_response->_headers['connection'])) {
-                        $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
-                    } else {
-                        $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
-                    }
-                }
-            }
-        }
-
-        ini_set('magic_quotes_runtime', $magicQuotes);
-
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        if (!$keepAlive) {
-            $this->disconnect();
-        // Store the connected socket in "static" property
-        } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
-            $sockets[$sockKey] =& $this->_sock;
-        }
-
-        // Check for redirection
-        if (    $this->_allowRedirects
-            AND $this->_redirects <= $this->_maxRedirects
-            AND $this->getResponseCode() > 300
-            AND $this->getResponseCode() < 399
-            AND !empty($this->_response->_headers['location'])) {
+	/**
+	 * Clears any cookies that have been added (DEPRECATED). 
+	 * 
+	 * Useful for multiple request scenarios
+	 *
+	 * @access public
+	 * @deprecated deprecated since 1.2
+	 */
+	function clearCookies()
+	{
+		$this->removeHeader('Cookie');
+	}
+
+	/**
+	 * Sends the request
+	 *
+	 * @access public
+	 * @param  bool   Whether to store response body in Response object property,
+	 *                set this to false if downloading a LARGE file and using a Listener
+	 * @return mixed  PEAR error on error, true otherwise
+	 */
+	function sendRequest($saveBody = true)
+	{
+		if (!is_a($this->_url, 'Net_URL')) {
+			return PEAR::raiseError('No URL given.');
+		}
+
+		$host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
+		$port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
+
+		// 4.3.0 supports SSL connections using OpenSSL. The function test determines
+		// we running on at least 4.3.0
+		if (strcasecmp($this->_url->protocol, 'https') == 0 AND function_exists('file_get_contents') AND extension_loaded('openssl')) {
+			if (isset($this->_proxy_host)) {
+				return PEAR::raiseError('HTTPS proxies are not supported.');
+			}
+			$host = 'ssl://' . $host;
+		}
+
+		// magic quotes may fuck up file uploads and chunked response processing
+		$magicQuotes = ini_get('magic_quotes_runtime');
+		ini_set('magic_quotes_runtime', false);
+
+		// RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive 
+		// connection token to a proxy server...
+		if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
+			'Keep-Alive' == $this->_requestHeaders['connection'])
+		{
+			$this->removeHeader('connection');
+		}
+
+		$keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
+					 (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
+		$sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
+		$sockKey   = $host . ':' . $port;
+		unset($this->_sock);
+
+		// There is a connected socket in the "static" property?
+		if ($keepAlive && !empty($sockets[$sockKey]) &&
+			!empty($sockets[$sockKey]->fp)) 
+		{
+			$this->_sock =& $sockets[$sockKey];
+			$err = null;
+		} else {
+			$this->_notify('connect');
+			$this->_sock =& new Net_Socket();
+			$err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
+		}
+		PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
+
+		if (!PEAR::isError($err)) {
+			if (!empty($this->_readTimeout)) {
+				$this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
+			}
+
+			$this->_notify('sentRequest');
+
+			// Read the response
+			$this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
+			$err = $this->_response->process(
+				$this->_saveBody && $saveBody,
+				HTTP_REQUEST_METHOD_HEAD != $this->_method
+			);
+
+			if ($keepAlive) {
+				$keepAlive = (isset($this->_response->_headers['content-length'])
+							  || (isset($this->_response->_headers['transfer-encoding'])
+								  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
+				if ($keepAlive) {
+					if (isset($this->_response->_headers['connection'])) {
+						$keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
+					} else {
+						$keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
+					}
+				}
+			}
+		}
+
+		ini_set('magic_quotes_runtime', $magicQuotes);
+
+		if (PEAR::isError($err)) {
+			return $err;
+		}
+
+		if (!$keepAlive) {
+			$this->disconnect();
+		// Store the connected socket in "static" property
+		} elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
+			$sockets[$sockKey] =& $this->_sock;
+		}
+
+		// Check for redirection
+		if (    $this->_allowRedirects
+			AND $this->_redirects <= $this->_maxRedirects
+			AND $this->getResponseCode() > 300
+			AND $this->getResponseCode() < 399
+			AND !empty($this->_response->_headers['location'])) {
 
             
-            $redirect = $this->_response->_headers['location'];
-
-            // Absolute URL
-            if (preg_match('/^https?:\/\//i', $redirect)) {
-                $this->_url = &new Net_URL($redirect);
-                $this->addHeader('Host', $this->_generateHostHeader());
-            // Absolute path
-            } elseif ($redirect{0} == '/') {
-                $this->_url->path = $redirect;
+			$redirect = $this->_response->_headers['location'];
+
+			// Absolute URL
+			if (preg_match('/^https?:\/\//i', $redirect)) {
+				$this->_url = &new Net_URL($redirect);
+				$this->addHeader('Host', $this->_generateHostHeader());
+			// Absolute path
+			} elseif ($redirect{0} == '/') {
+				$this->_url->path = $redirect;
             
-            // Relative path
-            } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
-                if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
-                } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
-                }
-                $redirect = Net_URL::resolvePath($redirect);
-                $this->_url->path = $redirect;
+			// Relative path
+			} elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
+				if (substr($this->_url->path, -1) == '/') {
+					$redirect = $this->_url->path . $redirect;
+				} else {
+					$redirect = dirname($this->_url->path) . '/' . $redirect;
+				}
+				$redirect = Net_URL::resolvePath($redirect);
+				$this->_url->path = $redirect;
                 
-            // Filename, no path
-            } else {
-                if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
-                } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
-                }
-                $this->_url->path = $redirect;
-            }
-
-            $this->_redirects++;
-            return $this->sendRequest($saveBody);
-
-        // Too many redirects
-        } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
-            return PEAR::raiseError('Too many redirects');
-        }
-
-        return true;
-    }
-
-    /**
-     * Disconnect the socket, if connected. Only useful if using Keep-Alive.
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        if (!empty($this->_sock) && !empty($this->_sock->fp)) {
-            $this->_notify('disconnect');
-            $this->_sock->disconnect();
-        }
-    }
-
-    /**
-    * Returns the response code
-    *
-    * @access public
-    * @return mixed     Response code, false if not set
-    */
-    function getResponseCode()
-    {
-        return isset($this->_response->_code) ? $this->_response->_code : false;
-    }
-
-    /**
-    * Returns either the named header or all if no name given
-    *
-    * @access public
-    * @param string     The header name to return, do not set to get all headers
-    * @return mixed     either the value of $headername (false if header is not present)
-    *                   or an array of all headers
-    */
-    function getResponseHeader($headername = null)
-    {
-        if (!isset($headername)) {
-            return isset($this->_response->_headers)? $this->_response->_headers: array();
-        } else {
-            $headername = strtolower($headername);
-            return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
-        }
-    }
-
-    /**
-    * Returns the body of the response
-    *
-    * @access public
-    * @return mixed     response body, false if not set
-    */
-    function getResponseBody()
-    {
-        return isset($this->_response->_body) ? $this->_response->_body : false;
-    }
-
-    /**
-    * Returns cookies set in response
-    * 
-    * @access public
-    * @return mixed     array of response cookies, false if none are present
-    */
-    function getResponseCookies()
-    {
-        return isset($this->_response->_cookies) ? $this->_response->_cookies : false;
-    }
-
-    /**
-    * Builds the request string
-    *
-    * @access private
-    * @return string The request string
-    */
-    function _buildRequest()
-    {
-        $separator = ini_get('arg_separator.output');
-        ini_set('arg_separator.output', '&');
-        $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
-        ini_set('arg_separator.output', $separator);
-
-        $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
-        $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
-        $path = $this->_url->path . $querystring;
-        $url  = $host . $port . $path;
-
-        $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
-
-        if (in_array($this->_method, $this->_bodyDisallowed) ||
-            (empty($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
-             (empty($this->_postData) && empty($this->_postFiles)))))
-        {
-            $this->removeHeader('Content-Type');
-        } else {
-            if (empty($this->_requestHeaders['content-type'])) {
-                // Add default content-type
-                $this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
-            } elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
-                $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
-                $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
-            }
-        }
-
-        // Request Headers
-        if (!empty($this->_requestHeaders)) {
-            foreach ($this->_requestHeaders as $name => $value) {
-                $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-                $request      .= $canonicalName . ': ' . $value . "\r\n";
-            }
-        }
-
-        // No post data or wrong method, so simply add a final CRLF
-        if (in_array($this->_method, $this->_bodyDisallowed) || 
-            (HTTP_REQUEST_METHOD_POST != $this->_method && empty($this->_body))) {
-
-            $request .= "\r\n";
-
-        // Post data if it's an array
-        } elseif (HTTP_REQUEST_METHOD_POST == $this->_method && 
-                  (!empty($this->_postData) || !empty($this->_postFiles))) {
-
-            // "normal" POST request
-            if (!isset($boundary)) {
-                $postdata = implode('&', array_map(
-                    create_function('$a', 'return $a[0] . \'=\' . $a[1];'), 
-                    $this->_flattenArray('', $this->_postData)
-                ));
-
-            // multipart request, probably with file uploads
-            } else {
-                $postdata = '';
-                if (!empty($this->_postData)) {
-                    $flatData = $this->_flattenArray('', $this->_postData);
-                    foreach ($flatData as $item) {
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
-                        $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
-                    }
-                }
-                foreach ($this->_postFiles as $name => $value) {
-                    if (is_array($value['name'])) {
-                        $varname       = $name . ($this->_useBrackets? '[]': '');
-                    } else {
-                        $varname       = $name;
-                        $value['name'] = array($value['name']);
-                    }
-                    foreach ($value['name'] as $key => $filename) {
-                        $fp   = fopen($filename, 'r');
-                        $data = fread($fp, filesize($filename));
-                        fclose($fp);
-                        $basename = basename($filename);
-                        $type     = is_array($value['type'])? @$value['type'][$key]: $value['type'];
-
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
-                        $postdata .= "\r\nContent-Type: " . $type;
-                        $postdata .= "\r\n\r\n" . $data . "\r\n";
-                    }
-                }
-                $postdata .= '--' . $boundary . "--\r\n";
-            }
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
-                        "\r\n\r\n";
-            $request .= $postdata;
-
-        // Explicitly set request body
-        } elseif (!empty($this->_body)) {
-
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
-                        "\r\n\r\n";
-            $request .= $this->_body;
-        }
+			// Filename, no path
+			} else {
+				if (substr($this->_url->path, -1) == '/') {
+					$redirect = $this->_url->path . $redirect;
+				} else {
+					$redirect = dirname($this->_url->path) . '/' . $redirect;
+				}
+				$this->_url->path = $redirect;
+			}
+
+			$this->_redirects++;
+			return $this->sendRequest($saveBody);
+
+		// Too many redirects
+		} elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
+			return PEAR::raiseError('Too many redirects');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Disconnect the socket, if connected. Only useful if using Keep-Alive.
+	 *
+	 * @access public
+	 */
+	function disconnect()
+	{
+		if (!empty($this->_sock) && !empty($this->_sock->fp)) {
+			$this->_notify('disconnect');
+			$this->_sock->disconnect();
+		}
+	}
+
+	/**
+	 * Returns the response code
+	 *
+	 * @access public
+	 * @return mixed     Response code, false if not set
+	 */
+	function getResponseCode()
+	{
+		return isset($this->_response->_code) ? $this->_response->_code : false;
+	}
+
+	/**
+	 * Returns either the named header or all if no name given
+	 *
+	 * @access public
+	 * @param string     The header name to return, do not set to get all headers
+	 * @return mixed     either the value of $headername (false if header is not present)
+	 *                   or an array of all headers
+	 */
+	function getResponseHeader($headername = null)
+	{
+		if (!isset($headername)) {
+			return isset($this->_response->_headers)? $this->_response->_headers: array();
+		} else {
+			$headername = strtolower($headername);
+			return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
+		}
+	}
+
+	/**
+	 * Returns the body of the response
+	 *
+	 * @access public
+	 * @return mixed     response body, false if not set
+	 */
+	function getResponseBody()
+	{
+		return isset($this->_response->_body) ? $this->_response->_body : false;
+	}
+
+	/**
+	 * Returns cookies set in response
+	 * 
+	 * @access public
+	 * @return mixed     array of response cookies, false if none are present
+	 */
+	function getResponseCookies()
+	{
+		return isset($this->_response->_cookies) ? $this->_response->_cookies : false;
+	}
+
+	/**
+	 * Builds the request string
+	 *
+	 * @access private
+	 * @return string The request string
+	 */
+	function _buildRequest()
+	{
+		$separator = ini_get('arg_separator.output');
+		ini_set('arg_separator.output', '&');
+		$querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
+		ini_set('arg_separator.output', $separator);
+
+		$host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
+		$port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
+		$path = $this->_url->path . $querystring;
+		$url  = $host . $port . $path;
+
+		$request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
+
+		if (in_array($this->_method, $this->_bodyDisallowed) ||
+			(empty($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
+			 (empty($this->_postData) && empty($this->_postFiles)))))
+		{
+			$this->removeHeader('Content-Type');
+		} else {
+			if (empty($this->_requestHeaders['content-type'])) {
+				// Add default content-type
+				$this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
+			} elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
+				$boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
+				$this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
+			}
+		}
+
+		// Request Headers
+		if (!empty($this->_requestHeaders)) {
+			foreach ($this->_requestHeaders as $name => $value) {
+				$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+				$request      .= $canonicalName . ': ' . $value . "\r\n";
+			}
+		}
+
+		// No post data or wrong method, so simply add a final CRLF
+		if (in_array($this->_method, $this->_bodyDisallowed) || 
+			(HTTP_REQUEST_METHOD_POST != $this->_method && empty($this->_body))) {
+
+			$request .= "\r\n";
+
+		// Post data if it's an array
+		} elseif (HTTP_REQUEST_METHOD_POST == $this->_method && 
+				  (!empty($this->_postData) || !empty($this->_postFiles))) {
+
+			// "normal" POST request
+			if (!isset($boundary)) {
+				$postdata = implode('&', array_map(
+					create_function('$a', 'return $a[0] . \'=\' . $a[1];'), 
+					$this->_flattenArray('', $this->_postData)
+				));
+
+			// multipart request, probably with file uploads
+			} else {
+				$postdata = '';
+				if (!empty($this->_postData)) {
+					$flatData = $this->_flattenArray('', $this->_postData);
+					foreach ($flatData as $item) {
+						$postdata .= '--' . $boundary . "\r\n";
+						$postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
+						$postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
+					}
+				}
+				foreach ($this->_postFiles as $name => $value) {
+					if (is_array($value['name'])) {
+						$varname       = $name . ($this->_useBrackets? '[]': '');
+					} else {
+						$varname       = $name;
+						$value['name'] = array($value['name']);
+					}
+					foreach ($value['name'] as $key => $filename) {
+						$fp   = fopen($filename, 'r');
+						$data = fread($fp, filesize($filename));
+						fclose($fp);
+						$basename = basename($filename);
+						$type     = is_array($value['type'])? @$value['type'][$key]: $value['type'];
+
+						$postdata .= '--' . $boundary . "\r\n";
+						$postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
+						$postdata .= "\r\nContent-Type: " . $type;
+						$postdata .= "\r\n\r\n" . $data . "\r\n";
+					}
+				}
+				$postdata .= '--' . $boundary . "--\r\n";
+			}
+			$request .= 'Content-Length: ' .
+						(HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
+						"\r\n\r\n";
+			$request .= $postdata;
+
+		// Explicitly set request body
+		} elseif (!empty($this->_body)) {
+
+			$request .= 'Content-Length: ' .
+						(HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
+						"\r\n\r\n";
+			$request .= $this->_body;
+		}
         
-        return $request;
-    }
+		return $request;
+	}
 
    /**
     * Helper function to change the (probably multidimensional) associative array
@@ -981,25 +981,25 @@  discard block
 block discarded – undo
     * @return   array   array with the following items: array('item name', 'item value');
     * @access   private
     */
-    function _flattenArray($name, $values)
-    {
-        if (!is_array($values)) {
-            return array(array($name, $values));
-        } else {
-            $ret = array();
-            foreach ($values as $k => $v) {
-                if (empty($name)) {
-                    $newName = $k;
-                } elseif ($this->_useBrackets) {
-                    $newName = $name . '[' . $k . ']';
-                } else {
-                    $newName = $name;
-                }
-                $ret = array_merge($ret, $this->_flattenArray($newName, $v));
-            }
-            return $ret;
-        }
-    }
+	function _flattenArray($name, $values)
+	{
+		if (!is_array($values)) {
+			return array(array($name, $values));
+		} else {
+			$ret = array();
+			foreach ($values as $k => $v) {
+				if (empty($name)) {
+					$newName = $k;
+				} elseif ($this->_useBrackets) {
+					$newName = $name . '[' . $k . ']';
+				} else {
+					$newName = $name;
+				}
+				$ret = array_merge($ret, $this->_flattenArray($newName, $v));
+			}
+			return $ret;
+		}
+	}
 
 
    /**
@@ -1021,14 +1021,14 @@  discard block
 block discarded – undo
     * @return   boolean                 whether the listener was successfully attached
     * @access   public
     */
-    function attach(&$listener)
-    {
-        if (!is_a($listener, 'HTTP_Request_Listener')) {
-            return false;
-        }
-        $this->_listeners[$listener->getId()] =& $listener;
-        return true;
-    }
+	function attach(&$listener)
+	{
+		if (!is_a($listener, 'HTTP_Request_Listener')) {
+			return false;
+		}
+		$this->_listeners[$listener->getId()] =& $listener;
+		return true;
+	}
 
 
    /**
@@ -1038,15 +1038,15 @@  discard block
 block discarded – undo
     * @return   boolean                 whether the listener was successfully detached
     * @access   public
     */
-    function detach(&$listener)
-    {
-        if (!is_a($listener, 'HTTP_Request_Listener') || 
-            !isset($this->_listeners[$listener->getId()])) {
-            return false;
-        }
-        unset($this->_listeners[$listener->getId()]);
-        return true;
-    }
+	function detach(&$listener)
+	{
+		if (!is_a($listener, 'HTTP_Request_Listener') || 
+			!isset($this->_listeners[$listener->getId()])) {
+			return false;
+		}
+		unset($this->_listeners[$listener->getId()]);
+		return true;
+	}
 
 
    /**
@@ -1057,12 +1057,12 @@  discard block
 block discarded – undo
     * @access   private
     * @see      HTTP_Request::attach()
     */
-    function _notify($event, $data = null)
-    {
-        foreach (array_keys($this->_listeners) as $id) {
-            $this->_listeners[$id]->update($this, $event, $data);
-        }
-    }
+	function _notify($event, $data = null)
+	{
+		foreach (array_keys($this->_listeners) as $id) {
+			$this->_listeners[$id]->update($this, $event, $data);
+		}
+	}
 }
 
 
@@ -1077,71 +1077,71 @@  discard block
 block discarded – undo
  */
 class HTTP_Response
 {
-    /**
-    * Socket object
-    * @var Net_Socket
-    */
-    var $_sock;
-
-    /**
-    * Protocol
-    * @var string
-    */
-    var $_protocol;
+	/**
+	 * Socket object
+	 * @var Net_Socket
+	 */
+	var $_sock;
+
+	/**
+	 * Protocol
+	 * @var string
+	 */
+	var $_protocol;
     
-    /**
-    * Return code
-    * @var string
-    */
-    var $_code;
+	/**
+	 * Return code
+	 * @var string
+	 */
+	var $_code;
     
-    /**
-    * Response headers
-    * @var array
-    */
-    var $_headers;
-
-    /**
-    * Cookies set in response  
-    * @var array
-    */
-    var $_cookies;
-
-    /**
-    * Response body
-    * @var string
-    */
-    var $_body = '';
+	/**
+	 * Response headers
+	 * @var array
+	 */
+	var $_headers;
+
+	/**
+	 * Cookies set in response  
+	 * @var array
+	 */
+	var $_cookies;
+
+	/**
+	 * Response body
+	 * @var string
+	 */
+	var $_body = '';
 
    /**
     * Used by _readChunked(): remaining length of the current chunk
     * @var string
     */
-    var $_chunkLength = 0;
+	var $_chunkLength = 0;
 
    /**
     * Attached listeners
     * @var array
     */
-    var $_listeners = array();
+	var $_listeners = array();
 
    /**
     * Bytes left to read from message-body
     * @var null|int
     */
-    var $_toRead;
+	var $_toRead;
 
-    /**
-    * Constructor
-    *
-    * @param  Net_Socket    socket to read the response from
-    * @param  array         listeners attached to request
-    */
-    function HTTP_Response(&$sock, &$listeners)
-    {
-        $this->_sock      =& $sock;
-        $this->_listeners =& $listeners;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param  Net_Socket    socket to read the response from
+	 * @param  array         listeners attached to request
+	 */
+	function HTTP_Response(&$sock, &$listeners)
+	{
+		$this->_sock      =& $sock;
+		$this->_listeners =& $listeners;
+	}
 
 
    /**
@@ -1159,80 +1159,80 @@  discard block
 block discarded – undo
     * @throws PEAR_Error
     * @return mixed     true on success, PEAR_Error in case of malformed response
     */
-    function process($saveBody = true, $canHaveBody = true)
-    {
-        do {
-            $line = $this->_sock->readLine();
-            if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
-                return PEAR::raiseError('Malformed response.');
-            } else {
-                $this->_protocol = 'HTTP/' . $http_version;
-                $this->_code     = intval($returncode);
-            }
-            while ('' !== ($header = $this->_sock->readLine())) {
-                $this->_processHeader($header);
-            }
-        } while (100 == $this->_code);
-
-        $this->_notify('gotHeaders', $this->_headers);
-
-        // RFC 2616, section 4.4:
-        // 1. Any response message which "MUST NOT" include a message-body ... 
-        // is always terminated by the first empty line after the header fields 
-        // 3. ... If a message is received with both a
-        // Transfer-Encoding header field and a Content-Length header field,
-        // the latter MUST be ignored.
-        $canHaveBody = $canHaveBody && $this->_code >= 200 && 
-                       $this->_code != 204 && $this->_code != 304;
-
-        // If response body is present, read it and decode
-        $chunked = isset($this->_headers['transfer-encoding']) && ('chunked' == $this->_headers['transfer-encoding']);
-        $gzipped = isset($this->_headers['content-encoding']) && ('gzip' == $this->_headers['content-encoding']);
-        $hasBody = false;
-        if ($canHaveBody && ($chunked || !isset($this->_headers['content-length']) || 
-                0 != $this->_headers['content-length']))
-        {
-            if ($chunked || !isset($this->_headers['content-length'])) {
-                $this->_toRead = null;
-            } else {
-                $this->_toRead = $this->_headers['content-length'];
-            }
-            while (!$this->_sock->eof() && (is_null($this->_toRead) || 0 < $this->_toRead)) {
-                if ($chunked) {
-                    $data = $this->_readChunked();
-                } elseif (is_null($this->_toRead)) {
-                    $data = $this->_sock->read(4096);
-                } else {
-                    $data = $this->_sock->read(min(4096, $this->_toRead));
-                    $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
-                }
-                if ('' == $data) {
-                    break;
-                } else {
-                    $hasBody = true;
-                    if ($saveBody || $gzipped) {
-                        $this->_body .= $data;
-                    }
-                    $this->_notify($gzipped? 'gzTick': 'tick', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            // Uncompress the body if needed
-            if ($gzipped) {
-                $body = $this->_decodeGzip($this->_body);
-                if (PEAR::isError($body)) {
-                    return $body;
-                }
-                $this->_body = $body;
-                $this->_notify('gotBody', $this->_body);
-            } else {
-                $this->_notify('gotBody');
-            }
-        }
-        return true;
-    }
+	function process($saveBody = true, $canHaveBody = true)
+	{
+		do {
+			$line = $this->_sock->readLine();
+			if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
+				return PEAR::raiseError('Malformed response.');
+			} else {
+				$this->_protocol = 'HTTP/' . $http_version;
+				$this->_code     = intval($returncode);
+			}
+			while ('' !== ($header = $this->_sock->readLine())) {
+				$this->_processHeader($header);
+			}
+		} while (100 == $this->_code);
+
+		$this->_notify('gotHeaders', $this->_headers);
+
+		// RFC 2616, section 4.4:
+		// 1. Any response message which "MUST NOT" include a message-body ... 
+		// is always terminated by the first empty line after the header fields 
+		// 3. ... If a message is received with both a
+		// Transfer-Encoding header field and a Content-Length header field,
+		// the latter MUST be ignored.
+		$canHaveBody = $canHaveBody && $this->_code >= 200 && 
+					   $this->_code != 204 && $this->_code != 304;
+
+		// If response body is present, read it and decode
+		$chunked = isset($this->_headers['transfer-encoding']) && ('chunked' == $this->_headers['transfer-encoding']);
+		$gzipped = isset($this->_headers['content-encoding']) && ('gzip' == $this->_headers['content-encoding']);
+		$hasBody = false;
+		if ($canHaveBody && ($chunked || !isset($this->_headers['content-length']) || 
+				0 != $this->_headers['content-length']))
+		{
+			if ($chunked || !isset($this->_headers['content-length'])) {
+				$this->_toRead = null;
+			} else {
+				$this->_toRead = $this->_headers['content-length'];
+			}
+			while (!$this->_sock->eof() && (is_null($this->_toRead) || 0 < $this->_toRead)) {
+				if ($chunked) {
+					$data = $this->_readChunked();
+				} elseif (is_null($this->_toRead)) {
+					$data = $this->_sock->read(4096);
+				} else {
+					$data = $this->_sock->read(min(4096, $this->_toRead));
+					$this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
+				}
+				if ('' == $data) {
+					break;
+				} else {
+					$hasBody = true;
+					if ($saveBody || $gzipped) {
+						$this->_body .= $data;
+					}
+					$this->_notify($gzipped? 'gzTick': 'tick', $data);
+				}
+			}
+		}
+
+		if ($hasBody) {
+			// Uncompress the body if needed
+			if ($gzipped) {
+				$body = $this->_decodeGzip($this->_body);
+				if (PEAR::isError($body)) {
+					return $body;
+				}
+				$this->_body = $body;
+				$this->_notify('gotBody', $this->_body);
+			} else {
+				$this->_notify('gotBody');
+			}
+		}
+		return true;
+	}
 
 
    /**
@@ -1241,25 +1241,25 @@  discard block
 block discarded – undo
     * @access private
     * @param  string    HTTP header
     */
-    function _processHeader($header)
-    {
-        if (false === strpos($header, ':')) {
-            return;
-        }
-        list($headername, $headervalue) = explode(':', $header, 2);
-        $headername  = strtolower($headername);
-        $headervalue = ltrim($headervalue);
+	function _processHeader($header)
+	{
+		if (false === strpos($header, ':')) {
+			return;
+		}
+		list($headername, $headervalue) = explode(':', $header, 2);
+		$headername  = strtolower($headername);
+		$headervalue = ltrim($headervalue);
         
-        if ('set-cookie' != $headername) {
-            if (isset($this->_headers[$headername])) {
-                $this->_headers[$headername] .= ',' . $headervalue;
-            } else {
-                $this->_headers[$headername]  = $headervalue;
-            }
-        } else {
-            $this->_parseCookie($headervalue);
-        }
-    }
+		if ('set-cookie' != $headername) {
+			if (isset($this->_headers[$headername])) {
+				$this->_headers[$headername] .= ',' . $headervalue;
+			} else {
+				$this->_headers[$headername]  = $headervalue;
+			}
+		} else {
+			$this->_parseCookie($headervalue);
+		}
+	}
 
 
    /**
@@ -1268,49 +1268,49 @@  discard block
 block discarded – undo
     * @access private
     * @param  string    value of Set-Cookie header
     */
-    function _parseCookie($headervalue)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        // Only a name=value pair
-        if (!strpos($headervalue, ';')) {
-            $pos = strpos($headervalue, '=');
-            $cookie['name']  = trim(substr($headervalue, 0, $pos));
-            $cookie['value'] = trim(substr($headervalue, $pos + 1));
-
-        // Some optional parameters are supplied
-        } else {
-            $elements = explode(';', $headervalue);
-            $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;
-    }
+	function _parseCookie($headervalue)
+	{
+		$cookie = array(
+			'expires' => null,
+			'domain'  => null,
+			'path'    => null,
+			'secure'  => false
+		);
+
+		// Only a name=value pair
+		if (!strpos($headervalue, ';')) {
+			$pos = strpos($headervalue, '=');
+			$cookie['name']  = trim(substr($headervalue, 0, $pos));
+			$cookie['value'] = trim(substr($headervalue, $pos + 1));
+
+		// Some optional parameters are supplied
+		} else {
+			$elements = explode(';', $headervalue);
+			$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;
+	}
 
 
    /**
@@ -1319,29 +1319,29 @@  discard block
 block discarded – undo
     * @access private
     * @return string
     */
-    function _readChunked()
-    {
-        // at start of the next chunk?
-        if (0 == $this->_chunkLength) {
-            $line = $this->_sock->readLine();
-            if (preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                $this->_chunkLength = hexdec($matches[1]); 
-                // Chunk with zero length indicates the end
-                if (0 == $this->_chunkLength) {
-                    $this->_sock->readLine(); // make this an eof()
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        }
-        $data = $this->_sock->read($this->_chunkLength);
-        $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
-        if (0 == $this->_chunkLength) {
-            $this->_sock->readLine(); // Trailing CRLF
-        }
-        return $data;
-    }
+	function _readChunked()
+	{
+		// at start of the next chunk?
+		if (0 == $this->_chunkLength) {
+			$line = $this->_sock->readLine();
+			if (preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+				$this->_chunkLength = hexdec($matches[1]); 
+				// Chunk with zero length indicates the end
+				if (0 == $this->_chunkLength) {
+					$this->_sock->readLine(); // make this an eof()
+					return '';
+				}
+			} else {
+				return '';
+			}
+		}
+		$data = $this->_sock->read($this->_chunkLength);
+		$this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
+		if (0 == $this->_chunkLength) {
+			$this->_sock->readLine(); // Trailing CRLF
+		}
+		return $data;
+	}
 
 
    /**
@@ -1352,12 +1352,12 @@  discard block
 block discarded – undo
     * @access   private
     * @see HTTP_Request::_notify()
     */
-    function _notify($event, $data = null)
-    {
-        foreach (array_keys($this->_listeners) as $id) {
-            $this->_listeners[$id]->update($this, $event, $data);
-        }
-    }
+	function _notify($event, $data = null)
+	{
+		foreach (array_keys($this->_listeners) as $id) {
+			$this->_listeners[$id]->update($this, $event, $data);
+		}
+	}
 
 
    /**
@@ -1371,91 +1371,91 @@  discard block
 block discarded – undo
     * @param    string  gzip-encoded data
     * @return   string  decoded data
     */
-    function _decodeGzip($data)
-    {
-        if (HTTP_REQUEST_MBSTRING) {
-            $oldEncoding = mb_internal_encoding();
-            mb_internal_encoding('iso-8859-1');
-        }
-        $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;
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            return PEAR::raiseError('_decodeGzip(): unknown compression method');
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            return PEAR::raiseError('_decodeGzip(): 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) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 1) {
-            if ($length - $headerLength - 2 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                return PEAR::raiseError('_decodeGzip(): 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
-        $unpacked = @gzinflate(substr($data, $headerLength, -8), $dataSize);
-        if (false === $unpacked) {
-            return PEAR::raiseError('_decodeGzip(): gzinflate() call failed');
-        } elseif ($dataSize != strlen($unpacked)) {
-            return PEAR::raiseError('_decodeGzip(): data size check failed');
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            return PEAR::raiseError('_decodeGzip(): data CRC check failed');
-        }
-        if (HTTP_REQUEST_MBSTRING) {
-            mb_internal_encoding($oldEncoding);
-        }
-        return $unpacked;
-    }
+	function _decodeGzip($data)
+	{
+		if (HTTP_REQUEST_MBSTRING) {
+			$oldEncoding = mb_internal_encoding();
+			mb_internal_encoding('iso-8859-1');
+		}
+		$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;
+		}
+		$method = ord(substr($data, 2, 1));
+		if (8 != $method) {
+			return PEAR::raiseError('_decodeGzip(): unknown compression method');
+		}
+		$flags = ord(substr($data, 3, 1));
+		if ($flags & 224) {
+			return PEAR::raiseError('_decodeGzip(): 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) {
+				return PEAR::raiseError('_decodeGzip(): data too short');
+			}
+			$extraLength = unpack('v', substr($data, 10, 2));
+			if ($length - $headerLength - 2 - $extraLength[1] < 8) {
+				return PEAR::raiseError('_decodeGzip(): data too short');
+			}
+			$headerLength += $extraLength[1] + 2;
+		}
+		// file name, need to skip that
+		if ($flags & 8) {
+			if ($length - $headerLength - 1 < 8) {
+				return PEAR::raiseError('_decodeGzip(): data too short');
+			}
+			$filenameLength = strpos(substr($data, $headerLength), chr(0));
+			if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
+				return PEAR::raiseError('_decodeGzip(): data too short');
+			}
+			$headerLength += $filenameLength + 1;
+		}
+		// comment, need to skip that also
+		if ($flags & 16) {
+			if ($length - $headerLength - 1 < 8) {
+				return PEAR::raiseError('_decodeGzip(): data too short');
+			}
+			$commentLength = strpos(substr($data, $headerLength), chr(0));
+			if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
+				return PEAR::raiseError('_decodeGzip(): data too short');
+			}
+			$headerLength += $commentLength + 1;
+		}
+		// have a CRC for header. let's check
+		if ($flags & 1) {
+			if ($length - $headerLength - 2 < 8) {
+				return PEAR::raiseError('_decodeGzip(): data too short');
+			}
+			$crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
+			$crcStored = unpack('v', substr($data, $headerLength, 2));
+			if ($crcReal != $crcStored[1]) {
+				return PEAR::raiseError('_decodeGzip(): 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
+		$unpacked = @gzinflate(substr($data, $headerLength, -8), $dataSize);
+		if (false === $unpacked) {
+			return PEAR::raiseError('_decodeGzip(): gzinflate() call failed');
+		} elseif ($dataSize != strlen($unpacked)) {
+			return PEAR::raiseError('_decodeGzip(): data size check failed');
+		} elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
+			return PEAR::raiseError('_decodeGzip(): data CRC check failed');
+		}
+		if (HTTP_REQUEST_MBSTRING) {
+			mb_internal_encoding($oldEncoding);
+		}
+		return $unpacked;
+	}
 } // End class HTTP_Response
 ?>

Please login to merge, or discard this patch.

Spacing +62 added lines, -62 removed lines patch added patch discarded remove patch

@@ -60,13 +60,13 @@  discard block
 block discarded – undo
 /**#@+
  * Constants for HTTP request methods
  */ 
-define('HTTP_REQUEST_METHOD_GET',     'GET',     true);
-define('HTTP_REQUEST_METHOD_HEAD',    'HEAD',    true);
-define('HTTP_REQUEST_METHOD_POST',    'POST',    true);
-define('HTTP_REQUEST_METHOD_PUT',     'PUT',     true);
-define('HTTP_REQUEST_METHOD_DELETE',  'DELETE',  true);
+define('HTTP_REQUEST_METHOD_GET', 'GET', true);
+define('HTTP_REQUEST_METHOD_HEAD', 'HEAD', true);
+define('HTTP_REQUEST_METHOD_POST', 'POST', true);
+define('HTTP_REQUEST_METHOD_PUT', 'PUT', true);
+define('HTTP_REQUEST_METHOD_DELETE', 'DELETE', true);
 define('HTTP_REQUEST_METHOD_OPTIONS', 'OPTIONS', true);
-define('HTTP_REQUEST_METHOD_TRACE',   'TRACE',   true);
+define('HTTP_REQUEST_METHOD_TRACE', 'TRACE', true);
 /**#@-*/
 
 /**#@+
@@ -287,8 +287,8 @@  discard block
 block discarded – undo
     */
     function HTTP_Request($url = '', $params = array())
     {
-        $this->_method         =  HTTP_REQUEST_METHOD_GET;
-        $this->_http           =  HTTP_REQUEST_HTTP_VER_1_1;
+        $this->_method         = HTTP_REQUEST_METHOD_GET;
+        $this->_http           = HTTP_REQUEST_HTTP_VER_1_1;
         $this->_requestHeaders = array();
         $this->_postData       = array();
         $this->_body           = null;
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
         $this->_response = null;
 
         foreach ($params as $key => $value) {
-            $this->{'_' . $key} = $value;
+            $this->{'_'.$key} = $value;
         }
 
         if (!empty($url)) {
@@ -324,12 +324,12 @@  discard block
 block discarded – undo
 
         // Basic authentication
         if (!empty($this->_user)) {
-            $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
+            $this->addHeader('Authorization', 'Basic '.base64_encode($this->_user.':'.$this->_pass));
         }
 
         // Proxy authentication (see bug #5913)
         if (!empty($this->_proxy_user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
+            $this->addHeader('Proxy-Authorization', 'Basic '.base64_encode($this->_proxy_user.':'.$this->_proxy_pass));
         }
 
         // Use gzip encoding if possible
@@ -347,13 +347,13 @@  discard block
 block discarded – undo
     function _generateHostHeader()
     {
         if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
+            $host = $this->_url->host.':'.$this->_url->port;
 
         } elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
+            $host = $this->_url->host.':'.$this->_url->port;
 
         } elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
-            $host = $this->_url->host . ':' . $this->_url->port;
+            $host = $this->_url->host.':'.$this->_url->port;
         
         } else {
             $host = $this->_url->host;
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
     */
     function getUrl()
     {
-        return empty($this->_url)? '': $this->_url->getUrl();
+        return empty($this->_url) ? '' : $this->_url->getUrl();
     }
 
     /**
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
         $this->_proxy_pass = $pass;
 
         if (!empty($user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+            $this->addHeader('Proxy-Authorization', 'Basic '.base64_encode($user.':'.$pass));
         }
     }
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
         $this->_user = $user;
         $this->_pass = $pass;
 
-        $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+        $this->addHeader('Authorization', 'Basic '.base64_encode($user.':'.$pass));
     }
 
     /**
@@ -634,8 +634,8 @@  discard block
 block discarded – undo
     */
     function addCookie($name, $value)
     {
-        $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
-        $this->addHeader('Cookie', $cookies . $name . '=' . $value);
+        $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie'].'; ' : '';
+        $this->addHeader('Cookie', $cookies.$name.'='.$value);
     }
     
     /**
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
             if (isset($this->_proxy_host)) {
                 return PEAR::raiseError('HTTPS proxies are not supported.');
             }
-            $host = 'ssl://' . $host;
+            $host = 'ssl://'.$host;
         }
 
         // magic quotes may fuck up file uploads and chunked response processing
@@ -692,18 +692,18 @@  discard block
 block discarded – undo
         $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
                      (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
         $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
-        $sockKey   = $host . ':' . $port;
+        $sockKey   = $host.':'.$port;
         unset($this->_sock);
 
         // There is a connected socket in the "static" property?
         if ($keepAlive && !empty($sockets[$sockKey]) &&
             !empty($sockets[$sockKey]->fp)) 
         {
-            $this->_sock =& $sockets[$sockKey];
+            $this->_sock = & $sockets[$sockKey];
             $err = null;
         } else {
             $this->_notify('connect');
-            $this->_sock =& new Net_Socket();
+            $this->_sock = & new Net_Socket();
             $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
         }
         PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
@@ -746,11 +746,11 @@  discard block
 block discarded – undo
             $this->disconnect();
         // Store the connected socket in "static" property
         } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
-            $sockets[$sockKey] =& $this->_sock;
+            $sockets[$sockKey] = & $this->_sock;
         }
 
         // Check for redirection
-        if (    $this->_allowRedirects
+        if ($this->_allowRedirects
             AND $this->_redirects <= $this->_maxRedirects
             AND $this->getResponseCode() > 300
             AND $this->getResponseCode() < 399
@@ -770,9 +770,9 @@  discard block
 block discarded – undo
             // Relative path
             } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
                 if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
+                    $redirect = $this->_url->path.$redirect;
                 } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                    $redirect = dirname($this->_url->path).'/'.$redirect;
                 }
                 $redirect = Net_URL::resolvePath($redirect);
                 $this->_url->path = $redirect;
@@ -780,9 +780,9 @@  discard block
 block discarded – undo
             // Filename, no path
             } else {
                 if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
+                    $redirect = $this->_url->path.$redirect;
                 } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                    $redirect = dirname($this->_url->path).'/'.$redirect;
                 }
                 $this->_url->path = $redirect;
             }
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
     function getResponseHeader($headername = null)
     {
         if (!isset($headername)) {
-            return isset($this->_response->_headers)? $this->_response->_headers: array();
+            return isset($this->_response->_headers) ? $this->_response->_headers : array();
         } else {
             $headername = strtolower($headername);
             return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
@@ -872,15 +872,15 @@  discard block
 block discarded – undo
     {
         $separator = ini_get('arg_separator.output');
         ini_set('arg_separator.output', '&');
-        $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
+        $querystring = ($querystring = $this->_url->getQueryString()) ? '?'.$querystring : '';
         ini_set('arg_separator.output', $separator);
 
-        $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
-        $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
-        $path = $this->_url->path . $querystring;
-        $url  = $host . $port . $path;
+        $host = isset($this->_proxy_host) ? $this->_url->protocol.'://'.$this->_url->host : '';
+        $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':'.$this->_url->port : '';
+        $path = $this->_url->path.$querystring;
+        $url  = $host.$port.$path;
 
-        $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
+        $request = $this->_method.' '.$url.' HTTP/'.$this->_http."\r\n";
 
         if (in_array($this->_method, $this->_bodyDisallowed) ||
             (empty($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
@@ -892,8 +892,8 @@  discard block
 block discarded – undo
                 // Add default content-type
                 $this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
             } elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
-                $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
-                $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
+                $boundary = 'HTTP_Request_'.md5(uniqid('request').microtime());
+                $this->addHeader('Content-Type', 'multipart/form-data; boundary='.$boundary);
             }
         }
 
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
         if (!empty($this->_requestHeaders)) {
             foreach ($this->_requestHeaders as $name => $value) {
                 $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-                $request      .= $canonicalName . ': ' . $value . "\r\n";
+                $request      .= $canonicalName.': '.$value."\r\n";
             }
         }
 
@@ -928,14 +928,14 @@  discard block
 block discarded – undo
                 if (!empty($this->_postData)) {
                     $flatData = $this->_flattenArray('', $this->_postData);
                     foreach ($flatData as $item) {
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
-                        $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
+                        $postdata .= '--'.$boundary."\r\n";
+                        $postdata .= 'Content-Disposition: form-data; name="'.$item[0].'"';
+                        $postdata .= "\r\n\r\n".urldecode($item[1])."\r\n";
                     }
                 }
                 foreach ($this->_postFiles as $name => $value) {
                     if (is_array($value['name'])) {
-                        $varname       = $name . ($this->_useBrackets? '[]': '');
+                        $varname       = $name.($this->_useBrackets ? '[]' : '');
                     } else {
                         $varname       = $name;
                         $value['name'] = array($value['name']);
@@ -945,26 +945,26 @@  discard block
 block discarded – undo
                         $data = fread($fp, filesize($filename));
                         fclose($fp);
                         $basename = basename($filename);
-                        $type     = is_array($value['type'])? @$value['type'][$key]: $value['type'];
+                        $type     = is_array($value['type']) ? @$value['type'][$key] : $value['type'];
 
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
-                        $postdata .= "\r\nContent-Type: " . $type;
-                        $postdata .= "\r\n\r\n" . $data . "\r\n";
+                        $postdata .= '--'.$boundary."\r\n";
+                        $postdata .= 'Content-Disposition: form-data; name="'.$varname.'"; filename="'.$basename.'"';
+                        $postdata .= "\r\nContent-Type: ".$type;
+                        $postdata .= "\r\n\r\n".$data."\r\n";
                     }
                 }
-                $postdata .= '--' . $boundary . "--\r\n";
+                $postdata .= '--'.$boundary."--\r\n";
             }
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
+            $request .= 'Content-Length: '.
+                        (HTTP_REQUEST_MBSTRING ? mb_strlen($postdata, 'iso-8859-1') : strlen($postdata)).
                         "\r\n\r\n";
             $request .= $postdata;
 
         // Explicitly set request body
         } elseif (!empty($this->_body)) {
 
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
+            $request .= 'Content-Length: '.
+                        (HTTP_REQUEST_MBSTRING ? mb_strlen($this->_body, 'iso-8859-1') : strlen($this->_body)).
                         "\r\n\r\n";
             $request .= $this->_body;
         }
@@ -991,7 +991,7 @@  discard block
 block discarded – undo
                 if (empty($name)) {
                     $newName = $k;
                 } elseif ($this->_useBrackets) {
-                    $newName = $name . '[' . $k . ']';
+                    $newName = $name.'['.$k.']';
                 } else {
                     $newName = $name;
                 }
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
         if (!is_a($listener, 'HTTP_Request_Listener')) {
             return false;
         }
-        $this->_listeners[$listener->getId()] =& $listener;
+        $this->_listeners[$listener->getId()] = & $listener;
         return true;
     }
 
@@ -1139,8 +1139,8 @@  discard block
 block discarded – undo
     */
     function HTTP_Response(&$sock, &$listeners)
     {
-        $this->_sock      =& $sock;
-        $this->_listeners =& $listeners;
+        $this->_sock      = & $sock;
+        $this->_listeners = & $listeners;
     }
 
 
@@ -1166,7 +1166,7 @@  discard block
 block discarded – undo
             if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
                 return PEAR::raiseError('Malformed response.');
             } else {
-                $this->_protocol = 'HTTP/' . $http_version;
+                $this->_protocol = 'HTTP/'.$http_version;
                 $this->_code     = intval($returncode);
             }
             while ('' !== ($header = $this->_sock->readLine())) {
@@ -1204,7 +1204,7 @@  discard block
 block discarded – undo
                     $data = $this->_sock->read(4096);
                 } else {
                     $data = $this->_sock->read(min(4096, $this->_toRead));
-                    $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
+                    $this->_toRead -= HTTP_REQUEST_MBSTRING ? mb_strlen($data, 'iso-8859-1') : strlen($data);
                 }
                 if ('' == $data) {
                     break;
@@ -1213,7 +1213,7 @@  discard block
 block discarded – undo
                     if ($saveBody || $gzipped) {
                         $this->_body .= $data;
                     }
-                    $this->_notify($gzipped? 'gzTick': 'tick', $data);
+                    $this->_notify($gzipped ? 'gzTick' : 'tick', $data);
                 }
             }
         }
@@ -1252,7 +1252,7 @@  discard block
 block discarded – undo
         
         if ('set-cookie' != $headername) {
             if (isset($this->_headers[$headername])) {
-                $this->_headers[$headername] .= ',' . $headervalue;
+                $this->_headers[$headername] .= ','.$headervalue;
             } else {
                 $this->_headers[$headername]  = $headervalue;
             }
@@ -1336,7 +1336,7 @@  discard block
 block discarded – undo
             }
         }
         $data = $this->_sock->read($this->_chunkLength);
-        $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
+        $this->_chunkLength -= HTTP_REQUEST_MBSTRING ? mb_strlen($data, 'iso-8859-1') : strlen($data);
         if (0 == $this->_chunkLength) {
             $this->_sock->readLine(); // Trailing CRLF
         }

Please login to merge, or discard this patch.

libs/PEAR/Net/URL.php 3 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -340,7 +340,7 @@
 block discarded – undo
     *
     * This method can also be called statically.
     *
-    * @param  string $url URL path to resolve
+    * @param string $path
     * @return string      The result
     */
     function resolvePath($path)

Please login to merge, or discard this patch.

Indentation +367 added lines, -367 removed lines patch added patch discarded remove patch

@@ -38,373 +38,373 @@
 block discarded – undo
 
 class Net_URL
 {
-    /**
-    * Full url
-    * @var string
-    */
-    var $url;
-
-    /**
-    * Protocol
-    * @var string
-    */
-    var $protocol;
-
-    /**
-    * Username
-    * @var string
-    */
-    var $username;
-
-    /**
-    * Password
-    * @var string
-    */
-    var $password;
-
-    /**
-    * Host
-    * @var string
-    */
-    var $host;
-
-    /**
-    * Port
-    * @var integer
-    */
-    var $port;
-
-    /**
-    * Path
-    * @var string
-    */
-    var $path;
-
-    /**
-    * Query string
-    * @var array
-    */
-    var $querystring;
-
-    /**
-    * Anchor
-    * @var string
-    */
-    var $anchor;
-
-    /**
-    * Whether to use []
-    * @var bool
-    */
-    var $useBrackets;
-
-    /**
-    * PHP4 Constructor
-    *
-    * @see __construct()
-    */
-    function Net_URL($url = null, $useBrackets = true)
-    {
-        $this->__construct($url, $useBrackets);
-    }
-
-    /**
-    * PHP5 Constructor
-    *
-    * Parses the given url and stores the various parts
-    * Defaults are used in certain cases
-    *
-    * @param string $url         Optional URL
-    * @param bool   $useBrackets Whether to use square brackets when
-    *                            multiple querystrings with the same name
-    *                            exist
-    */
-    function __construct($url = null, $useBrackets = true)
-    {
-        $HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
-
-        $this->useBrackets = $useBrackets;
-        $this->url         = $url;
-        $this->user        = '';
-        $this->pass        = '';
-        $this->host        = '';
-        $this->port        = 80;
-        $this->path        = '';
-        $this->querystring = array();
-        $this->anchor      = '';
-
-        // Only use defaults if not an absolute URL given
-        if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
-
-            $this->protocol    = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
-
-            /**
-            * Figure out host/port
-            */
-            if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
-                $host = $matches[1];
-                if (!empty($matches[3])) {
-                    $port = $matches[3];
-                } else {
-                    $port = $this->getStandardPort($this->protocol);
-                }
-            }
-
-            $this->user        = '';
-            $this->pass        = '';
-            $this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
-            $this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
-            $this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
-            $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
-            $this->anchor      = '';
-        }
-
-        // Parse the url and store the various parts
-        if (!empty($url)) {
-            $urlinfo = parse_url($url);
-
-            // Default querystring
-            $this->querystring = array();
-
-            foreach ($urlinfo as $key => $value) {
-                switch ($key) {
-                    case 'scheme':
-                        $this->protocol = $value;
-                        $this->port     = $this->getStandardPort($value);
-                        break;
-
-                    case 'user':
-                    case 'pass':
-                    case 'host':
-                    case 'port':
-                        $this->$key = $value;
-                        break;
-
-                    case 'path':
-                        if ($value{0} == '/') {
-                            $this->path = $value;
-                        } else {
-                            $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
-                            $this->path = sprintf('%s/%s', $path, $value);
-                        }
-                        break;
-
-                    case 'query':
-                        $this->querystring = $this->_parseRawQueryString($value);
-                        break;
-
-                    case 'fragment':
-                        $this->anchor = $value;
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-    * Returns full url
-    *
-    * @return string Full url
-    * @access public
-    */
-    function getURL()
-    {
-        $querystring = $this->getQueryString();
-
-        $this->url = $this->protocol . '://'
-                   . $this->user . (!empty($this->pass) ? ':' : '')
-                   . $this->pass . (!empty($this->user) ? '@' : '')
-                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
-                   . $this->path
-                   . (!empty($querystring) ? '?' . $querystring : '')
-                   . (!empty($this->anchor) ? '#' . $this->anchor : '');
-
-        return $this->url;
-    }
-
-    /**
-    * Adds a querystring item
-    *
-    * @param  string $name       Name of item
-    * @param  string $value      Value of item
-    * @param  bool   $preencoded Whether value is urlencoded or not, default = not
-    * @access public
-    */
-    function addQueryString($name, $value, $preencoded = false)
-    {
-        if ($preencoded) {
-            $this->querystring[$name] = $value;
-        } else {
-            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
-        }
-    }
-
-    /**
-    * Removes a querystring item
-    *
-    * @param  string $name Name of item
-    * @access public
-    */
-    function removeQueryString($name)
-    {
-        if (isset($this->querystring[$name])) {
-            unset($this->querystring[$name]);
-        }
-    }
-
-    /**
-    * Sets the querystring to literally what you supply
-    *
-    * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
-    * @access public
-    */
-    function addRawQueryString($querystring)
-    {
-        $this->querystring = $this->_parseRawQueryString($querystring);
-    }
-
-    /**
-    * Returns flat querystring
-    *
-    * @return string Querystring
-    * @access public
-    */
-    function getQueryString()
-    {
-        if (!empty($this->querystring)) {
-            foreach ($this->querystring as $name => $value) {
-                if (is_array($value)) {
-                    foreach ($value as $k => $v) {
-                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
-                    }
-                } elseif (!is_null($value)) {
-                    $querystring[] = $name . '=' . $value;
-                } else {
-                    $querystring[] = $name;
-                }
-            }
-            $querystring = implode(ini_get('arg_separator.output'), $querystring);
-        } else {
-            $querystring = '';
-        }
-
-        return $querystring;
-    }
-
-    /**
-    * Parses raw querystring and returns an array of it
-    *
-    * @param  string  $querystring The querystring to parse
-    * @return array                An array of the querystring data
-    * @access private
-    */
-    function _parseRawQuerystring($querystring)
-    {
-        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
-        $return = array();
-
-        foreach ($parts as $part) {
-            if (strpos($part, '=') !== false) {
-                $value = substr($part, strpos($part, '=') + 1);
-                $key   = substr($part, 0, strpos($part, '='));
-            } else {
-                $value = null;
-                $key   = $part;
-            }
-            if (substr($key, -2) == '[]') {
-                $key = substr($key, 0, -2);
-                if (@!is_array($return[$key])) {
-                    $return[$key]   = array();
-                    $return[$key][] = $value;
-                } else {
-                    $return[$key][] = $value;
-                }
-            } elseif (!$this->useBrackets AND !empty($return[$key])) {
-                $return[$key]   = (array)$return[$key];
-                $return[$key][] = $value;
-            } else {
-                $return[$key] = $value;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-    * Resolves //, ../ and ./ from a path and returns
-    * the result. Eg:
-    *
-    * /foo/bar/../boo.php    => /foo/boo.php
-    * /foo/bar/../../boo.php => /boo.php
-    * /foo/bar/.././/boo.php => /foo/boo.php
-    *
-    * This method can also be called statically.
-    *
-    * @param  string $url URL path to resolve
-    * @return string      The result
-    */
-    function resolvePath($path)
-    {
-        $path = explode('/', str_replace('//', '/', $path));
-
-        for ($i=0; $i<count($path); $i++) {
-            if ($path[$i] == '.') {
-                unset($path[$i]);
-                $path = array_values($path);
-                $i--;
-
-            } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
-                unset($path[$i]);
-                unset($path[$i-1]);
-                $path = array_values($path);
-                $i -= 2;
-
-            } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
-                unset($path[$i]);
-                $path = array_values($path);
-                $i--;
-
-            } else {
-                continue;
-            }
-        }
-
-        return implode('/', $path);
-    }
-
-    /**
-    * Returns the standard port number for a protocol
-    *
-    * @param  string  $scheme The protocol to lookup
-    * @return integer         Port number or NULL if no scheme matches
-    *
-    * @author Philippe Jausions <[email protected]>
-    */
-    function getStandardPort($scheme)
-    {
-        switch (strtolower($scheme)) {
-            case 'http':    return 80;
-            case 'https':   return 443;
-            case 'ftp':     return 21;
-            case 'imap':    return 143;
-            case 'imaps':   return 993;
-            case 'pop3':    return 110;
-            case 'pop3s':   return 995;
-            default:        return null;
-       }
-    }
-
-    /**
-    * Forces the URL to a particular protocol
-    *
-    * @param string  $protocol Protocol to force the URL to
-    * @param integer $port     Optional port (standard port is used by default)
-    */
-    function setProtocol($protocol, $port = null)
-    {
-        $this->protocol = $protocol;
-        $this->port = is_null($port) ? $this->getStandardPort() : $port;
-    }
+	/**
+	 * Full url
+	 * @var string
+	 */
+	var $url;
+
+	/**
+	 * Protocol
+	 * @var string
+	 */
+	var $protocol;
+
+	/**
+	 * Username
+	 * @var string
+	 */
+	var $username;
+
+	/**
+	 * Password
+	 * @var string
+	 */
+	var $password;
+
+	/**
+	 * Host
+	 * @var string
+	 */
+	var $host;
+
+	/**
+	 * Port
+	 * @var integer
+	 */
+	var $port;
+
+	/**
+	 * Path
+	 * @var string
+	 */
+	var $path;
+
+	/**
+	 * Query string
+	 * @var array
+	 */
+	var $querystring;
+
+	/**
+	 * Anchor
+	 * @var string
+	 */
+	var $anchor;
+
+	/**
+	 * Whether to use []
+	 * @var bool
+	 */
+	var $useBrackets;
+
+	/**
+	 * PHP4 Constructor
+	 *
+	 * @see __construct()
+	 */
+	function Net_URL($url = null, $useBrackets = true)
+	{
+		$this->__construct($url, $useBrackets);
+	}
+
+	/**
+	 * PHP5 Constructor
+	 *
+	 * Parses the given url and stores the various parts
+	 * Defaults are used in certain cases
+	 *
+	 * @param string $url         Optional URL
+	 * @param bool   $useBrackets Whether to use square brackets when
+	 *                            multiple querystrings with the same name
+	 *                            exist
+	 */
+	function __construct($url = null, $useBrackets = true)
+	{
+		$HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
+
+		$this->useBrackets = $useBrackets;
+		$this->url         = $url;
+		$this->user        = '';
+		$this->pass        = '';
+		$this->host        = '';
+		$this->port        = 80;
+		$this->path        = '';
+		$this->querystring = array();
+		$this->anchor      = '';
+
+		// Only use defaults if not an absolute URL given
+		if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
+
+			$this->protocol    = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
+
+			/**
+			 * Figure out host/port
+			 */
+			if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
+				$host = $matches[1];
+				if (!empty($matches[3])) {
+					$port = $matches[3];
+				} else {
+					$port = $this->getStandardPort($this->protocol);
+				}
+			}
+
+			$this->user        = '';
+			$this->pass        = '';
+			$this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
+			$this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
+			$this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
+			$this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
+			$this->anchor      = '';
+		}
+
+		// Parse the url and store the various parts
+		if (!empty($url)) {
+			$urlinfo = parse_url($url);
+
+			// Default querystring
+			$this->querystring = array();
+
+			foreach ($urlinfo as $key => $value) {
+				switch ($key) {
+					case 'scheme':
+						$this->protocol = $value;
+						$this->port     = $this->getStandardPort($value);
+						break;
+
+					case 'user':
+					case 'pass':
+					case 'host':
+					case 'port':
+						$this->$key = $value;
+						break;
+
+					case 'path':
+						if ($value{0} == '/') {
+							$this->path = $value;
+						} else {
+							$path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
+							$this->path = sprintf('%s/%s', $path, $value);
+						}
+						break;
+
+					case 'query':
+						$this->querystring = $this->_parseRawQueryString($value);
+						break;
+
+					case 'fragment':
+						$this->anchor = $value;
+						break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns full url
+	 *
+	 * @return string Full url
+	 * @access public
+	 */
+	function getURL()
+	{
+		$querystring = $this->getQueryString();
+
+		$this->url = $this->protocol . '://'
+				   . $this->user . (!empty($this->pass) ? ':' : '')
+				   . $this->pass . (!empty($this->user) ? '@' : '')
+				   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
+				   . $this->path
+				   . (!empty($querystring) ? '?' . $querystring : '')
+				   . (!empty($this->anchor) ? '#' . $this->anchor : '');
+
+		return $this->url;
+	}
+
+	/**
+	 * Adds a querystring item
+	 *
+	 * @param  string $name       Name of item
+	 * @param  string $value      Value of item
+	 * @param  bool   $preencoded Whether value is urlencoded or not, default = not
+	 * @access public
+	 */
+	function addQueryString($name, $value, $preencoded = false)
+	{
+		if ($preencoded) {
+			$this->querystring[$name] = $value;
+		} else {
+			$this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
+		}
+	}
+
+	/**
+	 * Removes a querystring item
+	 *
+	 * @param  string $name Name of item
+	 * @access public
+	 */
+	function removeQueryString($name)
+	{
+		if (isset($this->querystring[$name])) {
+			unset($this->querystring[$name]);
+		}
+	}
+
+	/**
+	 * Sets the querystring to literally what you supply
+	 *
+	 * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
+	 * @access public
+	 */
+	function addRawQueryString($querystring)
+	{
+		$this->querystring = $this->_parseRawQueryString($querystring);
+	}
+
+	/**
+	 * Returns flat querystring
+	 *
+	 * @return string Querystring
+	 * @access public
+	 */
+	function getQueryString()
+	{
+		if (!empty($this->querystring)) {
+			foreach ($this->querystring as $name => $value) {
+				if (is_array($value)) {
+					foreach ($value as $k => $v) {
+						$querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
+					}
+				} elseif (!is_null($value)) {
+					$querystring[] = $name . '=' . $value;
+				} else {
+					$querystring[] = $name;
+				}
+			}
+			$querystring = implode(ini_get('arg_separator.output'), $querystring);
+		} else {
+			$querystring = '';
+		}
+
+		return $querystring;
+	}
+
+	/**
+	 * Parses raw querystring and returns an array of it
+	 *
+	 * @param  string  $querystring The querystring to parse
+	 * @return array                An array of the querystring data
+	 * @access private
+	 */
+	function _parseRawQuerystring($querystring)
+	{
+		$parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
+		$return = array();
+
+		foreach ($parts as $part) {
+			if (strpos($part, '=') !== false) {
+				$value = substr($part, strpos($part, '=') + 1);
+				$key   = substr($part, 0, strpos($part, '='));
+			} else {
+				$value = null;
+				$key   = $part;
+			}
+			if (substr($key, -2) == '[]') {
+				$key = substr($key, 0, -2);
+				if (@!is_array($return[$key])) {
+					$return[$key]   = array();
+					$return[$key][] = $value;
+				} else {
+					$return[$key][] = $value;
+				}
+			} elseif (!$this->useBrackets AND !empty($return[$key])) {
+				$return[$key]   = (array)$return[$key];
+				$return[$key][] = $value;
+			} else {
+				$return[$key] = $value;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Resolves //, ../ and ./ from a path and returns
+	 * the result. Eg:
+	 *
+	 * /foo/bar/../boo.php    => /foo/boo.php
+	 * /foo/bar/../../boo.php => /boo.php
+	 * /foo/bar/.././/boo.php => /foo/boo.php
+	 *
+	 * This method can also be called statically.
+	 *
+	 * @param  string $url URL path to resolve
+	 * @return string      The result
+	 */
+	function resolvePath($path)
+	{
+		$path = explode('/', str_replace('//', '/', $path));
+
+		for ($i=0; $i<count($path); $i++) {
+			if ($path[$i] == '.') {
+				unset($path[$i]);
+				$path = array_values($path);
+				$i--;
+
+			} elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
+				unset($path[$i]);
+				unset($path[$i-1]);
+				$path = array_values($path);
+				$i -= 2;
+
+			} elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
+				unset($path[$i]);
+				$path = array_values($path);
+				$i--;
+
+			} else {
+				continue;
+			}
+		}
+
+		return implode('/', $path);
+	}
+
+	/**
+	 * Returns the standard port number for a protocol
+	 *
+	 * @param  string  $scheme The protocol to lookup
+	 * @return integer         Port number or NULL if no scheme matches
+	 *
+	 * @author Philippe Jausions <[email protected]>
+	 */
+	function getStandardPort($scheme)
+	{
+		switch (strtolower($scheme)) {
+			case 'http':    return 80;
+			case 'https':   return 443;
+			case 'ftp':     return 21;
+			case 'imap':    return 143;
+			case 'imaps':   return 993;
+			case 'pop3':    return 110;
+			case 'pop3s':   return 995;
+			default:        return null;
+	   }
+	}
+
+	/**
+	 * Forces the URL to a particular protocol
+	 *
+	 * @param string  $protocol Protocol to force the URL to
+	 * @param integer $port     Optional port (standard port is used by default)
+	 */
+	function setProtocol($protocol, $port = null)
+	{
+		$this->protocol = $protocol;
+		$this->port = is_null($port) ? $this->getStandardPort() : $port;
+	}
 
 }
 ?>

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -136,7 +136,7 @@  discard block
 block discarded – undo
         // Only use defaults if not an absolute URL given
         if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
 
-            $this->protocol    = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
+            $this->protocol = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
 
             /**
             * Figure out host/port
@@ -211,13 +211,13 @@  discard block
 block discarded – undo
     {
         $querystring = $this->getQueryString();
 
-        $this->url = $this->protocol . '://'
-                   . $this->user . (!empty($this->pass) ? ':' : '')
-                   . $this->pass . (!empty($this->user) ? '@' : '')
-                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
+        $this->url = $this->protocol.'://'
+                   . $this->user.(!empty($this->pass) ? ':' : '')
+                   . $this->pass.(!empty($this->user) ? '@' : '')
+                   . $this->host.($this->port == $this->getStandardPort($this->protocol) ? '' : ':'.$this->port)
                    . $this->path
-                   . (!empty($querystring) ? '?' . $querystring : '')
-                   . (!empty($this->anchor) ? '#' . $this->anchor : '');
+                   . (!empty($querystring) ? '?'.$querystring : '')
+                   . (!empty($this->anchor) ? '#'.$this->anchor : '');
 
         return $this->url;
     }
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
         if ($preencoded) {
             $this->querystring[$name] = $value;
         } else {
-            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
+            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value) : rawurlencode($value);
         }
     }
 
@@ -275,10 +275,10 @@  discard block
 block discarded – undo
             foreach ($this->querystring as $name => $value) {
                 if (is_array($value)) {
                     foreach ($value as $k => $v) {
-                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
+                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name.'='.$v);
                     }
                 } elseif (!is_null($value)) {
-                    $querystring[] = $name . '=' . $value;
+                    $querystring[] = $name.'='.$value;
                 } else {
                     $querystring[] = $name;
                 }
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
     */
     function _parseRawQuerystring($querystring)
     {
-        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
+        $parts  = preg_split('/['.preg_quote(ini_get('arg_separator.input'), '/').']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
         $return = array();
 
         foreach ($parts as $part) {
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
                     $return[$key][] = $value;
                 }
             } elseif (!$this->useBrackets AND !empty($return[$key])) {
-                $return[$key]   = (array)$return[$key];
+                $return[$key]   = (array) $return[$key];
                 $return[$key][] = $value;
             } else {
                 $return[$key] = $value;
@@ -347,15 +347,15 @@  discard block
 block discarded – undo
     {
         $path = explode('/', str_replace('//', '/', $path));
 
-        for ($i=0; $i<count($path); $i++) {
+        for ($i = 0; $i < count($path); $i++) {
             if ($path[$i] == '.') {
                 unset($path[$i]);
                 $path = array_values($path);
                 $i--;
 
-            } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
+            } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != ''))) {
                 unset($path[$i]);
-                unset($path[$i-1]);
+                unset($path[$i - 1]);
                 $path = array_values($path);
                 $i -= 2;
 

Please login to merge, or discard this patch.

libs/phpmailer/class.phpmailer.php 4 patches

Doc Comments +27 added lines, -5 removed lines patch added patch discarded remove patch

@@ -319,7 +319,7 @@  discard block
 block discarded – undo
    * Adds a "To" address.
    * @param string $address
    * @param string $name
-   * @return void
+   * @return boolean
    */
   function AddAddress($address, $name = '') {
     $cur = count($this->to);
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
    * mailer.
    * @param string $address
    * @param string $name
-   * @return void
+   * @return boolean
    */
   function AddCC($address, $name = '') {
     $cur = count($this->cc);
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
    * mailer.
    * @param string $address
    * @param string $name
-   * @return void
+   * @return boolean
    */
   function AddBCC($address, $name = '') {
     $cur = count($this->bcc);
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
    * Adds a "Reply-To" address.
    * @param string $address
    * @param string $name
-   * @return void
+   * @return boolean
    */
   function AddReplyTo($address, $name = '') {
     $cur = count($this->ReplyTo);
@@ -426,6 +426,8 @@  discard block
 block discarded – undo
   /**
    * Sends mail using the $Sendmail program.
    * @access private
+   * @param string $header
+   * @param string $body
    * @return bool
    */
   function SendmailSend($header, $body) {
@@ -457,6 +459,8 @@  discard block
 block discarded – undo
   /**
    * Sends mail using the PHP mail() function.
    * @access private
+   * @param string $header
+   * @param string $body
    * @return bool
    */
   function MailSend($header, $body) {
@@ -507,6 +511,8 @@  discard block
 block discarded – undo
    * Chris Ryan).  Returns bool.  Returns false if there is a
    * bad MAIL FROM, RCPT, or DATA input.
    * @access private
+   * @param string $header
+   * @param string $body
    * @return bool
    */
   function SmtpSend($header, $body) {
@@ -677,6 +683,7 @@  discard block
 block discarded – undo
   /**
    * Creates recipient headers.
    * @access private
+   * @param string $type
    * @return string
    */
   function AddrAppend($type, $addr) {
@@ -712,6 +719,8 @@  discard block
 block discarded – undo
    * automatically perform wrapping and for quoted-printable.
    * Original written by philippe.
    * @access private
+   * @param string $message
+   * @param integer $length
    * @return string
    */
   function WrapText($message, $length, $qp_mode = false) {
@@ -1040,6 +1049,9 @@  discard block
 block discarded – undo
   /**
    * Returns the start of a message boundary.
    * @access private
+   * @param string $charSet
+   * @param string $contentType
+   * @param string $encoding
    */
   function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
@@ -1094,6 +1106,10 @@  discard block
 block discarded – undo
    * @access private
    * @return string
    */
+
+  /**
+   * @param string $name
+   */
   function HeaderLine($name, $value) {
     return $name . ': ' . $value . $this->LE;
   }
@@ -1101,6 +1117,7 @@  discard block
 block discarded – undo
   /**
    * Returns a formatted mail line.
    * @access private
+   * @param string $value
    * @return string
    */
   function TextLine($value) {
@@ -1259,6 +1276,7 @@  discard block
 block discarded – undo
   /**
    * Encode a header string to best of Q, B, quoted or none.
    * @access private
+   * @param string $str
    * @return string
    */
   function EncodeHeader ($str, $position = 'text') {
@@ -1596,6 +1614,7 @@  discard block
 block discarded – undo
    * Adds the error message to the error container.
    * Returns void.
    * @access private
+   * @param string $msg
    * @return void
    */
   function SetError($msg) {
@@ -1623,6 +1642,7 @@  discard block
 block discarded – undo
    * PHP 4.1.0+ as well as older versions.  Returns an empty string
    * if nothing is found.
    * @access private
+   * @param string $varName
    * @return mixed
    */
   function ServerVar($varName) {
@@ -1663,6 +1683,7 @@  discard block
 block discarded – undo
   /**
    * Returns a message in the appropriate language.
    * @access private
+   * @param string $key
    * @return string
    */
   function Lang($key) {
@@ -1708,6 +1729,7 @@  discard block
 block discarded – undo
   /**
    * Evaluates the message and returns modifications for inline images and backgrounds
    * @access public
+   * @param string $message
    * @return $message
    */
   function MsgHTML($message,$basedir='') {
@@ -1745,7 +1767,7 @@  discard block
 block discarded – undo
   /**
    * Gets the mime type of the embedded or inline image
    * @access private
-   * @return mime type of ext
+   * @return string type of ext
    */
   function _mime_types($ext = '') {
     $mimes = array(

Please login to merge, or discard this patch.

Indentation +1070 added lines, -1070 removed lines patch added patch discarded remove patch

@@ -271,11 +271,11 @@  discard block
 block discarded – undo
    * @return void
    */
   function IsHTML($bool) {
-    if($bool == true) {
-      $this->ContentType = 'text/html';
-    } else {
-      $this->ContentType = 'text/plain';
-    }
+	if($bool == true) {
+	  $this->ContentType = 'text/html';
+	} else {
+	  $this->ContentType = 'text/plain';
+	}
   }
 
   /**
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function IsSMTP() {
-    $this->Mailer = 'smtp';
+	$this->Mailer = 'smtp';
   }
 
   /**
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function IsMail() {
-    $this->Mailer = 'mail';
+	$this->Mailer = 'mail';
   }
 
   /**
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function IsSendmail() {
-    $this->Mailer = 'sendmail';
+	$this->Mailer = 'sendmail';
   }
 
   /**
@@ -307,8 +307,8 @@  discard block
 block discarded – undo
    * @return void
    */
   function IsQmail() {
-    $this->Sendmail = '/var/qmail/bin/sendmail';
-    $this->Mailer = 'sendmail';
+	$this->Sendmail = '/var/qmail/bin/sendmail';
+	$this->Mailer = 'sendmail';
   }
 
   /////////////////////////////////////////////////
@@ -322,9 +322,9 @@  discard block
 block discarded – undo
    * @return void
    */
   function AddAddress($address, $name = '') {
-    $cur = count($this->to);
-    $this->to[$cur][0] = trim($address);
-    $this->to[$cur][1] = $name;
+	$cur = count($this->to);
+	$this->to[$cur][0] = trim($address);
+	$this->to[$cur][1] = $name;
   }
 
   /**
@@ -336,9 +336,9 @@  discard block
 block discarded – undo
    * @return void
    */
   function AddCC($address, $name = '') {
-    $cur = count($this->cc);
-    $this->cc[$cur][0] = trim($address);
-    $this->cc[$cur][1] = $name;
+	$cur = count($this->cc);
+	$this->cc[$cur][0] = trim($address);
+	$this->cc[$cur][1] = $name;
   }
 
   /**
@@ -350,9 +350,9 @@  discard block
 block discarded – undo
    * @return void
    */
   function AddBCC($address, $name = '') {
-    $cur = count($this->bcc);
-    $this->bcc[$cur][0] = trim($address);
-    $this->bcc[$cur][1] = $name;
+	$cur = count($this->bcc);
+	$this->bcc[$cur][0] = trim($address);
+	$this->bcc[$cur][1] = $name;
   }
 
   /**
@@ -362,9 +362,9 @@  discard block
 block discarded – undo
    * @return void
    */
   function AddReplyTo($address, $name = '') {
-    $cur = count($this->ReplyTo);
-    $this->ReplyTo[$cur][0] = trim($address);
-    $this->ReplyTo[$cur][1] = $name;
+	$cur = count($this->ReplyTo);
+	$this->ReplyTo[$cur][0] = trim($address);
+	$this->ReplyTo[$cur][1] = $name;
   }
 
   /////////////////////////////////////////////////
@@ -378,49 +378,49 @@  discard block
 block discarded – undo
    * @return bool
    */
   function Send() {
-    $header = '';
-    $body = '';
-    $result = true;
-
-    if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-      $this->SetError($this->Lang('provide_address'));
-      return false;
-    }
-
-    /* Set whether the message is multipart/alternative */
-    if(!empty($this->AltBody)) {
-      $this->ContentType = 'multipart/alternative';
-    }
-
-    $this->error_count = 0; // reset errors
-    $this->SetMessageType();
-    $header .= $this->CreateHeader();
-    $body = $this->CreateBody();
-
-    if($body == '') {
-      return false;
-    }
-
-    /* Choose the mailer */
-    switch($this->Mailer) {
-      case 'sendmail':
-        $result = $this->SendmailSend($header, $body);
-        break;
-      case 'smtp':
-        $result = $this->SmtpSend($header, $body);
-        break;
-      case 'mail':
-        $result = $this->MailSend($header, $body);
-        break;
-      default:
-        $result = $this->MailSend($header, $body);
-        break;
-        //$this->SetError($this->Mailer . $this->Lang('mailer_not_supported'));
-        //$result = false;
-        //break;
-    }
-
-    return $result;
+	$header = '';
+	$body = '';
+	$result = true;
+
+	if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+	  $this->SetError($this->Lang('provide_address'));
+	  return false;
+	}
+
+	/* Set whether the message is multipart/alternative */
+	if(!empty($this->AltBody)) {
+	  $this->ContentType = 'multipart/alternative';
+	}
+
+	$this->error_count = 0; // reset errors
+	$this->SetMessageType();
+	$header .= $this->CreateHeader();
+	$body = $this->CreateBody();
+
+	if($body == '') {
+	  return false;
+	}
+
+	/* Choose the mailer */
+	switch($this->Mailer) {
+	  case 'sendmail':
+		$result = $this->SendmailSend($header, $body);
+		break;
+	  case 'smtp':
+		$result = $this->SmtpSend($header, $body);
+		break;
+	  case 'mail':
+		$result = $this->MailSend($header, $body);
+		break;
+	  default:
+		$result = $this->MailSend($header, $body);
+		break;
+		//$this->SetError($this->Mailer . $this->Lang('mailer_not_supported'));
+		//$result = false;
+		//break;
+	}
+
+	return $result;
   }
 
   /**
@@ -429,29 +429,29 @@  discard block
 block discarded – undo
    * @return bool
    */
   function SendmailSend($header, $body) {
-    if ($this->Sender != '') {
-      $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-    } else {
-      $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
-    }
-
-    if(!@$mail = popen($sendmail, 'w')) {
-      $this->SetError($this->Lang('execute') . $this->Sendmail);
-      return false;
-    }
-
-    fputs($mail, $header);
-    fputs($mail, $body);
-
-    $result = pclose($mail);
-    if (version_compare(phpversion(), '4.2.3') == -1) {
-      $result = $result >> 8 & 0xFF;
-    }
-    if($result != 0) {
-      $this->SetError($this->Lang('execute') . $this->Sendmail);
-      return false;
-    }
-    return true;
+	if ($this->Sender != '') {
+	  $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+	} else {
+	  $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
+	}
+
+	if(!@$mail = popen($sendmail, 'w')) {
+	  $this->SetError($this->Lang('execute') . $this->Sendmail);
+	  return false;
+	}
+
+	fputs($mail, $header);
+	fputs($mail, $body);
+
+	$result = pclose($mail);
+	if (version_compare(phpversion(), '4.2.3') == -1) {
+	  $result = $result >> 8 & 0xFF;
+	}
+	if($result != 0) {
+	  $this->SetError($this->Lang('execute') . $this->Sendmail);
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -461,45 +461,45 @@  discard block
 block discarded – undo
    */
   function MailSend($header, $body) {
 
-    $to = '';
-    for($i = 0; $i < count($this->to); $i++) {
-      if($i != 0) { $to .= ', '; }
-      $to .= $this->AddrFormat($this->to[$i]);
-    }
-
-    $toArr = split(',', $to);
-
-    $params = sprintf("-oi -f %s", $this->Sender);
-    if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
-      $old_from = ini_get('sendmail_from');
-      ini_set('sendmail_from', $this->Sender);
-      if ($this->SingleTo === true && count($toArr) > 1) {
-        foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-        }
-      } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-      }
-    } else {
-      if ($this->SingleTo === true && count($toArr) > 1) {
-        foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-        }
-      } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
-      }
-    }
-
-    if (isset($old_from)) {
-      ini_set('sendmail_from', $old_from);
-    }
-
-    if(!$rt) {
-      $this->SetError($this->Lang('instantiate'));
-      return false;
-    }
-
-    return true;
+	$to = '';
+	for($i = 0; $i < count($this->to); $i++) {
+	  if($i != 0) { $to .= ', '; }
+	  $to .= $this->AddrFormat($this->to[$i]);
+	}
+
+	$toArr = split(',', $to);
+
+	$params = sprintf("-oi -f %s", $this->Sender);
+	if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
+	  $old_from = ini_get('sendmail_from');
+	  ini_set('sendmail_from', $this->Sender);
+	  if ($this->SingleTo === true && count($toArr) > 1) {
+		foreach ($toArr as $key => $val) {
+		  $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+		}
+	  } else {
+		$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+	  }
+	} else {
+	  if ($this->SingleTo === true && count($toArr) > 1) {
+		foreach ($toArr as $key => $val) {
+		  $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+		}
+	  } else {
+		$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
+	  }
+	}
+
+	if (isset($old_from)) {
+	  ini_set('sendmail_from', $old_from);
+	}
+
+	if(!$rt) {
+	  $this->SetError($this->Lang('instantiate'));
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -510,64 +510,64 @@  discard block
 block discarded – undo
    * @return bool
    */
   function SmtpSend($header, $body) {
-    include_once($this->PluginDir . 'class.smtp.php');
-    $error = '';
-    $bad_rcpt = array();
-
-    if(!$this->SmtpConnect()) {
-      return false;
-    }
-
-    $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      $error = $this->Lang('from_failed') . $smtp_from;
-      $this->SetError($error);
-      $this->smtp->Reset();
-      return false;
-    }
-
-    /* Attempt to send attach all recipients */
-    for($i = 0; $i < count($this->to); $i++) {
-      if(!$this->smtp->Recipient($this->to[$i][0])) {
-        $bad_rcpt[] = $this->to[$i][0];
-      }
-    }
-    for($i = 0; $i < count($this->cc); $i++) {
-      if(!$this->smtp->Recipient($this->cc[$i][0])) {
-        $bad_rcpt[] = $this->cc[$i][0];
-      }
-    }
-    for($i = 0; $i < count($this->bcc); $i++) {
-      if(!$this->smtp->Recipient($this->bcc[$i][0])) {
-        $bad_rcpt[] = $this->bcc[$i][0];
-      }
-    }
-
-    if(count($bad_rcpt) > 0) { // Create error message
-      for($i = 0; $i < count($bad_rcpt); $i++) {
-        if($i != 0) {
-          $error .= ', ';
-        }
-        $error .= $bad_rcpt[$i];
-      }
-      $error = $this->Lang('recipients_failed') . $error;
-      $this->SetError($error);
-      $this->smtp->Reset();
-      return false;
-    }
-
-    if(!$this->smtp->Data($header . $body)) {
-      $this->SetError($this->Lang('data_not_accepted'));
-      $this->smtp->Reset();
-      return false;
-    }
-    if($this->SMTPKeepAlive == true) {
-      $this->smtp->Reset();
-    } else {
-      $this->SmtpClose();
-    }
-
-    return true;
+	include_once($this->PluginDir . 'class.smtp.php');
+	$error = '';
+	$bad_rcpt = array();
+
+	if(!$this->SmtpConnect()) {
+	  return false;
+	}
+
+	$smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
+	if(!$this->smtp->Mail($smtp_from)) {
+	  $error = $this->Lang('from_failed') . $smtp_from;
+	  $this->SetError($error);
+	  $this->smtp->Reset();
+	  return false;
+	}
+
+	/* Attempt to send attach all recipients */
+	for($i = 0; $i < count($this->to); $i++) {
+	  if(!$this->smtp->Recipient($this->to[$i][0])) {
+		$bad_rcpt[] = $this->to[$i][0];
+	  }
+	}
+	for($i = 0; $i < count($this->cc); $i++) {
+	  if(!$this->smtp->Recipient($this->cc[$i][0])) {
+		$bad_rcpt[] = $this->cc[$i][0];
+	  }
+	}
+	for($i = 0; $i < count($this->bcc); $i++) {
+	  if(!$this->smtp->Recipient($this->bcc[$i][0])) {
+		$bad_rcpt[] = $this->bcc[$i][0];
+	  }
+	}
+
+	if(count($bad_rcpt) > 0) { // Create error message
+	  for($i = 0; $i < count($bad_rcpt); $i++) {
+		if($i != 0) {
+		  $error .= ', ';
+		}
+		$error .= $bad_rcpt[$i];
+	  }
+	  $error = $this->Lang('recipients_failed') . $error;
+	  $this->SetError($error);
+	  $this->smtp->Reset();
+	  return false;
+	}
+
+	if(!$this->smtp->Data($header . $body)) {
+	  $this->SetError($this->Lang('data_not_accepted'));
+	  $this->smtp->Reset();
+	  return false;
+	}
+	if($this->SMTPKeepAlive == true) {
+	  $this->smtp->Reset();
+	} else {
+	  $this->SmtpClose();
+	}
+
+	return true;
   }
 
   /**
@@ -577,49 +577,49 @@  discard block
 block discarded – undo
    * @return bool
    */
   function SmtpConnect() {
-    if($this->smtp == NULL) {
-      $this->smtp = new SMTP();
-    }
-
-    $this->smtp->do_debug = $this->SMTPDebug;
-    $hosts = explode(';', $this->Host);
-    $index = 0;
-    $connection = ($this->smtp->Connected());
-
-    /* Retry while there is no connection */
-    while($index < count($hosts) && $connection == false) {
-      $hostinfo = array();
-      if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
-        $host = $hostinfo[1];
-        $port = $hostinfo[2];
-      } else {
-        $host = $hosts[$index];
-        $port = $this->Port;
-      }
-
-      if($this->smtp->Connect(((!empty($this->SMTPSecure))?$this->SMTPSecure.'://':'').$host, $port, $this->Timeout)) {
-        if ($this->Helo != '') {
-          $this->smtp->Hello($this->Helo);
-        } else {
-          $this->smtp->Hello($this->ServerHostname());
-        }
-
-        $connection = true;
-        if($this->SMTPAuth) {
-          if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
-            $this->SetError($this->Lang('authenticate'));
-            $this->smtp->Reset();
-            $connection = false;
-          }
-        }
-      }
-      $index++;
-    }
-    if(!$connection) {
-      $this->SetError($this->Lang('connect_host'));
-    }
-
-    return $connection;
+	if($this->smtp == NULL) {
+	  $this->smtp = new SMTP();
+	}
+
+	$this->smtp->do_debug = $this->SMTPDebug;
+	$hosts = explode(';', $this->Host);
+	$index = 0;
+	$connection = ($this->smtp->Connected());
+
+	/* Retry while there is no connection */
+	while($index < count($hosts) && $connection == false) {
+	  $hostinfo = array();
+	  if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
+		$host = $hostinfo[1];
+		$port = $hostinfo[2];
+	  } else {
+		$host = $hosts[$index];
+		$port = $this->Port;
+	  }
+
+	  if($this->smtp->Connect(((!empty($this->SMTPSecure))?$this->SMTPSecure.'://':'').$host, $port, $this->Timeout)) {
+		if ($this->Helo != '') {
+		  $this->smtp->Hello($this->Helo);
+		} else {
+		  $this->smtp->Hello($this->ServerHostname());
+		}
+
+		$connection = true;
+		if($this->SMTPAuth) {
+		  if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
+			$this->SetError($this->Lang('authenticate'));
+			$this->smtp->Reset();
+			$connection = false;
+		  }
+		}
+	  }
+	  $index++;
+	}
+	if(!$connection) {
+	  $this->SetError($this->Lang('connect_host'));
+	}
+
+	return $connection;
   }
 
   /**
@@ -627,12 +627,12 @@  discard block
 block discarded – undo
    * @return void
    */
   function SmtpClose() {
-    if($this->smtp != NULL) {
-      if($this->smtp->Connected()) {
-        $this->smtp->Quit();
-        $this->smtp->Close();
-      }
-    }
+	if($this->smtp != NULL) {
+	  if($this->smtp->Connected()) {
+		$this->smtp->Quit();
+		$this->smtp->Close();
+	  }
+	}
   }
 
   /**
@@ -645,29 +645,29 @@  discard block
 block discarded – undo
    * @return bool
    */
   function SetLanguage($lang_type, $lang_path = 'language/') {
-    if(file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php')) {
-      include($lang_path.'phpmailer.lang-'.$lang_type.'.php');
-    } elseif (file_exists($lang_path.'phpmailer.lang-en.php')) {
-      include($lang_path.'phpmailer.lang-en.php');
-    } else {
-      $PHPMAILER_LANG = array();
-      $PHPMAILER_LANG["provide_address"]      = 'You must provide at least one ' .
-      $PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
-      $PHPMAILER_LANG["execute"]              = 'Could not execute: ';
-      $PHPMAILER_LANG["instantiate"]          = 'Could not instantiate mail function.';
-      $PHPMAILER_LANG["authenticate"]         = 'SMTP Error: Could not authenticate.';
-      $PHPMAILER_LANG["from_failed"]          = 'The following From address failed: ';
-      $PHPMAILER_LANG["recipients_failed"]    = 'SMTP Error: The following ' .
-      $PHPMAILER_LANG["data_not_accepted"]    = 'SMTP Error: Data not accepted.';
-      $PHPMAILER_LANG["connect_host"]         = 'SMTP Error: Could not connect to SMTP host.';
-      $PHPMAILER_LANG["file_access"]          = 'Could not access file: ';
-      $PHPMAILER_LANG["file_open"]            = 'File Error: Could not open file: ';
-      $PHPMAILER_LANG["encoding"]             = 'Unknown encoding: ';
-      $PHPMAILER_LANG["signing"]              = 'Signing Error: ';
-    }
-    $this->language = $PHPMAILER_LANG;
-
-    return true;
+	if(file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php')) {
+	  include($lang_path.'phpmailer.lang-'.$lang_type.'.php');
+	} elseif (file_exists($lang_path.'phpmailer.lang-en.php')) {
+	  include($lang_path.'phpmailer.lang-en.php');
+	} else {
+	  $PHPMAILER_LANG = array();
+	  $PHPMAILER_LANG["provide_address"]      = 'You must provide at least one ' .
+	  $PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
+	  $PHPMAILER_LANG["execute"]              = 'Could not execute: ';
+	  $PHPMAILER_LANG["instantiate"]          = 'Could not instantiate mail function.';
+	  $PHPMAILER_LANG["authenticate"]         = 'SMTP Error: Could not authenticate.';
+	  $PHPMAILER_LANG["from_failed"]          = 'The following From address failed: ';
+	  $PHPMAILER_LANG["recipients_failed"]    = 'SMTP Error: The following ' .
+	  $PHPMAILER_LANG["data_not_accepted"]    = 'SMTP Error: Data not accepted.';
+	  $PHPMAILER_LANG["connect_host"]         = 'SMTP Error: Could not connect to SMTP host.';
+	  $PHPMAILER_LANG["file_access"]          = 'Could not access file: ';
+	  $PHPMAILER_LANG["file_open"]            = 'File Error: Could not open file: ';
+	  $PHPMAILER_LANG["encoding"]             = 'Unknown encoding: ';
+	  $PHPMAILER_LANG["signing"]              = 'Signing Error: ';
+	}
+	$this->language = $PHPMAILER_LANG;
+
+	return true;
   }
 
   /////////////////////////////////////////////////
@@ -680,16 +680,16 @@  discard block
 block discarded – undo
    * @return string
    */
   function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
-    $addr_str .= $this->AddrFormat($addr[0]);
-    if(count($addr) > 1) {
-      for($i = 1; $i < count($addr); $i++) {
-        $addr_str .= ', ' . $this->AddrFormat($addr[$i]);
-      }
-    }
-    $addr_str .= $this->LE;
-
-    return $addr_str;
+	$addr_str = $type . ': ';
+	$addr_str .= $this->AddrFormat($addr[0]);
+	if(count($addr) > 1) {
+	  for($i = 1; $i < count($addr); $i++) {
+		$addr_str .= ', ' . $this->AddrFormat($addr[$i]);
+	  }
+	}
+	$addr_str .= $this->LE;
+
+	return $addr_str;
   }
 
   /**
@@ -698,13 +698,13 @@  discard block
 block discarded – undo
    * @return string
    */
   function AddrFormat($addr) {
-    if(empty($addr[1])) {
-      $formatted = $this->SecureHeader($addr[0]);
-    } else {
-      $formatted = $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
-    }
+	if(empty($addr[1])) {
+	  $formatted = $this->SecureHeader($addr[0]);
+	} else {
+	  $formatted = $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+	}
 
-    return $formatted;
+	return $formatted;
   }
 
   /**
@@ -715,76 +715,76 @@  discard block
 block discarded – undo
    * @return string
    */
   function WrapText($message, $length, $qp_mode = false) {
-    $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
-    // If utf-8 encoding is used, we will need to make sure we don't
-    // split multibyte characters when we wrap
-    $is_utf8 = (strtolower($this->CharSet) == "utf-8");
-
-    $message = $this->FixEOL($message);
-    if (substr($message, -1) == $this->LE) {
-      $message = substr($message, 0, -1);
-    }
-
-    $line = explode($this->LE, $message);
-    $message = '';
-    for ($i=0 ;$i < count($line); $i++) {
-      $line_part = explode(' ', $line[$i]);
-      $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
-        $word = $line_part[$e];
-        if ($qp_mode and (strlen($word) > $length)) {
-          $space_left = $length - strlen($buf) - 1;
-          if ($e != 0) {
-            if ($space_left > 20) {
-              $len = $space_left;
-              if ($is_utf8) {
-                $len = $this->UTF8CharBoundary($word, $len);
-              } elseif (substr($word, $len - 1, 1) == "=") {
-                $len--;
-              } elseif (substr($word, $len - 2, 1) == "=") {
-                $len -= 2;
-              }
-              $part = substr($word, 0, $len);
-              $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
-            } else {
-              $message .= $buf . $soft_break;
-            }
-            $buf = '';
-          }
-          while (strlen($word) > 0) {
-            $len = $length;
-            if ($is_utf8) {
-              $len = $this->UTF8CharBoundary($word, $len);
-            } elseif (substr($word, $len - 1, 1) == "=") {
-              $len--;
-            } elseif (substr($word, $len - 2, 1) == "=") {
-              $len -= 2;
-            }
-            $part = substr($word, 0, $len);
-            $word = substr($word, $len);
-
-            if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
-            } else {
-              $buf = $part;
-            }
-          }
-        } else {
-          $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
-
-          if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
-            $buf = $word;
-          }
-        }
-      }
-      $message .= $buf . $this->LE;
-    }
-
-    return $message;
+	$soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
+	// If utf-8 encoding is used, we will need to make sure we don't
+	// split multibyte characters when we wrap
+	$is_utf8 = (strtolower($this->CharSet) == "utf-8");
+
+	$message = $this->FixEOL($message);
+	if (substr($message, -1) == $this->LE) {
+	  $message = substr($message, 0, -1);
+	}
+
+	$line = explode($this->LE, $message);
+	$message = '';
+	for ($i=0 ;$i < count($line); $i++) {
+	  $line_part = explode(' ', $line[$i]);
+	  $buf = '';
+	  for ($e = 0; $e<count($line_part); $e++) {
+		$word = $line_part[$e];
+		if ($qp_mode and (strlen($word) > $length)) {
+		  $space_left = $length - strlen($buf) - 1;
+		  if ($e != 0) {
+			if ($space_left > 20) {
+			  $len = $space_left;
+			  if ($is_utf8) {
+				$len = $this->UTF8CharBoundary($word, $len);
+			  } elseif (substr($word, $len - 1, 1) == "=") {
+				$len--;
+			  } elseif (substr($word, $len - 2, 1) == "=") {
+				$len -= 2;
+			  }
+			  $part = substr($word, 0, $len);
+			  $word = substr($word, $len);
+			  $buf .= ' ' . $part;
+			  $message .= $buf . sprintf("=%s", $this->LE);
+			} else {
+			  $message .= $buf . $soft_break;
+			}
+			$buf = '';
+		  }
+		  while (strlen($word) > 0) {
+			$len = $length;
+			if ($is_utf8) {
+			  $len = $this->UTF8CharBoundary($word, $len);
+			} elseif (substr($word, $len - 1, 1) == "=") {
+			  $len--;
+			} elseif (substr($word, $len - 2, 1) == "=") {
+			  $len -= 2;
+			}
+			$part = substr($word, 0, $len);
+			$word = substr($word, $len);
+
+			if (strlen($word) > 0) {
+			  $message .= $part . sprintf("=%s", $this->LE);
+			} else {
+			  $buf = $part;
+			}
+		  }
+		} else {
+		  $buf_o = $buf;
+		  $buf .= ($e == 0) ? $word : (' ' . $word);
+
+		  if (strlen($buf) > $length and $buf_o != '') {
+			$message .= $buf_o . $soft_break;
+			$buf = $word;
+		  }
+		}
+	  }
+	  $message .= $buf . $this->LE;
+	}
+
+	return $message;
   }
 
   /**
@@ -797,35 +797,35 @@  discard block
 block discarded – undo
    * @return int
    */
   function UTF8CharBoundary($encodedText, $maxLength) {
-    $foundSplitPos = false;
-    $lookBack = 3;
-    while (!$foundSplitPos) {
-      $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-      $encodedCharPos = strpos($lastChunk, "=");
-      if ($encodedCharPos !== false) {
-        // Found start of encoded character byte within $lookBack block.
-        // Check the encoded byte value (the 2 chars after the '=')
-        $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
-        $dec = hexdec($hex);
-        if ($dec < 128) { // Single byte character.
-          // If the encoded char was found at pos 0, it will fit
-          // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
-          $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
-        } elseif ($dec >= 192) { // First byte of a multi byte character
-          // Reduce maxLength to split at start of character
-          $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
-        } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
-          $lookBack += 3;
-        }
-      } else {
-        // No encoded character found
-        $foundSplitPos = true;
-      }
-    }
-    return $maxLength;
+	$foundSplitPos = false;
+	$lookBack = 3;
+	while (!$foundSplitPos) {
+	  $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+	  $encodedCharPos = strpos($lastChunk, "=");
+	  if ($encodedCharPos !== false) {
+		// Found start of encoded character byte within $lookBack block.
+		// Check the encoded byte value (the 2 chars after the '=')
+		$hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+		$dec = hexdec($hex);
+		if ($dec < 128) { // Single byte character.
+		  // If the encoded char was found at pos 0, it will fit
+		  // otherwise reduce maxLength to start of the encoded char
+		  $maxLength = ($encodedCharPos == 0) ? $maxLength :
+		  $maxLength - ($lookBack - $encodedCharPos);
+		  $foundSplitPos = true;
+		} elseif ($dec >= 192) { // First byte of a multi byte character
+		  // Reduce maxLength to split at start of character
+		  $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+		  $foundSplitPos = true;
+		} elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
+		  $lookBack += 3;
+		}
+	  } else {
+		// No encoded character found
+		$foundSplitPos = true;
+	  }
+	}
+	return $maxLength;
   }
 
   /**
@@ -834,20 +834,20 @@  discard block
 block discarded – undo
    * @return void
    */
   function SetWordWrap() {
-    if($this->WordWrap < 1) {
-      return;
-    }
-
-    switch($this->message_type) {
-      case 'alt':
-        /* fall through */
-      case 'alt_attachments':
-        $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
-        break;
-      default:
-        $this->Body = $this->WrapText($this->Body, $this->WordWrap);
-        break;
-    }
+	if($this->WordWrap < 1) {
+	  return;
+	}
+
+	switch($this->message_type) {
+	  case 'alt':
+		/* fall through */
+	  case 'alt_attachments':
+		$this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
+		break;
+	  default:
+		$this->Body = $this->WrapText($this->Body, $this->WordWrap);
+		break;
+	}
   }
 
   /**
@@ -856,75 +856,75 @@  discard block
 block discarded – undo
    * @return string
    */
   function CreateHeader() {
-    $result = '';
-
-    /* Set the boundaries */
-    $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
-
-    $result .= $this->HeaderLine('Date', $this->RFCDate());
-    if($this->Sender == '') {
-      $result .= $this->HeaderLine('Return-Path', trim($this->From));
-    } else {
-      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
-    }
-
-    /* To be created automatically by mail() */
-    if($this->Mailer != 'mail') {
-      if(count($this->to) > 0) {
-        $result .= $this->AddrAppend('To', $this->to);
-      } elseif (count($this->cc) == 0) {
-        $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
-      }
-    }
-
-    $from = array();
-    $from[0][0] = trim($this->From);
-    $from[0][1] = $this->FromName;
-    $result .= $this->AddrAppend('From', $from);
-
-    /* sendmail and mail() extract Cc from the header before sending */
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->cc) > 0)) {
-      $result .= $this->AddrAppend('Cc', $this->cc);
-    }
-
-    /* sendmail and mail() extract Bcc from the header before sending */
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
-      $result .= $this->AddrAppend('Bcc', $this->bcc);
-    }
-
-    if(count($this->ReplyTo) > 0) {
-      $result .= $this->AddrAppend('Reply-To', $this->ReplyTo);
-    }
-
-    /* mail() sets the subject itself */
-    if($this->Mailer != 'mail') {
-      $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
-    }
-
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
-    } else {
-      $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
-    }
-    $result .= $this->HeaderLine('X-Priority', $this->Priority);
-    $result .= $this->HeaderLine('X-Mailer', 'PHPMailer (phpmailer.sourceforge.net) [version ' . $this->Version . ']');
-
-    if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
-    }
-
-    // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
-      $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
-    }
-    if (!$this->sign_key_file) {
-      $result .= $this->HeaderLine('MIME-Version', '1.0');
-      $result .= $this->GetMailMIME();
-    }
-
-    return $result;
+	$result = '';
+
+	/* Set the boundaries */
+	$uniq_id = md5(uniqid(time()));
+	$this->boundary[1] = 'b1_' . $uniq_id;
+	$this->boundary[2] = 'b2_' . $uniq_id;
+
+	$result .= $this->HeaderLine('Date', $this->RFCDate());
+	if($this->Sender == '') {
+	  $result .= $this->HeaderLine('Return-Path', trim($this->From));
+	} else {
+	  $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
+	}
+
+	/* To be created automatically by mail() */
+	if($this->Mailer != 'mail') {
+	  if(count($this->to) > 0) {
+		$result .= $this->AddrAppend('To', $this->to);
+	  } elseif (count($this->cc) == 0) {
+		$result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+	  }
+	}
+
+	$from = array();
+	$from[0][0] = trim($this->From);
+	$from[0][1] = $this->FromName;
+	$result .= $this->AddrAppend('From', $from);
+
+	/* sendmail and mail() extract Cc from the header before sending */
+	if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->cc) > 0)) {
+	  $result .= $this->AddrAppend('Cc', $this->cc);
+	}
+
+	/* sendmail and mail() extract Bcc from the header before sending */
+	if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+	  $result .= $this->AddrAppend('Bcc', $this->bcc);
+	}
+
+	if(count($this->ReplyTo) > 0) {
+	  $result .= $this->AddrAppend('Reply-To', $this->ReplyTo);
+	}
+
+	/* mail() sets the subject itself */
+	if($this->Mailer != 'mail') {
+	  $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
+	}
+
+	if($this->MessageID != '') {
+	  $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+	} else {
+	  $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+	}
+	$result .= $this->HeaderLine('X-Priority', $this->Priority);
+	$result .= $this->HeaderLine('X-Mailer', 'PHPMailer (phpmailer.sourceforge.net) [version ' . $this->Version . ']');
+
+	if($this->ConfirmReadingTo != '') {
+	  $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+	}
+
+	// Add custom headers
+	for($index = 0; $index < count($this->CustomHeader); $index++) {
+	  $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
+	}
+	if (!$this->sign_key_file) {
+	  $result .= $this->HeaderLine('MIME-Version', '1.0');
+	  $result .= $this->GetMailMIME();
+	}
+
+	return $result;
   }
 
   /**
@@ -933,33 +933,33 @@  discard block
 block discarded – undo
    * @return string
    */
   function GetMailMIME() {
-    $result = '';
-    switch($this->message_type) {
-      case 'plain':
-        $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
-        $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
-        break;
-      case 'attachments':
-        /* fall through */
-      case 'alt_attachments':
-        if($this->InlineImageExists()){
-          $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
-        } else {
-          $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        }
-        break;
-      case 'alt':
-        $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        break;
-    }
-
-    if($this->Mailer != 'mail') {
-      $result .= $this->LE.$this->LE;
-    }
-
-    return $result;
+	$result = '';
+	switch($this->message_type) {
+	  case 'plain':
+		$result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
+		$result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
+		break;
+	  case 'attachments':
+		/* fall through */
+	  case 'alt_attachments':
+		if($this->InlineImageExists()){
+		  $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
+		} else {
+		  $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
+		  $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+		}
+		break;
+	  case 'alt':
+		$result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
+		$result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+		break;
+	}
+
+	if($this->Mailer != 'mail') {
+	  $result .= $this->LE.$this->LE;
+	}
+
+	return $result;
   }
 
   /**
@@ -968,73 +968,73 @@  discard block
 block discarded – undo
    * @return string
    */
   function CreateBody() {
-    $result = '';
-    if ($this->sign_key_file) {
-      $result .= $this->GetMailMIME();
-    }
-
-    $this->SetWordWrap();
-
-    switch($this->message_type) {
-      case 'alt':
-        $result .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
-        $result .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $result .= $this->LE.$this->LE;
-        $result .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
-        $result .= $this->EncodeString($this->Body, $this->Encoding);
-        $result .= $this->LE.$this->LE;
-        $result .= $this->EndBoundary($this->boundary[1]);
-        break;
-      case 'plain':
-        $result .= $this->EncodeString($this->Body, $this->Encoding);
-        break;
-      case 'attachments':
-        $result .= $this->GetBoundary($this->boundary[1], '', '', '');
-        $result .= $this->EncodeString($this->Body, $this->Encoding);
-        $result .= $this->LE;
-        $result .= $this->AttachAll();
-        break;
-      case 'alt_attachments':
-        $result .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $result .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $result .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
-        $result .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $result .= $this->LE.$this->LE;
-        $result .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
-        $result .= $this->EncodeString($this->Body, $this->Encoding);
-        $result .= $this->LE.$this->LE;
-        $result .= $this->EndBoundary($this->boundary[2]);
-        $result .= $this->AttachAll();
-        break;
-    }
-
-    if($this->IsError()) {
-      $result = '';
-    } else if ($this->sign_key_file) {
-      $file = tempnam("", "mail");
-      $fp = fopen($file, "w");
-      fwrite($fp, $result);
-      fclose($fp);
-      $signed = tempnam("", "signed");
-
-      if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), null)) {
-        $fp = fopen($signed, "r");
-        $result = fread($fp, filesize($this->sign_key_file));
-        $result = '';
-        while(!feof($fp)){
-          $result = $result . fread($fp, 1024);
-        }
-        fclose($fp);
-      } else {
-        $this->SetError($this->Lang("signing").openssl_error_string());
-        $result = '';
-      }
-
-      unlink($file);
-      unlink($signed);
-    }
-
-    return $result;
+	$result = '';
+	if ($this->sign_key_file) {
+	  $result .= $this->GetMailMIME();
+	}
+
+	$this->SetWordWrap();
+
+	switch($this->message_type) {
+	  case 'alt':
+		$result .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
+		$result .= $this->EncodeString($this->AltBody, $this->Encoding);
+		$result .= $this->LE.$this->LE;
+		$result .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
+		$result .= $this->EncodeString($this->Body, $this->Encoding);
+		$result .= $this->LE.$this->LE;
+		$result .= $this->EndBoundary($this->boundary[1]);
+		break;
+	  case 'plain':
+		$result .= $this->EncodeString($this->Body, $this->Encoding);
+		break;
+	  case 'attachments':
+		$result .= $this->GetBoundary($this->boundary[1], '', '', '');
+		$result .= $this->EncodeString($this->Body, $this->Encoding);
+		$result .= $this->LE;
+		$result .= $this->AttachAll();
+		break;
+	  case 'alt_attachments':
+		$result .= sprintf("--%s%s", $this->boundary[1], $this->LE);
+		$result .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+		$result .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+		$result .= $this->EncodeString($this->AltBody, $this->Encoding);
+		$result .= $this->LE.$this->LE;
+		$result .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+		$result .= $this->EncodeString($this->Body, $this->Encoding);
+		$result .= $this->LE.$this->LE;
+		$result .= $this->EndBoundary($this->boundary[2]);
+		$result .= $this->AttachAll();
+		break;
+	}
+
+	if($this->IsError()) {
+	  $result = '';
+	} else if ($this->sign_key_file) {
+	  $file = tempnam("", "mail");
+	  $fp = fopen($file, "w");
+	  fwrite($fp, $result);
+	  fclose($fp);
+	  $signed = tempnam("", "signed");
+
+	  if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), null)) {
+		$fp = fopen($signed, "r");
+		$result = fread($fp, filesize($this->sign_key_file));
+		$result = '';
+		while(!feof($fp)){
+		  $result = $result . fread($fp, 1024);
+		}
+		fclose($fp);
+	  } else {
+		$this->SetError($this->Lang("signing").openssl_error_string());
+		$result = '';
+	  }
+
+	  unlink($file);
+	  unlink($signed);
+	}
+
+	return $result;
   }
 
   /**
@@ -1042,23 +1042,23 @@  discard block
 block discarded – undo
    * @access private
    */
   function GetBoundary($boundary, $charSet, $contentType, $encoding) {
-    $result = '';
-    if($charSet == '') {
-      $charSet = $this->CharSet;
-    }
-    if($contentType == '') {
-      $contentType = $this->ContentType;
-    }
-    if($encoding == '') {
-      $encoding = $this->Encoding;
-    }
-    $result .= $this->TextLine('--' . $boundary);
-    $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
-    $result .= $this->LE;
-    $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
-    $result .= $this->LE;
-
-    return $result;
+	$result = '';
+	if($charSet == '') {
+	  $charSet = $this->CharSet;
+	}
+	if($contentType == '') {
+	  $contentType = $this->ContentType;
+	}
+	if($encoding == '') {
+	  $encoding = $this->Encoding;
+	}
+	$result .= $this->TextLine('--' . $boundary);
+	$result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
+	$result .= $this->LE;
+	$result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
+	$result .= $this->LE;
+
+	return $result;
   }
 
   /**
@@ -1066,7 +1066,7 @@  discard block
 block discarded – undo
    * @access private
    */
   function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+	return $this->LE . '--' . $boundary . '--' . $this->LE;
   }
 
   /**
@@ -1075,19 +1075,19 @@  discard block
 block discarded – undo
    * @return void
    */
   function SetMessageType() {
-    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
-      $this->message_type = 'plain';
-    } else {
-      if(count($this->attachment) > 0) {
-        $this->message_type = 'attachments';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
-        $this->message_type = 'alt';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
-        $this->message_type = 'alt_attachments';
-      }
-    }
+	if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+	  $this->message_type = 'plain';
+	} else {
+	  if(count($this->attachment) > 0) {
+		$this->message_type = 'attachments';
+	  }
+	  if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+		$this->message_type = 'alt';
+	  }
+	  if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+		$this->message_type = 'alt_attachments';
+	  }
+	}
   }
 
   /* Returns a formatted header line.
@@ -1095,7 +1095,7 @@  discard block
 block discarded – undo
    * @return string
    */
   function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+	return $name . ': ' . $value . $this->LE;
   }
 
   /**
@@ -1104,7 +1104,7 @@  discard block
 block discarded – undo
    * @return string
    */
   function TextLine($value) {
-    return $value . $this->LE;
+	return $value . $this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1122,27 +1122,27 @@  discard block
 block discarded – undo
    * @return bool
    */
   function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-    if(!@is_file($path)) {
-      $this->SetError($this->Lang('file_access') . $path);
-      return false;
-    }
-
-    $filename = basename($path);
-    if($name == '') {
-      $name = $filename;
-    }
-
-    $cur = count($this->attachment);
-    $this->attachment[$cur][0] = $path;
-    $this->attachment[$cur][1] = $filename;
-    $this->attachment[$cur][2] = $name;
-    $this->attachment[$cur][3] = $encoding;
-    $this->attachment[$cur][4] = $type;
-    $this->attachment[$cur][5] = false; // isStringAttachment
-    $this->attachment[$cur][6] = 'attachment';
-    $this->attachment[$cur][7] = 0;
-
-    return true;
+	if(!@is_file($path)) {
+	  $this->SetError($this->Lang('file_access') . $path);
+	  return false;
+	}
+
+	$filename = basename($path);
+	if($name == '') {
+	  $name = $filename;
+	}
+
+	$cur = count($this->attachment);
+	$this->attachment[$cur][0] = $path;
+	$this->attachment[$cur][1] = $filename;
+	$this->attachment[$cur][2] = $name;
+	$this->attachment[$cur][3] = $encoding;
+	$this->attachment[$cur][4] = $type;
+	$this->attachment[$cur][5] = false; // isStringAttachment
+	$this->attachment[$cur][6] = 'attachment';
+	$this->attachment[$cur][7] = 0;
+
+	return true;
   }
 
   /**
@@ -1152,55 +1152,55 @@  discard block
 block discarded – undo
    * @return string
    */
   function AttachAll() {
-    /* Return text of body */
-    $mime = array();
-
-    /* Add all attachments */
-    for($i = 0; $i < count($this->attachment); $i++) {
-      /* Check for string attachment */
-      $bString = $this->attachment[$i][5];
-      if ($bString) {
-        $string = $this->attachment[$i][0];
-      } else {
-        $path = $this->attachment[$i][0];
-      }
-
-      $filename    = $this->attachment[$i][1];
-      $name        = $this->attachment[$i][2];
-      $encoding    = $this->attachment[$i][3];
-      $type        = $this->attachment[$i][4];
-      $disposition = $this->attachment[$i][6];
-      $cid         = $this->attachment[$i][7];
-
-      $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
-      $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
-      $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
-
-      if($disposition == 'inline') {
-        $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
-      }
-
-      $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
-
-      /* Encode as string attachment */
-      if($bString) {
-        $mime[] = $this->EncodeString($string, $encoding);
-        if($this->IsError()) {
-          return '';
-        }
-        $mime[] = $this->LE.$this->LE;
-      } else {
-        $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
-          return '';
-        }
-        $mime[] = $this->LE.$this->LE;
-      }
-    }
-
-    $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
-
-    return join('', $mime);
+	/* Return text of body */
+	$mime = array();
+
+	/* Add all attachments */
+	for($i = 0; $i < count($this->attachment); $i++) {
+	  /* Check for string attachment */
+	  $bString = $this->attachment[$i][5];
+	  if ($bString) {
+		$string = $this->attachment[$i][0];
+	  } else {
+		$path = $this->attachment[$i][0];
+	  }
+
+	  $filename    = $this->attachment[$i][1];
+	  $name        = $this->attachment[$i][2];
+	  $encoding    = $this->attachment[$i][3];
+	  $type        = $this->attachment[$i][4];
+	  $disposition = $this->attachment[$i][6];
+	  $cid         = $this->attachment[$i][7];
+
+	  $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
+	  $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
+	  $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
+
+	  if($disposition == 'inline') {
+		$mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
+	  }
+
+	  $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
+
+	  /* Encode as string attachment */
+	  if($bString) {
+		$mime[] = $this->EncodeString($string, $encoding);
+		if($this->IsError()) {
+		  return '';
+		}
+		$mime[] = $this->LE.$this->LE;
+	  } else {
+		$mime[] = $this->EncodeFile($path, $encoding);
+		if($this->IsError()) {
+		  return '';
+		}
+		$mime[] = $this->LE.$this->LE;
+	  }
+	}
+
+	$mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
+
+	return join('', $mime);
   }
 
   /**
@@ -1210,18 +1210,18 @@  discard block
 block discarded – undo
    * @return string
    */
   function EncodeFile ($path, $encoding = 'base64') {
-    if(!@$fd = fopen($path, 'rb')) {
-      $this->SetError($this->Lang('file_open') . $path);
-      return '';
-    }
-    $magic_quotes = get_magic_quotes_runtime();
-    set_magic_quotes_runtime(0);
-    $file_buffer = fread($fd, filesize($path));
-    $file_buffer = $this->EncodeString($file_buffer, $encoding);
-    fclose($fd);
-    set_magic_quotes_runtime($magic_quotes);
-
-    return $file_buffer;
+	if(!@$fd = fopen($path, 'rb')) {
+	  $this->SetError($this->Lang('file_open') . $path);
+	  return '';
+	}
+	$magic_quotes = get_magic_quotes_runtime();
+	set_magic_quotes_runtime(0);
+	$file_buffer = fread($fd, filesize($path));
+	$file_buffer = $this->EncodeString($file_buffer, $encoding);
+	fclose($fd);
+	set_magic_quotes_runtime($magic_quotes);
+
+	return $file_buffer;
   }
 
   /**
@@ -1231,29 +1231,29 @@  discard block
 block discarded – undo
    * @return string
    */
   function EncodeString ($str, $encoding = 'base64') {
-    $encoded = '';
-    switch(strtolower($encoding)) {
-      case 'base64':
-        /* chunk_split is found in PHP >= 3.0.6 */
-        $encoded = chunk_split(base64_encode($str), 76, $this->LE);
-        break;
-      case '7bit':
-      case '8bit':
-        $encoded = $this->FixEOL($str);
-        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
-        break;
-      case 'binary':
-        $encoded = $str;
-        break;
-      case 'quoted-printable':
-        $encoded = $this->EncodeQP($str);
-        break;
-      default:
-        $this->SetError($this->Lang('encoding') . $encoding);
-        break;
-    }
-    return $encoded;
+	$encoded = '';
+	switch(strtolower($encoding)) {
+	  case 'base64':
+		/* chunk_split is found in PHP >= 3.0.6 */
+		$encoded = chunk_split(base64_encode($str), 76, $this->LE);
+		break;
+	  case '7bit':
+	  case '8bit':
+		$encoded = $this->FixEOL($str);
+		if (substr($encoded, -(strlen($this->LE))) != $this->LE)
+		  $encoded .= $this->LE;
+		break;
+	  case 'binary':
+		$encoded = $str;
+		break;
+	  case 'quoted-printable':
+		$encoded = $this->EncodeQP($str);
+		break;
+	  default:
+		$this->SetError($this->Lang('encoding') . $encoding);
+		break;
+	}
+	return $encoded;
   }
 
   /**
@@ -1262,58 +1262,58 @@  discard block
 block discarded – undo
    * @return string
    */
   function EncodeHeader ($str, $position = 'text') {
-    $x = 0;
-
-    switch (strtolower($position)) {
-      case 'phrase':
-        if (!preg_match('/[\200-\377]/', $str)) {
-          /* Can't use addslashes as we don't know what value has magic_quotes_sybase. */
-          $encoded = addcslashes($str, "\0..\37\177\\\"");
-          if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-            return ($encoded);
-          } else {
-            return ("\"$encoded\"");
-          }
-        }
-        $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-        break;
-      case 'comment':
-        $x = preg_match_all('/[()"]/', $str, $matches);
-        /* Fall-through */
-      case 'text':
-      default:
-        $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-        break;
-    }
-
-    if ($x == 0) {
-      return ($str);
-    }
-
-    $maxlen = 75 - 7 - strlen($this->CharSet);
-    /* Try to select the encoding which should produce the shortest output */
-    if (strlen($str)/3 < $x) {
-      $encoding = 'B';
-      if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
-     // Use a custom function which correctly encodes and wraps long
-     // multibyte strings without breaking lines within a character
-        $encoded = $this->Base64EncodeWrapMB($str);
-      } else {
-        $encoded = base64_encode($str);
-        $maxlen -= $maxlen % 4;
-        $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-      }
-    } else {
-      $encoding = 'Q';
-      $encoded = $this->EncodeQ($str, $position);
-      $encoded = $this->WrapText($encoded, $maxlen, true);
-      $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
-    }
-
-    $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
-    $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
-    return $encoded;
+	$x = 0;
+
+	switch (strtolower($position)) {
+	  case 'phrase':
+		if (!preg_match('/[\200-\377]/', $str)) {
+		  /* Can't use addslashes as we don't know what value has magic_quotes_sybase. */
+		  $encoded = addcslashes($str, "\0..\37\177\\\"");
+		  if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+			return ($encoded);
+		  } else {
+			return ("\"$encoded\"");
+		  }
+		}
+		$x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+		break;
+	  case 'comment':
+		$x = preg_match_all('/[()"]/', $str, $matches);
+		/* Fall-through */
+	  case 'text':
+	  default:
+		$x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+		break;
+	}
+
+	if ($x == 0) {
+	  return ($str);
+	}
+
+	$maxlen = 75 - 7 - strlen($this->CharSet);
+	/* Try to select the encoding which should produce the shortest output */
+	if (strlen($str)/3 < $x) {
+	  $encoding = 'B';
+	  if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
+	 // Use a custom function which correctly encodes and wraps long
+	 // multibyte strings without breaking lines within a character
+		$encoded = $this->Base64EncodeWrapMB($str);
+	  } else {
+		$encoded = base64_encode($str);
+		$maxlen -= $maxlen % 4;
+		$encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+	  }
+	} else {
+	  $encoding = 'Q';
+	  $encoded = $this->EncodeQ($str, $position);
+	  $encoded = $this->WrapText($encoded, $maxlen, true);
+	  $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
+	}
+
+	$encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
+	$encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+	return $encoded;
   }
 
   /**
@@ -1323,11 +1323,11 @@  discard block
 block discarded – undo
    * @return bool
    */
   function HasMultiBytes($str) {
-    if (function_exists('mb_strlen')) {
-      return (strlen($str) > mb_strlen($str, $this->CharSet));
-    } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
-      return False;
-    }
+	if (function_exists('mb_strlen')) {
+	  return (strlen($str) > mb_strlen($str, $this->CharSet));
+	} else { // Assume no multibytes (we can't handle without mbstring functions anyway)
+	  return False;
+	}
   }
 
   /**
@@ -1339,35 +1339,35 @@  discard block
 block discarded – undo
    * @return string
    */
   function Base64EncodeWrapMB($str) {
-    $start = "=?".$this->CharSet."?B?";
-    $end = "?=";
-    $encoded = "";
-
-    $mb_length = mb_strlen($str, $this->CharSet);
-    // Each line must have length <= 75, including $start and $end
-    $length = 75 - strlen($start) - strlen($end);
-    // Average multi-byte ratio
-    $ratio = $mb_length / strlen($str);
-    // Base64 has a 4:3 ratio
-    $offset = $avgLength = floor($length * $ratio * .75);
-
-    for ($i = 0; $i < $mb_length; $i += $offset) {
-      $lookBack = 0;
-
-      do {
-        $offset = $avgLength - $lookBack;
-        $chunk = mb_substr($str, $i, $offset, $this->CharSet);
-        $chunk = base64_encode($chunk);
-        $lookBack++;
-      }
-      while (strlen($chunk) > $length);
-
-      $encoded .= $chunk . $this->LE;
-    }
-
-    // Chomp the last linefeed
-    $encoded = substr($encoded, 0, -strlen($this->LE));
-    return $encoded;
+	$start = "=?".$this->CharSet."?B?";
+	$end = "?=";
+	$encoded = "";
+
+	$mb_length = mb_strlen($str, $this->CharSet);
+	// Each line must have length <= 75, including $start and $end
+	$length = 75 - strlen($start) - strlen($end);
+	// Average multi-byte ratio
+	$ratio = $mb_length / strlen($str);
+	// Base64 has a 4:3 ratio
+	$offset = $avgLength = floor($length * $ratio * .75);
+
+	for ($i = 0; $i < $mb_length; $i += $offset) {
+	  $lookBack = 0;
+
+	  do {
+		$offset = $avgLength - $lookBack;
+		$chunk = mb_substr($str, $i, $offset, $this->CharSet);
+		$chunk = base64_encode($chunk);
+		$lookBack++;
+	  }
+	  while (strlen($chunk) > $length);
+
+	  $encoded .= $chunk . $this->LE;
+	}
+
+	// Chomp the last linefeed
+	$encoded = substr($encoded, 0, -strlen($this->LE));
+	return $encoded;
   }
 
   /**
@@ -1376,44 +1376,44 @@  discard block
 block discarded – undo
    * @return string
    */
   function EncodeQP( $input = '', $line_max = 76, $space_conv = false ) {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
-    $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
-    $eol = "\r\n";
-    $escape = '=';
-    $output = '';
-    while( list(, $line) = each($lines) ) {
-      $linlen = strlen($line);
-      $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
-        $c = substr( $line, $i, 1 );
-        $dec = ord( $c );
-        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
-          $c = '=2E';
-        }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
-            $c = '=20';
-          } else if ( $space_conv ) {
-            $c = '=20';
-          }
-        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
-          $c = $escape.$hex[$h2].$hex[$h1];
-        }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
-          $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
-          $newline = '';
-          // check if newline first character will be point or not
-          if ( $dec == 46 ) {
-            $c = '=2E';
-          }
-        }
-        $newline .= $c;
-      } // end of for
-      $output .= $newline.$eol;
-    } // end of while
-    return $output;
+	$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+	$lines = preg_split('/(?:\r\n|\r|\n)/', $input);
+	$eol = "\r\n";
+	$escape = '=';
+	$output = '';
+	while( list(, $line) = each($lines) ) {
+	  $linlen = strlen($line);
+	  $newline = '';
+	  for($i = 0; $i < $linlen; $i++) {
+		$c = substr( $line, $i, 1 );
+		$dec = ord( $c );
+		if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
+		  $c = '=2E';
+		}
+		if ( $dec == 32 ) {
+		  if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+			$c = '=20';
+		  } else if ( $space_conv ) {
+			$c = '=20';
+		  }
+		} elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
+		  $h2 = floor($dec/16);
+		  $h1 = floor($dec%16);
+		  $c = $escape.$hex[$h2].$hex[$h1];
+		}
+		if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+		  $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
+		  $newline = '';
+		  // check if newline first character will be point or not
+		  if ( $dec == 46 ) {
+			$c = '=2E';
+		  }
+		}
+		$newline .= $c;
+	  } // end of for
+	  $output .= $newline.$eol;
+	} // end of while
+	return $output;
   }
 
   /**
@@ -1422,27 +1422,27 @@  discard block
 block discarded – undo
    * @return string
    */
   function EncodeQ ($str, $position = 'text') {
-    /* There should not be any EOL in the string */
-    $encoded = preg_replace("[\r\n]", '', $str);
-
-    switch (strtolower($position)) {
-      case 'phrase':
-        $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        break;
-      case 'comment':
-        $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-      case 'text':
-      default:
-        /* Replace every high ascii, control =, ? and _ characters */
-        $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
-              "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        break;
-    }
-
-    /* Replace every spaces to _ (more readable than =20) */
-    $encoded = str_replace(' ', '_', $encoded);
-
-    return $encoded;
+	/* There should not be any EOL in the string */
+	$encoded = preg_replace("[\r\n]", '', $str);
+
+	switch (strtolower($position)) {
+	  case 'phrase':
+		$encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
+		break;
+	  case 'comment':
+		$encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
+	  case 'text':
+	  default:
+		/* Replace every high ascii, control =, ? and _ characters */
+		$encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+			  "'='.sprintf('%02X', ord('\\1'))", $encoded);
+		break;
+	}
+
+	/* Replace every spaces to _ (more readable than =20) */
+	$encoded = str_replace(' ', '_', $encoded);
+
+	return $encoded;
   }
 
   /**
@@ -1456,16 +1456,16 @@  discard block
 block discarded – undo
    * @return void
    */
   function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
-    /* Append to $attachment array */
-    $cur = count($this->attachment);
-    $this->attachment[$cur][0] = $string;
-    $this->attachment[$cur][1] = $filename;
-    $this->attachment[$cur][2] = $filename;
-    $this->attachment[$cur][3] = $encoding;
-    $this->attachment[$cur][4] = $type;
-    $this->attachment[$cur][5] = true; // isString
-    $this->attachment[$cur][6] = 'attachment';
-    $this->attachment[$cur][7] = 0;
+	/* Append to $attachment array */
+	$cur = count($this->attachment);
+	$this->attachment[$cur][0] = $string;
+	$this->attachment[$cur][1] = $filename;
+	$this->attachment[$cur][2] = $filename;
+	$this->attachment[$cur][3] = $encoding;
+	$this->attachment[$cur][4] = $type;
+	$this->attachment[$cur][5] = true; // isString
+	$this->attachment[$cur][6] = 'attachment';
+	$this->attachment[$cur][7] = 0;
   }
 
   /**
@@ -1483,28 +1483,28 @@  discard block
 block discarded – undo
    */
   function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
-    if(!@is_file($path)) {
-      $this->SetError($this->Lang('file_access') . $path);
-      return false;
-    }
-
-    $filename = basename($path);
-    if($name == '') {
-      $name = $filename;
-    }
-
-    /* Append to $attachment array */
-    $cur = count($this->attachment);
-    $this->attachment[$cur][0] = $path;
-    $this->attachment[$cur][1] = $filename;
-    $this->attachment[$cur][2] = $name;
-    $this->attachment[$cur][3] = $encoding;
-    $this->attachment[$cur][4] = $type;
-    $this->attachment[$cur][5] = false;
-    $this->attachment[$cur][6] = 'inline';
-    $this->attachment[$cur][7] = $cid;
-
-    return true;
+	if(!@is_file($path)) {
+	  $this->SetError($this->Lang('file_access') . $path);
+	  return false;
+	}
+
+	$filename = basename($path);
+	if($name == '') {
+	  $name = $filename;
+	}
+
+	/* Append to $attachment array */
+	$cur = count($this->attachment);
+	$this->attachment[$cur][0] = $path;
+	$this->attachment[$cur][1] = $filename;
+	$this->attachment[$cur][2] = $name;
+	$this->attachment[$cur][3] = $encoding;
+	$this->attachment[$cur][4] = $type;
+	$this->attachment[$cur][5] = false;
+	$this->attachment[$cur][6] = 'inline';
+	$this->attachment[$cur][7] = $cid;
+
+	return true;
   }
 
   /**
@@ -1513,15 +1513,15 @@  discard block
 block discarded – undo
    * @return bool
    */
   function InlineImageExists() {
-    $result = false;
-    for($i = 0; $i < count($this->attachment); $i++) {
-      if($this->attachment[$i][6] == 'inline') {
-        $result = true;
-        break;
-      }
-    }
-
-    return $result;
+	$result = false;
+	for($i = 0; $i < count($this->attachment); $i++) {
+	  if($this->attachment[$i][6] == 'inline') {
+		$result = true;
+		break;
+	  }
+	}
+
+	return $result;
   }
 
   /////////////////////////////////////////////////
@@ -1533,7 +1533,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function ClearAddresses() {
-    $this->to = array();
+	$this->to = array();
   }
 
   /**
@@ -1541,7 +1541,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function ClearCCs() {
-    $this->cc = array();
+	$this->cc = array();
   }
 
   /**
@@ -1549,7 +1549,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function ClearBCCs() {
-    $this->bcc = array();
+	$this->bcc = array();
   }
 
   /**
@@ -1557,7 +1557,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function ClearReplyTos() {
-    $this->ReplyTo = array();
+	$this->ReplyTo = array();
   }
 
   /**
@@ -1566,9 +1566,9 @@  discard block
 block discarded – undo
    * @return void
    */
   function ClearAllRecipients() {
-    $this->to = array();
-    $this->cc = array();
-    $this->bcc = array();
+	$this->to = array();
+	$this->cc = array();
+	$this->bcc = array();
   }
 
   /**
@@ -1577,7 +1577,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function ClearAttachments() {
-    $this->attachment = array();
+	$this->attachment = array();
   }
 
   /**
@@ -1585,7 +1585,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function ClearCustomHeaders() {
-    $this->CustomHeader = array();
+	$this->CustomHeader = array();
   }
 
   /////////////////////////////////////////////////
@@ -1599,8 +1599,8 @@  discard block
 block discarded – undo
    * @return void
    */
   function SetError($msg) {
-    $this->error_count++;
-    $this->ErrorInfo = $msg;
+	$this->error_count++;
+	$this->ErrorInfo = $msg;
   }
 
   /**
@@ -1609,13 +1609,13 @@  discard block
 block discarded – undo
    * @return string
    */
   function RFCDate() {
-    $tz = date('Z');
-    $tzs = ($tz < 0) ? '-' : '+';
-    $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
-    $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
+	$tz = date('Z');
+	$tzs = ($tz < 0) ? '-' : '+';
+	$tz = abs($tz);
+	$tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+	$result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
-    return $result;
+	return $result;
   }
 
   /**
@@ -1626,21 +1626,21 @@  discard block
 block discarded – undo
    * @return mixed
    */
   function ServerVar($varName) {
-    global $HTTP_SERVER_VARS;
-    global $HTTP_ENV_VARS;
-
-    if(!isset($_SERVER)) {
-      $_SERVER = $HTTP_SERVER_VARS;
-      if(!isset($_SERVER['REMOTE_ADDR'])) {
-        $_SERVER = $HTTP_ENV_VARS; // must be Apache
-      }
-    }
-
-    if(isset($_SERVER[$varName])) {
-      return $_SERVER[$varName];
-    } else {
-      return '';
-    }
+	global $HTTP_SERVER_VARS;
+	global $HTTP_ENV_VARS;
+
+	if(!isset($_SERVER)) {
+	  $_SERVER = $HTTP_SERVER_VARS;
+	  if(!isset($_SERVER['REMOTE_ADDR'])) {
+		$_SERVER = $HTTP_ENV_VARS; // must be Apache
+	  }
+	}
+
+	if(isset($_SERVER[$varName])) {
+	  return $_SERVER[$varName];
+	} else {
+	  return '';
+	}
   }
 
   /**
@@ -1649,15 +1649,15 @@  discard block
 block discarded – undo
    * @return string
    */
   function ServerHostname() {
-    if ($this->Hostname != '') {
-      $result = $this->Hostname;
-    } elseif ($this->ServerVar('SERVER_NAME') != '') {
-      $result = $this->ServerVar('SERVER_NAME');
-    } else {
-      $result = 'localhost.localdomain';
-    }
-
-    return $result;
+	if ($this->Hostname != '') {
+	  $result = $this->Hostname;
+	} elseif ($this->ServerVar('SERVER_NAME') != '') {
+	  $result = $this->ServerVar('SERVER_NAME');
+	} else {
+	  $result = 'localhost.localdomain';
+	}
+
+	return $result;
   }
 
   /**
@@ -1666,15 +1666,15 @@  discard block
 block discarded – undo
    * @return string
    */
   function Lang($key) {
-    if(count($this->language) < 1) {
-      $this->SetLanguage('en'); // set the default language
-    }
-
-    if(isset($this->language[$key])) {
-      return $this->language[$key];
-    } else {
-      return 'Language string failed to load: ' . $key;
-    }
+	if(count($this->language) < 1) {
+	  $this->SetLanguage('en'); // set the default language
+	}
+
+	if(isset($this->language[$key])) {
+	  return $this->language[$key];
+	} else {
+	  return 'Language string failed to load: ' . $key;
+	}
   }
 
   /**
@@ -1682,7 +1682,7 @@  discard block
 block discarded – undo
    * @return bool
    */
   function IsError() {
-    return ($this->error_count > 0);
+	return ($this->error_count > 0);
   }
 
   /**
@@ -1691,10 +1691,10 @@  discard block
 block discarded – undo
    * @return string
    */
   function FixEOL($str) {
-    $str = str_replace("\r\n", "\n", $str);
-    $str = str_replace("\r", "\n", $str);
-    $str = str_replace("\n", $this->LE, $str);
-    return $str;
+	$str = str_replace("\r\n", "\n", $str);
+	$str = str_replace("\r", "\n", $str);
+	$str = str_replace("\n", $this->LE, $str);
+	return $str;
   }
 
   /**
@@ -1702,7 +1702,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function AddCustomHeader($custom_header) {
-    $this->CustomHeader[] = explode(':', $custom_header, 2);
+	$this->CustomHeader[] = explode(':', $custom_header, 2);
   }
 
   /**
@@ -1711,35 +1711,35 @@  discard block
 block discarded – undo
    * @return $message
    */
   function MsgHTML($message,$basedir='') {
-    preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
-        // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('/^[A-z][A-z]*:\/\//',$url)) {
-          $filename = basename($url);
-          $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
-          $fileParts = split("\.", $filename);
-          $ext = $fileParts[1];
-          $mimeType = $this->_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
-            $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
-          }
-        }
-      }
-    }
-    $this->IsHTML(true);
-    $this->Body = $message;
-    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
-    if ( !empty($textMsg) && empty($this->AltBody) ) {
-      $this->AltBody = html_entity_decode($textMsg);
-    }
-    if ( empty($this->AltBody) ) {
-      $this->AltBody = 'To view this email message, open the email in with HTML compatibility!' . "\n\n";
-    }
+	preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
+	if(isset($images[2])) {
+	  foreach($images[2] as $i => $url) {
+		// do not change urls for absolute images (thanks to corvuscorax)
+		if (!preg_match('/^[A-z][A-z]*:\/\//',$url)) {
+		  $filename = basename($url);
+		  $directory = dirname($url);
+		  ($directory == '.')?$directory='':'';
+		  $cid = 'cid:' . md5($filename);
+		  $fileParts = split("\.", $filename);
+		  $ext = $fileParts[1];
+		  $mimeType = $this->_mime_types($ext);
+		  if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
+		  if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+		  if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+			$message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
+		  }
+		}
+	  }
+	}
+	$this->IsHTML(true);
+	$this->Body = $message;
+	$textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
+	if ( !empty($textMsg) && empty($this->AltBody) ) {
+	  $this->AltBody = html_entity_decode($textMsg);
+	}
+	if ( empty($this->AltBody) ) {
+	  $this->AltBody = 'To view this email message, open the email in with HTML compatibility!' . "\n\n";
+	}
   }
 
   /**
@@ -1748,95 +1748,95 @@  discard block
 block discarded – undo
    * @return mime type of ext
    */
   function _mime_types($ext = '') {
-    $mimes = array(
-      'ai'    =>  'application/postscript',
-      'aif'   =>  'audio/x-aiff',
-      'aifc'  =>  'audio/x-aiff',
-      'aiff'  =>  'audio/x-aiff',
-      'avi'   =>  'video/x-msvideo',
-      'bin'   =>  'application/macbinary',
-      'bmp'   =>  'image/bmp',
-      'class' =>  'application/octet-stream',
-      'cpt'   =>  'application/mac-compactpro',
-      'css'   =>  'text/css',
-      'dcr'   =>  'application/x-director',
-      'dir'   =>  'application/x-director',
-      'dll'   =>  'application/octet-stream',
-      'dms'   =>  'application/octet-stream',
-      'doc'   =>  'application/msword',
-      'dvi'   =>  'application/x-dvi',
-      'dxr'   =>  'application/x-director',
-      'eml'   =>  'message/rfc822',
-      'eps'   =>  'application/postscript',
-      'exe'   =>  'application/octet-stream',
-      'gif'   =>  'image/gif',
-      'gtar'  =>  'application/x-gtar',
-      'htm'   =>  'text/html',
-      'html'  =>  'text/html',
-      'jpe'   =>  'image/jpeg',
-      'jpeg'  =>  'image/jpeg',
-      'jpg'   =>  'image/jpeg',
-      'hqx'   =>  'application/mac-binhex40',
-      'js'    =>  'application/x-javascript',
-      'lha'   =>  'application/octet-stream',
-      'log'   =>  'text/plain',
-      'lzh'   =>  'application/octet-stream',
-      'mid'   =>  'audio/midi',
-      'midi'  =>  'audio/midi',
-      'mif'   =>  'application/vnd.mif',
-      'mov'   =>  'video/quicktime',
-      'movie' =>  'video/x-sgi-movie',
-      'mp2'   =>  'audio/mpeg',
-      'mp3'   =>  'audio/mpeg',
-      'mpe'   =>  'video/mpeg',
-      'mpeg'  =>  'video/mpeg',
-      'mpg'   =>  'video/mpeg',
-      'mpga'  =>  'audio/mpeg',
-      'oda'   =>  'application/oda',
-      'pdf'   =>  'application/pdf',
-      'php'   =>  'application/x-httpd-php',
-      'php3'  =>  'application/x-httpd-php',
-      'php4'  =>  'application/x-httpd-php',
-      'phps'  =>  'application/x-httpd-php-source',
-      'phtml' =>  'application/x-httpd-php',
-      'png'   =>  'image/png',
-      'ppt'   =>  'application/vnd.ms-powerpoint',
-      'ps'    =>  'application/postscript',
-      'psd'   =>  'application/octet-stream',
-      'qt'    =>  'video/quicktime',
-      'ra'    =>  'audio/x-realaudio',
-      'ram'   =>  'audio/x-pn-realaudio',
-      'rm'    =>  'audio/x-pn-realaudio',
-      'rpm'   =>  'audio/x-pn-realaudio-plugin',
-      'rtf'   =>  'text/rtf',
-      'rtx'   =>  'text/richtext',
-      'rv'    =>  'video/vnd.rn-realvideo',
-      'sea'   =>  'application/octet-stream',
-      'shtml' =>  'text/html',
-      'sit'   =>  'application/x-stuffit',
-      'so'    =>  'application/octet-stream',
-      'smi'   =>  'application/smil',
-      'smil'  =>  'application/smil',
-      'swf'   =>  'application/x-shockwave-flash',
-      'tar'   =>  'application/x-tar',
-      'text'  =>  'text/plain',
-      'txt'   =>  'text/plain',
-      'tgz'   =>  'application/x-tar',
-      'tif'   =>  'image/tiff',
-      'tiff'  =>  'image/tiff',
-      'wav'   =>  'audio/x-wav',
-      'wbxml' =>  'application/vnd.wap.wbxml',
-      'wmlc'  =>  'application/vnd.wap.wmlc',
-      'word'  =>  'application/msword',
-      'xht'   =>  'application/xhtml+xml',
-      'xhtml' =>  'application/xhtml+xml',
-      'xl'    =>  'application/excel',
-      'xls'   =>  'application/vnd.ms-excel',
-      'xml'   =>  'text/xml',
-      'xsl'   =>  'text/xml',
-      'zip'   =>  'application/zip'
-    );
-    return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
+	$mimes = array(
+	  'ai'    =>  'application/postscript',
+	  'aif'   =>  'audio/x-aiff',
+	  'aifc'  =>  'audio/x-aiff',
+	  'aiff'  =>  'audio/x-aiff',
+	  'avi'   =>  'video/x-msvideo',
+	  'bin'   =>  'application/macbinary',
+	  'bmp'   =>  'image/bmp',
+	  'class' =>  'application/octet-stream',
+	  'cpt'   =>  'application/mac-compactpro',
+	  'css'   =>  'text/css',
+	  'dcr'   =>  'application/x-director',
+	  'dir'   =>  'application/x-director',
+	  'dll'   =>  'application/octet-stream',
+	  'dms'   =>  'application/octet-stream',
+	  'doc'   =>  'application/msword',
+	  'dvi'   =>  'application/x-dvi',
+	  'dxr'   =>  'application/x-director',
+	  'eml'   =>  'message/rfc822',
+	  'eps'   =>  'application/postscript',
+	  'exe'   =>  'application/octet-stream',
+	  'gif'   =>  'image/gif',
+	  'gtar'  =>  'application/x-gtar',
+	  'htm'   =>  'text/html',
+	  'html'  =>  'text/html',
+	  'jpe'   =>  'image/jpeg',
+	  'jpeg'  =>  'image/jpeg',
+	  'jpg'   =>  'image/jpeg',
+	  'hqx'   =>  'application/mac-binhex40',
+	  'js'    =>  'application/x-javascript',
+	  'lha'   =>  'application/octet-stream',
+	  'log'   =>  'text/plain',
+	  'lzh'   =>  'application/octet-stream',
+	  'mid'   =>  'audio/midi',
+	  'midi'  =>  'audio/midi',
+	  'mif'   =>  'application/vnd.mif',
+	  'mov'   =>  'video/quicktime',
+	  'movie' =>  'video/x-sgi-movie',
+	  'mp2'   =>  'audio/mpeg',
+	  'mp3'   =>  'audio/mpeg',
+	  'mpe'   =>  'video/mpeg',
+	  'mpeg'  =>  'video/mpeg',
+	  'mpg'   =>  'video/mpeg',
+	  'mpga'  =>  'audio/mpeg',
+	  'oda'   =>  'application/oda',
+	  'pdf'   =>  'application/pdf',
+	  'php'   =>  'application/x-httpd-php',
+	  'php3'  =>  'application/x-httpd-php',
+	  'php4'  =>  'application/x-httpd-php',
+	  'phps'  =>  'application/x-httpd-php-source',
+	  'phtml' =>  'application/x-httpd-php',
+	  'png'   =>  'image/png',
+	  'ppt'   =>  'application/vnd.ms-powerpoint',
+	  'ps'    =>  'application/postscript',
+	  'psd'   =>  'application/octet-stream',
+	  'qt'    =>  'video/quicktime',
+	  'ra'    =>  'audio/x-realaudio',
+	  'ram'   =>  'audio/x-pn-realaudio',
+	  'rm'    =>  'audio/x-pn-realaudio',
+	  'rpm'   =>  'audio/x-pn-realaudio-plugin',
+	  'rtf'   =>  'text/rtf',
+	  'rtx'   =>  'text/richtext',
+	  'rv'    =>  'video/vnd.rn-realvideo',
+	  'sea'   =>  'application/octet-stream',
+	  'shtml' =>  'text/html',
+	  'sit'   =>  'application/x-stuffit',
+	  'so'    =>  'application/octet-stream',
+	  'smi'   =>  'application/smil',
+	  'smil'  =>  'application/smil',
+	  'swf'   =>  'application/x-shockwave-flash',
+	  'tar'   =>  'application/x-tar',
+	  'text'  =>  'text/plain',
+	  'txt'   =>  'text/plain',
+	  'tgz'   =>  'application/x-tar',
+	  'tif'   =>  'image/tiff',
+	  'tiff'  =>  'image/tiff',
+	  'wav'   =>  'audio/x-wav',
+	  'wbxml' =>  'application/vnd.wap.wbxml',
+	  'wmlc'  =>  'application/vnd.wap.wmlc',
+	  'word'  =>  'application/msword',
+	  'xht'   =>  'application/xhtml+xml',
+	  'xhtml' =>  'application/xhtml+xml',
+	  'xl'    =>  'application/excel',
+	  'xls'   =>  'application/vnd.ms-excel',
+	  'xml'   =>  'text/xml',
+	  'xsl'   =>  'text/xml',
+	  'zip'   =>  'application/zip'
+	);
+	return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
   }
 
   /**
@@ -1851,12 +1851,12 @@  discard block
 block discarded – undo
    * NOTE: will not work with arrays, there are no arrays to set/reset
    */
   function set ( $name, $value = '' ) {
-    if ( isset($this->$name) ) {
-      $this->$name = $value;
-    } else {
-      $this->SetError('Cannot set or reset variable ' . $name);
-      return false;
-    }
+	if ( isset($this->$name) ) {
+	  $this->$name = $value;
+	} else {
+	  $this->SetError('Cannot set or reset variable ' . $name);
+	  return false;
+	}
   }
 
   /**
@@ -1866,16 +1866,16 @@  discard block
 block discarded – undo
    * @param string $filename Parameter File Name
    */
   function getFile($filename) {
-    $return = '';
-    if ($fp = fopen($filename, 'rb')) {
-      while (!feof($fp)) {
-        $return .= fread($fp, 1024);
-      }
-      fclose($fp);
-      return $return;
-    } else {
-      return false;
-    }
+	$return = '';
+	if ($fp = fopen($filename, 'rb')) {
+	  while (!feof($fp)) {
+		$return .= fread($fp, 1024);
+	  }
+	  fclose($fp);
+	  return $return;
+	} else {
+	  return false;
+	}
   }
 
   /**
@@ -1885,10 +1885,10 @@  discard block
 block discarded – undo
    * @return string
    */
   function SecureHeader($str) {
-    $str = trim($str);
-    $str = str_replace("\r", "", $str);
-    $str = str_replace("\n", "", $str);
-    return $str;
+	$str = trim($str);
+	$str = str_replace("\r", "", $str);
+	$str = str_replace("\n", "", $str);
+	return $str;
   }
 
   /**
@@ -1899,9 +1899,9 @@  discard block
 block discarded – undo
    * @param string $key_pass Password for private key
    */
   function Sign($cert_filename, $key_filename, $key_pass) {
-    $this->sign_cert_file = $cert_filename;
-    $this->sign_key_file = $key_filename;
-    $this->sign_key_pass = $key_pass;
+	$this->sign_cert_file = $cert_filename;
+	$this->sign_key_file = $key_filename;
+	$this->sign_key_pass = $key_pass;
   }
 
 }

Please login to merge, or discard this patch.

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1240,8 +1240,9 @@
 block discarded – undo
       case '7bit':
       case '8bit':
         $encoded = $this->FixEOL($str);
-        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
+        if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+                  $encoded .= $this->LE;
+        }
         break;
       case 'binary':
         $encoded = $str;

Please login to merge, or discard this patch.

Spacing +185 added lines, -186 removed lines patch added patch discarded remove patch

@@ -41,64 +41,64 @@  discard block
 block discarded – undo
    * Email priority (1 = High, 3 = Normal, 5 = low).
    * @var int
    */
-  var $Priority          = 3;
+  var $Priority = 3;
 
   /**
    * Sets the CharSet of the message.
    * @var string
    */
-  var $CharSet           = 'iso-8859-1';
+  var $CharSet = 'iso-8859-1';
 
   /**
    * Sets the Content-type of the message.
    * @var string
    */
-  var $ContentType        = 'text/plain';
+  var $ContentType = 'text/plain';
 
   /**
    * Sets the Encoding of the message. Options for this are "8bit",
    * "7bit", "binary", "base64", and "quoted-printable".
    * @var string
    */
-  var $Encoding          = '8bit';
+  var $Encoding = '8bit';
 
   /**
    * Holds the most recent mailer error message.
    * @var string
    */
-  var $ErrorInfo         = '';
+  var $ErrorInfo = '';
 
   /**
    * Sets the From email address for the message.
    * @var string
    */
-  var $From              = 'root@localhost';
+  var $From = 'root@localhost';
 
   /**
    * Sets the From name of the message.
    * @var string
    */
-  var $FromName          = 'Root User';
+  var $FromName = 'Root User';
 
   /**
    * Sets the Sender email (Return-Path) of the message.  If not empty,
    * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
    * @var string
    */
-  var $Sender            = '';
+  var $Sender = '';
 
   /**
    * Sets the Subject of the message.
    * @var string
    */
-  var $Subject           = '';
+  var $Subject = '';
 
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.
    * If HTML then run IsHTML(true).
    * @var string
    */
-  var $Body              = '';
+  var $Body = '';
 
   /**
    * Sets the text-only body of the message.  This automatically sets the
@@ -107,45 +107,45 @@  discard block
 block discarded – undo
    * that can read HTML will view the normal Body.
    * @var string
    */
-  var $AltBody           = '';
+  var $AltBody = '';
 
   /**
    * Sets word wrapping on the body of the message to a given number of
    * characters.
    * @var int
    */
-  var $WordWrap          = 0;
+  var $WordWrap = 0;
 
   /**
    * Method to send mail: ("mail", "sendmail", or "smtp").
    * @var string
    */
-  var $Mailer            = 'mail';
+  var $Mailer = 'mail';
 
   /**
    * Sets the path of the sendmail program.
    * @var string
    */
-  var $Sendmail          = '/usr/sbin/sendmail';
+  var $Sendmail = '/usr/sbin/sendmail';
 
   /**
    * Path to PHPMailer plugins.  This is now only useful if the SMTP class
    * is in a different directory than the PHP include path.
    * @var string
    */
-  var $PluginDir         = '';
+  var $PluginDir = '';
 
   /**
    * Holds PHPMailer version.
    * @var string
    */
-  var $Version           = "2.0.4";
+  var $Version = "2.0.4";
 
   /**
    * Sets the email address that a reading confirmation will be sent.
    * @var string
    */
-  var $ConfirmReadingTo  = '';
+  var $ConfirmReadingTo = '';
 
   /**
    * Sets the hostname to use in Message-Id and Received headers
@@ -153,14 +153,14 @@  discard block
 block discarded – undo
    * by SERVER_NAME is used or 'localhost.localdomain'.
    * @var string
    */
-  var $Hostname          = '';
+  var $Hostname = '';
 
   /**
    * Sets the message ID to be used in the Message-Id header.
    * If empty, a unique id will be generated.
    * @var string
    */
-  var $MessageID         = '';
+  var $MessageID = '';
 
   /////////////////////////////////////////////////
   // PROPERTIES FOR SMTP
@@ -174,19 +174,19 @@  discard block
 block discarded – undo
    * Hosts will be tried in order.
    * @var string
    */
-  var $Host        = 'localhost';
+  var $Host = 'localhost';
 
   /**
    * Sets the default SMTP server port.
    * @var int
    */
-  var $Port        = 25;
+  var $Port = 25;
 
   /**
    * Sets the SMTP HELO of the message (Default is $Hostname).
    * @var string
    */
-  var $Helo        = '';
+  var $Helo = '';
 
   /**
    * Sets connection prefix.
@@ -199,32 +199,32 @@  discard block
 block discarded – undo
    * Sets SMTP authentication. Utilizes the Username and Password variables.
    * @var bool
    */
-  var $SMTPAuth     = false;
+  var $SMTPAuth = false;
 
   /**
    * Sets SMTP username.
    * @var string
    */
-  var $Username     = '';
+  var $Username = '';
 
   /**
    * Sets SMTP password.
    * @var string
    */
-  var $Password     = '';
+  var $Password = '';
 
   /**
    * Sets the SMTP server timeout in seconds. This function will not
    * work with the win32 version.
    * @var int
    */
-  var $Timeout      = 10;
+  var $Timeout = 10;
 
   /**
    * Sets SMTP class debugging on or off.
    * @var bool
    */
-  var $SMTPDebug    = false;
+  var $SMTPDebug = false;
 
   /**
    * Prevents the SMTP connection from being closed after each mail
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
    * @return void
    */
   function IsHTML($bool) {
-    if($bool == true) {
+    if ($bool == true) {
       $this->ContentType = 'text/html';
     } else {
       $this->ContentType = 'text/plain';
@@ -382,13 +382,13 @@  discard block
 block discarded – undo
     $body = '';
     $result = true;
 
-    if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+    if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
       $this->SetError($this->Lang('provide_address'));
       return false;
     }
 
     /* Set whether the message is multipart/alternative */
-    if(!empty($this->AltBody)) {
+    if (!empty($this->AltBody)) {
       $this->ContentType = 'multipart/alternative';
     }
 
@@ -397,12 +397,12 @@  discard block
 block discarded – undo
     $header .= $this->CreateHeader();
     $body = $this->CreateBody();
 
-    if($body == '') {
+    if ($body == '') {
       return false;
     }
 
     /* Choose the mailer */
-    switch($this->Mailer) {
+    switch ($this->Mailer) {
       case 'sendmail':
         $result = $this->SendmailSend($header, $body);
         break;
@@ -435,8 +435,8 @@  discard block
 block discarded – undo
       $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
     }
 
-    if(!@$mail = popen($sendmail, 'w')) {
-      $this->SetError($this->Lang('execute') . $this->Sendmail);
+    if (!@$mail = popen($sendmail, 'w')) {
+      $this->SetError($this->Lang('execute').$this->Sendmail);
       return false;
     }
 
@@ -447,8 +447,8 @@  discard block
 block discarded – undo
     if (version_compare(phpversion(), '4.2.3') == -1) {
       $result = $result >> 8 & 0xFF;
     }
-    if($result != 0) {
-      $this->SetError($this->Lang('execute') . $this->Sendmail);
+    if ($result != 0) {
+      $this->SetError($this->Lang('execute').$this->Sendmail);
       return false;
     }
     return true;
@@ -462,8 +462,8 @@  discard block
 block discarded – undo
   function MailSend($header, $body) {
 
     $to = '';
-    for($i = 0; $i < count($this->to); $i++) {
-      if($i != 0) { $to .= ', '; }
+    for ($i = 0; $i < count($this->to); $i++) {
+      if ($i != 0) { $to .= ', '; }
       $to .= $this->AddrFormat($this->to[$i]);
     }
 
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
       ini_set('sendmail_from', $old_from);
     }
 
-    if(!$rt) {
+    if (!$rt) {
       $this->SetError($this->Lang('instantiate'));
       return false;
     }
@@ -510,58 +510,58 @@  discard block
 block discarded – undo
    * @return bool
    */
   function SmtpSend($header, $body) {
-    include_once($this->PluginDir . 'class.smtp.php');
+    include_once($this->PluginDir.'class.smtp.php');
     $error = '';
     $bad_rcpt = array();
 
-    if(!$this->SmtpConnect()) {
+    if (!$this->SmtpConnect()) {
       return false;
     }
 
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      $error = $this->Lang('from_failed') . $smtp_from;
+    if (!$this->smtp->Mail($smtp_from)) {
+      $error = $this->Lang('from_failed').$smtp_from;
       $this->SetError($error);
       $this->smtp->Reset();
       return false;
     }
 
     /* Attempt to send attach all recipients */
-    for($i = 0; $i < count($this->to); $i++) {
-      if(!$this->smtp->Recipient($this->to[$i][0])) {
+    for ($i = 0; $i < count($this->to); $i++) {
+      if (!$this->smtp->Recipient($this->to[$i][0])) {
         $bad_rcpt[] = $this->to[$i][0];
       }
     }
-    for($i = 0; $i < count($this->cc); $i++) {
-      if(!$this->smtp->Recipient($this->cc[$i][0])) {
+    for ($i = 0; $i < count($this->cc); $i++) {
+      if (!$this->smtp->Recipient($this->cc[$i][0])) {
         $bad_rcpt[] = $this->cc[$i][0];
       }
     }
-    for($i = 0; $i < count($this->bcc); $i++) {
-      if(!$this->smtp->Recipient($this->bcc[$i][0])) {
+    for ($i = 0; $i < count($this->bcc); $i++) {
+      if (!$this->smtp->Recipient($this->bcc[$i][0])) {
         $bad_rcpt[] = $this->bcc[$i][0];
       }
     }
 
-    if(count($bad_rcpt) > 0) { // Create error message
-      for($i = 0; $i < count($bad_rcpt); $i++) {
-        if($i != 0) {
+    if (count($bad_rcpt) > 0) { // Create error message
+      for ($i = 0; $i < count($bad_rcpt); $i++) {
+        if ($i != 0) {
           $error .= ', ';
         }
         $error .= $bad_rcpt[$i];
       }
-      $error = $this->Lang('recipients_failed') . $error;
+      $error = $this->Lang('recipients_failed').$error;
       $this->SetError($error);
       $this->smtp->Reset();
       return false;
     }
 
-    if(!$this->smtp->Data($header . $body)) {
+    if (!$this->smtp->Data($header.$body)) {
       $this->SetError($this->Lang('data_not_accepted'));
       $this->smtp->Reset();
       return false;
     }
-    if($this->SMTPKeepAlive == true) {
+    if ($this->SMTPKeepAlive == true) {
       $this->smtp->Reset();
     } else {
       $this->SmtpClose();
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
    * @return bool
    */
   function SmtpConnect() {
-    if($this->smtp == NULL) {
+    if ($this->smtp == NULL) {
       $this->smtp = new SMTP();
     }
 
@@ -587,9 +587,9 @@  discard block
 block discarded – undo
     $connection = ($this->smtp->Connected());
 
     /* Retry while there is no connection */
-    while($index < count($hosts) && $connection == false) {
+    while ($index < count($hosts) && $connection == false) {
       $hostinfo = array();
-      if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
+      if (eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
         $host = $hostinfo[1];
         $port = $hostinfo[2];
       } else {
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
         $port = $this->Port;
       }
 
-      if($this->smtp->Connect(((!empty($this->SMTPSecure))?$this->SMTPSecure.'://':'').$host, $port, $this->Timeout)) {
+      if ($this->smtp->Connect(((!empty($this->SMTPSecure)) ? $this->SMTPSecure.'://' : '').$host, $port, $this->Timeout)) {
         if ($this->Helo != '') {
           $this->smtp->Hello($this->Helo);
         } else {
@@ -605,8 +605,8 @@  discard block
 block discarded – undo
         }
 
         $connection = true;
-        if($this->SMTPAuth) {
-          if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
+        if ($this->SMTPAuth) {
+          if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
             $this->SetError($this->Lang('authenticate'));
             $this->smtp->Reset();
             $connection = false;
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
       }
       $index++;
     }
-    if(!$connection) {
+    if (!$connection) {
       $this->SetError($this->Lang('connect_host'));
     }
 
@@ -627,8 +627,8 @@  discard block
 block discarded – undo
    * @return void
    */
   function SmtpClose() {
-    if($this->smtp != NULL) {
-      if($this->smtp->Connected()) {
+    if ($this->smtp != NULL) {
+      if ($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
       }
@@ -645,19 +645,19 @@  discard block
 block discarded – undo
    * @return bool
    */
   function SetLanguage($lang_type, $lang_path = 'language/') {
-    if(file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php')) {
+    if (file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php')) {
       include($lang_path.'phpmailer.lang-'.$lang_type.'.php');
     } elseif (file_exists($lang_path.'phpmailer.lang-en.php')) {
       include($lang_path.'phpmailer.lang-en.php');
     } else {
       $PHPMAILER_LANG = array();
-      $PHPMAILER_LANG["provide_address"]      = 'You must provide at least one ' .
+      $PHPMAILER_LANG["provide_address"]      = 'You must provide at least one '.
       $PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
       $PHPMAILER_LANG["execute"]              = 'Could not execute: ';
       $PHPMAILER_LANG["instantiate"]          = 'Could not instantiate mail function.';
       $PHPMAILER_LANG["authenticate"]         = 'SMTP Error: Could not authenticate.';
       $PHPMAILER_LANG["from_failed"]          = 'The following From address failed: ';
-      $PHPMAILER_LANG["recipients_failed"]    = 'SMTP Error: The following ' .
+      $PHPMAILER_LANG["recipients_failed"]    = 'SMTP Error: The following '.
       $PHPMAILER_LANG["data_not_accepted"]    = 'SMTP Error: Data not accepted.';
       $PHPMAILER_LANG["connect_host"]         = 'SMTP Error: Could not connect to SMTP host.';
       $PHPMAILER_LANG["file_access"]          = 'Could not access file: ';
@@ -680,11 +680,11 @@  discard block
 block discarded – undo
    * @return string
    */
   function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
+    $addr_str = $type.': ';
     $addr_str .= $this->AddrFormat($addr[0]);
-    if(count($addr) > 1) {
-      for($i = 1; $i < count($addr); $i++) {
-        $addr_str .= ', ' . $this->AddrFormat($addr[$i]);
+    if (count($addr) > 1) {
+      for ($i = 1; $i < count($addr); $i++) {
+        $addr_str .= ', '.$this->AddrFormat($addr[$i]);
       }
     }
     $addr_str .= $this->LE;
@@ -698,10 +698,10 @@  discard block
 block discarded – undo
    * @return string
    */
   function AddrFormat($addr) {
-    if(empty($addr[1])) {
+    if (empty($addr[1])) {
       $formatted = $this->SecureHeader($addr[0]);
     } else {
-      $formatted = $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+      $formatted = $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase')." <".$this->SecureHeader($addr[0]).">";
     }
 
     return $formatted;
@@ -727,10 +727,10 @@  discard block
 block discarded – undo
 
     $line = explode($this->LE, $message);
     $message = '';
-    for ($i=0 ;$i < count($line); $i++) {
+    for ($i = 0; $i < count($line); $i++) {
       $line_part = explode(' ', $line[$i]);
       $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
+      for ($e = 0; $e < count($line_part); $e++) {
         $word = $line_part[$e];
         if ($qp_mode and (strlen($word) > $length)) {
           $space_left = $length - strlen($buf) - 1;
@@ -746,10 +746,10 @@  discard block
 block discarded – undo
               }
               $part = substr($word, 0, $len);
               $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
+              $buf .= ' '.$part;
+              $message .= $buf.sprintf("=%s", $this->LE);
             } else {
-              $message .= $buf . $soft_break;
+              $message .= $buf.$soft_break;
             }
             $buf = '';
           }
@@ -766,22 +766,22 @@  discard block
 block discarded – undo
             $word = substr($word, $len);
 
             if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
+              $message .= $part.sprintf("=%s", $this->LE);
             } else {
               $buf = $part;
             }
           }
         } else {
           $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
+          $buf .= ($e == 0) ? $word : (' '.$word);
 
           if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
+            $message .= $buf_o.$soft_break;
             $buf = $word;
           }
         }
       }
-      $message .= $buf . $this->LE;
+      $message .= $buf.$this->LE;
     }
 
     return $message;
@@ -810,8 +810,7 @@  discard block
 block discarded – undo
         if ($dec < 128) { // Single byte character.
           // If the encoded char was found at pos 0, it will fit
           // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
-          $maxLength - ($lookBack - $encodedCharPos);
+          $maxLength = ($encodedCharPos == 0) ? $maxLength : $maxLength - ($lookBack - $encodedCharPos);
           $foundSplitPos = true;
         } elseif ($dec >= 192) { // First byte of a multi byte character
           // Reduce maxLength to split at start of character
@@ -834,11 +833,11 @@  discard block
 block discarded – undo
    * @return void
    */
   function SetWordWrap() {
-    if($this->WordWrap < 1) {
+    if ($this->WordWrap < 1) {
       return;
     }
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
         /* fall through */
       case 'alt_attachments':
@@ -860,19 +859,19 @@  discard block
 block discarded – undo
 
     /* Set the boundaries */
     $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
+    $this->boundary[1] = 'b1_'.$uniq_id;
+    $this->boundary[2] = 'b2_'.$uniq_id;
 
     $result .= $this->HeaderLine('Date', $this->RFCDate());
-    if($this->Sender == '') {
+    if ($this->Sender == '') {
       $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
       $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
     }
 
     /* To be created automatically by mail() */
-    if($this->Mailer != 'mail') {
-      if(count($this->to) > 0) {
+    if ($this->Mailer != 'mail') {
+      if (count($this->to) > 0) {
         $result .= $this->AddrAppend('To', $this->to);
       } elseif (count($this->cc) == 0) {
         $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
@@ -885,38 +884,38 @@  discard block
 block discarded – undo
     $result .= $this->AddrAppend('From', $from);
 
     /* sendmail and mail() extract Cc from the header before sending */
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->cc) > 0)) {
+    if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->cc) > 0)) {
       $result .= $this->AddrAppend('Cc', $this->cc);
     }
 
     /* sendmail and mail() extract Bcc from the header before sending */
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+    if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
       $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
-    if(count($this->ReplyTo) > 0) {
+    if (count($this->ReplyTo) > 0) {
       $result .= $this->AddrAppend('Reply-To', $this->ReplyTo);
     }
 
     /* mail() sets the subject itself */
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+    if ($this->MessageID != '') {
+      $result .= $this->HeaderLine('Message-ID', $this->MessageID);
     } else {
       $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
-    $result .= $this->HeaderLine('X-Mailer', 'PHPMailer (phpmailer.sourceforge.net) [version ' . $this->Version . ']');
+    $result .= $this->HeaderLine('X-Mailer', 'PHPMailer (phpmailer.sourceforge.net) [version '.$this->Version.']');
 
-    if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+    if ($this->ConfirmReadingTo != '') {
+      $result .= $this->HeaderLine('Disposition-Notification-To', '<'.trim($this->ConfirmReadingTo).'>');
     }
 
     // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
+    for ($index = 0; $index < count($this->CustomHeader); $index++) {
       $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
@@ -934,7 +933,7 @@  discard block
 block discarded – undo
    */
   function GetMailMIME() {
     $result = '';
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
         $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
@@ -942,20 +941,20 @@  discard block
 block discarded – undo
       case 'attachments':
         /* fall through */
       case 'alt_attachments':
-        if($this->InlineImageExists()){
+        if ($this->InlineImageExists()) {
           $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
         } else {
           $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+          $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         }
         break;
       case 'alt':
         $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+        $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         break;
     }
 
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->LE.$this->LE;
     }
 
@@ -975,7 +974,7 @@  discard block
 block discarded – undo
 
     $this->SetWordWrap();
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
         $result .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $result .= $this->EncodeString($this->AltBody, $this->Encoding);
@@ -996,11 +995,11 @@  discard block
 block discarded – undo
         break;
       case 'alt_attachments':
         $result .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $result .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $result .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+        $result .= sprintf("Content-Type: %s;%s"."\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+        $result .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '').$this->LE; // Create text body
         $result .= $this->EncodeString($this->AltBody, $this->Encoding);
         $result .= $this->LE.$this->LE;
-        $result .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+        $result .= $this->GetBoundary($this->boundary[2], '', 'text/html', '').$this->LE; // Create the HTML body
         $result .= $this->EncodeString($this->Body, $this->Encoding);
         $result .= $this->LE.$this->LE;
         $result .= $this->EndBoundary($this->boundary[2]);
@@ -1008,7 +1007,7 @@  discard block
 block discarded – undo
         break;
     }
 
-    if($this->IsError()) {
+    if ($this->IsError()) {
       $result = '';
     } else if ($this->sign_key_file) {
       $file = tempnam("", "mail");
@@ -1021,8 +1020,8 @@  discard block
 block discarded – undo
         $fp = fopen($signed, "r");
         $result = fread($fp, filesize($this->sign_key_file));
         $result = '';
-        while(!feof($fp)){
-          $result = $result . fread($fp, 1024);
+        while (!feof($fp)) {
+          $result = $result.fread($fp, 1024);
         }
         fclose($fp);
       } else {
@@ -1043,16 +1042,16 @@  discard block
 block discarded – undo
    */
   function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
-    if($charSet == '') {
+    if ($charSet == '') {
       $charSet = $this->CharSet;
     }
-    if($contentType == '') {
+    if ($contentType == '') {
       $contentType = $this->ContentType;
     }
-    if($encoding == '') {
+    if ($encoding == '') {
       $encoding = $this->Encoding;
     }
-    $result .= $this->TextLine('--' . $boundary);
+    $result .= $this->TextLine('--'.$boundary);
     $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
     $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
@@ -1066,7 +1065,7 @@  discard block
 block discarded – undo
    * @access private
    */
   function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+    return $this->LE.'--'.$boundary.'--'.$this->LE;
   }
 
   /**
@@ -1075,16 +1074,16 @@  discard block
 block discarded – undo
    * @return void
    */
   function SetMessageType() {
-    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+    if (count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
       $this->message_type = 'plain';
     } else {
-      if(count($this->attachment) > 0) {
+      if (count($this->attachment) > 0) {
         $this->message_type = 'attachments';
       }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+      if (strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
         $this->message_type = 'alt';
       }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+      if (strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
         $this->message_type = 'alt_attachments';
       }
     }
@@ -1095,7 +1094,7 @@  discard block
 block discarded – undo
    * @return string
    */
   function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+    return $name.': '.$value.$this->LE;
   }
 
   /**
@@ -1104,7 +1103,7 @@  discard block
 block discarded – undo
    * @return string
    */
   function TextLine($value) {
-    return $value . $this->LE;
+    return $value.$this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1122,13 +1121,13 @@  discard block
 block discarded – undo
    * @return bool
    */
   function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-    if(!@is_file($path)) {
-      $this->SetError($this->Lang('file_access') . $path);
+    if (!@is_file($path)) {
+      $this->SetError($this->Lang('file_access').$path);
       return false;
     }
 
     $filename = basename($path);
-    if($name == '') {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -1156,7 +1155,7 @@  discard block
 block discarded – undo
     $mime = array();
 
     /* Add all attachments */
-    for($i = 0; $i < count($this->attachment); $i++) {
+    for ($i = 0; $i < count($this->attachment); $i++) {
       /* Check for string attachment */
       $bString = $this->attachment[$i][5];
       if ($bString) {
@@ -1176,22 +1175,22 @@  discard block
 block discarded – undo
       $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
       $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
 
-      if($disposition == 'inline') {
+      if ($disposition == 'inline') {
         $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
       }
 
       $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
 
       /* Encode as string attachment */
-      if($bString) {
+      if ($bString) {
         $mime[] = $this->EncodeString($string, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
       } else {
         $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
@@ -1209,9 +1208,9 @@  discard block
 block discarded – undo
    * @access private
    * @return string
    */
-  function EncodeFile ($path, $encoding = 'base64') {
-    if(!@$fd = fopen($path, 'rb')) {
-      $this->SetError($this->Lang('file_open') . $path);
+  function EncodeFile($path, $encoding = 'base64') {
+    if (!@$fd = fopen($path, 'rb')) {
+      $this->SetError($this->Lang('file_open').$path);
       return '';
     }
     $magic_quotes = get_magic_quotes_runtime();
@@ -1230,9 +1229,9 @@  discard block
 block discarded – undo
    * @access private
    * @return string
    */
-  function EncodeString ($str, $encoding = 'base64') {
+  function EncodeString($str, $encoding = 'base64') {
     $encoded = '';
-    switch(strtolower($encoding)) {
+    switch (strtolower($encoding)) {
       case 'base64':
         /* chunk_split is found in PHP >= 3.0.6 */
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
@@ -1250,7 +1249,7 @@  discard block
 block discarded – undo
         $encoded = $this->EncodeQP($str);
         break;
       default:
-        $this->SetError($this->Lang('encoding') . $encoding);
+        $this->SetError($this->Lang('encoding').$encoding);
         break;
     }
     return $encoded;
@@ -1261,7 +1260,7 @@  discard block
 block discarded – undo
    * @access private
    * @return string
    */
-  function EncodeHeader ($str, $position = 'text') {
+  function EncodeHeader($str, $position = 'text') {
     $x = 0;
 
     switch (strtolower($position)) {
@@ -1292,7 +1291,7 @@  discard block
 block discarded – undo
 
     $maxlen = 75 - 7 - strlen($this->CharSet);
     /* Try to select the encoding which should produce the shortest output */
-    if (strlen($str)/3 < $x) {
+    if (strlen($str) / 3 < $x) {
       $encoding = 'B';
       if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
      // Use a custom function which correctly encodes and wraps long
@@ -1362,7 +1361,7 @@  discard block
 block discarded – undo
       }
       while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+      $encoded .= $chunk.$this->LE;
     }
 
     // Chomp the last linefeed
@@ -1375,37 +1374,37 @@  discard block
 block discarded – undo
    * @access private
    * @return string
    */
-  function EncodeQP( $input = '', $line_max = 76, $space_conv = false ) {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+  function EncodeQP($input = '', $line_max = 76, $space_conv = false) {
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $escape = '=';
     $output = '';
-    while( list(, $line) = each($lines) ) {
+    while (list(, $line) = each($lines)) {
       $linlen = strlen($line);
       $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
-        $c = substr( $line, $i, 1 );
-        $dec = ord( $c );
-        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
+      for ($i = 0; $i < $linlen; $i++) {
+        $c = substr($line, $i, 1);
+        $dec = ord($c);
+        if (($i == 0) && ($dec == 46)) { // convert first point in the line into =2E
           $c = '=2E';
         }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+        if ($dec == 32) {
+          if ($i == ($linlen - 1)) { // convert space at eol only
             $c = '=20';
-          } else if ( $space_conv ) {
+          } else if ($space_conv) {
             $c = '=20';
           }
-        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
+        } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+          $h2 = floor($dec / 16);
+          $h1 = floor($dec % 16);
           $c = $escape.$hex[$h2].$hex[$h1];
         }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+        if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
           $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
           $newline = '';
           // check if newline first character will be point or not
-          if ( $dec == 46 ) {
+          if ($dec == 46) {
             $c = '=2E';
           }
         }
@@ -1421,7 +1420,7 @@  discard block
 block discarded – undo
    * @access private
    * @return string
    */
-  function EncodeQ ($str, $position = 'text') {
+  function EncodeQ($str, $position = 'text') {
     /* There should not be any EOL in the string */
     $encoded = preg_replace("[\r\n]", '', $str);
 
@@ -1483,13 +1482,13 @@  discard block
 block discarded – undo
    */
   function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
-    if(!@is_file($path)) {
-      $this->SetError($this->Lang('file_access') . $path);
+    if (!@is_file($path)) {
+      $this->SetError($this->Lang('file_access').$path);
       return false;
     }
 
     $filename = basename($path);
-    if($name == '') {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -1514,8 +1513,8 @@  discard block
 block discarded – undo
    */
   function InlineImageExists() {
     $result = false;
-    for($i = 0; $i < count($this->attachment); $i++) {
-      if($this->attachment[$i][6] == 'inline') {
+    for ($i = 0; $i < count($this->attachment); $i++) {
+      if ($this->attachment[$i][6] == 'inline') {
         $result = true;
         break;
       }
@@ -1612,7 +1611,7 @@  discard block
 block discarded – undo
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+    $tz = (int) ($tz / 3600) * 100 + ($tz % 3600) / 60;
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
@@ -1629,14 +1628,14 @@  discard block
 block discarded – undo
     global $HTTP_SERVER_VARS;
     global $HTTP_ENV_VARS;
 
-    if(!isset($_SERVER)) {
+    if (!isset($_SERVER)) {
       $_SERVER = $HTTP_SERVER_VARS;
-      if(!isset($_SERVER['REMOTE_ADDR'])) {
+      if (!isset($_SERVER['REMOTE_ADDR'])) {
         $_SERVER = $HTTP_ENV_VARS; // must be Apache
       }
     }
 
-    if(isset($_SERVER[$varName])) {
+    if (isset($_SERVER[$varName])) {
       return $_SERVER[$varName];
     } else {
       return '';
@@ -1666,14 +1665,14 @@  discard block
 block discarded – undo
    * @return string
    */
   function Lang($key) {
-    if(count($this->language) < 1) {
+    if (count($this->language) < 1) {
       $this->SetLanguage('en'); // set the default language
     }
 
-    if(isset($this->language[$key])) {
+    if (isset($this->language[$key])) {
       return $this->language[$key];
     } else {
-      return 'Language string failed to load: ' . $key;
+      return 'Language string failed to load: '.$key;
     }
   }
 
@@ -1710,22 +1709,22 @@  discard block
 block discarded – undo
    * @access public
    * @return $message
    */
-  function MsgHTML($message,$basedir='') {
+  function MsgHTML($message, $basedir = '') {
     preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
+    if (isset($images[2])) {
+      foreach ($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('/^[A-z][A-z]*:\/\//',$url)) {
+        if (!preg_match('/^[A-z][A-z]*:\/\//', $url)) {
           $filename = basename($url);
           $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
+          ($directory == '.') ? $directory = '' : '';
+          $cid = 'cid:'.md5($filename);
           $fileParts = split("\.", $filename);
           $ext = $fileParts[1];
           $mimeType = $this->_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+          if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }
+          if (strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
+          if ($this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64', $mimeType)) {
             $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
           }
         }
@@ -1733,12 +1732,12 @@  discard block
 block discarded – undo
     }
     $this->IsHTML(true);
     $this->Body = $message;
-    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
-    if ( !empty($textMsg) && empty($this->AltBody) ) {
+    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message)));
+    if (!empty($textMsg) && empty($this->AltBody)) {
       $this->AltBody = html_entity_decode($textMsg);
     }
-    if ( empty($this->AltBody) ) {
-      $this->AltBody = 'To view this email message, open the email in with HTML compatibility!' . "\n\n";
+    if (empty($this->AltBody)) {
+      $this->AltBody = 'To view this email message, open the email in with HTML compatibility!'."\n\n";
     }
   }
 
@@ -1836,7 +1835,7 @@  discard block
 block discarded – undo
       'xsl'   =>  'text/xml',
       'zip'   =>  'application/zip'
     );
-    return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
+    return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
   }
 
   /**
@@ -1850,11 +1849,11 @@  discard block
 block discarded – undo
    * @param mixed $value Parameter Value
    * NOTE: will not work with arrays, there are no arrays to set/reset
    */
-  function set ( $name, $value = '' ) {
-    if ( isset($this->$name) ) {
+  function set($name, $value = '') {
+    if (isset($this->$name)) {
       $this->$name = $value;
     } else {
-      $this->SetError('Cannot set or reset variable ' . $name);
+      $this->SetError('Cannot set or reset variable '.$name);
       return false;
     }
   }

Please login to merge, or discard this patch.

GitHub Access Token became invalid

Push — master ( b130b6...8a2f54 )

Status

Category

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +457 added lines, -457 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Doc Comments +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +1160 added lines, -1160 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines patch added patch discarded remove patch

Indentation +275 added lines, -275 removed lines patch added patch discarded remove patch

Braces +14 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -26 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +405 added lines, -405 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +306 added lines, -306 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Doc Comments +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +828 added lines, -828 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Indentation +1104 added lines, -1104 removed lines patch added patch discarded remove patch

Spacing +62 added lines, -62 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +367 added lines, -367 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Doc Comments +27 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +1070 added lines, -1070 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +185 added lines, -186 removed lines patch added patch discarded remove patch

		@@ -425,7 +425,7 @@
		block discarded – undo
425	425	*
426	426	* @param string $domain domain name
427	427	*
428		- * @return string\|bool registered domain, will return false if $domain is
	428	+ * @return false\|string registered domain, will return false if $domain is
429	429	* either invalid or a TLD itself
430	430	*/
431	431	public static function getRegisteredDomain($domain)

		@@ -173,13 +173,13 @@ discard block
		block discarded – undo
173	173	}
174	174	if (empty($cookie['path'])) {
175	175	$path = $setter->getPath();
176		- $cookie['path'] = empty($path)? '/': substr($path, 0, strrpos($path, '/') + 1);
	176	+ $cookie['path'] = empty($path) ? '/' : substr($path, 0, strrpos($path, '/') + 1);
177	177	}
178	178	}
179	179
180	180	if ($setter && !$this->domainMatch($setter->getHost(), $cookie['domain'])) {
181	181	throw new HTTP_Request2_MessageException(
182		- "Domain " . $setter->getHost() . " cannot set cookies for "
	182	+ "Domain ".$setter->getHost()." cannot set cookies for "
183	183	. $cookie['domain']
184	184	);
185	185	}
		@@ -272,7 +272,7 @@ discard block
		block discarded – undo
272	272	} else {
273	273	$str = '';
274	274	foreach ($ret as $c) {
275		- $str .= (empty($str)? '': '; ') . $c['name'] . '=' . $c['value'];
	275	+ $str .= (empty($str) ? '' : '; ').$c['name'].'='.$c['value'];
276	276	}
277	277	return $str;
278	278	}
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	*/
304	304	public function serializeSessionCookies($serialize)
305	305	{
306		- $this->serializeSession = (bool)$serialize;
	306	+ $this->serializeSession = (bool) $serialize;
307	307	}
308	308
309	309	/**
		@@ -329,7 +329,7 @@ discard block
		block discarded – undo
329	329	*/
330	330	public function usePublicSuffixList($useList)
331	331	{
332		- $this->useList = (bool)$useList;
	332	+ $this->useList = (bool) $useList;
333	333	}
334	334
335	335	/**
		@@ -405,7 +405,7 @@ discard block
		block discarded – undo
405	405	return false;
406	406	}
407	407	if ('.' != $cookieDomain[0]) {
408		- $cookieDomain = '.' . $cookieDomain;
	408	+ $cookieDomain = '.'.$cookieDomain;
409	409	}
410	410	// prevents setting cookies for '.com' and similar domains
411	411	if (!$this->useList && substr_count($cookieDomain, '.') < 2
		@@ -413,7 +413,7 @@ discard block
		block discarded – undo
413	413	) {
414	414	return false;
415	415	}
416		- return substr('.' . $requestHost, -strlen($cookieDomain)) == $cookieDomain;
	416	+ return substr('.'.$requestHost, -strlen($cookieDomain)) == $cookieDomain;
417	417	}
418	418
419	419	/**
		@@ -434,14 +434,14 @@ discard block
		block discarded – undo
434	434
435	435	// load the list if needed
436	436	if (empty(self::$psl)) {
437		- $path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
438		- if (0 === strpos($path, '@' . 'data_dir@')) {
	437	+ $path = '@data_dir@'.DIRECTORY_SEPARATOR.'HTTP_Request2';
	438	+ if (0 === strpos($path, '@'.'data_dir@')) {
439	439	$path = realpath(
440		- dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
441		- . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data'
	440	+ dirname(__FILE__).DIRECTORY_SEPARATOR.'..'
	441	+ . DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'data'
442	442	);
443	443	}
444		- self::$psl = include_once $path . DIRECTORY_SEPARATOR . 'public-suffix-list.php';
	444	+ self::$psl = include_once $path.DIRECTORY_SEPARATOR.'public-suffix-list.php';
445	445	}
446	446
447	447	if (!($result = self::checkDomainsList($domainParts, self::$psl))) {
		@@ -455,7 +455,7 @@ discard block
		block discarded – undo
455	455	if (2 > ($count = count($domainParts))) {
456	456	return false;
457	457	}
458		- return $domainParts[$count - 2] . '.' . $domainParts[$count - 1];
	458	+ return $domainParts[$count - 2].'.'.$domainParts[$count - 1];
459	459	}
460	460	return $result;
461	461	}
		@@ -474,7 +474,7 @@ discard block
		block discarded – undo
474	474	$result = null;
475	475
476	476	if (!is_array($listNode) \|\| is_null($sub)
477		- \|\| array_key_exists('!' . $sub, $listNode)
	477	+ \|\| array_key_exists('!'.$sub, $listNode)
478	478	) {
479	479	return $sub;
480	480
		@@ -488,7 +488,7 @@ discard block
		block discarded – undo
488	488	return $sub;
489	489	}
490	490
491		- return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
	491	+ return (strlen($result) > 0) ? ($result.'.'.$sub) : null;
492	492	}
493	493	}
494	494	?>
495	495	\ No newline at end of file

		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229	* Returns the user part of the userinfo part (the part preceding the first
230	230	* ":"), or false if there is no userinfo part.
231	231	*
232		- * @return string\|bool
	232	+ * @return string\|false
233	233	*/
234	234	public function getUser()
235	235	{
		@@ -244,7 +244,7 @@ discard block
		block discarded – undo
244	244	* contain "@" in front of the hostname) or the userinfo part does not
245	245	* contain ":".
246	246	*
247		- * @return string\|bool
	247	+ * @return string\|false
248	248	*/
249	249	public function getPassword()
250	250	{
		@@ -341,7 +341,7 @@ discard block
		block discarded – undo
341	341	* Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
342	342	* false if there is no authority.
343	343	*
344		- * @return string\|bool
	344	+ * @return false\|string
345	345	*/
346	346	public function getAuthority()
347	347	{
		@@ -874,7 +874,7 @@ discard block
		block discarded – undo
874	874	* Returns an Net_URL2 instance representing an absolute URL relative to
875	875	* this URL.
876	876	*
877		- * @param Net_URL2\|string $reference relative URL
	877	+ * @param Net_URL2 $reference relative URL
878	878	*
879	879	* @throws Exception
880	880	* @return $this
		@@ -1047,7 +1047,7 @@ discard block
		block discarded – undo
1047	1047	* currently executing PHP script.
1048	1048	*
1049	1049	* @throws Exception
1050		- * @return string
	1050	+ * @return Net_URL2
1051	1051	*/
1052	1052	public static function getCanonical()
1053	1053	{
		@@ -1106,7 +1106,7 @@ discard block
		block discarded – undo
1106	1106	*
1107	1107	* @param string $optionName The name of the option to retrieve
1108	1108	*
1109		- * @return mixed
	1109	+ * @return string
1110	1110	*/
1111	1111	public function getOption($optionName)
1112	1112	{

		@@ -169,7 +169,7 @@ discard block
		block discarded – undo
169	169	*/
170	170	public function __set($var, $arg)
171	171	{
172		- $method = 'set' . $var;
	172	+ $method = 'set'.$var;
173	173	if (method_exists($this, $method)) {
174	174	$this->$method($arg);
175	175	}
		@@ -189,7 +189,7 @@ discard block
		block discarded – undo
189	189	*/
190	190	public function __get($var)
191	191	{
192		- $method = 'get' . $var;
	192	+ $method = 'get'.$var;
193	193	if (method_exists($this, $method)) {
194	194	return $this->$method();
195	195	}
		@@ -276,7 +276,7 @@ discard block
		block discarded – undo
276	276	public function setUserinfo($userinfo, $password = false)
277	277	{
278	278	if ($password !== false) {
279		- $userinfo .= ':' . $password;
	279	+ $userinfo .= ':'.$password;
280	280	}
281	281
282	282	if ($userinfo !== false) {
		@@ -352,13 +352,13 @@ discard block
		block discarded – undo
352	352	$authority = '';
353	353
354	354	if (strlen($this->_userinfo)) {
355		- $authority .= $this->_userinfo . '@';
	355	+ $authority .= $this->_userinfo.'@';
356	356	}
357	357
358	358	$authority .= $this->_host;
359	359
360	360	if ($this->_port !== false) {
361		- $authority .= ':' . $this->_port;
	361	+ $authority .= ':'.$this->_port;
362	362	}
363	363
364	364	return $authority;
		@@ -488,7 +488,7 @@ discard block
		block discarded – undo
488	488	$encodeKeys = $this->getOption(self::OPTION_ENCODE_KEYS);
489	489	$useBrackets = $this->getOption(self::OPTION_USE_BRACKETS);
490	490
491		- $return = array();
	491	+ $return = array();
492	492
493	493	for ($part = strtok($this->_query, $separator);
494	494	strlen($part);
		@@ -505,7 +505,7 @@ discard block
		block discarded – undo
505	505	$return = $this->_queryArrayByKey($key, $value, $return);
506	506	} else {
507	507	if (isset($return[$key])) {
508		- $return[$key] = (array) $return[$key];
	508	+ $return[$key] = (array) $return[$key];
509	509	$return[$key][] = $value;
510	510	} else {
511	511	$return[$key] = $value;
		@@ -585,7 +585,7 @@ discard block
		block discarded – undo
585	585	}
586	586	// @codeCoverageIgnoreStart
587	587	throw new Exception(
588		- 'Net_URL2 Internal Error: '. __METHOD__ .'(): ' .
	588	+ 'Net_URL2 Internal Error: '.__METHOD__.'(): '.
589	589	'Opening bracket [ must exist at offset 0'
590	590	);
591	591	// @codeCoverageIgnoreEnd
		@@ -598,7 +598,7 @@ discard block
		block discarded – undo
598	598	// See as well the first exception for the opening bracket.
599	599	// @codeCoverageIgnoreStart
600	600	throw new Exception(
601		- 'Net_URL2 Internal Error: '. __METHOD__ .'(): ' .
	601	+ 'Net_URL2 Internal Error: '.__METHOD__.'(): '.
602	602	'Closing bracket ] must exist, not found'
603	603	);
604	604	// @codeCoverageIgnoreEnd
		@@ -702,7 +702,7 @@ discard block
		block discarded – undo
702	702	$url = '';
703	703
704	704	if ($this->_scheme !== false) {
705		- $url .= $this->_scheme . ':';
	705	+ $url .= $this->_scheme.':';
706	706	}
707	707
708	708	$authority = $this->getAuthority();
		@@ -713,11 +713,11 @@ discard block
		block discarded – undo
713	713	$url .= $this->_buildAuthorityAndPath($authority, $this->_path);
714	714
715	715	if ($this->_query !== false) {
716		- $url .= '?' . $this->_query;
	716	+ $url .= '?'.$this->_query;
717	717	}
718	718
719	719	if ($this->_fragment !== false) {
720		- $url .= '#' . $this->_fragment;
	720	+ $url .= '#'.$this->_fragment;
721	721	}
722	722
723	723	return $url;
		@@ -740,7 +740,7 @@ discard block
		block discarded – undo
740	740
741	741	$terminator = ($path !== '' && $path[0] !== '/') ? '/' : '';
742	742
743		- return '//' . $authority . $terminator . $path;
	743	+ return '//'.$authority.$terminator.$path;
744	744	}
745	745
746	746	/**
		@@ -823,7 +823,7 @@ discard block
		block discarded – undo
823	823	&& strlen($this->_path)
824	824	&& $this->_path[0] !== '/'
825	825	) {
826		- $this->_path = '/' . $this->_path;
	826	+ $this->_path = '/'.$this->_path;
827	827	}
828	828	}
829	829
		@@ -924,7 +924,7 @@ discard block
		block discarded – undo
924	924	} else {
925	925	// Merge paths (RFC 3986, section 5.2.3)
926	926	if ($this->_host !== false && $this->_path == '') {
927		- $target->_path = '/' . $reference->_path;
	927	+ $target->_path = '/'.$reference->_path;
928	928	} else {
929	929	$i = strrpos($this->_path, '/');
930	930	if ($i !== false) {
		@@ -991,10 +991,10 @@ discard block
		block discarded – undo
991	991	$path = substr($path, 3);
992	992	} elseif (substr($path, 0, 3) === '/./' \|\| $path === '/.') {
993	993	// Step 2.B
994		- $path = '/' . substr($path, 3);
	994	+ $path = '/'.substr($path, 3);
995	995	} elseif (substr($path, 0, 4) === '/../' \|\| $path === '/..') {
996	996	// Step 2.C
997		- $path = '/' . substr($path, 4);
	997	+ $path = '/'.substr($path, 4);
998	998	$i = strrpos($output, '/');
999	999	$output = $i === false ? '' : substr($output, 0, $i);
1000	1000	} elseif ($path === '.' \|\| $path === '..') {
		@@ -1139,7 +1139,7 @@ discard block
		block discarded – undo
1139	1139	if ($key !== null) {
1140	1140	if ($this->getOption(self::OPTION_USE_BRACKETS) === true) {
1141	1141	$drop_names && $name = '';
1142		- $name = $key . '[' . $name . ']';
	1142	+ $name = $key.'['.$name.']';
1143	1143	} else {
1144	1144	$name = $key;
1145	1145	}
		@@ -1147,7 +1147,7 @@ discard block
		block discarded – undo
1147	1147	if (is_array($value)) {
1148	1148	$query[] = $this->buildQuery($value, $separator, $name);
1149	1149	} else {
1150		- $query[] = $name . '=' . rawurlencode($value);
	1150	+ $query[] = $name.'='.rawurlencode($value);
1151	1151	}
1152	1152	}
1153	1153	return implode($separator, $query);

		@@ -117,6 +117,8 @@
		block discarded – undo
117	117	* @param string exception message
118	118	* @param int\|Exception\|PEAR_Error\|array\|null exception cause
119	119	* @param int\|null exception code or null
	120	+ * @param string\|null $message
	121	+ * @param integer $p2
120	122	*/
121	123	public function __construct($message, $p2 = null, $p3 = null)
122	124	{

		@@ -96,294 +96,294 @@
		block discarded – undo
96	96	*/
97	97	class PEAR_Exception extends Exception
98	98	{
99		- const OBSERVER_PRINT = -2;
100		- const OBSERVER_TRIGGER = -4;
101		- const OBSERVER_DIE = -8;
102		- protected $cause;
103		- private static $_observers = array();
104		- private static $_uniqueid = 0;
105		- private $_trace;
	99	+ const OBSERVER_PRINT = -2;
	100	+ const OBSERVER_TRIGGER = -4;
	101	+ const OBSERVER_DIE = -8;
	102	+ protected $cause;
	103	+ private static $_observers = array();
	104	+ private static $_uniqueid = 0;
	105	+ private $_trace;
106	106
107		- /**
108		- * Supported signatures:
109		- * - PEAR_Exception(string $message);
110		- * - PEAR_Exception(string $message, int $code);
111		- * - PEAR_Exception(string $message, Exception $cause);
112		- * - PEAR_Exception(string $message, Exception $cause, int $code);
113		- * - PEAR_Exception(string $message, PEAR_Error $cause);
114		- * - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
115		- * - PEAR_Exception(string $message, array $causes);
116		- * - PEAR_Exception(string $message, array $causes, int $code);
117		- * @param string exception message
118		- * @param int\|Exception\|PEAR_Error\|array\|null exception cause
119		- * @param int\|null exception code or null
120		- */
121		- public function __construct($message, $p2 = null, $p3 = null)
122		- {
123		- if (is_int($p2)) {
124		- $code = $p2;
125		- $this->cause = null;
126		- } elseif (is_object($p2) \|\| is_array($p2)) {
127		- // using is_object allows both Exception and PEAR_Error
128		- if (is_object($p2) && !($p2 instanceof Exception)) {
129		- if (!class_exists('PEAR_Error') \|\| !($p2 instanceof PEAR_Error)) {
130		- throw new PEAR_Exception('exception cause must be Exception, ' .
131		- 'array, or PEAR_Error');
132		- }
133		- }
134		- $code = $p3;
135		- if (is_array($p2) && isset($p2['message'])) {
136		- // fix potential problem of passing in a single warning
137		- $p2 = array($p2);
138		- }
139		- $this->cause = $p2;
140		- } else {
141		- $code = null;
142		- $this->cause = null;
143		- }
144		- parent::__construct($message, $code);
145		- $this->signal();
146		- }
	107	+ /**
	108	+ * Supported signatures:
	109	+ * - PEAR_Exception(string $message);
	110	+ * - PEAR_Exception(string $message, int $code);
	111	+ * - PEAR_Exception(string $message, Exception $cause);
	112	+ * - PEAR_Exception(string $message, Exception $cause, int $code);
	113	+ * - PEAR_Exception(string $message, PEAR_Error $cause);
	114	+ * - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
	115	+ * - PEAR_Exception(string $message, array $causes);
	116	+ * - PEAR_Exception(string $message, array $causes, int $code);
	117	+ * @param string exception message
	118	+ * @param int\|Exception\|PEAR_Error\|array\|null exception cause
	119	+ * @param int\|null exception code or null
	120	+ */
	121	+ public function __construct($message, $p2 = null, $p3 = null)
	122	+ {
	123	+ if (is_int($p2)) {
	124	+ $code = $p2;
	125	+ $this->cause = null;
	126	+ } elseif (is_object($p2) \|\| is_array($p2)) {
	127	+ // using is_object allows both Exception and PEAR_Error
	128	+ if (is_object($p2) && !($p2 instanceof Exception)) {
	129	+ if (!class_exists('PEAR_Error') \|\| !($p2 instanceof PEAR_Error)) {
	130	+ throw new PEAR_Exception('exception cause must be Exception, ' .
	131	+ 'array, or PEAR_Error');
	132	+ }
	133	+ }
	134	+ $code = $p3;
	135	+ if (is_array($p2) && isset($p2['message'])) {
	136	+ // fix potential problem of passing in a single warning
	137	+ $p2 = array($p2);
	138	+ }
	139	+ $this->cause = $p2;
	140	+ } else {
	141	+ $code = null;
	142	+ $this->cause = null;
	143	+ }
	144	+ parent::__construct($message, $code);
	145	+ $this->signal();
	146	+ }
147	147
148		- /**
149		- * @param mixed $callback - A valid php callback, see php func is_callable()
150		- * - A PEAR_Exception::OBSERVER_* constant
151		- * - An array(const PEAR_Exception::OBSERVER_*,
152		- * mixed $options)
153		- * @param string $label The name of the observer. Use this if you want
154		- * to remove it later with removeObserver()
155		- */
156		- public static function addObserver($callback, $label = 'default')
157		- {
158		- self::$_observers[$label] = $callback;
159		- }
	148	+ /**
	149	+ * @param mixed $callback - A valid php callback, see php func is_callable()
	150	+ * - A PEAR_Exception::OBSERVER_* constant
	151	+ * - An array(const PEAR_Exception::OBSERVER_*,
	152	+ * mixed $options)
	153	+ * @param string $label The name of the observer. Use this if you want
	154	+ * to remove it later with removeObserver()
	155	+ */
	156	+ public static function addObserver($callback, $label = 'default')
	157	+ {
	158	+ self::$_observers[$label] = $callback;
	159	+ }
160	160
161		- public static function removeObserver($label = 'default')
162		- {
163		- unset(self::$_observers[$label]);
164		- }
	161	+ public static function removeObserver($label = 'default')
	162	+ {
	163	+ unset(self::$_observers[$label]);
	164	+ }
165	165
166		- /**
167		- * @return int unique identifier for an observer
168		- */
169		- public static function getUniqueId()
170		- {
171		- return self::$_uniqueid++;
172		- }
	166	+ /**
	167	+ * @return int unique identifier for an observer
	168	+ */
	169	+ public static function getUniqueId()
	170	+ {
	171	+ return self::$_uniqueid++;
	172	+ }
173	173
174		- private function signal()
175		- {
176		- foreach (self::$_observers as $func) {
177		- if (is_callable($func)) {
178		- call_user_func($func, $this);
179		- continue;
180		- }
181		- settype($func, 'array');
182		- switch ($func[0]) {
183		- case self::OBSERVER_PRINT :
184		- $f = (isset($func[1])) ? $func[1] : '%s';
185		- printf($f, $this->getMessage());
186		- break;
187		- case self::OBSERVER_TRIGGER :
188		- $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
189		- trigger_error($this->getMessage(), $f);
190		- break;
191		- case self::OBSERVER_DIE :
192		- $f = (isset($func[1])) ? $func[1] : '%s';
193		- die(printf($f, $this->getMessage()));
194		- break;
195		- default:
196		- trigger_error('invalid observer type', E_USER_WARNING);
197		- }
198		- }
199		- }
	174	+ private function signal()
	175	+ {
	176	+ foreach (self::$_observers as $func) {
	177	+ if (is_callable($func)) {
	178	+ call_user_func($func, $this);
	179	+ continue;
	180	+ }
	181	+ settype($func, 'array');
	182	+ switch ($func[0]) {
	183	+ case self::OBSERVER_PRINT :
	184	+ $f = (isset($func[1])) ? $func[1] : '%s';
	185	+ printf($f, $this->getMessage());
	186	+ break;
	187	+ case self::OBSERVER_TRIGGER :
	188	+ $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
	189	+ trigger_error($this->getMessage(), $f);
	190	+ break;
	191	+ case self::OBSERVER_DIE :
	192	+ $f = (isset($func[1])) ? $func[1] : '%s';
	193	+ die(printf($f, $this->getMessage()));
	194	+ break;
	195	+ default:
	196	+ trigger_error('invalid observer type', E_USER_WARNING);
	197	+ }
	198	+ }
	199	+ }
200	200
201		- /**
202		- * Return specific error information that can be used for more detailed
203		- * error messages or translation.
204		- *
205		- * This method may be overridden in child exception classes in order
206		- * to add functionality not present in PEAR_Exception and is a placeholder
207		- * to define API
208		- *
209		- * The returned array must be an associative array of parameter => value like so:
210		- * <pre>
211		- * array('name' => $name, 'context' => array(...))
212		- * </pre>
213		- * @return array
214		- */
215		- public function getErrorData()
216		- {
217		- return array();
218		- }
	201	+ /**
	202	+ * Return specific error information that can be used for more detailed
	203	+ * error messages or translation.
	204	+ *
	205	+ * This method may be overridden in child exception classes in order
	206	+ * to add functionality not present in PEAR_Exception and is a placeholder
	207	+ * to define API
	208	+ *
	209	+ * The returned array must be an associative array of parameter => value like so:
	210	+ * <pre>
	211	+ * array('name' => $name, 'context' => array(...))
	212	+ * </pre>
	213	+ * @return array
	214	+ */
	215	+ public function getErrorData()
	216	+ {
	217	+ return array();
	218	+ }
219	219
220		- /**
221		- * Returns the exception that caused this exception to be thrown
222		- * @access public
223		- * @return Exception\|array The context of the exception
224		- */
225		- public function getCause()
226		- {
227		- return $this->cause;
228		- }
	220	+ /**
	221	+ * Returns the exception that caused this exception to be thrown
	222	+ * @access public
	223	+ * @return Exception\|array The context of the exception
	224	+ */
	225	+ public function getCause()
	226	+ {
	227	+ return $this->cause;
	228	+ }
229	229
230		- /**
231		- * Function must be public to call on caused exceptions
232		- * @param array
233		- */
234		- public function getCauseMessage(&$causes)
235		- {
236		- $trace = $this->getTraceSafe();
237		- $cause = array('class' => get_class($this),
238		- 'message' => $this->message,
239		- 'file' => 'unknown',
240		- 'line' => 'unknown');
241		- if (isset($trace[0])) {
242		- if (isset($trace[0]['file'])) {
243		- $cause['file'] = $trace[0]['file'];
244		- $cause['line'] = $trace[0]['line'];
245		- }
246		- }
247		- $causes[] = $cause;
248		- if ($this->cause instanceof PEAR_Exception) {
249		- $this->cause->getCauseMessage($causes);
250		- } elseif ($this->cause instanceof Exception) {
251		- $causes[] = array('class' => get_class($this->cause),
252		- 'message' => $this->cause->getMessage(),
253		- 'file' => $this->cause->getFile(),
254		- 'line' => $this->cause->getLine());
255		- } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
256		- $causes[] = array('class' => get_class($this->cause),
257		- 'message' => $this->cause->getMessage(),
258		- 'file' => 'unknown',
259		- 'line' => 'unknown');
260		- } elseif (is_array($this->cause)) {
261		- foreach ($this->cause as $cause) {
262		- if ($cause instanceof PEAR_Exception) {
263		- $cause->getCauseMessage($causes);
264		- } elseif ($cause instanceof Exception) {
265		- $causes[] = array('class' => get_class($cause),
266		- 'message' => $cause->getMessage(),
267		- 'file' => $cause->getFile(),
268		- 'line' => $cause->getLine());
269		- } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
270		- $causes[] = array('class' => get_class($cause),
271		- 'message' => $cause->getMessage(),
272		- 'file' => 'unknown',
273		- 'line' => 'unknown');
274		- } elseif (is_array($cause) && isset($cause['message'])) {
275		- // PEAR_ErrorStack warning
276		- $causes[] = array(
277		- 'class' => $cause['package'],
278		- 'message' => $cause['message'],
279		- 'file' => isset($cause['context']['file']) ?
280		- $cause['context']['file'] :
281		- 'unknown',
282		- 'line' => isset($cause['context']['line']) ?
283		- $cause['context']['line'] :
284		- 'unknown',
285		- );
286		- }
287		- }
288		- }
289		- }
	230	+ /**
	231	+ * Function must be public to call on caused exceptions
	232	+ * @param array
	233	+ */
	234	+ public function getCauseMessage(&$causes)
	235	+ {
	236	+ $trace = $this->getTraceSafe();
	237	+ $cause = array('class' => get_class($this),
	238	+ 'message' => $this->message,
	239	+ 'file' => 'unknown',
	240	+ 'line' => 'unknown');
	241	+ if (isset($trace[0])) {
	242	+ if (isset($trace[0]['file'])) {
	243	+ $cause['file'] = $trace[0]['file'];
	244	+ $cause['line'] = $trace[0]['line'];
	245	+ }
	246	+ }
	247	+ $causes[] = $cause;
	248	+ if ($this->cause instanceof PEAR_Exception) {
	249	+ $this->cause->getCauseMessage($causes);
	250	+ } elseif ($this->cause instanceof Exception) {
	251	+ $causes[] = array('class' => get_class($this->cause),
	252	+ 'message' => $this->cause->getMessage(),
	253	+ 'file' => $this->cause->getFile(),
	254	+ 'line' => $this->cause->getLine());
	255	+ } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
	256	+ $causes[] = array('class' => get_class($this->cause),
	257	+ 'message' => $this->cause->getMessage(),
	258	+ 'file' => 'unknown',
	259	+ 'line' => 'unknown');
	260	+ } elseif (is_array($this->cause)) {
	261	+ foreach ($this->cause as $cause) {
	262	+ if ($cause instanceof PEAR_Exception) {
	263	+ $cause->getCauseMessage($causes);
	264	+ } elseif ($cause instanceof Exception) {
	265	+ $causes[] = array('class' => get_class($cause),
	266	+ 'message' => $cause->getMessage(),
	267	+ 'file' => $cause->getFile(),
	268	+ 'line' => $cause->getLine());
	269	+ } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
	270	+ $causes[] = array('class' => get_class($cause),
	271	+ 'message' => $cause->getMessage(),
	272	+ 'file' => 'unknown',
	273	+ 'line' => 'unknown');
	274	+ } elseif (is_array($cause) && isset($cause['message'])) {
	275	+ // PEAR_ErrorStack warning
	276	+ $causes[] = array(
	277	+ 'class' => $cause['package'],
	278	+ 'message' => $cause['message'],
	279	+ 'file' => isset($cause['context']['file']) ?
	280	+ $cause['context']['file'] :
	281	+ 'unknown',
	282	+ 'line' => isset($cause['context']['line']) ?
	283	+ $cause['context']['line'] :
	284	+ 'unknown',
	285	+ );
	286	+ }
	287	+ }
	288	+ }
	289	+ }
290	290
291		- public function getTraceSafe()
292		- {
293		- if (!isset($this->_trace)) {
294		- $this->_trace = $this->getTrace();
295		- if (empty($this->_trace)) {
296		- $backtrace = debug_backtrace();
297		- $this->_trace = array($backtrace[count($backtrace)-1]);
298		- }
299		- }
300		- return $this->_trace;
301		- }
	291	+ public function getTraceSafe()
	292	+ {
	293	+ if (!isset($this->_trace)) {
	294	+ $this->_trace = $this->getTrace();
	295	+ if (empty($this->_trace)) {
	296	+ $backtrace = debug_backtrace();
	297	+ $this->_trace = array($backtrace[count($backtrace)-1]);
	298	+ }
	299	+ }
	300	+ return $this->_trace;
	301	+ }
302	302
303		- public function getErrorClass()
304		- {
305		- $trace = $this->getTraceSafe();
306		- return $trace[0]['class'];
307		- }
	303	+ public function getErrorClass()
	304	+ {
	305	+ $trace = $this->getTraceSafe();
	306	+ return $trace[0]['class'];
	307	+ }
308	308
309		- public function getErrorMethod()
310		- {
311		- $trace = $this->getTraceSafe();
312		- return $trace[0]['function'];
313		- }
	309	+ public function getErrorMethod()
	310	+ {
	311	+ $trace = $this->getTraceSafe();
	312	+ return $trace[0]['function'];
	313	+ }
314	314
315		- public function __toString()
316		- {
317		- if (isset($_SERVER['REQUEST_URI'])) {
318		- return $this->toHtml();
319		- }
320		- return $this->toText();
321		- }
	315	+ public function __toString()
	316	+ {
	317	+ if (isset($_SERVER['REQUEST_URI'])) {
	318	+ return $this->toHtml();
	319	+ }
	320	+ return $this->toText();
	321	+ }
322	322
323		- public function toHtml()
324		- {
325		- $trace = $this->getTraceSafe();
326		- $causes = array();
327		- $this->getCauseMessage($causes);
328		- $html = '<table style="border: 1px" cellspacing="0">' . "\n";
329		- foreach ($causes as $i => $cause) {
330		- $html .= '<tr><td colspan="3" style="background: #ff9999">'
331		- . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
332		- . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
333		- . 'on line <b>' . $cause['line'] . '</b>'
334		- . "</td></tr>\n";
335		- }
336		- $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
337		- . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
338		- . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
339		- . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
	323	+ public function toHtml()
	324	+ {
	325	+ $trace = $this->getTraceSafe();
	326	+ $causes = array();
	327	+ $this->getCauseMessage($causes);
	328	+ $html = '<table style="border: 1px" cellspacing="0">' . "\n";
	329	+ foreach ($causes as $i => $cause) {
	330	+ $html .= '<tr><td colspan="3" style="background: #ff9999">'
	331	+ . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
	332	+ . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
	333	+ . 'on line <b>' . $cause['line'] . '</b>'
	334	+ . "</td></tr>\n";
	335	+ }
	336	+ $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
	337	+ . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
	338	+ . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
	339	+ . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
340	340
341		- foreach ($trace as $k => $v) {
342		- $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
343		- . '<td>';
344		- if (!empty($v['class'])) {
345		- $html .= $v['class'] . $v['type'];
346		- }
347		- $html .= $v['function'];
348		- $args = array();
349		- if (!empty($v['args'])) {
350		- foreach ($v['args'] as $arg) {
351		- if (is_null($arg)) $args[] = 'null';
352		- elseif (is_array($arg)) $args[] = 'Array';
353		- elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
354		- elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355		- elseif (is_int($arg) \|\| is_double($arg)) $args[] = $arg;
356		- else {
357		- $arg = (string)$arg;
358		- $str = htmlspecialchars(substr($arg, 0, 16));
359		- if (strlen($arg) > 16) $str .= '…';
360		- $args[] = "'" . $str . "'";
361		- }
362		- }
363		- }
364		- $html .= '(' . implode(', ',$args) . ')'
365		- . '</td>'
366		- . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
367		- . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
368		- . '</td></tr>' . "\n";
369		- }
370		- $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
371		- . '<td>{main}</td>'
372		- . '<td> </td></tr>' . "\n"
373		- . '</table>';
374		- return $html;
375		- }
	341	+ foreach ($trace as $k => $v) {
	342	+ $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
	343	+ . '<td>';
	344	+ if (!empty($v['class'])) {
	345	+ $html .= $v['class'] . $v['type'];
	346	+ }
	347	+ $html .= $v['function'];
	348	+ $args = array();
	349	+ if (!empty($v['args'])) {
	350	+ foreach ($v['args'] as $arg) {
	351	+ if (is_null($arg)) $args[] = 'null';
	352	+ elseif (is_array($arg)) $args[] = 'Array';
	353	+ elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
	354	+ elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
	355	+ elseif (is_int($arg) \|\| is_double($arg)) $args[] = $arg;
	356	+ else {
	357	+ $arg = (string)$arg;
	358	+ $str = htmlspecialchars(substr($arg, 0, 16));
	359	+ if (strlen($arg) > 16) $str .= '…';
	360	+ $args[] = "'" . $str . "'";
	361	+ }
	362	+ }
	363	+ }
	364	+ $html .= '(' . implode(', ',$args) . ')'
	365	+ . '</td>'
	366	+ . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
	367	+ . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
	368	+ . '</td></tr>' . "\n";
	369	+ }
	370	+ $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
	371	+ . '<td>{main}</td>'
	372	+ . '<td> </td></tr>' . "\n"
	373	+ . '</table>';
	374	+ return $html;
	375	+ }
376	376
377		- public function toText()
378		- {
379		- $causes = array();
380		- $this->getCauseMessage($causes);
381		- $causeMsg = '';
382		- foreach ($causes as $i => $cause) {
383		- $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
384		- . $cause['message'] . ' in ' . $cause['file']
385		- . ' on line ' . $cause['line'] . "\n";
386		- }
387		- return $causeMsg . $this->getTraceAsString();
388		- }
	377	+ public function toText()
	378	+ {
	379	+ $causes = array();
	380	+ $this->getCauseMessage($causes);
	381	+ $causeMsg = '';
	382	+ foreach ($causes as $i => $cause) {
	383	+ $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
	384	+ . $cause['message'] . ' in ' . $cause['file']
	385	+ . ' on line ' . $cause['line'] . "\n";
	386	+ }
	387	+ return $causeMsg . $this->getTraceAsString();
	388	+ }
389	389	}
390	390	\ No newline at end of file

		@@ -348,15 +348,22 @@
		block discarded – undo
348	348	$args = array();
349	349	if (!empty($v['args'])) {
350	350	foreach ($v['args'] as $arg) {
351		- if (is_null($arg)) $args[] = 'null';
352		- elseif (is_array($arg)) $args[] = 'Array';
353		- elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
354		- elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355		- elseif (is_int($arg) \|\| is_double($arg)) $args[] = $arg;
356		- else {
	351	+ if (is_null($arg)) {
	352	+ $args[] = 'null';
	353	+ } elseif (is_array($arg)) {
	354	+ $args[] = 'Array';
	355	+ } elseif (is_object($arg)) {
	356	+ $args[] = 'Object('.get_class($arg).')';
	357	+ } elseif (is_bool($arg)) {
	358	+ $args[] = $arg ? 'true' : 'false';
	359	+ } elseif (is_int($arg) \|\| is_double($arg)) {
	360	+ $args[] = $arg;
	361	+ } else {
357	362	$arg = (string)$arg;
358	363	$str = htmlspecialchars(substr($arg, 0, 16));
359		- if (strlen($arg) > 16) $str .= '…';
	364	+ if (strlen($arg) > 16) {
	365	+ $str .= '…';
	366	+ }
360	367	$args[] = "'" . $str . "'";
361	368	}
362	369	}

		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	// using is_object allows both Exception and PEAR_Error
128	128	if (is_object($p2) && !($p2 instanceof Exception)) {
129	129	if (!class_exists('PEAR_Error') \|\| !($p2 instanceof PEAR_Error)) {
130		- throw new PEAR_Exception('exception cause must be Exception, ' .
	130	+ throw new PEAR_Exception('exception cause must be Exception, '.
131	131	'array, or PEAR_Error');
132	132	}
133	133	}
		@@ -277,11 +277,9 @@ discard block
		block discarded – undo
277	277	'class' => $cause['package'],
278	278	'message' => $cause['message'],
279	279	'file' => isset($cause['context']['file']) ?
280		- $cause['context']['file'] :
281		- 'unknown',
	280	+ $cause['context']['file'] : 'unknown',
282	281	'line' => isset($cause['context']['line']) ?
283		- $cause['context']['line'] :
284		- 'unknown',
	282	+ $cause['context']['line'] : 'unknown',
285	283	);
286	284	}
287	285	}
		@@ -294,7 +292,7 @@ discard block
		block discarded – undo
294	292	$this->_trace = $this->getTrace();
295	293	if (empty($this->_trace)) {
296	294	$backtrace = debug_backtrace();
297		- $this->_trace = array($backtrace[count($backtrace)-1]);
	295	+ $this->_trace = array($backtrace[count($backtrace) - 1]);
298	296	}
299	297	}
300	298	return $this->_trace;
		@@ -325,24 +323,24 @@ discard block
		block discarded – undo
325	323	$trace = $this->getTraceSafe();
326	324	$causes = array();
327	325	$this->getCauseMessage($causes);
328		- $html = '<table style="border: 1px" cellspacing="0">' . "\n";
	326	+ $html = '<table style="border: 1px" cellspacing="0">'."\n";
329	327	foreach ($causes as $i => $cause) {
330	328	$html .= '<tr><td colspan="3" style="background: #ff9999">'
331		- . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
332		- . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
333		- . 'on line <b>' . $cause['line'] . '</b>'
	329	+ . str_repeat('-', $i).' <b>'.$cause['class'].'</b>: '
	330	+ . htmlspecialchars($cause['message']).' in <b>'.$cause['file'].'</b> '
	331	+ . 'on line <b>'.$cause['line'].'</b>'
334	332	. "</td></tr>\n";
335	333	}
336		- $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
	334	+ $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>'."\n"
337	335	. '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
338	336	. '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
339		- . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
	337	+ . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>'."\n";
340	338
341	339	foreach ($trace as $k => $v) {
342		- $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
	340	+ $html .= '<tr><td style="text-align: center;">'.$k.'</td>'
343	341	. '<td>';
344	342	if (!empty($v['class'])) {
345		- $html .= $v['class'] . $v['type'];
	343	+ $html .= $v['class'].$v['type'];
346	344	}
347	345	$html .= $v['function'];
348	346	$args = array();
		@@ -354,22 +352,22 @@ discard block
		block discarded – undo
354	352	elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355	353	elseif (is_int($arg) \|\| is_double($arg)) $args[] = $arg;
356	354	else {
357		- $arg = (string)$arg;
	355	+ $arg = (string) $arg;
358	356	$str = htmlspecialchars(substr($arg, 0, 16));
359	357	if (strlen($arg) > 16) $str .= '…';
360		- $args[] = "'" . $str . "'";
	358	+ $args[] = "'".$str."'";
361	359	}
362	360	}
363	361	}
364		- $html .= '(' . implode(', ',$args) . ')'
	362	+ $html .= '('.implode(', ', $args).')'
365	363	. '</td>'
366		- . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
367		- . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
368		- . '</td></tr>' . "\n";
	364	+ . '<td>'.(isset($v['file']) ? $v['file'] : 'unknown')
	365	+ . ':'.(isset($v['line']) ? $v['line'] : 'unknown')
	366	+ . '</td></tr>'."\n";
369	367	}
370		- $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
	368	+ $html .= '<tr><td style="text-align: center;">'.($k + 1).'</td>'
371	369	. '<td>{main}</td>'
372		- . '<td> </td></tr>' . "\n"
	370	+ . '<td> </td></tr>'."\n"
373	371	. '</table>';
374	372	return $html;
375	373	}
		@@ -380,10 +378,10 @@ discard block
		block discarded – undo
380	378	$this->getCauseMessage($causes);
381	379	$causeMsg = '';
382	380	foreach ($causes as $i => $cause) {
383		- $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
384		- . $cause['message'] . ' in ' . $cause['file']
385		- . ' on line ' . $cause['line'] . "\n";
	381	+ $causeMsg .= str_repeat(' ', $i).$cause['class'].': '
	382	+ . $cause['message'].' in '.$cause['file']
	383	+ . ' on line '.$cause['line']."\n";
386	384	}
387		- return $causeMsg . $this->getTraceAsString();
	385	+ return $causeMsg.$this->getTraceAsString();
388	386	}
389	387	}
390	388	\ No newline at end of file

		@@ -269,7 +269,7 @@
		block discarded – undo
269	269	/**
270	270	* Returns the request URL
271	271	*
272		- * @return Net_URL2
	272	+ * @return string
273	273	*/
274	274	public function getUrl()
275	275	{

		@@ -225,9 +225,9 @@ discard block
		block discarded – undo
225	225	if (!empty($method)) {
226	226	$this->setMethod($method);
227	227	}
228		- $this->setHeader('user-agent', 'HTTP_Request2/0.5.2 ' .
229		- '(http://pear.php.net/package/http_request2) ' .
230		- 'PHP/' . phpversion());
	228	+ $this->setHeader('user-agent', 'HTTP_Request2/0.5.2 '.
	229	+ '(http://pear.php.net/package/http_request2) '.
	230	+ 'PHP/'.phpversion());
231	231	}
232	232
233	233	/**
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255	if ($url->getUserinfo()) {
256	256	$username = $url->getUser();
257	257	$password = $url->getPassword();
258		- $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
	258	+ $this->setAuth(rawurldecode($username), $password ? rawurldecode($password) : '');
259	259	$url->setUserinfo('');
260	260	}
261	261	if ('' == $url->getPath()) {
		@@ -405,8 +405,8 @@ discard block
		block discarded – undo
405	405	$this->auth = null;
406	406	} else {
407	407	$this->auth = array(
408		- 'user' => (string)$user,
409		- 'password' => (string)$password,
	408	+ 'user' => (string) $user,
	409	+ 'password' => (string) $password,
410	410	'scheme' => $scheme
411	411	);
412	412	}
		@@ -504,12 +504,12 @@ discard block
		block discarded – undo
504	504	*/
505	505	public function addCookie($name, $value)
506	506	{
507		- $cookie = $name . '=' . $value;
	507	+ $cookie = $name.'='.$value;
508	508	if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
509	509	throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");
510	510	}
511		- $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
512		- $this->setHeader('cookie', $cookies . $cookie);
	511	+ $cookies = empty($this->headers['cookie']) ? '' : $this->headers['cookie'].'; ';
	512	+ $this->setHeader('cookie', $cookies.$cookie);
513	513
514	514	return $this;
515	515	}
		@@ -526,7 +526,7 @@ discard block
		block discarded – undo
526	526	{
527	527	if (!$isFilename) {
528	528	if (!$body instanceof HTTP_Request2_MultipartBody) {
529		- $this->body = (string)$body;
	529	+ $this->body = (string) $body;
530	530	} else {
531	531	$this->body = $body;
532	532	}
		@@ -597,9 +597,9 @@ discard block
		block discarded – undo
597	597	}
598	598	$this->uploads[$fieldName] = array(
599	599	'fp' => $fp,
600		- 'filename' => empty($sendFilename)? basename($filename): $sendFilename,
	600	+ 'filename' => empty($sendFilename) ? basename($filename) : $sendFilename,
601	601	'size' => filesize($filename),
602		- 'type' => empty($contentType)? self::detectMimeType($filename): $contentType
	602	+ 'type' => empty($contentType) ? self::detectMimeType($filename) : $contentType
603	603	);
604	604	} else {
605	605	$fps = $names = $sizes = $types = array();
		@@ -611,9 +611,9 @@ discard block
		block discarded – undo
611	611	throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");
612	612	}
613	613	$fps[] = $fp;
614		- $names[] = empty($f[1])? basename($f[0]): $f[1];
	614	+ $names[] = empty($f[1]) ? basename($f[0]) : $f[1];
615	615	$sizes[] = filesize($f[0]);
616		- $types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];
	616	+ $types[] = empty($f[2]) ? self::detectMimeType($f[0]) : $f[2];
617	617	}
618	618	$this->uploads[$fieldName] = array(
619	619	'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
		@@ -762,10 +762,10 @@ discard block
		block discarded – undo
762	762	if (is_string($adapter)) {
763	763	if (!class_exists($adapter, false)) {
764	764	if (false === strpos($adapter, '_')) {
765		- $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
	765	+ $adapter = 'HTTP_Request2_Adapter_'.ucfirst($adapter);
766	766	}
767	767	if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
768		- include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
	768	+ include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter).'.php';
769	769	}
770	770	if (!class_exists($adapter, false)) {
771	771	throw new HTTP_Request2_Exception("Class {$adapter} not found");
		@@ -855,7 +855,7 @@ discard block
		block discarded – undo
855	855	if (empty($info) && function_exists('mime_content_type')) {
856	856	return mime_content_type($filename);
857	857	}
858		- return empty($info)? 'application/octet-stream': $info;
	858	+ return empty($info) ? 'application/octet-stream' : $info;
859	859	}
860	860	}
861	861	?>
862	862	\ No newline at end of file

		@@ -379,7 +379,7 @@ discard block
		block discarded – undo
379	379	* Callback function called by cURL for saving the response headers
380	380	*
381	381	* @param resource cURL handle
382		- * @param string response header (with trailing CRLF)
	382	+ * @param string string header (with trailing CRLF)
383	383	* @return integer number of bytes saved
384	384	* @see HTTP_Request2_Response::parseHeaderLine()
385	385	*/
		@@ -440,7 +440,7 @@ discard block
		block discarded – undo
440	440	* Callback function called by cURL for saving the response body
441	441	*
442	442	* @param resource cURL handle (not used)
443		- * @param string part of the response body
	443	+ * @param string string of the response body
444	444	* @return integer number of bytes saved
445	445	* @see HTTP_Request2_Response::appendBody()
446	446	*/

		@@ -131,8 +131,8 @@ discard block
		block discarded – undo
131	131
132	132	try {
133	133	if (false === curl_exec($ch = $this->createCurlHandle())) {
134		- $errorMessage = 'Error sending request: #' . curl_errno($ch) .
135		- ' ' . curl_error($ch);
	134	+ $errorMessage = 'Error sending request: #'.curl_errno($ch).
	135	+ ' '.curl_error($ch);
136	136	}
137	137	} catch (Exception $e) {
138	138	}
		@@ -238,9 +238,9 @@ discard block
		block discarded – undo
238	238	if (!($port = $this->request->getConfig('proxy_port'))) {
239	239	throw new HTTP_Request2_Exception('Proxy port not provided');
240	240	}
241		- curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
	241	+ curl_setopt($ch, CURLOPT_PROXY, $host.':'.$port);
242	242	if ($user = $this->request->getConfig('proxy_user')) {
243		- curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
	243	+ curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user.':'.
244	244	$this->request->getConfig('proxy_password'));
245	245	switch ($this->request->getConfig('proxy_auth_scheme')) {
246	246	case HTTP_Request2::AUTH_BASIC:
		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254
255	255	// set authentication data
256	256	if ($auth = $this->request->getAuth()) {
257		- curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
	257	+ curl_setopt($ch, CURLOPT_USERPWD, $auth['user'].':'.$auth['password']);
258	258	switch ($auth['scheme']) {
259	259	case HTTP_Request2::AUTH_BASIC:
260	260	curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
		@@ -268,7 +268,7 @@ discard block
		block discarded – undo
268	268	if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {
269	269	foreach ($this->request->getConfig() as $name => $value) {
270	270	if ('ssl_verify_host' == $name && null !== $value) {
271		- curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
	271	+ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value ? 2 : 0);
272	272	} elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
273	273	curl_setopt($ch, self::$sslContextMap[$name], $value);
274	274	}
		@@ -298,7 +298,7 @@ discard block
		block discarded – undo
298	298	$headersFmt = array();
299	299	foreach ($headers as $name => $value) {
300	300	$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
301		- $headersFmt[] = $canonicalName . ': ' . $value;
	301	+ $headersFmt[] = $canonicalName.': '.$value;
302	302	}
303	303	curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
304	304

		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	*/
172	172	public function __set($var, $arg)
173	173	{
174		- $method = 'set' . $var;
	174	+ $method = 'set'.$var;
175	175	if (method_exists($this, $method)) {
176	176	$this->$method($arg);
177	177	}
		@@ -190,7 +190,7 @@ discard block
		block discarded – undo
190	190	*/
191	191	public function __get($var)
192	192	{
193		- $method = 'get' . $var;
	193	+ $method = 'get'.$var;
194	194	if (method_exists($this, $method)) {
195	195	return $this->$method();
196	196	}
		@@ -277,7 +277,7 @@ discard block
		block discarded – undo
277	277	{
278	278	$this->_userinfo = $userinfo;
279	279	if ($password !== false) {
280		- $this->_userinfo .= ':' . $password;
	280	+ $this->_userinfo .= ':'.$password;
281	281	}
282	282	}
283	283
		@@ -344,13 +344,13 @@ discard block
		block discarded – undo
344	344	$authority = '';
345	345
346	346	if ($this->_userinfo !== false) {
347		- $authority .= $this->_userinfo . '@';
	347	+ $authority .= $this->_userinfo.'@';
348	348	}
349	349
350	350	$authority .= $this->_host;
351	351
352	352	if ($this->_port !== false) {
353		- $authority .= ':' . $this->_port;
	353	+ $authority .= ':'.$this->_port;
354	354	}
355	355
356	356	return $authority;
		@@ -463,8 +463,8 @@ discard block
		block discarded – undo
463	463	*/
464	464	public function getQueryVariables()
465	465	{
466		- $pattern = '/[' .
467		- preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
	466	+ $pattern = '/['.
	467	+ preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/').
468	468	']/';
469	469	$parts = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
470	470	$return = array();
		@@ -533,10 +533,10 @@ discard block
		block discarded – undo
533	533	foreach ($value as $k => $v) {
534	534	$parts[] = $this->getOption(self::OPTION_USE_BRACKETS)
535	535	? sprintf('%s[%s]=%s', $name, $k, $v)
536		- : ($name . '=' . $v);
	536	+ : ($name.'='.$v);
537	537	}
538	538	} elseif (!is_null($value)) {
539		- $parts[] = $name . '=' . self::urlencode($value);
	539	+ $parts[] = $name.'='.self::urlencode($value);
540	540	} else {
541	541	$parts[] = $name;
542	542	}
		@@ -586,21 +586,21 @@ discard block
		block discarded – undo
586	586	$url = "";
587	587
588	588	if ($this->_scheme !== false) {
589		- $url .= $this->_scheme . ':';
	589	+ $url .= $this->_scheme.':';
590	590	}
591	591
592	592	$authority = $this->getAuthority();
593	593	if ($authority !== false) {
594		- $url .= '//' . $authority;
	594	+ $url .= '//'.$authority;
595	595	}
596	596	$url .= $this->_path;
597	597
598	598	if ($this->_query !== false) {
599		- $url .= '?' . $this->_query;
	599	+ $url .= '?'.$this->_query;
600	600	}
601	601
602	602	if ($this->_fragment !== false) {
603		- $url .= '#' . $this->_fragment;
	603	+ $url .= '#'.$this->_fragment;
604	604	}
605	605
606	606	return $url;
		@@ -734,7 +734,7 @@ discard block
		block discarded – undo
734	734	} else {
735	735	// Merge paths (RFC 3986, section 5.2.3)
736	736	if ($this->_host !== false && $this->_path == '') {
737		- $target->_path = '/' . $this->_path;
	737	+ $target->_path = '/'.$this->_path;
738	738	} else {
739	739	$i = strrpos($this->_path, '/');
740	740	if ($i !== false) {
		@@ -780,10 +780,10 @@ discard block
		block discarded – undo
780	780	$path = substr($path, 3);
781	781	} elseif (substr($path, 0, 3) == '/./' \|\| $path == '/.') {
782	782	// Step 2.B
783		- $path = '/' . substr($path, 3);
	783	+ $path = '/'.substr($path, 3);
784	784	} elseif (substr($path, 0, 4) == '/../' \|\| $path == '/..') {
785	785	// Step 2.C
786		- $path = '/' . substr($path, 4);
	786	+ $path = '/'.substr($path, 4);
787	787	$i = strrpos($output, '/');
788	788	$output = $i === false ? '' : substr($output, 0, $i);
789	789	} elseif ($path == '.' \|\| $path == '..') {

		@@ -1267,6 +1267,7 @@ discard block
		block discarded – undo
1267	1267	*
1268	1268	* @access private
1269	1269	* @param string value of Set-Cookie header
	1270	+ * @param string $headervalue
1270	1271	*/
1271	1272	function _parseCookie($headervalue)
1272	1273	{
		@@ -1349,6 +1350,7 @@ discard block
		block discarded – undo
1349	1350	*
1350	1351	* @param string Event name
1351	1352	* @param mixed Additional data
	1353	+ * @param string $event
1352	1354	* @access private
1353	1355	* @see HTTP_Request::_notify()
1354	1356	*/
		@@ -1369,6 +1371,7 @@ discard block
		block discarded – undo
1369	1371	*
1370	1372	* @access private
1371	1373	* @param string gzip-encoded data
	1374	+ * @param string $data
1372	1375	* @return string decoded data
1373	1376	*/
1374	1377	function _decodeGzip($data)

		@@ -60,13 +60,13 @@ discard block
		block discarded – undo
60	60	/**#@+
61	61	* Constants for HTTP request methods
62	62	*/
63		-define('HTTP_REQUEST_METHOD_GET', 'GET', true);
64		-define('HTTP_REQUEST_METHOD_HEAD', 'HEAD', true);
65		-define('HTTP_REQUEST_METHOD_POST', 'POST', true);
66		-define('HTTP_REQUEST_METHOD_PUT', 'PUT', true);
67		-define('HTTP_REQUEST_METHOD_DELETE', 'DELETE', true);
	63	+define('HTTP_REQUEST_METHOD_GET', 'GET', true);
	64	+define('HTTP_REQUEST_METHOD_HEAD', 'HEAD', true);
	65	+define('HTTP_REQUEST_METHOD_POST', 'POST', true);
	66	+define('HTTP_REQUEST_METHOD_PUT', 'PUT', true);
	67	+define('HTTP_REQUEST_METHOD_DELETE', 'DELETE', true);
68	68	define('HTTP_REQUEST_METHOD_OPTIONS', 'OPTIONS', true);
69		-define('HTTP_REQUEST_METHOD_TRACE', 'TRACE', true);
	69	+define('HTTP_REQUEST_METHOD_TRACE', 'TRACE', true);
70	70	/*#@-/
71	71
72	72	/**#@+
		@@ -287,8 +287,8 @@ discard block
		block discarded – undo
287	287	*/
288	288	function HTTP_Request($url = '', $params = array())
289	289	{
290		- $this->_method = HTTP_REQUEST_METHOD_GET;
291		- $this->_http = HTTP_REQUEST_HTTP_VER_1_1;
	290	+ $this->_method = HTTP_REQUEST_METHOD_GET;
	291	+ $this->_http = HTTP_REQUEST_HTTP_VER_1_1;
292	292	$this->_requestHeaders = array();
293	293	$this->_postData = array();
294	294	$this->_body = null;
		@@ -309,7 +309,7 @@ discard block
		block discarded – undo
309	309	$this->_response = null;
310	310
311	311	foreach ($params as $key => $value) {
312		- $this->{'_' . $key} = $value;
	312	+ $this->{'_'.$key} = $value;
313	313	}
314	314
315	315	if (!empty($url)) {
		@@ -324,12 +324,12 @@ discard block
		block discarded – undo
324	324
325	325	// Basic authentication
326	326	if (!empty($this->_user)) {
327		- $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
	327	+ $this->addHeader('Authorization', 'Basic '.base64_encode($this->_user.':'.$this->_pass));
328	328	}
329	329
330	330	// Proxy authentication (see bug #5913)
331	331	if (!empty($this->_proxy_user)) {
332		- $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
	332	+ $this->addHeader('Proxy-Authorization', 'Basic '.base64_encode($this->_proxy_user.':'.$this->_proxy_pass));
333	333	}
334	334
335	335	// Use gzip encoding if possible
		@@ -347,13 +347,13 @@ discard block
		block discarded – undo
347	347	function _generateHostHeader()
348	348	{
349	349	if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
350		- $host = $this->_url->host . ':' . $this->_url->port;
	350	+ $host = $this->_url->host.':'.$this->_url->port;
351	351
352	352	} elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
353		- $host = $this->_url->host . ':' . $this->_url->port;
	353	+ $host = $this->_url->host.':'.$this->_url->port;
354	354
355	355	} elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
356		- $host = $this->_url->host . ':' . $this->_url->port;
	356	+ $host = $this->_url->host.':'.$this->_url->port;
357	357
358	358	} else {
359	359	$host = $this->_url->host;
		@@ -409,7 +409,7 @@ discard block
		block discarded – undo
409	409	*/
410	410	function getUrl()
411	411	{
412		- return empty($this->_url)? '': $this->_url->getUrl();
	412	+ return empty($this->_url) ? '' : $this->_url->getUrl();
413	413	}
414	414
415	415	/**
		@@ -429,7 +429,7 @@ discard block
		block discarded – undo
429	429	$this->_proxy_pass = $pass;
430	430
431	431	if (!empty($user)) {
432		- $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
	432	+ $this->addHeader('Proxy-Authorization', 'Basic '.base64_encode($user.':'.$pass));
433	433	}
434	434	}
435	435
		@@ -444,7 +444,7 @@ discard block
		block discarded – undo
444	444	$this->_user = $user;
445	445	$this->_pass = $pass;
446	446
447		- $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
	447	+ $this->addHeader('Authorization', 'Basic '.base64_encode($user.':'.$pass));
448	448	}
449	449
450	450	/**
		@@ -634,8 +634,8 @@ discard block
		block discarded – undo
634	634	*/
635	635	function addCookie($name, $value)
636	636	{
637		- $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
638		- $this->addHeader('Cookie', $cookies . $name . '=' . $value);
	637	+ $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie'].'; ' : '';
	638	+ $this->addHeader('Cookie', $cookies.$name.'='.$value);
639	639	}
640	640
641	641	/**
		@@ -674,7 +674,7 @@ discard block
		block discarded – undo
674	674	if (isset($this->_proxy_host)) {
675	675	return PEAR::raiseError('HTTPS proxies are not supported.');
676	676	}
677		- $host = 'ssl://' . $host;
	677	+ $host = 'ssl://'.$host;
678	678	}
679	679
680	680	// magic quotes may fuck up file uploads and chunked response processing
		@@ -692,18 +692,18 @@ discard block
		block discarded – undo
692	692	$keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) \|\|
693	693	(!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
694	694	$sockets = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
695		- $sockKey = $host . ':' . $port;
	695	+ $sockKey = $host.':'.$port;
696	696	unset($this->_sock);
697	697
698	698	// There is a connected socket in the "static" property?
699	699	if ($keepAlive && !empty($sockets[$sockKey]) &&
700	700	!empty($sockets[$sockKey]->fp))
701	701	{
702		- $this->_sock =& $sockets[$sockKey];
	702	+ $this->_sock = & $sockets[$sockKey];
703	703	$err = null;
704	704	} else {
705	705	$this->_notify('connect');
706		- $this->_sock =& new Net_Socket();
	706	+ $this->_sock = & new Net_Socket();
707	707	$err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
708	708	}
709	709	PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
		@@ -746,11 +746,11 @@ discard block
		block discarded – undo
746	746	$this->disconnect();
747	747	// Store the connected socket in "static" property
748	748	} elseif (empty($sockets[$sockKey]) \|\| empty($sockets[$sockKey]->fp)) {
749		- $sockets[$sockKey] =& $this->_sock;
	749	+ $sockets[$sockKey] = & $this->_sock;
750	750	}
751	751
752	752	// Check for redirection
753		- if ( $this->_allowRedirects
	753	+ if ($this->_allowRedirects
754	754	AND $this->_redirects <= $this->_maxRedirects
755	755	AND $this->getResponseCode() > 300
756	756	AND $this->getResponseCode() < 399
		@@ -770,9 +770,9 @@ discard block
		block discarded – undo
770	770	// Relative path
771	771	} elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
772	772	if (substr($this->_url->path, -1) == '/') {
773		- $redirect = $this->_url->path . $redirect;
	773	+ $redirect = $this->_url->path.$redirect;
774	774	} else {
775		- $redirect = dirname($this->_url->path) . '/' . $redirect;
	775	+ $redirect = dirname($this->_url->path).'/'.$redirect;
776	776	}
777	777	$redirect = Net_URL::resolvePath($redirect);
778	778	$this->_url->path = $redirect;
		@@ -780,9 +780,9 @@ discard block
		block discarded – undo
780	780	// Filename, no path
781	781	} else {
782	782	if (substr($this->_url->path, -1) == '/') {
783		- $redirect = $this->_url->path . $redirect;
	783	+ $redirect = $this->_url->path.$redirect;
784	784	} else {
785		- $redirect = dirname($this->_url->path) . '/' . $redirect;
	785	+ $redirect = dirname($this->_url->path).'/'.$redirect;
786	786	}
787	787	$this->_url->path = $redirect;
788	788	}
		@@ -833,7 +833,7 @@ discard block
		block discarded – undo
833	833	function getResponseHeader($headername = null)
834	834	{
835	835	if (!isset($headername)) {
836		- return isset($this->_response->_headers)? $this->_response->_headers: array();
	836	+ return isset($this->_response->_headers) ? $this->_response->_headers : array();
837	837	} else {
838	838	$headername = strtolower($headername);
839	839	return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
		@@ -872,15 +872,15 @@ discard block
		block discarded – undo
872	872	{
873	873	$separator = ini_get('arg_separator.output');
874	874	ini_set('arg_separator.output', '&');
875		- $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
	875	+ $querystring = ($querystring = $this->_url->getQueryString()) ? '?'.$querystring : '';
876	876	ini_set('arg_separator.output', $separator);
877	877
878		- $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
879		- $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
880		- $path = $this->_url->path . $querystring;
881		- $url = $host . $port . $path;
	878	+ $host = isset($this->_proxy_host) ? $this->_url->protocol.'://'.$this->_url->host : '';
	879	+ $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':'.$this->_url->port : '';
	880	+ $path = $this->_url->path.$querystring;
	881	+ $url = $host.$port.$path;
882	882
883		- $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
	883	+ $request = $this->_method.' '.$url.' HTTP/'.$this->_http."\r\n";
884	884
885	885	if (in_array($this->_method, $this->_bodyDisallowed) \|\|
886	886	(empty($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method \|\|
		@@ -892,8 +892,8 @@ discard block
		block discarded – undo
892	892	// Add default content-type
893	893	$this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
894	894	} elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
895		- $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
896		- $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
	895	+ $boundary = 'HTTP_Request_'.md5(uniqid('request').microtime());
	896	+ $this->addHeader('Content-Type', 'multipart/form-data; boundary='.$boundary);
897	897	}
898	898	}
899	899
		@@ -901,7 +901,7 @@ discard block
		block discarded – undo
901	901	if (!empty($this->_requestHeaders)) {
902	902	foreach ($this->_requestHeaders as $name => $value) {
903	903	$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
904		- $request .= $canonicalName . ': ' . $value . "\r\n";
	904	+ $request .= $canonicalName.': '.$value."\r\n";
905	905	}
906	906	}
907	907
		@@ -928,14 +928,14 @@ discard block
		block discarded – undo
928	928	if (!empty($this->_postData)) {
929	929	$flatData = $this->_flattenArray('', $this->_postData);
930	930	foreach ($flatData as $item) {
931		- $postdata .= '--' . $boundary . "\r\n";
932		- $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
933		- $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
	931	+ $postdata .= '--'.$boundary."\r\n";
	932	+ $postdata .= 'Content-Disposition: form-data; name="'.$item[0].'"';
	933	+ $postdata .= "\r\n\r\n".urldecode($item[1])."\r\n";
934	934	}
935	935	}
936	936	foreach ($this->_postFiles as $name => $value) {
937	937	if (is_array($value['name'])) {
938		- $varname = $name . ($this->_useBrackets? '[]': '');
	938	+ $varname = $name.($this->_useBrackets ? '[]' : '');
939	939	} else {
940	940	$varname = $name;
941	941	$value['name'] = array($value['name']);
		@@ -945,26 +945,26 @@ discard block
		block discarded – undo
945	945	$data = fread($fp, filesize($filename));
946	946	fclose($fp);
947	947	$basename = basename($filename);
948		- $type = is_array($value['type'])? @$value['type'][$key]: $value['type'];
	948	+ $type = is_array($value['type']) ? @$value['type'][$key] : $value['type'];
949	949
950		- $postdata .= '--' . $boundary . "\r\n";
951		- $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
952		- $postdata .= "\r\nContent-Type: " . $type;
953		- $postdata .= "\r\n\r\n" . $data . "\r\n";
	950	+ $postdata .= '--'.$boundary."\r\n";
	951	+ $postdata .= 'Content-Disposition: form-data; name="'.$varname.'"; filename="'.$basename.'"';
	952	+ $postdata .= "\r\nContent-Type: ".$type;
	953	+ $postdata .= "\r\n\r\n".$data."\r\n";
954	954	}
955	955	}
956		- $postdata .= '--' . $boundary . "--\r\n";
	956	+ $postdata .= '--'.$boundary."--\r\n";
957	957	}
958		- $request .= 'Content-Length: ' .
959		- (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
	958	+ $request .= 'Content-Length: '.
	959	+ (HTTP_REQUEST_MBSTRING ? mb_strlen($postdata, 'iso-8859-1') : strlen($postdata)).
960	960	"\r\n\r\n";
961	961	$request .= $postdata;
962	962
963	963	// Explicitly set request body
964	964	} elseif (!empty($this->_body)) {
965	965
966		- $request .= 'Content-Length: ' .
967		- (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
	966	+ $request .= 'Content-Length: '.
	967	+ (HTTP_REQUEST_MBSTRING ? mb_strlen($this->_body, 'iso-8859-1') : strlen($this->_body)).
968	968	"\r\n\r\n";
969	969	$request .= $this->_body;
970	970	}
		@@ -991,7 +991,7 @@ discard block
		block discarded – undo
991	991	if (empty($name)) {
992	992	$newName = $k;
993	993	} elseif ($this->_useBrackets) {
994		- $newName = $name . '[' . $k . ']';
	994	+ $newName = $name.'['.$k.']';
995	995	} else {
996	996	$newName = $name;
997	997	}
		@@ -1026,7 +1026,7 @@ discard block
		block discarded – undo
1026	1026	if (!is_a($listener, 'HTTP_Request_Listener')) {
1027	1027	return false;
1028	1028	}
1029		- $this->_listeners[$listener->getId()] =& $listener;
	1029	+ $this->_listeners[$listener->getId()] = & $listener;
1030	1030	return true;
1031	1031	}
1032	1032
		@@ -1139,8 +1139,8 @@ discard block
		block discarded – undo
1139	1139	*/
1140	1140	function HTTP_Response(&$sock, &$listeners)
1141	1141	{
1142		- $this->_sock =& $sock;
1143		- $this->_listeners =& $listeners;
	1142	+ $this->_sock = & $sock;
	1143	+ $this->_listeners = & $listeners;
1144	1144	}
1145	1145
1146	1146
		@@ -1166,7 +1166,7 @@ discard block
		block discarded – undo
1166	1166	if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
1167	1167	return PEAR::raiseError('Malformed response.');
1168	1168	} else {
1169		- $this->_protocol = 'HTTP/' . $http_version;
	1169	+ $this->_protocol = 'HTTP/'.$http_version;
1170	1170	$this->_code = intval($returncode);
1171	1171	}
1172	1172	while ('' !== ($header = $this->_sock->readLine())) {
		@@ -1204,7 +1204,7 @@ discard block
		block discarded – undo
1204	1204	$data = $this->_sock->read(4096);
1205	1205	} else {
1206	1206	$data = $this->_sock->read(min(4096, $this->_toRead));
1207		- $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
	1207	+ $this->_toRead -= HTTP_REQUEST_MBSTRING ? mb_strlen($data, 'iso-8859-1') : strlen($data);
1208	1208	}
1209	1209	if ('' == $data) {
1210	1210	break;
		@@ -1213,7 +1213,7 @@ discard block
		block discarded – undo
1213	1213	if ($saveBody \|\| $gzipped) {
1214	1214	$this->_body .= $data;
1215	1215	}
1216		- $this->_notify($gzipped? 'gzTick': 'tick', $data);
	1216	+ $this->_notify($gzipped ? 'gzTick' : 'tick', $data);
1217	1217	}
1218	1218	}
1219	1219	}
		@@ -1252,7 +1252,7 @@ discard block
		block discarded – undo
1252	1252
1253	1253	if ('set-cookie' != $headername) {
1254	1254	if (isset($this->_headers[$headername])) {
1255		- $this->_headers[$headername] .= ',' . $headervalue;
	1255	+ $this->_headers[$headername] .= ','.$headervalue;
1256	1256	} else {
1257	1257	$this->_headers[$headername] = $headervalue;
1258	1258	}
		@@ -1336,7 +1336,7 @@ discard block
		block discarded – undo
1336	1336	}
1337	1337	}
1338	1338	$data = $this->_sock->read($this->_chunkLength);
1339		- $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
	1339	+ $this->_chunkLength -= HTTP_REQUEST_MBSTRING ? mb_strlen($data, 'iso-8859-1') : strlen($data);
1340	1340	if (0 == $this->_chunkLength) {
1341	1341	$this->_sock->readLine(); // Trailing CRLF
1342	1342	}

		@@ -340,7 +340,7 @@
		block discarded – undo
340	340	*
341	341	* This method can also be called statically.
342	342	*
343		- * @param string $url URL path to resolve
	343	+ * @param string $path
344	344	* @return string The result
345	345	*/
346	346	function resolvePath($path)

		@@ -38,373 +38,373 @@
		block discarded – undo
38	38
39	39	class Net_URL
40	40	{
41		- /**
42		- * Full url
43		- * @var string
44		- */
45		- var $url;
46		-
47		- /**
48		- * Protocol
49		- * @var string
50		- */
51		- var $protocol;
52		-
53		- /**
54		- * Username
55		- * @var string
56		- */
57		- var $username;
58		-
59		- /**
60		- * Password
61		- * @var string
62		- */
63		- var $password;
64		-
65		- /**
66		- * Host
67		- * @var string
68		- */
69		- var $host;
70		-
71		- /**
72		- * Port
73		- * @var integer
74		- */
75		- var $port;
76		-
77		- /**
78		- * Path
79		- * @var string
80		- */
81		- var $path;
82		-
83		- /**
84		- * Query string
85		- * @var array
86		- */
87		- var $querystring;
88		-
89		- /**
90		- * Anchor
91		- * @var string
92		- */
93		- var $anchor;
94		-
95		- /**
96		- * Whether to use []
97		- * @var bool
98		- */
99		- var $useBrackets;
100		-
101		- /**
102		- * PHP4 Constructor
103		- *
104		- * @see __construct()
105		- */
106		- function Net_URL($url = null, $useBrackets = true)
107		- {
108		- $this->__construct($url, $useBrackets);
109		- }
110		-
111		- /**
112		- * PHP5 Constructor
113		- *
114		- * Parses the given url and stores the various parts
115		- * Defaults are used in certain cases
116		- *
117		- * @param string $url Optional URL
118		- * @param bool $useBrackets Whether to use square brackets when
119		- * multiple querystrings with the same name
120		- * exist
121		- */
122		- function __construct($url = null, $useBrackets = true)
123		- {
124		- $HTTP_SERVER_VARS = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
125		-
126		- $this->useBrackets = $useBrackets;
127		- $this->url = $url;
128		- $this->user = '';
129		- $this->pass = '';
130		- $this->host = '';
131		- $this->port = 80;
132		- $this->path = '';
133		- $this->querystring = array();
134		- $this->anchor = '';
135		-
136		- // Only use defaults if not an absolute URL given
137		- if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
138		-
139		- $this->protocol = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
140		-
141		- /**
142		- * Figure out host/port
143		- */
144		- if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
145		- $host = $matches[1];
146		- if (!empty($matches[3])) {
147		- $port = $matches[3];
148		- } else {
149		- $port = $this->getStandardPort($this->protocol);
150		- }
151		- }
152		-
153		- $this->user = '';
154		- $this->pass = '';
155		- $this->host = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
156		- $this->port = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
157		- $this->path = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
158		- $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
159		- $this->anchor = '';
160		- }
161		-
162		- // Parse the url and store the various parts
163		- if (!empty($url)) {
164		- $urlinfo = parse_url($url);
165		-
166		- // Default querystring
167		- $this->querystring = array();
168		-
169		- foreach ($urlinfo as $key => $value) {
170		- switch ($key) {
171		- case 'scheme':
172		- $this->protocol = $value;
173		- $this->port = $this->getStandardPort($value);
174		- break;
175		-
176		- case 'user':
177		- case 'pass':
178		- case 'host':
179		- case 'port':
180		- $this->$key = $value;
181		- break;
182		-
183		- case 'path':
184		- if ($value{0} == '/') {
185		- $this->path = $value;
186		- } else {
187		- $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
188		- $this->path = sprintf('%s/%s', $path, $value);
189		- }
190		- break;
191		-
192		- case 'query':
193		- $this->querystring = $this->_parseRawQueryString($value);
194		- break;
195		-
196		- case 'fragment':
197		- $this->anchor = $value;
198		- break;
199		- }
200		- }
201		- }
202		- }
203		-
204		- /**
205		- * Returns full url
206		- *
207		- * @return string Full url
208		- * @access public
209		- */
210		- function getURL()
211		- {
212		- $querystring = $this->getQueryString();
213		-
214		- $this->url = $this->protocol . '://'
215		- . $this->user . (!empty($this->pass) ? ':' : '')
216		- . $this->pass . (!empty($this->user) ? '@' : '')
217		- . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
218		- . $this->path
219		- . (!empty($querystring) ? '?' . $querystring : '')
220		- . (!empty($this->anchor) ? '#' . $this->anchor : '');
221		-
222		- return $this->url;
223		- }
224		-
225		- /**
226		- * Adds a querystring item
227		- *
228		- * @param string $name Name of item
229		- * @param string $value Value of item
230		- * @param bool $preencoded Whether value is urlencoded or not, default = not
231		- * @access public
232		- */
233		- function addQueryString($name, $value, $preencoded = false)
234		- {
235		- if ($preencoded) {
236		- $this->querystring[$name] = $value;
237		- } else {
238		- $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
239		- }
240		- }
241		-
242		- /**
243		- * Removes a querystring item
244		- *
245		- * @param string $name Name of item
246		- * @access public
247		- */
248		- function removeQueryString($name)
249		- {
250		- if (isset($this->querystring[$name])) {
251		- unset($this->querystring[$name]);
252		- }
253		- }
254		-
255		- /**
256		- * Sets the querystring to literally what you supply
257		- *
258		- * @param string $querystring The querystring data. Should be of the format foo=bar&x=y etc
259		- * @access public
260		- */
261		- function addRawQueryString($querystring)
262		- {
263		- $this->querystring = $this->_parseRawQueryString($querystring);
264		- }
265		-
266		- /**
267		- * Returns flat querystring
268		- *
269		- * @return string Querystring
270		- * @access public
271		- */
272		- function getQueryString()
273		- {
274		- if (!empty($this->querystring)) {
275		- foreach ($this->querystring as $name => $value) {
276		- if (is_array($value)) {
277		- foreach ($value as $k => $v) {
278		- $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
279		- }
280		- } elseif (!is_null($value)) {
281		- $querystring[] = $name . '=' . $value;
282		- } else {
283		- $querystring[] = $name;
284		- }
285		- }
286		- $querystring = implode(ini_get('arg_separator.output'), $querystring);
287		- } else {
288		- $querystring = '';
289		- }
290		-
291		- return $querystring;
292		- }
293		-
294		- /**
295		- * Parses raw querystring and returns an array of it
296		- *
297		- * @param string $querystring The querystring to parse
298		- * @return array An array of the querystring data
299		- * @access private
300		- */
301		- function _parseRawQuerystring($querystring)
302		- {
303		- $parts = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
304		- $return = array();
305		-
306		- foreach ($parts as $part) {
307		- if (strpos($part, '=') !== false) {
308		- $value = substr($part, strpos($part, '=') + 1);
309		- $key = substr($part, 0, strpos($part, '='));
310		- } else {
311		- $value = null;
312		- $key = $part;
313		- }
314		- if (substr($key, -2) == '[]') {
315		- $key = substr($key, 0, -2);
316		- if (@!is_array($return[$key])) {
317		- $return[$key] = array();
318		- $return[$key][] = $value;
319		- } else {
320		- $return[$key][] = $value;
321		- }
322		- } elseif (!$this->useBrackets AND !empty($return[$key])) {
323		- $return[$key] = (array)$return[$key];
324		- $return[$key][] = $value;
325		- } else {
326		- $return[$key] = $value;
327		- }
328		- }
329		-
330		- return $return;
331		- }
332		-
333		- /**
334		- * Resolves //, ../ and ./ from a path and returns
335		- * the result. Eg:
336		- *
337		- * /foo/bar/../boo.php => /foo/boo.php
338		- * /foo/bar/../../boo.php => /boo.php
339		- * /foo/bar/.././/boo.php => /foo/boo.php
340		- *
341		- * This method can also be called statically.
342		- *
343		- * @param string $url URL path to resolve
344		- * @return string The result
345		- */
346		- function resolvePath($path)
347		- {
348		- $path = explode('/', str_replace('//', '/', $path));
349		-
350		- for ($i=0; $i<count($path); $i++) {
351		- if ($path[$i] == '.') {
352		- unset($path[$i]);
353		- $path = array_values($path);
354		- $i--;
355		-
356		- } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
357		- unset($path[$i]);
358		- unset($path[$i-1]);
359		- $path = array_values($path);
360		- $i -= 2;
361		-
362		- } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
363		- unset($path[$i]);
364		- $path = array_values($path);
365		- $i--;
366		-
367		- } else {
368		- continue;
369		- }
370		- }
371		-
372		- return implode('/', $path);
373		- }
374		-
375		- /**
376		- * Returns the standard port number for a protocol
377		- *
378		- * @param string $scheme The protocol to lookup
379		- * @return integer Port number or NULL if no scheme matches
380		- *
381		- * @author Philippe Jausions <[email protected]>
382		- */
383		- function getStandardPort($scheme)
384		- {
385		- switch (strtolower($scheme)) {
386		- case 'http': return 80;
387		- case 'https': return 443;
388		- case 'ftp': return 21;
389		- case 'imap': return 143;
390		- case 'imaps': return 993;
391		- case 'pop3': return 110;
392		- case 'pop3s': return 995;
393		- default: return null;
394		- }
395		- }
396		-
397		- /**
398		- * Forces the URL to a particular protocol
399		- *
400		- * @param string $protocol Protocol to force the URL to
401		- * @param integer $port Optional port (standard port is used by default)
402		- */
403		- function setProtocol($protocol, $port = null)
404		- {
405		- $this->protocol = $protocol;
406		- $this->port = is_null($port) ? $this->getStandardPort() : $port;
407		- }
	41	+ /**
	42	+ * Full url
	43	+ * @var string
	44	+ */
	45	+ var $url;
	46	+
	47	+ /**
	48	+ * Protocol
	49	+ * @var string
	50	+ */
	51	+ var $protocol;
	52	+
	53	+ /**
	54	+ * Username
	55	+ * @var string
	56	+ */
	57	+ var $username;
	58	+
	59	+ /**
	60	+ * Password
	61	+ * @var string
	62	+ */
	63	+ var $password;
	64	+
	65	+ /**
	66	+ * Host
	67	+ * @var string
	68	+ */
	69	+ var $host;
	70	+
	71	+ /**
	72	+ * Port
	73	+ * @var integer
	74	+ */
	75	+ var $port;
	76	+
	77	+ /**
	78	+ * Path
	79	+ * @var string
	80	+ */
	81	+ var $path;
	82	+
	83	+ /**
	84	+ * Query string
	85	+ * @var array
	86	+ */
	87	+ var $querystring;
	88	+
	89	+ /**
	90	+ * Anchor
	91	+ * @var string
	92	+ */
	93	+ var $anchor;
	94	+
	95	+ /**
	96	+ * Whether to use []
	97	+ * @var bool
	98	+ */
	99	+ var $useBrackets;
	100	+
	101	+ /**
	102	+ * PHP4 Constructor
	103	+ *
	104	+ * @see __construct()
	105	+ */
	106	+ function Net_URL($url = null, $useBrackets = true)
	107	+ {
	108	+ $this->__construct($url, $useBrackets);
	109	+ }
	110	+
	111	+ /**
	112	+ * PHP5 Constructor
	113	+ *
	114	+ * Parses the given url and stores the various parts
	115	+ * Defaults are used in certain cases
	116	+ *
	117	+ * @param string $url Optional URL
	118	+ * @param bool $useBrackets Whether to use square brackets when
	119	+ * multiple querystrings with the same name
	120	+ * exist
	121	+ */
	122	+ function __construct($url = null, $useBrackets = true)
	123	+ {
	124	+ $HTTP_SERVER_VARS = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
	125	+
	126	+ $this->useBrackets = $useBrackets;
	127	+ $this->url = $url;
	128	+ $this->user = '';
	129	+ $this->pass = '';
	130	+ $this->host = '';
	131	+ $this->port = 80;
	132	+ $this->path = '';
	133	+ $this->querystring = array();
	134	+ $this->anchor = '';
	135	+
	136	+ // Only use defaults if not an absolute URL given
	137	+ if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
	138	+
	139	+ $this->protocol = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
	140	+
	141	+ /**
	142	+ * Figure out host/port
	143	+ */
	144	+ if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
	145	+ $host = $matches[1];
	146	+ if (!empty($matches[3])) {
	147	+ $port = $matches[3];
	148	+ } else {
	149	+ $port = $this->getStandardPort($this->protocol);
	150	+ }
	151	+ }
	152	+
	153	+ $this->user = '';
	154	+ $this->pass = '';
	155	+ $this->host = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
	156	+ $this->port = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
	157	+ $this->path = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
	158	+ $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
	159	+ $this->anchor = '';
	160	+ }
	161	+
	162	+ // Parse the url and store the various parts
	163	+ if (!empty($url)) {
	164	+ $urlinfo = parse_url($url);
	165	+
	166	+ // Default querystring
	167	+ $this->querystring = array();
	168	+
	169	+ foreach ($urlinfo as $key => $value) {
	170	+ switch ($key) {
	171	+ case 'scheme':
	172	+ $this->protocol = $value;
	173	+ $this->port = $this->getStandardPort($value);
	174	+ break;
	175	+
	176	+ case 'user':
	177	+ case 'pass':
	178	+ case 'host':
	179	+ case 'port':
	180	+ $this->$key = $value;
	181	+ break;
	182	+
	183	+ case 'path':
	184	+ if ($value{0} == '/') {
	185	+ $this->path = $value;
	186	+ } else {
	187	+ $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
	188	+ $this->path = sprintf('%s/%s', $path, $value);
	189	+ }
	190	+ break;
	191	+
	192	+ case 'query':
	193	+ $this->querystring = $this->_parseRawQueryString($value);
	194	+ break;
	195	+
	196	+ case 'fragment':
	197	+ $this->anchor = $value;
	198	+ break;
	199	+ }
	200	+ }
	201	+ }
	202	+ }
	203	+
	204	+ /**
	205	+ * Returns full url
	206	+ *
	207	+ * @return string Full url
	208	+ * @access public
	209	+ */
	210	+ function getURL()
	211	+ {
	212	+ $querystring = $this->getQueryString();
	213	+
	214	+ $this->url = $this->protocol . '://'
	215	+ . $this->user . (!empty($this->pass) ? ':' : '')
	216	+ . $this->pass . (!empty($this->user) ? '@' : '')
	217	+ . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
	218	+ . $this->path
	219	+ . (!empty($querystring) ? '?' . $querystring : '')
	220	+ . (!empty($this->anchor) ? '#' . $this->anchor : '');
	221	+
	222	+ return $this->url;
	223	+ }
	224	+
	225	+ /**
	226	+ * Adds a querystring item
	227	+ *
	228	+ * @param string $name Name of item
	229	+ * @param string $value Value of item
	230	+ * @param bool $preencoded Whether value is urlencoded or not, default = not
	231	+ * @access public
	232	+ */
	233	+ function addQueryString($name, $value, $preencoded = false)
	234	+ {
	235	+ if ($preencoded) {
	236	+ $this->querystring[$name] = $value;
	237	+ } else {
	238	+ $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
	239	+ }
	240	+ }
	241	+
	242	+ /**
	243	+ * Removes a querystring item
	244	+ *
	245	+ * @param string $name Name of item
	246	+ * @access public
	247	+ */
	248	+ function removeQueryString($name)
	249	+ {
	250	+ if (isset($this->querystring[$name])) {
	251	+ unset($this->querystring[$name]);
	252	+ }
	253	+ }
	254	+
	255	+ /**
	256	+ * Sets the querystring to literally what you supply
	257	+ *
	258	+ * @param string $querystring The querystring data. Should be of the format foo=bar&x=y etc
	259	+ * @access public
	260	+ */
	261	+ function addRawQueryString($querystring)
	262	+ {
	263	+ $this->querystring = $this->_parseRawQueryString($querystring);
	264	+ }
	265	+
	266	+ /**
	267	+ * Returns flat querystring
	268	+ *
	269	+ * @return string Querystring
	270	+ * @access public
	271	+ */
	272	+ function getQueryString()
	273	+ {
	274	+ if (!empty($this->querystring)) {
	275	+ foreach ($this->querystring as $name => $value) {
	276	+ if (is_array($value)) {
	277	+ foreach ($value as $k => $v) {
	278	+ $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
	279	+ }
	280	+ } elseif (!is_null($value)) {
	281	+ $querystring[] = $name . '=' . $value;
	282	+ } else {
	283	+ $querystring[] = $name;
	284	+ }
	285	+ }
	286	+ $querystring = implode(ini_get('arg_separator.output'), $querystring);
	287	+ } else {
	288	+ $querystring = '';
	289	+ }
	290	+
	291	+ return $querystring;
	292	+ }
	293	+
	294	+ /**
	295	+ * Parses raw querystring and returns an array of it
	296	+ *
	297	+ * @param string $querystring The querystring to parse
	298	+ * @return array An array of the querystring data
	299	+ * @access private
	300	+ */
	301	+ function _parseRawQuerystring($querystring)
	302	+ {
	303	+ $parts = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
	304	+ $return = array();
	305	+
	306	+ foreach ($parts as $part) {
	307	+ if (strpos($part, '=') !== false) {
	308	+ $value = substr($part, strpos($part, '=') + 1);
	309	+ $key = substr($part, 0, strpos($part, '='));
	310	+ } else {
	311	+ $value = null;
	312	+ $key = $part;
	313	+ }
	314	+ if (substr($key, -2) == '[]') {
	315	+ $key = substr($key, 0, -2);
	316	+ if (@!is_array($return[$key])) {
	317	+ $return[$key] = array();
	318	+ $return[$key][] = $value;
	319	+ } else {
	320	+ $return[$key][] = $value;
	321	+ }
	322	+ } elseif (!$this->useBrackets AND !empty($return[$key])) {
	323	+ $return[$key] = (array)$return[$key];
	324	+ $return[$key][] = $value;
	325	+ } else {
	326	+ $return[$key] = $value;
	327	+ }
	328	+ }
	329	+
	330	+ return $return;
	331	+ }
	332	+
	333	+ /**
	334	+ * Resolves //, ../ and ./ from a path and returns
	335	+ * the result. Eg:
	336	+ *
	337	+ * /foo/bar/../boo.php => /foo/boo.php
	338	+ * /foo/bar/../../boo.php => /boo.php
	339	+ * /foo/bar/.././/boo.php => /foo/boo.php
	340	+ *
	341	+ * This method can also be called statically.
	342	+ *
	343	+ * @param string $url URL path to resolve
	344	+ * @return string The result
	345	+ */
	346	+ function resolvePath($path)
	347	+ {
	348	+ $path = explode('/', str_replace('//', '/', $path));
	349	+
	350	+ for ($i=0; $i<count($path); $i++) {
	351	+ if ($path[$i] == '.') {
	352	+ unset($path[$i]);
	353	+ $path = array_values($path);
	354	+ $i--;
	355	+
	356	+ } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
	357	+ unset($path[$i]);
	358	+ unset($path[$i-1]);
	359	+ $path = array_values($path);
	360	+ $i -= 2;
	361	+
	362	+ } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
	363	+ unset($path[$i]);
	364	+ $path = array_values($path);
	365	+ $i--;
	366	+
	367	+ } else {
	368	+ continue;
	369	+ }
	370	+ }
	371	+
	372	+ return implode('/', $path);
	373	+ }
	374	+
	375	+ /**
	376	+ * Returns the standard port number for a protocol
	377	+ *
	378	+ * @param string $scheme The protocol to lookup
	379	+ * @return integer Port number or NULL if no scheme matches
	380	+ *
	381	+ * @author Philippe Jausions <[email protected]>
	382	+ */
	383	+ function getStandardPort($scheme)
	384	+ {
	385	+ switch (strtolower($scheme)) {
	386	+ case 'http': return 80;
	387	+ case 'https': return 443;
	388	+ case 'ftp': return 21;
	389	+ case 'imap': return 143;
	390	+ case 'imaps': return 993;
	391	+ case 'pop3': return 110;
	392	+ case 'pop3s': return 995;
	393	+ default: return null;
	394	+ }
	395	+ }
	396	+
	397	+ /**
	398	+ * Forces the URL to a particular protocol
	399	+ *
	400	+ * @param string $protocol Protocol to force the URL to
	401	+ * @param integer $port Optional port (standard port is used by default)
	402	+ */
	403	+ function setProtocol($protocol, $port = null)
	404	+ {
	405	+ $this->protocol = $protocol;
	406	+ $this->port = is_null($port) ? $this->getStandardPort() : $port;
	407	+ }
408	408
409	409	}
410	410	?>

		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	// Only use defaults if not an absolute URL given
137	137	if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
138	138
139		- $this->protocol = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
	139	+ $this->protocol = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
140	140
141	141	/**
142	142	* Figure out host/port
		@@ -211,13 +211,13 @@ discard block
		block discarded – undo
211	211	{
212	212	$querystring = $this->getQueryString();
213	213
214		- $this->url = $this->protocol . '://'
215		- . $this->user . (!empty($this->pass) ? ':' : '')
216		- . $this->pass . (!empty($this->user) ? '@' : '')
217		- . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
	214	+ $this->url = $this->protocol.'://'
	215	+ . $this->user.(!empty($this->pass) ? ':' : '')
	216	+ . $this->pass.(!empty($this->user) ? '@' : '')
	217	+ . $this->host.($this->port == $this->getStandardPort($this->protocol) ? '' : ':'.$this->port)
218	218	. $this->path
219		- . (!empty($querystring) ? '?' . $querystring : '')
220		- . (!empty($this->anchor) ? '#' . $this->anchor : '');
	219	+ . (!empty($querystring) ? '?'.$querystring : '')
	220	+ . (!empty($this->anchor) ? '#'.$this->anchor : '');
221	221
222	222	return $this->url;
223	223	}
		@@ -235,7 +235,7 @@ discard block
		block discarded – undo
235	235	if ($preencoded) {
236	236	$this->querystring[$name] = $value;
237	237	} else {
238		- $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
	238	+ $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value) : rawurlencode($value);
239	239	}
240	240	}
241	241
		@@ -275,10 +275,10 @@ discard block
		block discarded – undo
275	275	foreach ($this->querystring as $name => $value) {
276	276	if (is_array($value)) {
277	277	foreach ($value as $k => $v) {
278		- $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
	278	+ $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name.'='.$v);
279	279	}
280	280	} elseif (!is_null($value)) {
281		- $querystring[] = $name . '=' . $value;
	281	+ $querystring[] = $name.'='.$value;
282	282	} else {
283	283	$querystring[] = $name;
284	284	}
		@@ -300,7 +300,7 @@ discard block
		block discarded – undo
300	300	*/
301	301	function _parseRawQuerystring($querystring)
302	302	{
303		- $parts = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
	303	+ $parts = preg_split('/['.preg_quote(ini_get('arg_separator.input'), '/').']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
304	304	$return = array();
305	305
306	306	foreach ($parts as $part) {
		@@ -320,7 +320,7 @@ discard block
		block discarded – undo
320	320	$return[$key][] = $value;
321	321	}
322	322	} elseif (!$this->useBrackets AND !empty($return[$key])) {
323		- $return[$key] = (array)$return[$key];
	323	+ $return[$key] = (array) $return[$key];
324	324	$return[$key][] = $value;
325	325	} else {
326	326	$return[$key] = $value;
		@@ -347,15 +347,15 @@ discard block
		block discarded – undo
347	347	{
348	348	$path = explode('/', str_replace('//', '/', $path));
349	349
350		- for ($i=0; $i<count($path); $i++) {
	350	+ for ($i = 0; $i < count($path); $i++) {
351	351	if ($path[$i] == '.') {
352	352	unset($path[$i]);
353	353	$path = array_values($path);
354	354	$i--;
355	355
356		- } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
	356	+ } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != ''))) {
357	357	unset($path[$i]);
358		- unset($path[$i-1]);
	358	+ unset($path[$i - 1]);
359	359	$path = array_values($path);
360	360	$i -= 2;
361	361

		@@ -319,7 +319,7 @@ discard block
		block discarded – undo
319	319	* Adds a "To" address.
320	320	* @param string $address
321	321	* @param string $name
322		- * @return void
	322	+ * @return boolean
323	323	*/
324	324	function AddAddress($address, $name = '') {
325	325	$cur = count($this->to);
		@@ -333,7 +333,7 @@ discard block
		block discarded – undo
333	333	* mailer.
334	334	* @param string $address
335	335	* @param string $name
336		- * @return void
	336	+ * @return boolean
337	337	*/
338	338	function AddCC($address, $name = '') {
339	339	$cur = count($this->cc);
		@@ -347,7 +347,7 @@ discard block
		block discarded – undo
347	347	* mailer.
348	348	* @param string $address
349	349	* @param string $name
350		- * @return void
	350	+ * @return boolean
351	351	*/
352	352	function AddBCC($address, $name = '') {
353	353	$cur = count($this->bcc);
		@@ -359,7 +359,7 @@ discard block
		block discarded – undo
359	359	* Adds a "Reply-To" address.
360	360	* @param string $address
361	361	* @param string $name
362		- * @return void
	362	+ * @return boolean
363	363	*/
364	364	function AddReplyTo($address, $name = '') {
365	365	$cur = count($this->ReplyTo);
		@@ -426,6 +426,8 @@ discard block
		block discarded – undo
426	426	/**
427	427	* Sends mail using the $Sendmail program.
428	428	* @access private
	429	+ * @param string $header
	430	+ * @param string $body
429	431	* @return bool
430	432	*/
431	433	function SendmailSend($header, $body) {
		@@ -457,6 +459,8 @@ discard block
		block discarded – undo
457	459	/**
458	460	* Sends mail using the PHP mail() function.
459	461	* @access private
	462	+ * @param string $header
	463	+ * @param string $body
460	464	* @return bool
461	465	*/
462	466	function MailSend($header, $body) {
		@@ -507,6 +511,8 @@ discard block
		block discarded – undo
507	511	* Chris Ryan). Returns bool. Returns false if there is a
508	512	* bad MAIL FROM, RCPT, or DATA input.
509	513	* @access private
	514	+ * @param string $header
	515	+ * @param string $body
510	516	* @return bool
511	517	*/
512	518	function SmtpSend($header, $body) {
		@@ -677,6 +683,7 @@ discard block
		block discarded – undo
677	683	/**
678	684	* Creates recipient headers.
679	685	* @access private
	686	+ * @param string $type
680	687	* @return string
681	688	*/
682	689	function AddrAppend($type, $addr) {
		@@ -712,6 +719,8 @@ discard block
		block discarded – undo
712	719	* automatically perform wrapping and for quoted-printable.
713	720	* Original written by philippe.
714	721	* @access private
	722	+ * @param string $message
	723	+ * @param integer $length
715	724	* @return string
716	725	*/
717	726	function WrapText($message, $length, $qp_mode = false) {
		@@ -1040,6 +1049,9 @@ discard block
		block discarded – undo
1040	1049	/**
1041	1050	* Returns the start of a message boundary.
1042	1051	* @access private
	1052	+ * @param string $charSet
	1053	+ * @param string $contentType
	1054	+ * @param string $encoding
1043	1055	*/
1044	1056	function GetBoundary($boundary, $charSet, $contentType, $encoding) {
1045	1057	$result = '';
		@@ -1094,6 +1106,10 @@ discard block
		block discarded – undo
1094	1106	* @access private
1095	1107	* @return string
1096	1108	*/
	1109	+
	1110	+ /**
	1111	+ * @param string $name
	1112	+ */
1097	1113	function HeaderLine($name, $value) {
1098	1114	return $name . ': ' . $value . $this->LE;
1099	1115	}
		@@ -1101,6 +1117,7 @@ discard block
		block discarded – undo
1101	1117	/**
1102	1118	* Returns a formatted mail line.
1103	1119	* @access private
	1120	+ * @param string $value
1104	1121	* @return string
1105	1122	*/
1106	1123	function TextLine($value) {
		@@ -1259,6 +1276,7 @@ discard block
		block discarded – undo
1259	1276	/**
1260	1277	* Encode a header string to best of Q, B, quoted or none.
1261	1278	* @access private
	1279	+ * @param string $str
1262	1280	* @return string
1263	1281	*/
1264	1282	function EncodeHeader ($str, $position = 'text') {
		@@ -1596,6 +1614,7 @@ discard block
		block discarded – undo
1596	1614	* Adds the error message to the error container.
1597	1615	* Returns void.
1598	1616	* @access private
	1617	+ * @param string $msg
1599	1618	* @return void
1600	1619	*/
1601	1620	function SetError($msg) {
		@@ -1623,6 +1642,7 @@ discard block
		block discarded – undo
1623	1642	* PHP 4.1.0+ as well as older versions. Returns an empty string
1624	1643	* if nothing is found.
1625	1644	* @access private
	1645	+ * @param string $varName
1626	1646	* @return mixed
1627	1647	*/
1628	1648	function ServerVar($varName) {
		@@ -1663,6 +1683,7 @@ discard block
		block discarded – undo
1663	1683	/**
1664	1684	* Returns a message in the appropriate language.
1665	1685	* @access private
	1686	+ * @param string $key
1666	1687	* @return string
1667	1688	*/
1668	1689	function Lang($key) {
		@@ -1708,6 +1729,7 @@ discard block
		block discarded – undo
1708	1729	/**
1709	1730	* Evaluates the message and returns modifications for inline images and backgrounds
1710	1731	* @access public
	1732	+ * @param string $message
1711	1733	* @return $message
1712	1734	*/
1713	1735	function MsgHTML($message,$basedir='') {
		@@ -1745,7 +1767,7 @@ discard block
		block discarded – undo
1745	1767	/**
1746	1768	* Gets the mime type of the embedded or inline image
1747	1769	* @access private
1748		- * @return mime type of ext
	1770	+ * @return string type of ext
1749	1771	*/
1750	1772	function _mime_types($ext = '') {
1751	1773	$mimes = array(

		@@ -1240,8 +1240,9 @@
		block discarded – undo
1240	1240	case '7bit':
1241	1241	case '8bit':
1242	1242	$encoded = $this->FixEOL($str);
1243		- if (substr($encoded, -(strlen($this->LE))) != $this->LE)
1244		- $encoded .= $this->LE;
	1243	+ if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
	1244	+ $encoded .= $this->LE;
	1245	+ }
1245	1246	break;
1246	1247	case 'binary':
1247	1248	$encoded = $str;

xpressengine / xe-core

GitHub Access Token became invalid

Push — master ( b130b6...8a2f54 )

Status

Category

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +457 added lines, -457 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Doc Comments +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +1160 added lines, -1160 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines patch added patch discarded remove patch

Indentation +275 added lines, -275 removed lines patch added patch discarded remove patch

Braces +14 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -26 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +405 added lines, -405 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +306 added lines, -306 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Doc Comments +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +828 added lines, -828 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Indentation +1104 added lines, -1104 removed lines patch added patch discarded remove patch

Spacing +62 added lines, -62 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +367 added lines, -367 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Doc Comments +27 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +1070 added lines, -1070 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +185 added lines, -186 removed lines patch added patch discarded remove patch