xpressengine / xe-core

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

Doc Comments +2 added lines, -2 removed lines

@@ -379,7 +379,7 @@ 
     * 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 @@ 
     * 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()
     */

Indentation +306 added lines, -306 removed lines

@@ -60,55 +60,55 @@ 
     * 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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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);
+	}
 }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -131,8 +131,8 @@ 
 
         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 @@ 
             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 @@ 
 
         // 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 @@ 
         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 @@ 
         $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);
 

libs/PEAR.1.9/Net/URL2.php

Doc Comments +11 added lines, -11 removed lines

@@ -229,7 +229,7 @@ 
      * 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 @@ 
      * 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 @@ 
      * @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 @@ 
      * 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 @@ 
      * 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:bar@example.org:81".
      *
-     * @return void
+     * @return Net_URL2
      */
     public function setAuthority($authority)
     {
@@ -517,7 +517,7 @@ 
      *
      * @param array $array (name => value) array
      *
-     * @return void
+     * @return Net_URL2
      */
     public function setQueryVariables(array $array)
     {
@@ -552,7 +552,7 @@ 
      * @param string $name  variable name
      * @param mixed  $value variable value
      *
-     * @return  array
+     * @return  Net_URL2
      */
     public function setQueryVariable($name, $value)
     {
@@ -689,7 +689,7 @@ 
      * 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 @@ 
      * 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 @@ 
      *
      * @param string $optionName The name of the option to retrieve
      *
-     * @return  mixed
+     * @return  string
      */
     function getOption($optionName)
     {

Indentation +828 added lines, -828 removed lines

@@ -56,839 +56,839 @@
  */
 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:bar@example.org: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:bar@example.org: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;
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -171,7 +171,7 @@ 
      */
     public function __set($var, $arg)
     {
-        $method = 'set' . $var;
+        $method = 'set'.$var;
         if (method_exists($this, $method)) {
             $this->$method($arg);
         }
@@ -190,7 +190,7 @@ 
      */
     public function __get($var)
     {
-        $method = 'get' . $var;
+        $method = 'get'.$var;
         if (method_exists($this, $method)) {
             return $this->$method();
         }
@@ -277,7 +277,7 @@ 
     {
         $this->_userinfo = $userinfo;
         if ($password !== false) {
-            $this->_userinfo .= ':' . $password;
+            $this->_userinfo .= ':'.$password;
         }
     }
 
@@ -344,13 +344,13 @@ 
         $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 @@ 
      */
     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 @@ 
                     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 @@ 
         $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 @@ 
                     } 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 @@ 
                 $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 == '..') {

libs/PEAR.1.9/PEAR/Exception.php

Doc Comments +2 added lines

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

Indentation +275 added lines, -275 removed lines

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

Braces +14 added lines, -7 removed lines

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

Spacing +24 added lines, -26 removed lines

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

libs/PEAR/HTTP/Request.php

Doc Comments +3 added lines

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

Indentation +1104 added lines, -1104 removed lines

@@ -80,12 +80,12 @@ 
    /**
     * 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 @@ 
    /**#@+
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
  */
 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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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 @@ 
     * @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
 ?>

Spacing +62 added lines, -62 removed lines

@@ -60,13 +60,13 @@ 
 /**#@+
  * 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 @@ 
     */
     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 @@ 
         $this->_response = null;
 
         foreach ($params as $key => $value) {
-            $this->{'_' . $key} = $value;
+            $this->{'_'.$key} = $value;
         }
 
         if (!empty($url)) {
@@ -324,12 +324,12 @@ 
 
         // 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 @@ 
     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 @@ 
     */
     function getUrl()
     {
-        return empty($this->_url)? '': $this->_url->getUrl();
+        return empty($this->_url) ? '' : $this->_url->getUrl();
     }
 
     /**
@@ -429,7 +429,7 @@ 
         $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 @@ 
         $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 @@ 
     */
     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 @@ 
             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 @@ 
         $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 @@ 
             $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 @@ 
             // 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 @@ 
             // 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 @@ 
     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 @@ 
     {
         $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 @@ 
                 // 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 @@ 
         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 @@ 
                 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 @@ 
                         $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 @@ 
                 if (empty($name)) {
                     $newName = $k;
                 } elseif ($this->_useBrackets) {
-                    $newName = $name . '[' . $k . ']';
+                    $newName = $name.'['.$k.']';
                 } else {
                     $newName = $name;
                 }
@@ -1026,7 +1026,7 @@ 
         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 @@ 
     */
     function HTTP_Response(&$sock, &$listeners)
     {
-        $this->_sock      =& $sock;
-        $this->_listeners =& $listeners;
+        $this->_sock      = & $sock;
+        $this->_listeners = & $listeners;
     }
 
 
@@ -1166,7 +1166,7 @@ 
             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 @@ 
                     $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 @@ 
                     if ($saveBody || $gzipped) {
                         $this->_body .= $data;
                     }
-                    $this->_notify($gzipped? 'gzTick': 'tick', $data);
+                    $this->_notify($gzipped ? 'gzTick' : 'tick', $data);
                 }
             }
         }
@@ -1252,7 +1252,7 @@ 
         
         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 @@ 
             }
         }
         $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
         }

libs/PEAR/Net/URL.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +367 added lines, -367 removed lines

@@ -38,373 +38,373 @@
 
 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 <Philippe.Jausions@11abacus.com>
-    */
-    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 <Philippe.Jausions@11abacus.com>
+	 */
+	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;
+	}
 
 }
 ?>

Spacing +15 added lines, -15 removed lines

@@ -136,7 +136,7 @@ 
         // 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 @@ 
     {
         $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 @@ 
         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 @@ 
             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 @@ 
     */
     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 @@ 
                     $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 @@ 
     {
         $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;
 

libs/phpmailer/class.phpmailer.php

Doc Comments +27 added lines, -5 removed lines

@@ -319,7 +319,7 @@ 
    * 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 @@ 
    * mailer.
    * @param string $address
    * @param string $name
-   * @return void
+   * @return boolean
    */
   function AddCC($address, $name = '') {
     $cur = count($this->cc);
@@ -347,7 +347,7 @@ 
    * mailer.
    * @param string $address
    * @param string $name
-   * @return void
+   * @return boolean
    */
   function AddBCC($address, $name = '') {
     $cur = count($this->bcc);
@@ -359,7 +359,7 @@ 
    * 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 @@ 
   /**
    * Sends mail using the $Sendmail program.
    * @access private
+   * @param string $header
+   * @param string $body
    * @return bool
    */
   function SendmailSend($header, $body) {
@@ -457,6 +459,8 @@ 
   /**
    * 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 @@ 
    * 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 @@ 
   /**
    * Creates recipient headers.
    * @access private
+   * @param string $type
    * @return string
    */
   function AddrAppend($type, $addr) {
@@ -712,6 +719,8 @@ 
    * 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 @@ 
   /**
    * 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 @@ 
    * @access private
    * @return string
    */
+
+  /**
+   * @param string $name
+   */
   function HeaderLine($name, $value) {
     return $name . ': ' . $value . $this->LE;
   }
@@ -1101,6 +1117,7 @@ 
   /**
    * Returns a formatted mail line.
    * @access private
+   * @param string $value
    * @return string
    */
   function TextLine($value) {
@@ -1259,6 +1276,7 @@ 
   /**
    * 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 @@ 
    * Adds the error message to the error container.
    * Returns void.
    * @access private
+   * @param string $msg
    * @return void
    */
   function SetError($msg) {
@@ -1623,6 +1642,7 @@ 
    * 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 @@ 
   /**
    * Returns a message in the appropriate language.
    * @access private
+   * @param string $key
    * @return string
    */
   function Lang($key) {
@@ -1708,6 +1729,7 @@ 
   /**
    * 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 @@ 
   /**
    * 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(

Indentation +1070 added lines, -1070 removed lines

@@ -271,11 +271,11 @@ 
    * @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 @@ 
    * @return void
    */
   function IsSMTP() {
-    $this->Mailer = 'smtp';
+	$this->Mailer = 'smtp';
   }
 
   /**
@@ -291,7 +291,7 @@ 
    * @return void
    */
   function IsMail() {
-    $this->Mailer = 'mail';
+	$this->Mailer = 'mail';
   }
 
   /**
@@ -299,7 +299,7 @@ 
    * @return void
    */
   function IsSendmail() {
-    $this->Mailer = 'sendmail';
+	$this->Mailer = 'sendmail';
   }
 
   /**
@@ -307,8 +307,8 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    */
   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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @access private
    */
   function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+	return $this->LE . '--' . $boundary . '--' . $this->LE;
   }
 
   /**
@@ -1075,19 +1075,19 @@ 
    * @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 @@ 
    * @return string
    */
   function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+	return $name . ': ' . $value . $this->LE;
   }
 
   /**
@@ -1104,7 +1104,7 @@ 
    * @return string
    */
   function TextLine($value) {
-    return $value . $this->LE;
+	return $value . $this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1122,27 +1122,27 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    */
   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 @@ 
    * @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 @@ 
    * @return void
    */
   function ClearAddresses() {
-    $this->to = array();
+	$this->to = array();
   }
 
   /**
@@ -1541,7 +1541,7 @@ 
    * @return void
    */
   function ClearCCs() {
-    $this->cc = array();
+	$this->cc = array();
   }
 
   /**
@@ -1549,7 +1549,7 @@ 
    * @return void
    */
   function ClearBCCs() {
-    $this->bcc = array();
+	$this->bcc = array();
   }
 
   /**
@@ -1557,7 +1557,7 @@ 
    * @return void
    */
   function ClearReplyTos() {
-    $this->ReplyTo = array();
+	$this->ReplyTo = array();
   }
 
   /**
@@ -1566,9 +1566,9 @@ 
    * @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 @@ 
    * @return void
    */
   function ClearAttachments() {
-    $this->attachment = array();
+	$this->attachment = array();
   }
 
   /**
@@ -1585,7 +1585,7 @@ 
    * @return void
    */
   function ClearCustomHeaders() {
-    $this->CustomHeader = array();
+	$this->CustomHeader = array();
   }
 
   /////////////////////////////////////////////////
@@ -1599,8 +1599,8 @@ 
    * @return void
    */
   function SetError($msg) {
-    $this->error_count++;
-    $this->ErrorInfo = $msg;
+	$this->error_count++;
+	$this->ErrorInfo = $msg;
   }
 
   /**
@@ -1609,13 +1609,13 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @return bool
    */
   function IsError() {
-    return ($this->error_count > 0);
+	return ($this->error_count > 0);
   }
 
   /**
@@ -1691,10 +1691,10 @@ 
    * @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 @@ 
    * @return void
    */
   function AddCustomHeader($custom_header) {
-    $this->CustomHeader[] = explode(':', $custom_header, 2);
+	$this->CustomHeader[] = explode(':', $custom_header, 2);
   }
 
   /**
@@ -1711,35 +1711,35 @@ 
    * @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 @@ 
    * @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 @@ 
    * 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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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;
   }
 
 }

Braces +3 added lines, -2 removed lines

@@ -1240,8 +1240,9 @@
       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;

Spacing +185 added lines, -186 removed lines

@@ -41,64 +41,64 @@ 
    * 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 @@ 
    * 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 @@ 
    * 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 @@ 
    * 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 @@ 
    * 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 @@ 
    * @return void
    */
   function IsHTML($bool) {
-    if($bool == true) {
+    if ($bool == true) {
       $this->ContentType = 'text/html';
     } else {
       $this->ContentType = 'text/plain';
@@ -382,13 +382,13 @@ 
     $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 @@ 
     $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 @@ 
       $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 @@ 
     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 @@ 
   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 @@ 
       ini_set('sendmail_from', $old_from);
     }
 
-    if(!$rt) {
+    if (!$rt) {
       $this->SetError($this->Lang('instantiate'));
       return false;
     }
@@ -510,58 +510,58 @@ 
    * @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 @@ 
    * @return bool
    */
   function SmtpConnect() {
-    if($this->smtp == NULL) {
+    if ($this->smtp == NULL) {
       $this->smtp = new SMTP();
     }
 
@@ -587,9 +587,9 @@ 
     $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 @@ 
         $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 @@ 
         }
 
         $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 @@ 
       }
       $index++;
     }
-    if(!$connection) {
+    if (!$connection) {
       $this->SetError($this->Lang('connect_host'));
     }
 
@@ -627,8 +627,8 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
    * @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 @@ 
 
     $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 @@ 
               }
               $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 @@ 
             $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 @@ 
         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 @@ 
    * @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 @@ 
 
     /* 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 @@ 
     $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 @@ 
    */
   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 @@ 
       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 @@ 
 
     $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 @@ 
         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 @@ 
         break;
     }
 
-    if($this->IsError()) {
+    if ($this->IsError()) {
       $result = '';
     } else if ($this->sign_key_file) {
       $file = tempnam("", "mail");
@@ -1021,8 +1020,8 @@ 
         $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 @@ 
    */
   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 @@ 
    * @access private
    */
   function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+    return $this->LE.'--'.$boundary.'--'.$this->LE;
   }
 
   /**
@@ -1075,16 +1074,16 @@ 
    * @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 @@ 
    * @return string
    */
   function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+    return $name.': '.$value.$this->LE;
   }
 
   /**
@@ -1104,7 +1103,7 @@ 
    * @return string
    */
   function TextLine($value) {
-    return $value . $this->LE;
+    return $value.$this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1122,13 +1121,13 @@ 
    * @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 @@ 
     $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 @@ 
       $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 @@ 
    * @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 @@ 
    * @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 @@ 
         $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 @@ 
    * @access private
    * @return string
    */
-  function EncodeHeader ($str, $position = 'text') {
+  function EncodeHeader($str, $position = 'text') {
     $x = 0;
 
     switch (strtolower($position)) {
@@ -1292,7 +1291,7 @@ 
 
     $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 @@ 
       }
       while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+      $encoded .= $chunk.$this->LE;
     }
 
     // Chomp the last linefeed
@@ -1375,37 +1374,37 @@ 
    * @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 @@ 
    * @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 @@ 
    */
   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 @@ 
    */
   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 @@ 
     $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 @@ 
     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 @@ 
    * @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 @@ 
    * @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 @@ 
     }
     $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 @@ 
       '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 @@ 
    * @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;
     }
   }

libs/phpmailer/class.smtp.php

Doc Comments +8 added lines, -1 removed lines

@@ -95,6 +95,7 @@ 
    * SMTP CODE SUCCESS: 220
    * SMTP CODE FAILURE: 421
    * @access public
+   * @param string $host
    * @return bool
    */
   function Connect($host,$port=0,$tval=30) {
@@ -156,6 +157,8 @@ 
    * Performs SMTP authentication.  Must be run after running the
    * Hello() method.  Returns true if successfully authenticated.
    * @access public
+   * @param string $username
+   * @param string $password
    * @return bool
    */
   function Authenticate($username, $password) {
@@ -277,6 +280,7 @@ 
    * SMTP CODE FAILURE: 451,554
    * SMTP CODE ERROR  : 500,501,503,421
    * @access public
+   * @param string $msg_data
    * @return bool
    */
   function Data($msg_data) {
@@ -499,6 +503,8 @@ 
   /**
    * Sends a HELO/EHLO command.
    * @access private
+   * @param string $hello
+   * @param string $host
    * @return bool
    */
   function SendHello($hello, $host) {
@@ -593,6 +599,7 @@ 
    * SMTP CODE SUCCESS: 552,451,452
    * SMTP CODE SUCCESS: 500,501,421
    * @access public
+   * @param string $from
    * @return bool
    */
   function Mail($from) {
@@ -989,7 +996,7 @@ 
    * SMTP CODE FAILURE: 550,551,553
    * SMTP CODE ERROR  : 500,501,502,421
    * @access public
-   * @return int
+   * @return false|string
    */
   function Verify($name) {
     $this->error = null; # so no confusion is caused

Indentation +668 added lines, -668 removed lines

@@ -73,11 +73,11 @@ 
    * @return void
    */
   function SMTP() {
-    $this->smtp_conn = 0;
-    $this->error = null;
-    $this->helo_rply = null;
+	$this->smtp_conn = 0;
+	$this->error = null;
+	$this->helo_rply = null;
 
-    $this->do_debug = 0;
+	$this->do_debug = 0;
   }
 
   /*************************************************************
@@ -98,58 +98,58 @@ 
    * @return bool
    */
   function Connect($host,$port=0,$tval=30) {
-    # set the error val to null so there is no confusion
-    $this->error = null;
-
-    # make sure we are __not__ connected
-    if($this->connected()) {
-      # ok we are connected! what should we do?
-      # for now we will just give an error saying we
-      # are already connected
-      $this->error = array("error" => "Already connected to a server");
-      return false;
-    }
-
-    if(empty($port)) {
-      $port = $this->SMTP_PORT;
-    }
-
-    #connect to the smtp server
-    $this->smtp_conn = fsockopen($host,    # the host of the server
-                                 $port,    # the port to use
-                                 $errno,   # error number if any
-                                 $errstr,  # error message if any
-                                 $tval);   # give up after ? secs
-    # verify we connected properly
-    if(empty($this->smtp_conn)) {
-      $this->error = array("error" => "Failed to connect to server",
-                           "errno" => $errno,
-                           "errstr" => $errstr);
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": $errstr ($errno)" . $this->CRLF;
-      }
-      return false;
-    }
-
-    # sometimes the SMTP server takes a little longer to respond
-    # so we will give it a longer timeout for the first read
-    // Windows still does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
-     socket_set_timeout($this->smtp_conn, $tval, 0);
-
-    # get any announcement stuff
-    $announce = $this->get_lines();
-
-    # set the timeout  of any socket functions at 1/10 of a second
-    //if(function_exists("socket_set_timeout"))
-    //   socket_set_timeout($this->smtp_conn, 0, 100000);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
-    }
-
-    return true;
+	# set the error val to null so there is no confusion
+	$this->error = null;
+
+	# make sure we are __not__ connected
+	if($this->connected()) {
+	  # ok we are connected! what should we do?
+	  # for now we will just give an error saying we
+	  # are already connected
+	  $this->error = array("error" => "Already connected to a server");
+	  return false;
+	}
+
+	if(empty($port)) {
+	  $port = $this->SMTP_PORT;
+	}
+
+	#connect to the smtp server
+	$this->smtp_conn = fsockopen($host,    # the host of the server
+								 $port,    # the port to use
+								 $errno,   # error number if any
+								 $errstr,  # error message if any
+								 $tval);   # give up after ? secs
+	# verify we connected properly
+	if(empty($this->smtp_conn)) {
+	  $this->error = array("error" => "Failed to connect to server",
+						   "errno" => $errno,
+						   "errstr" => $errstr);
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": $errstr ($errno)" . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	# sometimes the SMTP server takes a little longer to respond
+	# so we will give it a longer timeout for the first read
+	// Windows still does not have support for this timeout function
+	if(substr(PHP_OS, 0, 3) != "WIN")
+	 socket_set_timeout($this->smtp_conn, $tval, 0);
+
+	# get any announcement stuff
+	$announce = $this->get_lines();
+
+	# set the timeout  of any socket functions at 1/10 of a second
+	//if(function_exists("socket_set_timeout"))
+	//   socket_set_timeout($this->smtp_conn, 0, 100000);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
+	}
+
+	return true;
   }
 
   /**
@@ -159,61 +159,61 @@ 
    * @return bool
    */
   function Authenticate($username, $password) {
-    // Start authentication
-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 334) {
-      $this->error =
-        array("error" => "AUTH not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-
-    // Send encoded username
-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 334) {
-      $this->error =
-        array("error" => "Username not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-
-    // Send encoded password
-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 235) {
-      $this->error =
-        array("error" => "Password not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-
-    return true;
+	// Start authentication
+	fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 334) {
+	  $this->error =
+		array("error" => "AUTH not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	// Send encoded username
+	fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 334) {
+	  $this->error =
+		array("error" => "Username not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	// Send encoded password
+	fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 235) {
+	  $this->error =
+		array("error" => "Password not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -222,21 +222,21 @@ 
    * @return bool
    */
   function Connected() {
-    if(!empty($this->smtp_conn)) {
-      $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
-        # hmm this is an odd situation... the socket is
-        # valid but we are not connected anymore
-        if($this->do_debug >= 1) {
-            echo "SMTP -> NOTICE:" . $this->CRLF .
-                 "EOF caught while checking if connected";
-        }
-        $this->Close();
-        return false;
-      }
-      return true; # everything looks good
-    }
-    return false;
+	if(!empty($this->smtp_conn)) {
+	  $sock_status = socket_get_status($this->smtp_conn);
+	  if($sock_status["eof"]) {
+		# hmm this is an odd situation... the socket is
+		# valid but we are not connected anymore
+		if($this->do_debug >= 1) {
+			echo "SMTP -> NOTICE:" . $this->CRLF .
+				 "EOF caught while checking if connected";
+		}
+		$this->Close();
+		return false;
+	  }
+	  return true; # everything looks good
+	}
+	return false;
   }
 
   /**
@@ -247,13 +247,13 @@ 
    * @return void
    */
   function Close() {
-    $this->error = null; # so there is no confusion
-    $this->helo_rply = null;
-    if(!empty($this->smtp_conn)) {
-      # close the connection and cleanup
-      fclose($this->smtp_conn);
-      $this->smtp_conn = 0;
-    }
+	$this->error = null; # so there is no confusion
+	$this->helo_rply = null;
+	if(!empty($this->smtp_conn)) {
+	  # close the connection and cleanup
+	  fclose($this->smtp_conn);
+	  $this->smtp_conn = 0;
+	}
   }
 
   /***************************************************************
@@ -280,126 +280,126 @@ 
    * @return bool
    */
   function Data($msg_data) {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Data() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"DATA" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 354) {
-      $this->error =
-        array("error" => "DATA command not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-
-    # the server is ready to accept data!
-    # according to rfc 821 we should not send more than 1000
-    # including the CRLF
-    # characters on a single line so we will break the data up
-    # into lines by \r and/or \n then if needed we will break
-    # each of those into smaller lines to fit within the limit.
-    # in addition we will be looking for lines that start with
-    # a period '.' and append and additional period '.' to that
-    # line. NOTE: this does not count towards are limit.
-
-    # normalize the line breaks so we know the explode works
-    $msg_data = str_replace("\r\n","\n",$msg_data);
-    $msg_data = str_replace("\r","\n",$msg_data);
-    $lines = explode("\n",$msg_data);
-
-    # we need to find a good way to determine is headers are
-    # in the msg_data or if it is a straight msg body
-    # currently I am assuming rfc 822 definitions of msg headers
-    # and if the first field of the first line (':' sperated)
-    # does not contain a space then it _should_ be a header
-    # and we can process all lines before a blank "" line as
-    # headers.
-    $field = substr($lines[0],0,strpos($lines[0],":"));
-    $in_headers = false;
-    if(!empty($field) && !strstr($field," ")) {
-      $in_headers = true;
-    }
-
-    $max_line_length = 998; # used below; set here for ease in change
-
-    while(list(,$line) = @each($lines)) {
-      $lines_out = null;
-      if($line == "" && $in_headers) {
-        $in_headers = false;
-      }
-      # ok we need to break this line up into several
-      # smaller lines
-      while(strlen($line) > $max_line_length) {
-        $pos = strrpos(substr($line,0,$max_line_length)," ");
-
-        # Patch to fix DOS attack
-        if(!$pos) {
-          $pos = $max_line_length - 1;
-        }
-
-        $lines_out[] = substr($line,0,$pos);
-        $line = substr($line,$pos + 1);
-        # if we are processing headers we need to
-        # add a LWSP-char to the front of the new line
-        # rfc 822 on long msg headers
-        if($in_headers) {
-          $line = "\t" . $line;
-        }
-      }
-      $lines_out[] = $line;
-
-      # now send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
-        if(strlen($line_out) > 0)
-        {
-          if(substr($line_out, 0, 1) == ".") {
-            $line_out = "." . $line_out;
-          }
-        }
-        fputs($this->smtp_conn,$line_out . $this->CRLF);
-      }
-    }
-
-    # ok all the message data has been sent so lets get this
-    # over with aleady
-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "DATA not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Data() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"DATA" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 354) {
+	  $this->error =
+		array("error" => "DATA command not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	# the server is ready to accept data!
+	# according to rfc 821 we should not send more than 1000
+	# including the CRLF
+	# characters on a single line so we will break the data up
+	# into lines by \r and/or \n then if needed we will break
+	# each of those into smaller lines to fit within the limit.
+	# in addition we will be looking for lines that start with
+	# a period '.' and append and additional period '.' to that
+	# line. NOTE: this does not count towards are limit.
+
+	# normalize the line breaks so we know the explode works
+	$msg_data = str_replace("\r\n","\n",$msg_data);
+	$msg_data = str_replace("\r","\n",$msg_data);
+	$lines = explode("\n",$msg_data);
+
+	# we need to find a good way to determine is headers are
+	# in the msg_data or if it is a straight msg body
+	# currently I am assuming rfc 822 definitions of msg headers
+	# and if the first field of the first line (':' sperated)
+	# does not contain a space then it _should_ be a header
+	# and we can process all lines before a blank "" line as
+	# headers.
+	$field = substr($lines[0],0,strpos($lines[0],":"));
+	$in_headers = false;
+	if(!empty($field) && !strstr($field," ")) {
+	  $in_headers = true;
+	}
+
+	$max_line_length = 998; # used below; set here for ease in change
+
+	while(list(,$line) = @each($lines)) {
+	  $lines_out = null;
+	  if($line == "" && $in_headers) {
+		$in_headers = false;
+	  }
+	  # ok we need to break this line up into several
+	  # smaller lines
+	  while(strlen($line) > $max_line_length) {
+		$pos = strrpos(substr($line,0,$max_line_length)," ");
+
+		# Patch to fix DOS attack
+		if(!$pos) {
+		  $pos = $max_line_length - 1;
+		}
+
+		$lines_out[] = substr($line,0,$pos);
+		$line = substr($line,$pos + 1);
+		# if we are processing headers we need to
+		# add a LWSP-char to the front of the new line
+		# rfc 822 on long msg headers
+		if($in_headers) {
+		  $line = "\t" . $line;
+		}
+	  }
+	  $lines_out[] = $line;
+
+	  # now send the lines to the server
+	  while(list(,$line_out) = @each($lines_out)) {
+		if(strlen($line_out) > 0)
+		{
+		  if(substr($line_out, 0, 1) == ".") {
+			$line_out = "." . $line_out;
+		  }
+		}
+		fputs($this->smtp_conn,$line_out . $this->CRLF);
+	  }
+	}
+
+	# ok all the message data has been sent so lets get this
+	# over with aleady
+	fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "DATA not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -419,42 +419,42 @@ 
    * @return string array
    */
   function Expand($name) {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-            "error" => "Called Expand() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "EXPN not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-
-    # parse the reply and place in our array to return to user
-    $entries = explode($this->CRLF,$rply);
-    while(list(,$l) = @each($entries)) {
-      $list[] = substr($l,4);
-    }
-
-    return $list;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			"error" => "Called Expand() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "EXPN not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	# parse the reply and place in our array to return to user
+	$entries = explode($this->CRLF,$rply);
+	while(list(,$l) = @each($entries)) {
+	  $list[] = substr($l,4);
+	}
+
+	return $list;
   }
 
   /**
@@ -470,30 +470,30 @@ 
    * @return bool
    */
   function Hello($host="") {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-            "error" => "Called Hello() without being connected");
-      return false;
-    }
-
-    # if a hostname for the HELO was not specified determine
-    # a suitable one to send
-    if(empty($host)) {
-      # we need to determine some sort of appopiate default
-      # to send to the server
-      $host = "localhost";
-    }
-
-    // Send extended hello first (RFC 2821)
-    if(!$this->SendHello("EHLO", $host))
-    {
-      if(!$this->SendHello("HELO", $host))
-          return false;
-    }
-
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			"error" => "Called Hello() without being connected");
+	  return false;
+	}
+
+	# if a hostname for the HELO was not specified determine
+	# a suitable one to send
+	if(empty($host)) {
+	  # we need to determine some sort of appopiate default
+	  # to send to the server
+	  $host = "localhost";
+	}
+
+	// Send extended hello first (RFC 2821)
+	if(!$this->SendHello("EHLO", $host))
+	{
+	  if(!$this->SendHello("HELO", $host))
+		  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -502,30 +502,30 @@ 
    * @return bool
    */
   function SendHello($hello, $host) {
-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => $hello . " not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-
-    $this->helo_rply = $rply;
-
-    return true;
+	fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER: " . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => $hello . " not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	$this->helo_rply = $rply;
+
+	return true;
   }
 
   /**
@@ -544,41 +544,41 @@ 
    * @return string
    */
   function Help($keyword="") {
-    $this->error = null; # to avoid confusion
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Help() without being connected");
-      return false;
-    }
-
-    $extra = "";
-    if(!empty($keyword)) {
-      $extra = " " . $keyword;
-    }
-
-    fputs($this->smtp_conn,"HELP" . $extra . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 211 && $code != 214) {
-      $this->error =
-        array("error" => "HELP not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-
-    return $rply;
+	$this->error = null; # to avoid confusion
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Help() without being connected");
+	  return false;
+	}
+
+	$extra = "";
+	if(!empty($keyword)) {
+	  $extra = " " . $keyword;
+	}
+
+	fputs($this->smtp_conn,"HELP" . $extra . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 211 && $code != 214) {
+	  $this->error =
+		array("error" => "HELP not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	return $rply;
   }
 
   /**
@@ -596,36 +596,36 @@ 
    * @return bool
    */
   function Mail($from) {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Mail() without being connected");
-      return false;
-    }
-
-    $useVerp = ($this->do_verp ? "XVERP" : "");
-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "MAIL not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Mail() without being connected");
+	  return false;
+	}
+
+	$useVerp = ($this->do_verp ? "XVERP" : "");
+	fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "MAIL not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -639,35 +639,35 @@ 
    * @return bool
    */
   function Noop() {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Noop() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"NOOP" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "NOOP not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Noop() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"NOOP" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "NOOP not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -682,45 +682,45 @@ 
    * @return bool
    */
   function Quit($close_on_error=true) {
-    $this->error = null; # so there is no confusion
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Quit() without being connected");
-      return false;
-    }
-
-    # send the quit command to the server
-    fputs($this->smtp_conn,"quit" . $this->CRLF);
-
-    # get any good-bye messages
-    $byemsg = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
-    }
-
-    $rval = true;
-    $e = null;
-
-    $code = substr($byemsg,0,3);
-    if($code != 221) {
-      # use e as a tmp var cause Close will overwrite $this->error
-      $e = array("error" => "SMTP server rejected quit command",
-                 "smtp_code" => $code,
-                 "smtp_rply" => substr($byemsg,4));
-      $rval = false;
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $e["error"] . ": " .
-                 $byemsg . $this->CRLF;
-      }
-    }
-
-    if(empty($e) || $close_on_error) {
-      $this->Close();
-    }
-
-    return $rval;
+	$this->error = null; # so there is no confusion
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Quit() without being connected");
+	  return false;
+	}
+
+	# send the quit command to the server
+	fputs($this->smtp_conn,"quit" . $this->CRLF);
+
+	# get any good-bye messages
+	$byemsg = $this->get_lines();
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
+	}
+
+	$rval = true;
+	$e = null;
+
+	$code = substr($byemsg,0,3);
+	if($code != 221) {
+	  # use e as a tmp var cause Close will overwrite $this->error
+	  $e = array("error" => "SMTP server rejected quit command",
+				 "smtp_code" => $code,
+				 "smtp_rply" => substr($byemsg,4));
+	  $rval = false;
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $e["error"] . ": " .
+				 $byemsg . $this->CRLF;
+	  }
+	}
+
+	if(empty($e) || $close_on_error) {
+	  $this->Close();
+	}
+
+	return $rval;
   }
 
   /**
@@ -736,35 +736,35 @@ 
    * @return bool
    */
   function Recipient($to) {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Recipient() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250 && $code != 251) {
-      $this->error =
-        array("error" => "RCPT not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Recipient() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250 && $code != 251) {
+	  $this->error =
+		array("error" => "RCPT not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -780,36 +780,36 @@ 
    * @return bool
    */
   function Reset() {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Reset() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RSET" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "RSET failed",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Reset() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"RSET" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "RSET failed",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -829,35 +829,35 @@ 
    * @return bool
    */
   function Send($from) {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Send() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "SEND not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Send() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "SEND not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -877,35 +877,35 @@ 
    * @return bool
    */
   function SendAndMail($from) {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-          "error" => "Called SendAndMail() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "SAML not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+		  "error" => "Called SendAndMail() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "SAML not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -925,35 +925,35 @@ 
    * @return bool
    */
   function SendOrMail($from) {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-          "error" => "Called SendOrMail() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "SOML not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+		  "error" => "Called SendOrMail() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "SOML not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -970,12 +970,12 @@ 
    * @return bool
    */
   function Turn() {
-    $this->error = array("error" => "This method, TURN, of the SMTP ".
-                                    "is not implemented");
-    if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
-    }
-    return false;
+	$this->error = array("error" => "This method, TURN, of the SMTP ".
+									"is not implemented");
+	if($this->do_debug >= 1) {
+	  echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
+	}
+	return false;
   }
 
   /**
@@ -992,35 +992,35 @@ 
    * @return int
    */
   function Verify($name) {
-    $this->error = null; # so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Verify() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-    }
-
-    if($code != 250 && $code != 251) {
-      $this->error =
-        array("error" => "VRFY failed on name '$name'",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
-      }
-      return false;
-    }
-    return $rply;
+	$this->error = null; # so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Verify() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+	}
+
+	if($code != 250 && $code != 251) {
+	  $this->error =
+		array("error" => "VRFY failed on name '$name'",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] .
+				 ": " . $rply . $this->CRLF;
+	  }
+	  return false;
+	}
+	return $rply;
   }
 
   /*******************************************************************
@@ -1037,23 +1037,23 @@ 
    * @return string
    */
   function get_lines() {
-    $data = "";
-    while($str = @fgets($this->smtp_conn,515)) {
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data was \"$data\"" .
-                 $this->CRLF;
-        echo "SMTP -> get_lines(): \$str is \"$str\"" .
-                 $this->CRLF;
-      }
-      $data .= $str;
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
-      }
-      # if the 4th character is a space then we are done reading
-      # so just break the loop
-      if(substr($str,3,1) == " ") { break; }
-    }
-    return $data;
+	$data = "";
+	while($str = @fgets($this->smtp_conn,515)) {
+	  if($this->do_debug >= 4) {
+		echo "SMTP -> get_lines(): \$data was \"$data\"" .
+				 $this->CRLF;
+		echo "SMTP -> get_lines(): \$str is \"$str\"" .
+				 $this->CRLF;
+	  }
+	  $data .= $str;
+	  if($this->do_debug >= 4) {
+		echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
+	  }
+	  # if the 4th character is a space then we are done reading
+	  # so just break the loop
+	  if(substr($str,3,1) == " ") { break; }
+	}
+	return $data;
   }
 
 }

Braces +6 added lines, -4 removed lines

@@ -135,8 +135,9 @@ 
     # sometimes the SMTP server takes a little longer to respond
     # so we will give it a longer timeout for the first read
     // Windows still does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
-     socket_set_timeout($this->smtp_conn, $tval, 0);
+    if(substr(PHP_OS, 0, 3) != "WIN") {
+         socket_set_timeout($this->smtp_conn, $tval, 0);
+    }
 
     # get any announcement stuff
     $announce = $this->get_lines();
@@ -489,8 +490,9 @@ 
     // Send extended hello first (RFC 2821)
     if(!$this->SendHello("EHLO", $host))
     {
-      if(!$this->SendHello("HELO", $host))
-          return false;
+      if(!$this->SendHello("HELO", $host)) {
+                return false;
+      }
     }
 
     return true;

Spacing +225 added lines, -225 removed lines

@@ -51,7 +51,7 @@ 
    *  Sets whether debugging is turned on
    *  @var bool
    */
-  var $do_debug;       # the level of debug to perform
+  var $do_debug; # the level of debug to perform
 
   /**
    *  Sets VERP use on/off (default is off)
@@ -62,9 +62,9 @@ 
   /**#@+
    * @access private
    */
-  var $smtp_conn;      # the socket to the server
-  var $error;          # error if any on the last call
-  var $helo_rply;      # the reply the server sent to us for HELO
+  var $smtp_conn; # the socket to the server
+  var $error; # error if any on the last call
+  var $helo_rply; # the reply the server sent to us for HELO
   /**#@-*/
 
   /**
@@ -97,12 +97,12 @@ 
    * @access public
    * @return bool
    */
-  function Connect($host,$port=0,$tval=30) {
+  function Connect($host, $port = 0, $tval = 30) {
     # set the error val to null so there is no confusion
     $this->error = null;
 
     # make sure we are __not__ connected
-    if($this->connected()) {
+    if ($this->connected()) {
       # ok we are connected! what should we do?
       # for now we will just give an error saying we
       # are already connected
@@ -110,24 +110,24 @@ 
       return false;
     }
 
-    if(empty($port)) {
+    if (empty($port)) {
       $port = $this->SMTP_PORT;
     }
 
     #connect to the smtp server
-    $this->smtp_conn = fsockopen($host,    # the host of the server
-                                 $port,    # the port to use
-                                 $errno,   # error number if any
-                                 $errstr,  # error message if any
-                                 $tval);   # give up after ? secs
+    $this->smtp_conn = fsockopen($host, # the host of the server
+                                 $port, # the port to use
+                                 $errno, # error number if any
+                                 $errstr, # error message if any
+                                 $tval); # give up after ? secs
     # verify we connected properly
-    if(empty($this->smtp_conn)) {
+    if (empty($this->smtp_conn)) {
       $this->error = array("error" => "Failed to connect to server",
                            "errno" => $errno,
                            "errstr" => $errstr);
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": $errstr ($errno)" . $this->CRLF;
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": $errstr ($errno)".$this->CRLF;
       }
       return false;
     }
@@ -135,7 +135,7 @@ 
     # sometimes the SMTP server takes a little longer to respond
     # so we will give it a longer timeout for the first read
     // Windows still does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
+    if (substr(PHP_OS, 0, 3) != "WIN")
      socket_set_timeout($this->smtp_conn, $tval, 0);
 
     # get any announcement stuff
@@ -145,8 +145,8 @@ 
     //if(function_exists("socket_set_timeout"))
     //   socket_set_timeout($this->smtp_conn, 0, 100000);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$announce;
     }
 
     return true;
@@ -160,55 +160,55 @@ 
    */
   function Authenticate($username, $password) {
     // Start authentication
-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+    fputs($this->smtp_conn, "AUTH LOGIN".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 334) {
+    if ($code != 334) {
       $this->error =
         array("error" => "AUTH not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
 
     // Send encoded username
-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+    fputs($this->smtp_conn, base64_encode($username).$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 334) {
+    if ($code != 334) {
       $this->error =
         array("error" => "Username not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
 
     // Send encoded password
-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
+    fputs($this->smtp_conn, base64_encode($password).$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 235) {
+    if ($code != 235) {
       $this->error =
         array("error" => "Password not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -222,13 +222,13 @@ 
    * @return bool
    */
   function Connected() {
-    if(!empty($this->smtp_conn)) {
+    if (!empty($this->smtp_conn)) {
       $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
+      if ($sock_status["eof"]) {
         # hmm this is an odd situation... the socket is
         # valid but we are not connected anymore
-        if($this->do_debug >= 1) {
-            echo "SMTP -> NOTICE:" . $this->CRLF .
+        if ($this->do_debug >= 1) {
+            echo "SMTP -> NOTICE:".$this->CRLF.
                  "EOF caught while checking if connected";
         }
         $this->Close();
@@ -249,7 +249,7 @@ 
   function Close() {
     $this->error = null; # so there is no confusion
     $this->helo_rply = null;
-    if(!empty($this->smtp_conn)) {
+    if (!empty($this->smtp_conn)) {
       # close the connection and cleanup
       fclose($this->smtp_conn);
       $this->smtp_conn = 0;
@@ -282,29 +282,29 @@ 
   function Data($msg_data) {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Data() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"DATA" . $this->CRLF);
+    fputs($this->smtp_conn, "DATA".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 354) {
+    if ($code != 354) {
       $this->error =
         array("error" => "DATA command not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -320,9 +320,9 @@ 
     # line. NOTE: this does not count towards are limit.
 
     # normalize the line breaks so we know the explode works
-    $msg_data = str_replace("\r\n","\n",$msg_data);
-    $msg_data = str_replace("\r","\n",$msg_data);
-    $lines = explode("\n",$msg_data);
+    $msg_data = str_replace("\r\n", "\n", $msg_data);
+    $msg_data = str_replace("\r", "\n", $msg_data);
+    $lines = explode("\n", $msg_data);
 
     # we need to find a good way to determine is headers are
     # in the msg_data or if it is a straight msg body
@@ -331,71 +331,71 @@ 
     # does not contain a space then it _should_ be a header
     # and we can process all lines before a blank "" line as
     # headers.
-    $field = substr($lines[0],0,strpos($lines[0],":"));
+    $field = substr($lines[0], 0, strpos($lines[0], ":"));
     $in_headers = false;
-    if(!empty($field) && !strstr($field," ")) {
+    if (!empty($field) && !strstr($field, " ")) {
       $in_headers = true;
     }
 
     $max_line_length = 998; # used below; set here for ease in change
 
-    while(list(,$line) = @each($lines)) {
+    while (list(,$line) = @each($lines)) {
       $lines_out = null;
-      if($line == "" && $in_headers) {
+      if ($line == "" && $in_headers) {
         $in_headers = false;
       }
       # ok we need to break this line up into several
       # smaller lines
-      while(strlen($line) > $max_line_length) {
-        $pos = strrpos(substr($line,0,$max_line_length)," ");
+      while (strlen($line) > $max_line_length) {
+        $pos = strrpos(substr($line, 0, $max_line_length), " ");
 
         # Patch to fix DOS attack
-        if(!$pos) {
+        if (!$pos) {
           $pos = $max_line_length - 1;
         }
 
-        $lines_out[] = substr($line,0,$pos);
-        $line = substr($line,$pos + 1);
+        $lines_out[] = substr($line, 0, $pos);
+        $line = substr($line, $pos + 1);
         # if we are processing headers we need to
         # add a LWSP-char to the front of the new line
         # rfc 822 on long msg headers
-        if($in_headers) {
-          $line = "\t" . $line;
+        if ($in_headers) {
+          $line = "\t".$line;
         }
       }
       $lines_out[] = $line;
 
       # now send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
-        if(strlen($line_out) > 0)
+      while (list(,$line_out) = @each($lines_out)) {
+        if (strlen($line_out) > 0)
         {
-          if(substr($line_out, 0, 1) == ".") {
-            $line_out = "." . $line_out;
+          if (substr($line_out, 0, 1) == ".") {
+            $line_out = ".".$line_out;
           }
         }
-        fputs($this->smtp_conn,$line_out . $this->CRLF);
+        fputs($this->smtp_conn, $line_out.$this->CRLF);
       }
     }
 
     # ok all the message data has been sent so lets get this
     # over with aleady
-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+    fputs($this->smtp_conn, $this->CRLF.".".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "DATA not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -421,37 +421,37 @@ 
   function Expand($name) {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
             "error" => "Called Expand() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);
+    fputs($this->smtp_conn, "EXPN ".$name.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "EXPN not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
 
     # parse the reply and place in our array to return to user
-    $entries = explode($this->CRLF,$rply);
-    while(list(,$l) = @each($entries)) {
-      $list[] = substr($l,4);
+    $entries = explode($this->CRLF, $rply);
+    while (list(,$l) = @each($entries)) {
+      $list[] = substr($l, 4);
     }
 
     return $list;
@@ -469,10 +469,10 @@ 
    * @access public
    * @return bool
    */
-  function Hello($host="") {
+  function Hello($host = "") {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
             "error" => "Called Hello() without being connected");
       return false;
@@ -480,16 +480,16 @@ 
 
     # if a hostname for the HELO was not specified determine
     # a suitable one to send
-    if(empty($host)) {
+    if (empty($host)) {
       # we need to determine some sort of appopiate default
       # to send to the server
       $host = "localhost";
     }
 
     // Send extended hello first (RFC 2821)
-    if(!$this->SendHello("EHLO", $host))
+    if (!$this->SendHello("EHLO", $host))
     {
-      if(!$this->SendHello("HELO", $host))
+      if (!$this->SendHello("HELO", $host))
           return false;
     }
 
@@ -502,23 +502,23 @@ 
    * @return bool
    */
   function SendHello($hello, $host) {
-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
+    fputs($this->smtp_conn, $hello." ".$host.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER: ".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
-        array("error" => $hello . " not accepted from server",
+        array("error" => $hello." not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -543,37 +543,37 @@ 
    * @access public
    * @return string
    */
-  function Help($keyword="") {
+  function Help($keyword = "") {
     $this->error = null; # to avoid confusion
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Help() without being connected");
       return false;
     }
 
     $extra = "";
-    if(!empty($keyword)) {
-      $extra = " " . $keyword;
+    if (!empty($keyword)) {
+      $extra = " ".$keyword;
     }
 
-    fputs($this->smtp_conn,"HELP" . $extra . $this->CRLF);
+    fputs($this->smtp_conn, "HELP".$extra.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 211 && $code != 214) {
+    if ($code != 211 && $code != 214) {
       $this->error =
         array("error" => "HELP not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -598,30 +598,30 @@ 
   function Mail($from) {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Mail() without being connected");
       return false;
     }
 
     $useVerp = ($this->do_verp ? "XVERP" : "");
-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
+    fputs($this->smtp_conn, "MAIL FROM:<".$from.">".$useVerp.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "MAIL not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -641,29 +641,29 @@ 
   function Noop() {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Noop() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"NOOP" . $this->CRLF);
+    fputs($this->smtp_conn, "NOOP".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "NOOP not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -681,42 +681,42 @@ 
    * @access public
    * @return bool
    */
-  function Quit($close_on_error=true) {
+  function Quit($close_on_error = true) {
     $this->error = null; # so there is no confusion
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Quit() without being connected");
       return false;
     }
 
     # send the quit command to the server
-    fputs($this->smtp_conn,"quit" . $this->CRLF);
+    fputs($this->smtp_conn, "quit".$this->CRLF);
 
     # get any good-bye messages
     $byemsg = $this->get_lines();
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$byemsg;
     }
 
     $rval = true;
     $e = null;
 
-    $code = substr($byemsg,0,3);
-    if($code != 221) {
+    $code = substr($byemsg, 0, 3);
+    if ($code != 221) {
       # use e as a tmp var cause Close will overwrite $this->error
       $e = array("error" => "SMTP server rejected quit command",
                  "smtp_code" => $code,
-                 "smtp_rply" => substr($byemsg,4));
+                 "smtp_rply" => substr($byemsg, 4));
       $rval = false;
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $e["error"] . ": " .
-                 $byemsg . $this->CRLF;
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$e["error"].": ".
+                 $byemsg.$this->CRLF;
       }
     }
 
-    if(empty($e) || $close_on_error) {
+    if (empty($e) || $close_on_error) {
       $this->Close();
     }
 
@@ -738,29 +738,29 @@ 
   function Recipient($to) {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Recipient() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+    fputs($this->smtp_conn, "RCPT TO:<".$to.">".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250 && $code != 251) {
+    if ($code != 250 && $code != 251) {
       $this->error =
         array("error" => "RCPT not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -782,29 +782,29 @@ 
   function Reset() {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Reset() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"RSET" . $this->CRLF);
+    fputs($this->smtp_conn, "RSET".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "RSET failed",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -831,29 +831,29 @@ 
   function Send($from) {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Send() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);
+    fputs($this->smtp_conn, "SEND FROM:".$from.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "SEND not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -879,29 +879,29 @@ 
   function SendAndMail($from) {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
           "error" => "Called SendAndMail() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+    fputs($this->smtp_conn, "SAML FROM:".$from.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "SAML not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -927,29 +927,29 @@ 
   function SendOrMail($from) {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
           "error" => "Called SendOrMail() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);
+    fputs($this->smtp_conn, "SOML FROM:".$from.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "SOML not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -972,8 +972,8 @@ 
   function Turn() {
     $this->error = array("error" => "This method, TURN, of the SMTP ".
                                     "is not implemented");
-    if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
+    if ($this->do_debug >= 1) {
+      echo "SMTP -> NOTICE: ".$this->error["error"].$this->CRLF;
     }
     return false;
   }
@@ -994,29 +994,29 @@ 
   function Verify($name) {
     $this->error = null; # so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Verify() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);
+    fputs($this->smtp_conn, "VRFY ".$name.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$this->CRLF.$rply;
     }
 
-    if($code != 250 && $code != 251) {
+    if ($code != 250 && $code != 251) {
       $this->error =
         array("error" => "VRFY failed on name '$name'",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].
+                 ": ".$rply.$this->CRLF;
       }
       return false;
     }
@@ -1038,20 +1038,20 @@ 
    */
   function get_lines() {
     $data = "";
-    while($str = @fgets($this->smtp_conn,515)) {
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data was \"$data\"" .
+    while ($str = @fgets($this->smtp_conn, 515)) {
+      if ($this->do_debug >= 4) {
+        echo "SMTP -> get_lines(): \$data was \"$data\"".
                  $this->CRLF;
-        echo "SMTP -> get_lines(): \$str is \"$str\"" .
+        echo "SMTP -> get_lines(): \$str is \"$str\"".
                  $this->CRLF;
       }
       $data .= $str;
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
+      if ($this->do_debug >= 4) {
+        echo "SMTP -> get_lines(): \$data is \"$data\"".$this->CRLF;
       }
       # if the 4th character is a space then we are done reading
       # so just break the loop
-      if(substr($str,3,1) == " ") { break; }
+      if (substr($str, 3, 1) == " ") { break; }
     }
     return $data;
   }

libs/phpmailer/phpmailer.php

Doc Comments +10 added lines

@@ -892,6 +892,7 @@ 
   /**
    * Creates recipient headers.
    * @access public
+   * @param string $type
    * @return string
    */
   public function AddrAppend($type, $addr) {
@@ -1259,6 +1260,9 @@ 
   /**
    * Returns the start of a message boundary.
    * @access private
+   * @param string $charSet
+   * @param string $contentType
+   * @param string $encoding
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
@@ -1312,6 +1316,7 @@ 
   /**
    *  Returns a formatted header line.
    * @access public
+   * @param string $name
    * @return string
    */
   public function HeaderLine($name, $value) {
@@ -1321,6 +1326,7 @@ 
   /**
    * Returns a formatted mail line.
    * @access public
+   * @param string $value
    * @return string
    */
   public function TextLine($value) {
@@ -1517,6 +1523,7 @@ 
   /**
    * Encode a header string to best (shortest) of Q, B, quoted or none.
    * @access public
+   * @param string $str
    * @return string
    */
   public function EncodeHeader ($str, $position = 'text') {
@@ -1902,6 +1909,7 @@ 
   /**
    * Adds the error message to the error container.
    * @access protected
+   * @param string $msg
    * @return void
    */
   protected function SetError($msg) {
@@ -1951,6 +1959,7 @@ 
   /**
    * Returns a message in the appropriate language.
    * @access private
+   * @param string $key
    * @return string
    */
   private function Lang($key) {
@@ -1998,6 +2007,7 @@ 
   /**
    * Evaluates the message and returns modifications for inline images and backgrounds
    * @access public
+   * @param string $message
    * @return $message
    */
   public function MsgHTML($message,$basedir='') {

Braces +9 added lines, -4 removed lines

@@ -38,7 +38,9 @@ 
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+if (version_compare(PHP_VERSION, '5.0.0', '<') ) {
+	exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+}
 
 class PHPMailer {
 
@@ -1498,8 +1500,9 @@ 
       case '8bit':
         $encoded = $this->FixEOL($str);
         //Make sure it ends with a line break
-        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;
@@ -2249,7 +2252,9 @@ 
    * @param string $body Message Body
    */
   public function DKIM_BodyC($body) {
-    if ($body == '') return "\r\n";
+    if ($body == '') {
+    	return "\r\n";
+    }
     // stabilize line endings
     $body=str_replace("\r\n","\n",$body);
     $body=str_replace("\n","\r\n",$body);

Indentation +1309 added lines, -1309 removed lines

@@ -251,9 +251,9 @@ 
   public $SingleToArray = array();
 
  /**
-   * Provides the ability to change the line ending
-   * @var string
-   */
+  * Provides the ability to change the line ending
+  * @var string
+  */
   public $LE              = "\n";
 
   /**
@@ -340,7 +340,7 @@ 
    * @param boolean $exceptions Should we throw external exceptions?
    */
   public function __construct($exceptions = false) {
-    $this->exceptions = ($exceptions == true);
+	$this->exceptions = ($exceptions == true);
   }
 
   /**
@@ -349,11 +349,11 @@ 
    * @return void
    */
   public function IsHTML($ishtml = true) {
-    if ($ishtml) {
-      $this->ContentType = 'text/html';
-    } else {
-      $this->ContentType = 'text/plain';
-    }
+	if ($ishtml) {
+	  $this->ContentType = 'text/html';
+	} else {
+	  $this->ContentType = 'text/plain';
+	}
   }
 
   /**
@@ -361,7 +361,7 @@ 
    * @return void
    */
   public function IsSMTP() {
-    $this->Mailer = 'smtp';
+	$this->Mailer = 'smtp';
   }
 
   /**
@@ -369,7 +369,7 @@ 
    * @return void
    */
   public function IsMail() {
-    $this->Mailer = 'mail';
+	$this->Mailer = 'mail';
   }
 
   /**
@@ -377,10 +377,10 @@ 
    * @return void
    */
   public function IsSendmail() {
-    if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
-    }
-    $this->Mailer = 'sendmail';
+	if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
+	  $this->Sendmail = '/var/qmail/bin/sendmail';
+	}
+	$this->Mailer = 'sendmail';
   }
 
   /**
@@ -388,10 +388,10 @@ 
    * @return void
    */
   public function IsQmail() {
-    if (stristr(ini_get('sendmail_path'), 'qmail')) {
-    $this->Sendmail = '/var/qmail/bin/sendmail';
-    }
-    $this->Mailer   = 'sendmail';
+	if (stristr(ini_get('sendmail_path'), 'qmail')) {
+	$this->Sendmail = '/var/qmail/bin/sendmail';
+	}
+	$this->Mailer   = 'sendmail';
   }
 
   /////////////////////////////////////////////////
@@ -405,7 +405,7 @@ 
    * @return boolean true on success, false if address already used
    */
   public function AddAddress($address, $name = '') {
-    return $this->AddAnAddress('to', $address, $name);
+	return $this->AddAnAddress('to', $address, $name);
   }
 
   /**
@@ -416,7 +416,7 @@ 
    * @return boolean true on success, false if address already used
    */
   public function AddCC($address, $name = '') {
-    return $this->AddAnAddress('cc', $address, $name);
+	return $this->AddAnAddress('cc', $address, $name);
   }
 
   /**
@@ -427,7 +427,7 @@ 
    * @return boolean true on success, false if address already used
    */
   public function AddBCC($address, $name = '') {
-    return $this->AddAnAddress('bcc', $address, $name);
+	return $this->AddAnAddress('bcc', $address, $name);
   }
 
   /**
@@ -437,7 +437,7 @@ 
    * @return boolean
    */
   public function AddReplyTo($address, $name = '') {
-    return $this->AddAnAddress('ReplyTo', $address, $name);
+	return $this->AddAnAddress('ReplyTo', $address, $name);
   }
 
   /**
@@ -450,31 +450,31 @@ 
    * @access private
    */
   private function AddAnAddress($kind, $address, $name = '') {
-    if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      echo 'Invalid recipient array: ' . kind;
-      return false;
-    }
-    $address = trim($address);
-    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-    if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
-        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      echo $this->Lang('invalid_address').': '.$address;
-      return false;
-    }
-    if ($kind != 'ReplyTo') {
-      if (!isset($this->all_recipients[strtolower($address)])) {
-        array_push($this->$kind, array($address, $name));
-        $this->all_recipients[strtolower($address)] = true;
-        return true;
-      }
-    } else {
-      if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-        $this->ReplyTo[strtolower($address)] = array($address, $name);
-      return true;
-    }
+	if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
+	  echo 'Invalid recipient array: ' . kind;
+	  return false;
+	}
+	$address = trim($address);
+	$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+	if (!self::ValidateAddress($address)) {
+	  $this->SetError($this->Lang('invalid_address').': '. $address);
+	  if ($this->exceptions) {
+		throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+	  }
+	  echo $this->Lang('invalid_address').': '.$address;
+	  return false;
+	}
+	if ($kind != 'ReplyTo') {
+	  if (!isset($this->all_recipients[strtolower($address)])) {
+		array_push($this->$kind, array($address, $name));
+		$this->all_recipients[strtolower($address)] = true;
+		return true;
+	  }
+	} else {
+	  if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+		$this->ReplyTo[strtolower($address)] = array($address, $name);
+	  return true;
+	}
   }
   return false;
 }
@@ -486,27 +486,27 @@ 
  * @return boolean
  */
   public function SetFrom($address, $name = '',$auto=1) {
-    $address = trim($address);
-    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-    if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
-        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      echo $this->Lang('invalid_address').': '.$address;
-      return false;
-    }
-    $this->From = $address;
-    $this->FromName = $name;
-    if ($auto) {
-      if (empty($this->ReplyTo)) {
-        $this->AddAnAddress('ReplyTo', $address, $name);
-      }
-      if (empty($this->Sender)) {
-        $this->Sender = $address;
-      }
-    }
-    return true;
+	$address = trim($address);
+	$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+	if (!self::ValidateAddress($address)) {
+	  $this->SetError($this->Lang('invalid_address').': '. $address);
+	  if ($this->exceptions) {
+		throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+	  }
+	  echo $this->Lang('invalid_address').': '.$address;
+	  return false;
+	}
+	$this->From = $address;
+	$this->FromName = $name;
+	if ($auto) {
+	  if (empty($this->ReplyTo)) {
+		$this->AddAnAddress('ReplyTo', $address, $name);
+	  }
+	  if (empty($this->Sender)) {
+		$this->Sender = $address;
+	  }
+	}
+	return true;
   }
 
   /**
@@ -521,15 +521,15 @@ 
    * @access public
    */
   public static function ValidateAddress($address) {
-    if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
-        return false;
-      } else {
-        return true;
-      }
-    } else {
-      return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
-    }
+	if (function_exists('filter_var')) { //Introduced in PHP 5.2
+	  if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+		return false;
+	  } else {
+		return true;
+	  }
+	} else {
+	  return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
+	}
   }
 
   /////////////////////////////////////////////////
@@ -543,49 +543,49 @@ 
    * @return bool
    */
   public function Send() {
-    try {
-    if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-        throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
-    }
-
-      // 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 (empty($this->Body)) {
-        throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
-      }
-
-      // digitally sign with DKIM if enabled
-      if ($this->DKIM_domain && $this->DKIM_private) {
-        $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
-        $header = str_replace("\r\n","\n",$header_dkim) . $header;
-    }
-
-      // Choose the mailer and send through it
-    switch($this->Mailer) {
-      case 'sendmail':
-          return $this->SendmailSend($header, $body);
-      case 'smtp':
-          return $this->SmtpSend($header, $body);
-      default:
-          return $this->MailSend($header, $body);
-    }
-
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      echo $e->getMessage()."\n";
-      return false;
-    }
+	try {
+	if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+		throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
+	}
+
+	  // 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 (empty($this->Body)) {
+		throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
+	  }
+
+	  // digitally sign with DKIM if enabled
+	  if ($this->DKIM_domain && $this->DKIM_private) {
+		$header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
+		$header = str_replace("\r\n","\n",$header_dkim) . $header;
+	}
+
+	  // Choose the mailer and send through it
+	switch($this->Mailer) {
+	  case 'sendmail':
+		  return $this->SendmailSend($header, $body);
+	  case 'smtp':
+		  return $this->SmtpSend($header, $body);
+	  default:
+		  return $this->MailSend($header, $body);
+	}
+
+	} catch (phpmailerException $e) {
+	  $this->SetError($e->getMessage());
+	  if ($this->exceptions) {
+		throw $e;
+	  }
+	  echo $e->getMessage()."\n";
+	  return false;
+	}
   }
 
   /**
@@ -596,42 +596,42 @@ 
    * @return bool
    */
   protected 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 ($this->SingleTo === true) {
-      foreach ($this->SingleToArray as $key => $val) {
-    if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-    }
-        fputs($mail, "To: " . $val . "\n");
-    fputs($mail, $header);
-    fputs($mail, $body);
-    $result = pclose($mail);
-        // implement call back function if it exists
-        $isSent = ($result == 0) ? 1 : 0;
-        $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-        }
-      }
-    } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-    }
-      fputs($mail, $header);
-      fputs($mail, $body);
-      $result = pclose($mail);
-      // implement call back function if it exists
-      $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-    if($result != 0) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
-    }
-    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 ($this->SingleTo === true) {
+	  foreach ($this->SingleToArray as $key => $val) {
+	if(!@$mail = popen($sendmail, 'w')) {
+		  throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+	}
+		fputs($mail, "To: " . $val . "\n");
+	fputs($mail, $header);
+	fputs($mail, $body);
+	$result = pclose($mail);
+		// implement call back function if it exists
+		$isSent = ($result == 0) ? 1 : 0;
+		$this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+		if($result != 0) {
+		  throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+		}
+	  }
+	} else {
+	  if(!@$mail = popen($sendmail, 'w')) {
+		throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+	}
+	  fputs($mail, $header);
+	  fputs($mail, $body);
+	  $result = pclose($mail);
+	  // implement call back function if it exists
+	  $isSent = ($result == 0) ? 1 : 0;
+	  $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
+	if($result != 0) {
+		throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+	  }
+	}
+	return true;
   }
 
   /**
@@ -642,51 +642,51 @@ 
    * @return bool
    */
   protected function MailSend($header, $body) {
-    $toArr = array();
-    foreach($this->to as $t) {
-      $toArr[] = $this->AddrFormat($t);
-    }
-    $to = implode(', ', $toArr);
-
-    $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);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        }
-      } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-        // implement call back function if it exists
-        $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
-    } 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);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        }
-      } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
-        // implement call back function if it exists
-        $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
-    }
-    if (isset($old_from)) {
-      ini_set('sendmail_from', $old_from);
-    }
-    if(!$rt) {
-      throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
-    }
-    return true;
+	$toArr = array();
+	foreach($this->to as $t) {
+	  $toArr[] = $this->AddrFormat($t);
+	}
+	$to = implode(', ', $toArr);
+
+	$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);
+		  // implement call back function if it exists
+		  $isSent = ($rt == 1) ? 1 : 0;
+		  $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+		}
+	  } else {
+		$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+		// implement call back function if it exists
+		$isSent = ($rt == 1) ? 1 : 0;
+		$this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+	  }
+	} 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);
+		  // implement call back function if it exists
+		  $isSent = ($rt == 1) ? 1 : 0;
+		  $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+		}
+	  } else {
+		$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
+		// implement call back function if it exists
+		$isSent = ($rt == 1) ? 1 : 0;
+		$this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+	  }
+	}
+	if (isset($old_from)) {
+	  ini_set('sendmail_from', $old_from);
+	}
+	if(!$rt) {
+	  throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
+	}
+	return true;
   }
 
   /**
@@ -699,67 +699,67 @@ 
    * @return bool
    */
   protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'smtp.php';
-    $bad_rcpt = array();
-
-    if(!$this->SmtpConnect()) {
-      throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
-    }
-    $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
-    }
-
-    // Attempt to send attach all recipients
-    foreach($this->to as $to) {
-      if (!$this->smtp->Recipient($to[0])) {
-        $bad_rcpt[] = $to[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      }
-    }
-    foreach($this->cc as $cc) {
-      if (!$this->smtp->Recipient($cc[0])) {
-        $bad_rcpt[] = $cc[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      }
-    }
-    foreach($this->bcc as $bcc) {
-      if (!$this->smtp->Recipient($bcc[0])) {
-        $bad_rcpt[] = $bcc[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      }
-    }
-
-
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
-      $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
-    }
-    if(!$this->smtp->Data($header . $body)) {
-      throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
-    }
-    if($this->SMTPKeepAlive == true) {
-      $this->smtp->Reset();
-    }
-    return true;
+	require_once $this->PluginDir . 'smtp.php';
+	$bad_rcpt = array();
+
+	if(!$this->SmtpConnect()) {
+	  throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
+	}
+	$smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
+	if(!$this->smtp->Mail($smtp_from)) {
+	  throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+	}
+
+	// Attempt to send attach all recipients
+	foreach($this->to as $to) {
+	  if (!$this->smtp->Recipient($to[0])) {
+		$bad_rcpt[] = $to[0];
+		// implement call back function if it exists
+		$isSent = 0;
+		$this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+	  } else {
+		// implement call back function if it exists
+		$isSent = 1;
+		$this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+	  }
+	}
+	foreach($this->cc as $cc) {
+	  if (!$this->smtp->Recipient($cc[0])) {
+		$bad_rcpt[] = $cc[0];
+		// implement call back function if it exists
+		$isSent = 0;
+		$this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+	  } else {
+		// implement call back function if it exists
+		$isSent = 1;
+		$this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+	  }
+	}
+	foreach($this->bcc as $bcc) {
+	  if (!$this->smtp->Recipient($bcc[0])) {
+		$bad_rcpt[] = $bcc[0];
+		// implement call back function if it exists
+		$isSent = 0;
+		$this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+	  } else {
+		// implement call back function if it exists
+		$isSent = 1;
+		$this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+	  }
+	}
+
+
+	if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+	  $badaddresses = implode(', ', $bad_rcpt);
+	  throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+	}
+	if(!$this->smtp->Data($header . $body)) {
+	  throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
+	}
+	if($this->SMTPKeepAlive == true) {
+	  $this->smtp->Reset();
+	}
+	return true;
   }
 
   /**
@@ -770,61 +770,61 @@ 
    * @return bool
    */
   public function SmtpConnect() {
-    if(is_null($this->smtp)) {
-      $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
-    try {
-      while($index < count($hosts) && !$connection) {
-      $hostinfo = array();
-        if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
-        $host = $hostinfo[1];
-        $port = $hostinfo[2];
-      } else {
-        $host = $hosts[$index];
-        $port = $this->Port;
-      }
-
-      $tls = ($this->SMTPSecure == 'tls');
-      $ssl = ($this->SMTPSecure == 'ssl');
-
-      if($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
-
-        $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
-        $this->smtp->Hello($hello);
-
-        if($tls) {
-          if(!$this->smtp->StartTLS()) {
-              throw new phpmailerException($this->Lang('tls'));
-          }
-
-            //We must resend HELO after tls negotiation
-          $this->smtp->Hello($hello);
-        }
-
-        $connection = true;
-        if($this->SMTPAuth) {
-          if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
-              throw new phpmailerException($this->Lang('authenticate'));
-          }
-        }
-      }
-      $index++;
-    if(!$connection) {
-          throw new phpmailerException($this->Lang('connect_host'));
-    }
-      }
-    } catch (phpmailerException $e) {
-      $this->smtp->Reset();
-      throw $e;
-    }
-    return true;
+	if(is_null($this->smtp)) {
+	  $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
+	try {
+	  while($index < count($hosts) && !$connection) {
+	  $hostinfo = array();
+		if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
+		$host = $hostinfo[1];
+		$port = $hostinfo[2];
+	  } else {
+		$host = $hosts[$index];
+		$port = $this->Port;
+	  }
+
+	  $tls = ($this->SMTPSecure == 'tls');
+	  $ssl = ($this->SMTPSecure == 'ssl');
+
+	  if($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
+
+		$hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
+		$this->smtp->Hello($hello);
+
+		if($tls) {
+		  if(!$this->smtp->StartTLS()) {
+			  throw new phpmailerException($this->Lang('tls'));
+		  }
+
+			//We must resend HELO after tls negotiation
+		  $this->smtp->Hello($hello);
+		}
+
+		$connection = true;
+		if($this->SMTPAuth) {
+		  if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
+			  throw new phpmailerException($this->Lang('authenticate'));
+		  }
+		}
+	  }
+	  $index++;
+	if(!$connection) {
+		  throw new phpmailerException($this->Lang('connect_host'));
+	}
+	  }
+	} catch (phpmailerException $e) {
+	  $this->smtp->Reset();
+	  throw $e;
+	}
+	return true;
   }
 
   /**
@@ -832,57 +832,57 @@ 
    * @return void
    */
   public function SmtpClose() {
-    if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
-        $this->smtp->Quit();
-        $this->smtp->Close();
-      }
-    }
+	if(!is_null($this->smtp)) {
+	  if($this->smtp->Connected()) {
+		$this->smtp->Quit();
+		$this->smtp->Close();
+	  }
+	}
   }
 
   /**
-  * Sets the language for all class error messages.
-  * Returns false if it cannot load the language file.  The default language is English.
-  * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
+   * Sets the language for all class error messages.
+   * Returns false if it cannot load the language file.  The default language is English.
+   * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
    * @param string $lang_path Path to the language file directory
    * @access public
    */
   function SetLanguage($langcode = 'en', $lang_path = 'language/') {
-    //Define full set of translatable strings
-    $PHPMAILER_LANG = array(
-      'provide_address' => 'You must provide at least one recipient email address.',
-      'mailer_not_supported' => ' mailer is not supported.',
-      'execute' => 'Could not execute: ',
-      'instantiate' => 'Could not instantiate mail function.',
-      'authenticate' => 'SMTP Error: Could not authenticate.',
-      'from_failed' => 'The following From address failed: ',
-      'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-      'data_not_accepted' => 'SMTP Error: Data not accepted.',
-      'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-      'file_access' => 'Could not access file: ',
-      'file_open' => 'File Error: Could not open file: ',
-      'encoding' => 'Unknown encoding: ',
-      'signing' => 'Signing Error: ',
-      'smtp_error' => 'SMTP server error: ',
-      'empty_message' => 'Message body empty',
-      'invalid_address' => 'Invalid address',
-      'variable_set' => 'Cannot set or reset variable: '
-    );
-    //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
-    $l = true;
-    if ($langcode != 'en') { //There is no English translation file
-      $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
-    }
-    $this->language = $PHPMAILER_LANG;
-    return ($l == true); //Returns false if language not found
-  }
-
-  /**
-  * Return the current array of language strings
-  * @return array
-  */
+	//Define full set of translatable strings
+	$PHPMAILER_LANG = array(
+	  'provide_address' => 'You must provide at least one recipient email address.',
+	  'mailer_not_supported' => ' mailer is not supported.',
+	  'execute' => 'Could not execute: ',
+	  'instantiate' => 'Could not instantiate mail function.',
+	  'authenticate' => 'SMTP Error: Could not authenticate.',
+	  'from_failed' => 'The following From address failed: ',
+	  'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+	  'data_not_accepted' => 'SMTP Error: Data not accepted.',
+	  'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+	  'file_access' => 'Could not access file: ',
+	  'file_open' => 'File Error: Could not open file: ',
+	  'encoding' => 'Unknown encoding: ',
+	  'signing' => 'Signing Error: ',
+	  'smtp_error' => 'SMTP server error: ',
+	  'empty_message' => 'Message body empty',
+	  'invalid_address' => 'Invalid address',
+	  'variable_set' => 'Cannot set or reset variable: '
+	);
+	//Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
+	$l = true;
+	if ($langcode != 'en') { //There is no English translation file
+	  $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
+	}
+	$this->language = $PHPMAILER_LANG;
+	return ($l == true); //Returns false if language not found
+  }
+
+  /**
+   * Return the current array of language strings
+   * @return array
+   */
   public function GetTranslations() {
-    return $this->language;
+	return $this->language;
   }
 
   /////////////////////////////////////////////////
@@ -895,15 +895,15 @@ 
    * @return string
    */
   public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
-    $addresses = array();
-    foreach ($addr as $a) {
-      $addresses[] = $this->AddrFormat($a);
-    }
-    $addr_str .= implode(', ', $addresses);
-    $addr_str .= $this->LE;
+	$addr_str = $type . ': ';
+	$addresses = array();
+	foreach ($addr as $a) {
+	  $addresses[] = $this->AddrFormat($a);
+	}
+	$addr_str .= implode(', ', $addresses);
+	$addr_str .= $this->LE;
 
-    return $addr_str;
+	return $addr_str;
   }
 
   /**
@@ -912,11 +912,11 @@ 
    * @return string
    */
   public function AddrFormat($addr) {
-    if(empty($addr[1])) {
-      return $this->SecureHeader($addr[0]);
-    } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
-    }
+	if(empty($addr[1])) {
+	  return $this->SecureHeader($addr[0]);
+	} else {
+	  return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+	}
   }
 
   /**
@@ -930,76 +930,76 @@ 
    * @return string
    */
   public 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;
   }
 
   /**
@@ -1012,35 +1012,35 @@ 
    * @return int
    */
   public 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;
   }
 
 
@@ -1050,19 +1050,19 @@ 
    * @return void
    */
   public function SetWordWrap() {
-    if($this->WordWrap < 1) {
-      return;
-    }
+	if($this->WordWrap < 1) {
+	  return;
+	}
 
-    switch($this->message_type) {
-      case 'alt':
-      case 'alt_attachments':
-        $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
-        break;
-      default:
-        $this->Body = $this->WrapText($this->Body, $this->WordWrap);
-        break;
-    }
+	switch($this->message_type) {
+	  case 'alt':
+	  case 'alt_attachments':
+		$this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
+		break;
+	  default:
+		$this->Body = $this->WrapText($this->Body, $this->WordWrap);
+		break;
+	}
   }
 
   /**
@@ -1071,81 +1071,81 @@ 
    * @return string The assembled header
    */
   public 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', self::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 ($this->SingleTo === true) {
-        foreach($this->to as $t) {
-          $this->SingleToArray[] = $this->AddrFormat($t);
-        }
-      } else {
-      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(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 '.$this->Version.' (phpmailer.sourceforge.net)');
-
-    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', self::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 ($this->SingleTo === true) {
+		foreach($this->to as $t) {
+		  $this->SingleToArray[] = $this->AddrFormat($t);
+		}
+	  } else {
+	  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(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 '.$this->Version.' (phpmailer.sourceforge.net)');
+
+	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;
   }
 
   /**
@@ -1154,32 +1154,32 @@ 
    * @return string
    */
   public 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':
-      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':
+	  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;
   }
 
   /**
@@ -1188,72 +1188,72 @@ 
    * @return string The assembled message body
    */
   public function CreateBody() {
-    $body = '';
-
-    if ($this->sign_key_file) {
-      $body .= $this->GetMailMIME();
-    }
-
-    $this->SetWordWrap();
-
-    switch($this->message_type) {
-      case 'alt':
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->EndBoundary($this->boundary[1]);
-        break;
-      case 'plain':
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        break;
-      case 'attachments':
-        $body .= $this->GetBoundary($this->boundary[1], '', '', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE;
-        $body .= $this->AttachAll();
-        break;
-      case 'alt_attachments':
-        $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->EndBoundary($this->boundary[2]);
-        $body .= $this->AttachAll();
-        break;
-    }
-
-    if($this->IsError()) {
-      $body = '';
-    } else if ($this->sign_key_file) {
-      try {
-        $file = tempnam('', 'mail');
-        file_put_contents($file, $body, LOCK_EX); //TODO check this worked
-      $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)) {
-          @unlink($file);
-          @unlink($signed);
-          $body = file_get_contents($signed);
-      } else {
-          @unlink($file);
-          @unlink($signed);
-          throw new phpmailerException($this->Lang("signing").openssl_error_string());
-        }
-      } catch (phpmailerException $e) {
-        $body = '';
-        if ($this->exceptions) {
-          throw $e;
-        }
-      }
-    }
-
-    return $body;
+	$body = '';
+
+	if ($this->sign_key_file) {
+	  $body .= $this->GetMailMIME();
+	}
+
+	$this->SetWordWrap();
+
+	switch($this->message_type) {
+	  case 'alt':
+		$body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
+		$body .= $this->EncodeString($this->AltBody, $this->Encoding);
+		$body .= $this->LE.$this->LE;
+		$body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
+		$body .= $this->EncodeString($this->Body, $this->Encoding);
+		$body .= $this->LE.$this->LE;
+		$body .= $this->EndBoundary($this->boundary[1]);
+		break;
+	  case 'plain':
+		$body .= $this->EncodeString($this->Body, $this->Encoding);
+		break;
+	  case 'attachments':
+		$body .= $this->GetBoundary($this->boundary[1], '', '', '');
+		$body .= $this->EncodeString($this->Body, $this->Encoding);
+		$body .= $this->LE;
+		$body .= $this->AttachAll();
+		break;
+	  case 'alt_attachments':
+		$body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
+		$body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+		$body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+		$body .= $this->EncodeString($this->AltBody, $this->Encoding);
+		$body .= $this->LE.$this->LE;
+		$body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+		$body .= $this->EncodeString($this->Body, $this->Encoding);
+		$body .= $this->LE.$this->LE;
+		$body .= $this->EndBoundary($this->boundary[2]);
+		$body .= $this->AttachAll();
+		break;
+	}
+
+	if($this->IsError()) {
+	  $body = '';
+	} else if ($this->sign_key_file) {
+	  try {
+		$file = tempnam('', 'mail');
+		file_put_contents($file, $body, LOCK_EX); //TODO check this worked
+	  $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)) {
+		  @unlink($file);
+		  @unlink($signed);
+		  $body = file_get_contents($signed);
+	  } else {
+		  @unlink($file);
+		  @unlink($signed);
+		  throw new phpmailerException($this->Lang("signing").openssl_error_string());
+		}
+	  } catch (phpmailerException $e) {
+		$body = '';
+		if ($this->exceptions) {
+		  throw $e;
+		}
+	  }
+	}
+
+	return $body;
   }
 
   /**
@@ -1261,23 +1261,23 @@ 
    * @access private
    */
   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;
   }
 
   /**
@@ -1285,7 +1285,7 @@ 
    * @access private
    */
   private function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+	return $this->LE . '--' . $boundary . '--' . $this->LE;
   }
 
   /**
@@ -1294,19 +1294,19 @@ 
    * @return void
    */
   private 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';
+	  }
+	}
   }
 
   /**
@@ -1315,7 +1315,7 @@ 
    * @return string
    */
   public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+	return $name . ': ' . $value . $this->LE;
   }
 
   /**
@@ -1324,7 +1324,7 @@ 
    * @return string
    */
   public function TextLine($value) {
-    return $value . $this->LE;
+	return $value . $this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1342,45 +1342,45 @@ 
    * @return bool
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-    try {
-    if(!@is_file($path)) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
-    }
-    $filename = basename($path);
-    if($name == '') {
-      $name = $filename;
-    }
-
-      $this->attachment[] = array(
-        0 => $path,
-        1 => $filename,
-        2 => $name,
-        3 => $encoding,
-        4 => $type,
-        5 => false,  // isStringAttachment
-        6 => 'attachment',
-        7 => 0
-      );
-
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      echo $e->getMessage()."\n";
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-  * Return the current array of attachments
-  * @return array
-  */
+	try {
+	if(!@is_file($path)) {
+		throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
+	}
+	$filename = basename($path);
+	if($name == '') {
+	  $name = $filename;
+	}
+
+	  $this->attachment[] = array(
+		0 => $path,
+		1 => $filename,
+		2 => $name,
+		3 => $encoding,
+		4 => $type,
+		5 => false,  // isStringAttachment
+		6 => 'attachment',
+		7 => 0
+	  );
+
+	} catch (phpmailerException $e) {
+	  $this->SetError($e->getMessage());
+	  if ($this->exceptions) {
+		throw $e;
+	  }
+	  echo $e->getMessage()."\n";
+	  if ( $e->getCode() == self::STOP_CRITICAL ) {
+		return false;
+	  }
+	}
+	return true;
+  }
+
+  /**
+   * Return the current array of attachments
+   * @return array
+   */
   public function GetAttachments() {
-    return $this->attachment;
+	return $this->attachment;
   }
 
   /**
@@ -1390,61 +1390,61 @@ 
    * @return string
    */
   private function AttachAll() {
-    // Return text of body
-    $mime = array();
-    $cidUniq = array();
-    $incl = array();
-
-    // Add all attachments
-    foreach ($this->attachment as $attachment) {
-      // Check for string attachment
-      $bString = $attachment[5];
-      if ($bString) {
-        $string = $attachment[0];
-      } else {
-        $path = $attachment[0];
-      }
-
-      if (in_array($attachment[0], $incl)) { continue; }
-      $filename    = $attachment[1];
-      $name        = $attachment[2];
-      $encoding    = $attachment[3];
-      $type        = $attachment[4];
-      $disposition = $attachment[6];
-      $cid         = $attachment[7];
-      $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
-      $cidUniq[$cid] = true;
-
-      $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();
+	$cidUniq = array();
+	$incl = array();
+
+	// Add all attachments
+	foreach ($this->attachment as $attachment) {
+	  // Check for string attachment
+	  $bString = $attachment[5];
+	  if ($bString) {
+		$string = $attachment[0];
+	  } else {
+		$path = $attachment[0];
+	  }
+
+	  if (in_array($attachment[0], $incl)) { continue; }
+	  $filename    = $attachment[1];
+	  $name        = $attachment[2];
+	  $encoding    = $attachment[3];
+	  $type        = $attachment[4];
+	  $disposition = $attachment[6];
+	  $cid         = $attachment[7];
+	  $incl[]      = $attachment[0];
+	  if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+	  $cidUniq[$cid] = true;
+
+	  $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);
   }
 
   /**
@@ -1457,27 +1457,27 @@ 
    * @return string
    */
   private function EncodeFile($path, $encoding = 'base64') {
-    try {
-      if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
-    }
-    if (function_exists('get_magic_quotes')) {
-        function get_magic_quotes() {
-            return false;
-        }
+	try {
+	  if (!is_readable($path)) {
+		throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
+	}
+	if (function_exists('get_magic_quotes')) {
+		function get_magic_quotes() {
+			return false;
+		}
 }
-    if (PHP_VERSION < 5) {
-      $magic_quotes = get_magic_quotes_runtime();
-      set_magic_quotes_runtime(0);
-    }
-    $file_buffer  = file_get_contents($path);
-    $file_buffer  = $this->EncodeString($file_buffer, $encoding);
-    if (PHP_VERSION < 5) { set_magic_quotes_runtime($magic_quotes); }
-    return $file_buffer;
-    } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      return '';
-    }
+	if (PHP_VERSION < 5) {
+	  $magic_quotes = get_magic_quotes_runtime();
+	  set_magic_quotes_runtime(0);
+	}
+	$file_buffer  = file_get_contents($path);
+	$file_buffer  = $this->EncodeString($file_buffer, $encoding);
+	if (PHP_VERSION < 5) { set_magic_quotes_runtime($magic_quotes); }
+	return $file_buffer;
+	} catch (Exception $e) {
+	  $this->SetError($e->getMessage());
+	  return '';
+	}
   }
 
   /**
@@ -1489,29 +1489,29 @@ 
    * @return string
    */
   public function EncodeString ($str, $encoding = 'base64') {
-    $encoded = '';
-    switch(strtolower($encoding)) {
-      case 'base64':
-        $encoded = chunk_split(base64_encode($str), 76, $this->LE);
-        break;
-      case '7bit':
-      case '8bit':
-        $encoded = $this->FixEOL($str);
-        //Make sure it ends with a line break
-        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':
+		$encoded = chunk_split(base64_encode($str), 76, $this->LE);
+		break;
+	  case '7bit':
+	  case '8bit':
+		$encoded = $this->FixEOL($str);
+		//Make sure it ends with a line break
+		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;
   }
 
   /**
@@ -1520,58 +1520,58 @@ 
    * @return string
    */
   public 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;
   }
 
   /**
@@ -1581,11 +1581,11 @@ 
    * @return bool
    */
   public 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;
+	}
   }
 
   /**
@@ -1597,117 +1597,117 @@ 
    * @return string
    */
   public 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;
-  }
-
-  /**
-  * Encode string to quoted-printable.
-  * Only uses standard PHP, slow, but will always work
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @return string
-  */
+	$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;
+  }
+
+  /**
+   * Encode string to quoted-printable.
+   * Only uses standard PHP, slow, but will always work
+   * @access public
+   * @param string $string the text to encode
+   * @param integer $line_max Number of chars allowed on a line before wrapping
+   * @return string
+   */
   public function EncodeQPphp( $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;
-  }
-
-  /**
-  * Encode string to RFC2045 (6.7) quoted-printable format
-  * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
-  * Also results in same content as you started with after decoding
-  * @see EncodeQPphp()
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
-  * @return string
-  * @author Marcus Bointon
-  */
+	$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;
+  }
+
+  /**
+   * Encode string to RFC2045 (6.7) quoted-printable format
+   * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
+   * Also results in same content as you started with after decoding
+   * @see EncodeQPphp()
+   * @access public
+   * @param string $string the text to encode
+   * @param integer $line_max Number of chars allowed on a line before wrapping
+   * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
+   * @return string
+   * @author Marcus Bointon
+   */
   public function EncodeQP($string, $line_max = 76, $space_conv = false) {
-    if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
-      return quoted_printable_encode($string);
-    }
-    $filters = stream_get_filters();
-    if (!in_array('convert.*', $filters)) { //Got convert stream filter?
-      return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
-    }
-    $fp = fopen('php://temp/', 'r+');
-    $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
-    $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
-    $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
-    fputs($fp, $string);
-    rewind($fp);
-    $out = stream_get_contents($fp);
-    stream_filter_remove($s);
-    $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
-    fclose($fp);
-    return $out;
+	if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
+	  return quoted_printable_encode($string);
+	}
+	$filters = stream_get_filters();
+	if (!in_array('convert.*', $filters)) { //Got convert stream filter?
+	  return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
+	}
+	$fp = fopen('php://temp/', 'r+');
+	$string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
+	$params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
+	$s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
+	fputs($fp, $string);
+	rewind($fp);
+	$out = stream_get_contents($fp);
+	stream_filter_remove($s);
+	$out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
+	fclose($fp);
+	return $out;
   }
 
   /**
@@ -1719,28 +1719,28 @@ 
    * @return string
    */
   public function EncodeQ ($str, $position = 'text') {
-    // There should not be any EOL in the string
-    $encoded = preg_replace('/[\r\n]*/', '', $str);
+	// There should not be any EOL in the string
+	$encoded = preg_replace('/[\r\n]*/', '', $str);
 
-    switch (strtolower($position)) {
-      case 'phrase':
+	switch (strtolower($position)) {
+	  case 'phrase':
 		$encoded = preg_replace_callback('/([^A-Za-z0-9!*+\/ -])/', function($n) { return '='.sprintf('%02X', ord('\\1')); }, $encoded);
-        break;
-      case 'comment':
+		break;
+	  case 'comment':
 		$encoded = preg_replace_callback('/([\(\)\"])/', function($n) { return '='.sprintf('%02X', ord('\\1')); }, $encoded);
-      case 'text':
-      default:
-        // Replace every high ascii, control =, ? and _ characters
-        //TODO using /e (equivalent to eval()) is probably not a good idea
-        $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
-              "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        break;
-    }
+	  case 'text':
+	  default:
+		// Replace every high ascii, control =, ? and _ characters
+		//TODO using /e (equivalent to eval()) is probably not a good idea
+		$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);
+	// Replace every spaces to _ (more readable than =20)
+	$encoded = str_replace(' ', '_', $encoded);
 
-    return $encoded;
+	return $encoded;
   }
 
   /**
@@ -1754,17 +1754,17 @@ 
    * @return void
    */
   public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $string,
-      1 => $filename,
-      2 => basename($filename),
-      3 => $encoding,
-      4 => $type,
-      5 => true,  // isStringAttachment
-      6 => 'attachment',
-      7 => 0
-    );
+	// Append to $attachment array
+	$this->attachment[] = array(
+	  0 => $string,
+	  1 => $filename,
+	  2 => basename($filename),
+	  3 => $encoding,
+	  4 => $type,
+	  5 => true,  // isStringAttachment
+	  6 => 'attachment',
+	  7 => 0
+	);
   }
 
   /**
@@ -1782,29 +1782,29 @@ 
    */
   public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
-    if(!@is_file($path)) {
-      $this->SetError($this->Lang('file_access') . $path);
-      return false;
-    }
+	if(!@is_file($path)) {
+	  $this->SetError($this->Lang('file_access') . $path);
+	  return false;
+	}
 
-    $filename = basename($path);
-    if($name == '') {
-      $name = $filename;
-    }
+	$filename = basename($path);
+	if($name == '') {
+	  $name = $filename;
+	}
 
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $path,
-      1 => $filename,
-      2 => $name,
-      3 => $encoding,
-      4 => $type,
-      5 => false,  // isStringAttachment
-      6 => 'inline',
-      7 => $cid
-    );
+	// Append to $attachment array
+	$this->attachment[] = array(
+	  0 => $path,
+	  1 => $filename,
+	  2 => $name,
+	  3 => $encoding,
+	  4 => $type,
+	  5 => false,  // isStringAttachment
+	  6 => 'inline',
+	  7 => $cid
+	);
 
-    return true;
+	return true;
   }
 
   /**
@@ -1813,12 +1813,12 @@ 
    * @return bool
    */
   public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
-      if ($attachment[6] == 'inline') {
-        return true;
-      }
-    }
-    return false;
+	foreach($this->attachment as $attachment) {
+	  if ($attachment[6] == 'inline') {
+		return true;
+	  }
+	}
+	return false;
   }
 
   /////////////////////////////////////////////////
@@ -1830,10 +1830,10 @@ 
    * @return void
    */
   public function ClearAddresses() {
-    foreach($this->to as $to) {
-      unset($this->all_recipients[strtolower($to[0])]);
-    }
-    $this->to = array();
+	foreach($this->to as $to) {
+	  unset($this->all_recipients[strtolower($to[0])]);
+	}
+	$this->to = array();
   }
 
   /**
@@ -1841,10 +1841,10 @@ 
    * @return void
    */
   public function ClearCCs() {
-    foreach($this->cc as $cc) {
-      unset($this->all_recipients[strtolower($cc[0])]);
-    }
-    $this->cc = array();
+	foreach($this->cc as $cc) {
+	  unset($this->all_recipients[strtolower($cc[0])]);
+	}
+	$this->cc = array();
   }
 
   /**
@@ -1852,10 +1852,10 @@ 
    * @return void
    */
   public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
-      unset($this->all_recipients[strtolower($bcc[0])]);
-    }
-    $this->bcc = array();
+	foreach($this->bcc as $bcc) {
+	  unset($this->all_recipients[strtolower($bcc[0])]);
+	}
+	$this->bcc = array();
   }
 
   /**
@@ -1863,7 +1863,7 @@ 
    * @return void
    */
   public function ClearReplyTos() {
-    $this->ReplyTo = array();
+	$this->ReplyTo = array();
   }
 
   /**
@@ -1872,10 +1872,10 @@ 
    * @return void
    */
   public function ClearAllRecipients() {
-    $this->to = array();
-    $this->cc = array();
-    $this->bcc = array();
-    $this->all_recipients = array();
+	$this->to = array();
+	$this->cc = array();
+	$this->bcc = array();
+	$this->all_recipients = array();
   }
 
   /**
@@ -1884,7 +1884,7 @@ 
    * @return void
    */
   public function ClearAttachments() {
-    $this->attachment = array();
+	$this->attachment = array();
   }
 
   /**
@@ -1892,7 +1892,7 @@ 
    * @return void
    */
   public function ClearCustomHeaders() {
-    $this->CustomHeader = array();
+	$this->CustomHeader = array();
   }
 
   /////////////////////////////////////////////////
@@ -1905,14 +1905,14 @@ 
    * @return void
    */
   protected function SetError($msg) {
-    $this->error_count++;
-    if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-      $lasterror = $this->smtp->getError();
-      if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
-      }
-    }
-    $this->ErrorInfo = $msg;
+	$this->error_count++;
+	if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+	  $lasterror = $this->smtp->getError();
+	  if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
+		$msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+	  }
+	}
+	$this->ErrorInfo = $msg;
   }
 
   /**
@@ -1922,13 +1922,13 @@ 
    * @static
    */
   public static 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;
   }
 
   /**
@@ -1937,15 +1937,15 @@ 
    * @return string
    */
   private function ServerHostname() {
-    if (!empty($this->Hostname)) {
-      $result = $this->Hostname;
-    } elseif (isset($_SERVER['SERVER_NAME'])) {
-      $result = $_SERVER['SERVER_NAME'];
-    } else {
-      $result = 'localhost.localdomain';
-    }
+	if (!empty($this->Hostname)) {
+	  $result = $this->Hostname;
+	} elseif (isset($_SERVER['SERVER_NAME'])) {
+	  $result = $_SERVER['SERVER_NAME'];
+	} else {
+	  $result = 'localhost.localdomain';
+	}
 
-    return $result;
+	return $result;
   }
 
   /**
@@ -1954,15 +1954,15 @@ 
    * @return string
    */
   private function Lang($key) {
-    if(count($this->language) < 1) {
-      $this->SetLanguage('en'); // set the default language
-    }
+	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(isset($this->language[$key])) {
+	  return $this->language[$key];
+	} else {
+	  return 'Language string failed to load: ' . $key;
+	}
   }
 
   /**
@@ -1971,7 +1971,7 @@ 
    * @return bool
    */
   public function IsError() {
-    return ($this->error_count > 0);
+	return ($this->error_count > 0);
   }
 
   /**
@@ -1980,10 +1980,10 @@ 
    * @return string
    */
   private 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;
   }
 
   /**
@@ -1992,7 +1992,7 @@ 
    * @return void
    */
   public function AddCustomHeader($custom_header) {
-    $this->CustomHeader[] = explode(':', $custom_header, 2);
+	$this->CustomHeader[] = explode(':', $custom_header, 2);
   }
 
   /**
@@ -2001,34 +2001,34 @@ 
    * @return $message
    */
   public 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]+://#',$url)) {
-          $filename = basename($url);
-          $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
-          $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_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 it in a program that understands HTML!' . "\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]+://#',$url)) {
+		  $filename = basename($url);
+		  $directory = dirname($url);
+		  ($directory == '.')?$directory='':'';
+		  $cid = 'cid:' . md5($filename);
+		  $ext = pathinfo($filename, PATHINFO_EXTENSION);
+		  $mimeType  = self::_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 it in a program that understands HTML!' . "\n\n";
+	}
   }
 
   /**
@@ -2039,96 +2039,96 @@ 
    * @static
    */
   public static function _mime_types($ext = '') {
-    $mimes = array(
-      'hqx'   =>  'application/mac-binhex40',
-      'cpt'   =>  'application/mac-compactpro',
-      'doc'   =>  'application/msword',
-      'bin'   =>  'application/macbinary',
-      'dms'   =>  'application/octet-stream',
-      'lha'   =>  'application/octet-stream',
-      'lzh'   =>  'application/octet-stream',
-      'exe'   =>  'application/octet-stream',
-      'class' =>  'application/octet-stream',
-      'psd'   =>  'application/octet-stream',
-      'so'    =>  'application/octet-stream',
-      'sea'   =>  'application/octet-stream',
-      'dll'   =>  'application/octet-stream',
-      'oda'   =>  'application/oda',
-      'pdf'   =>  'application/pdf',
-      'ai'    =>  'application/postscript',
-      'eps'   =>  'application/postscript',
-      'ps'    =>  'application/postscript',
-      'smi'   =>  'application/smil',
-      'smil'  =>  'application/smil',
-      'mif'   =>  'application/vnd.mif',
-      'xls'   =>  'application/vnd.ms-excel',
-      'ppt'   =>  'application/vnd.ms-powerpoint',
-      'wbxml' =>  'application/vnd.wap.wbxml',
-      'wmlc'  =>  'application/vnd.wap.wmlc',
-      'dcr'   =>  'application/x-director',
-      'dir'   =>  'application/x-director',
-      'dxr'   =>  'application/x-director',
-      'dvi'   =>  'application/x-dvi',
-      'gtar'  =>  'application/x-gtar',
-      'php'   =>  'application/x-httpd-php',
-      'php4'  =>  'application/x-httpd-php',
-      'php3'  =>  'application/x-httpd-php',
-      'phtml' =>  'application/x-httpd-php',
-      'phps'  =>  'application/x-httpd-php-source',
-      'js'    =>  'application/x-javascript',
-      'swf'   =>  'application/x-shockwave-flash',
-      'sit'   =>  'application/x-stuffit',
-      'tar'   =>  'application/x-tar',
-      'tgz'   =>  'application/x-tar',
-      'xhtml' =>  'application/xhtml+xml',
-      'xht'   =>  'application/xhtml+xml',
-      'zip'   =>  'application/zip',
-      'mid'   =>  'audio/midi',
-      'midi'  =>  'audio/midi',
-      'mpga'  =>  'audio/mpeg',
-      'mp2'   =>  'audio/mpeg',
-      'mp3'   =>  'audio/mpeg',
-      'aif'   =>  'audio/x-aiff',
-      'aiff'  =>  'audio/x-aiff',
-      'aifc'  =>  'audio/x-aiff',
-      'ram'   =>  'audio/x-pn-realaudio',
-      'rm'    =>  'audio/x-pn-realaudio',
-      'rpm'   =>  'audio/x-pn-realaudio-plugin',
-      'ra'    =>  'audio/x-realaudio',
-      'rv'    =>  'video/vnd.rn-realvideo',
-      'wav'   =>  'audio/x-wav',
-      'bmp'   =>  'image/bmp',
-      'gif'   =>  'image/gif',
-      'jpeg'  =>  'image/jpeg',
-      'jpg'   =>  'image/jpeg',
-      'jpe'   =>  'image/jpeg',
-      'png'   =>  'image/png',
-      'tiff'  =>  'image/tiff',
-      'tif'   =>  'image/tiff',
-      'css'   =>  'text/css',
-      'html'  =>  'text/html',
-      'htm'   =>  'text/html',
-      'shtml' =>  'text/html',
-      'txt'   =>  'text/plain',
-      'text'  =>  'text/plain',
-      'log'   =>  'text/plain',
-      'rtx'   =>  'text/richtext',
-      'rtf'   =>  'text/rtf',
-      'xml'   =>  'text/xml',
-      'xsl'   =>  'text/xml',
-      'mpeg'  =>  'video/mpeg',
-      'mpg'   =>  'video/mpeg',
-      'mpe'   =>  'video/mpeg',
-      'qt'    =>  'video/quicktime',
-      'mov'   =>  'video/quicktime',
-      'avi'   =>  'video/x-msvideo',
-      'movie' =>  'video/x-sgi-movie',
-      'doc'   =>  'application/msword',
-      'word'  =>  'application/msword',
-      'xl'    =>  'application/excel',
-      'eml'   =>  'message/rfc822'
-    );
-    return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
+	$mimes = array(
+	  'hqx'   =>  'application/mac-binhex40',
+	  'cpt'   =>  'application/mac-compactpro',
+	  'doc'   =>  'application/msword',
+	  'bin'   =>  'application/macbinary',
+	  'dms'   =>  'application/octet-stream',
+	  'lha'   =>  'application/octet-stream',
+	  'lzh'   =>  'application/octet-stream',
+	  'exe'   =>  'application/octet-stream',
+	  'class' =>  'application/octet-stream',
+	  'psd'   =>  'application/octet-stream',
+	  'so'    =>  'application/octet-stream',
+	  'sea'   =>  'application/octet-stream',
+	  'dll'   =>  'application/octet-stream',
+	  'oda'   =>  'application/oda',
+	  'pdf'   =>  'application/pdf',
+	  'ai'    =>  'application/postscript',
+	  'eps'   =>  'application/postscript',
+	  'ps'    =>  'application/postscript',
+	  'smi'   =>  'application/smil',
+	  'smil'  =>  'application/smil',
+	  'mif'   =>  'application/vnd.mif',
+	  'xls'   =>  'application/vnd.ms-excel',
+	  'ppt'   =>  'application/vnd.ms-powerpoint',
+	  'wbxml' =>  'application/vnd.wap.wbxml',
+	  'wmlc'  =>  'application/vnd.wap.wmlc',
+	  'dcr'   =>  'application/x-director',
+	  'dir'   =>  'application/x-director',
+	  'dxr'   =>  'application/x-director',
+	  'dvi'   =>  'application/x-dvi',
+	  'gtar'  =>  'application/x-gtar',
+	  'php'   =>  'application/x-httpd-php',
+	  'php4'  =>  'application/x-httpd-php',
+	  'php3'  =>  'application/x-httpd-php',
+	  'phtml' =>  'application/x-httpd-php',
+	  'phps'  =>  'application/x-httpd-php-source',
+	  'js'    =>  'application/x-javascript',
+	  'swf'   =>  'application/x-shockwave-flash',
+	  'sit'   =>  'application/x-stuffit',
+	  'tar'   =>  'application/x-tar',
+	  'tgz'   =>  'application/x-tar',
+	  'xhtml' =>  'application/xhtml+xml',
+	  'xht'   =>  'application/xhtml+xml',
+	  'zip'   =>  'application/zip',
+	  'mid'   =>  'audio/midi',
+	  'midi'  =>  'audio/midi',
+	  'mpga'  =>  'audio/mpeg',
+	  'mp2'   =>  'audio/mpeg',
+	  'mp3'   =>  'audio/mpeg',
+	  'aif'   =>  'audio/x-aiff',
+	  'aiff'  =>  'audio/x-aiff',
+	  'aifc'  =>  'audio/x-aiff',
+	  'ram'   =>  'audio/x-pn-realaudio',
+	  'rm'    =>  'audio/x-pn-realaudio',
+	  'rpm'   =>  'audio/x-pn-realaudio-plugin',
+	  'ra'    =>  'audio/x-realaudio',
+	  'rv'    =>  'video/vnd.rn-realvideo',
+	  'wav'   =>  'audio/x-wav',
+	  'bmp'   =>  'image/bmp',
+	  'gif'   =>  'image/gif',
+	  'jpeg'  =>  'image/jpeg',
+	  'jpg'   =>  'image/jpeg',
+	  'jpe'   =>  'image/jpeg',
+	  'png'   =>  'image/png',
+	  'tiff'  =>  'image/tiff',
+	  'tif'   =>  'image/tiff',
+	  'css'   =>  'text/css',
+	  'html'  =>  'text/html',
+	  'htm'   =>  'text/html',
+	  'shtml' =>  'text/html',
+	  'txt'   =>  'text/plain',
+	  'text'  =>  'text/plain',
+	  'log'   =>  'text/plain',
+	  'rtx'   =>  'text/richtext',
+	  'rtf'   =>  'text/rtf',
+	  'xml'   =>  'text/xml',
+	  'xsl'   =>  'text/xml',
+	  'mpeg'  =>  'video/mpeg',
+	  'mpg'   =>  'video/mpeg',
+	  'mpe'   =>  'video/mpeg',
+	  'qt'    =>  'video/quicktime',
+	  'mov'   =>  'video/quicktime',
+	  'avi'   =>  'video/x-msvideo',
+	  'movie' =>  'video/x-sgi-movie',
+	  'doc'   =>  'application/msword',
+	  'word'  =>  'application/msword',
+	  'xl'    =>  'application/excel',
+	  'eml'   =>  'message/rfc822'
+	);
+	return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
   }
 
   /**
@@ -2141,22 +2141,22 @@ 
    * @param string $name Parameter Name
    * @param mixed $value Parameter Value
    * NOTE: will not work with arrays, there are no arrays to set/reset
-  * @todo Should this not be using __set() magic function?
+   * @todo Should this not be using __set() magic function?
    */
   public function set ( $name, $value = '' ) {
-    try {
-    if ( isset($this->$name) ) {
-      $this->$name = $value;
-    } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
+	try {
+	if ( isset($this->$name) ) {
+	  $this->$name = $value;
+	} else {
+		throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
   }
-    } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      if ($e->getCode() == self::STOP_CRITICAL) {
-      return false;
-    }
+	} catch (Exception $e) {
+	  $this->SetError($e->getMessage());
+	  if ($e->getCode() == self::STOP_CRITICAL) {
+	  return false;
+	}
   }
-    return true;
+	return true;
   }
 
   /**
@@ -2166,9 +2166,9 @@ 
    * @return string
    */
   public function SecureHeader($str) {
-    $str = str_replace("\r", '', $str);
-    $str = str_replace("\n", '', $str);
-    return trim($str);
+	$str = str_replace("\r", '', $str);
+	$str = str_replace("\n", '', $str);
+	return trim($str);
   }
 
   /**
@@ -2179,9 +2179,9 @@ 
    * @param string $key_pass Password for private key
    */
   public 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;
   }
 
   /**
@@ -2192,17 +2192,17 @@ 
    * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
-    $tmp="";
-    $line="";
-    for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-        $line.=$txt[$i];
-      } else {
-        $line.="=".sprintf("%02X",$ord);
-      }
-    }
-    return $line;
+	$tmp="";
+	$line="";
+	for ($i=0;$i<strlen($txt);$i++) {
+	  $ord=ord($txt[$i]);
+	  if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
+		$line.=$txt[$i];
+	  } else {
+		$line.="=".sprintf("%02X",$ord);
+	  }
+	}
+	return $line;
 }
 
   /**
@@ -2212,15 +2212,15 @@ 
    * @param string $s Header
    */
   public function DKIM_Sign($s) {
-    $privKeyStr = file_get_contents($this->DKIM_private);
-    if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
-    } else {
-      $privKey = $privKeyStr;
-    }
-    if (openssl_sign($s, $signature, $privKey)) {
-      return base64_encode($signature);
-    }
+	$privKeyStr = file_get_contents($this->DKIM_private);
+	if ($this->DKIM_passphrase!='') {
+	  $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+	} else {
+	  $privKey = $privKeyStr;
+	}
+	if (openssl_sign($s, $signature, $privKey)) {
+	  return base64_encode($signature);
+	}
   }
 
   /**
@@ -2230,16 +2230,16 @@ 
    * @param string $s Header
    */
   public function DKIM_HeaderC($s) {
-    $s=preg_replace("/\r\n\s+/"," ",$s);
-    $lines=explode("\r\n",$s);
-    foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
-    }
-    $s=implode("\r\n",$lines);
-    return $s;
+	$s=preg_replace("/\r\n\s+/"," ",$s);
+	$lines=explode("\r\n",$s);
+	foreach ($lines as $key=>$line) {
+	  list($heading,$value)=explode(":",$line,2);
+	  $heading=strtolower($heading);
+	  $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
+	  $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+	}
+	$s=implode("\r\n",$lines);
+	return $s;
   }
 
   /**
@@ -2249,15 +2249,15 @@ 
    * @param string $body Message Body
    */
   public function DKIM_BodyC($body) {
-    if ($body == '') return "\r\n";
-    // stabilize line endings
-    $body=str_replace("\r\n","\n",$body);
-    $body=str_replace("\n","\r\n",$body);
-    // END stabilize line endings
-    while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
-    }
-    return $body;
+	if ($body == '') return "\r\n";
+	// stabilize line endings
+	$body=str_replace("\r\n","\n",$body);
+	$body=str_replace("\n","\r\n",$body);
+	// END stabilize line endings
+	while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
+	  $body=substr($body,0,strlen($body)-2);
+	}
+	return $body;
   }
 
   /**
@@ -2269,52 +2269,52 @@ 
    * @param string $body Body
    */
   public function DKIM_Add($headers_line,$subject,$body) {
-    $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
-    $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
-    $DKIMquery            = 'dns/txt'; // Query method
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
-    $subject_header       = "Subject: $subject";
-    $headers              = explode("\r\n",$headers_line);
-    foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
-        $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
-        $to_header=$header;
-      }
-    }
-    $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
-    $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
-    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
-    $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
-                "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
-                "\tz=$from\r\n".
-                "\t|$to\r\n".
-                "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
-                "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
-    $signed   = $this->DKIM_Sign($toSign);
-    return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
+	$DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
+	$DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+	$DKIMquery            = 'dns/txt'; // Query method
+	$DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+	$subject_header       = "Subject: $subject";
+	$headers              = explode("\r\n",$headers_line);
+	foreach($headers as $header) {
+	  if (strpos($header,'From:') === 0) {
+		$from_header=$header;
+	  } elseif (strpos($header,'To:') === 0) {
+		$to_header=$header;
+	  }
+	}
+	$from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
+	$to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
+	$subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+	$body     = $this->DKIM_BodyC($body);
+	$DKIMlen  = strlen($body) ; // Length of body
+	$DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
+	$ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
+	$dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
+				"\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+				"\th=From:To:Subject;\r\n".
+				"\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+				"\tz=$from\r\n".
+				"\t|$to\r\n".
+				"\t|$subject;\r\n".
+				"\tbh=" . $DKIMb64 . ";\r\n".
+				"\tb=";
+	$toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+	$signed   = $this->DKIM_Sign($toSign);
+	return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
   }
 
   protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
-    if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
-    }
+	if (!empty($this->action_function) && function_exists($this->action_function)) {
+	  $params = array($isSent,$to,$cc,$bcc,$subject,$body);
+	  call_user_func_array($this->action_function,$params);
+	}
   }
 }
 
 class phpmailerException extends Exception {
   public function errorMessage() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
-    return $errorMsg;
+	$errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+	return $errorMsg;
   }
 }
 ?>
\ No newline at end of file

Spacing +250 added lines, -251 removed lines

@@ -38,7 +38,7 @@ 
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+if (version_compare(PHP_VERSION, '5.0.0', '<')) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
 
 class PHPMailer {
 
@@ -50,64 +50,64 @@ 
    * Email priority (1 = High, 3 = Normal, 5 = low).
    * @var int
    */
-  public $Priority          = 3;
+  public $Priority = 3;
 
   /**
    * Sets the CharSet of the message.
    * @var string
    */
-  public $CharSet           = 'utf-8';
+  public $CharSet = 'utf-8';
 
   /**
    * Sets the Content-type of the message.
    * @var string
    */
-  public $ContentType       = 'text/plain';
+  public $ContentType = 'text/plain';
 
   /**
    * Sets the Encoding of the message. Options for this are
    *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
    * @var string
    */
-  public $Encoding          = '8bit';
+  public $Encoding = '8bit';
 
   /**
    * Holds the most recent mailer error message.
    * @var string
    */
-  public $ErrorInfo         = '';
+  public $ErrorInfo = '';
 
   /**
    * Sets the From email address for the message.
    * @var string
    */
-  public $From              = 'root@localhost';
+  public $From = 'root@localhost';
 
   /**
    * Sets the From name of the message.
    * @var string
    */
-  public $FromName          = 'Root User';
+  public $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
    */
-  public $Sender            = '';
+  public $Sender = '';
 
   /**
    * Sets the Subject of the message.
    * @var string
    */
-  public $Subject           = '';
+  public $Subject = '';
 
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.
    * If HTML then run IsHTML(true).
    * @var string
    */
-  public $Body              = '';
+  public $Body = '';
 
   /**
    * Sets the text-only body of the message.  This automatically sets the
@@ -116,39 +116,39 @@ 
    * that can read HTML will view the normal Body.
    * @var string
    */
-  public $AltBody           = '';
+  public $AltBody = '';
 
   /**
    * Sets word wrapping on the body of the message to a given number of
    * characters.
    * @var int
    */
-  public $WordWrap          = 0;
+  public $WordWrap = 0;
 
   /**
    * Method to send mail: ("mail", "sendmail", or "smtp").
    * @var string
    */
-  public $Mailer            = 'mail';
+  public $Mailer = 'mail';
 
   /**
    * Sets the path of the sendmail program.
    * @var string
    */
-  public $Sendmail          = '/usr/sbin/sendmail';
+  public $Sendmail = '/usr/sbin/sendmail';
 
   /**
    * Path to PHPMailer plugins.  Useful if the SMTP class
    * is in a different directory than the PHP include path.
    * @var string
    */
-  public $PluginDir         = '';
+  public $PluginDir = '';
 
   /**
    * Sets the email address that a reading confirmation will be sent.
    * @var string
    */
-  public $ConfirmReadingTo  = '';
+  public $ConfirmReadingTo = '';
 
   /**
    * Sets the hostname to use in Message-Id and Received headers
@@ -156,14 +156,14 @@ 
    * by SERVER_NAME is used or 'localhost.localdomain'.
    * @var string
    */
-  public $Hostname          = '';
+  public $Hostname = '';
 
   /**
    * Sets the message ID to be used in the Message-Id header.
    * If empty, a unique id will be generated.
    * @var string
    */
-  public $MessageID      = '';
+  public $MessageID = '';
 
   /////////////////////////////////////////////////
   // PROPERTIES FOR SMTP
@@ -177,57 +177,57 @@ 
    * Hosts will be tried in order.
    * @var string
    */
-  public $Host        = 'localhost';
+  public $Host = 'localhost';
 
   /**
    * Sets the default SMTP server port.
    * @var int
    */
-  public $Port        = 25;
+  public $Port = 25;
 
   /**
    * Sets the SMTP HELO of the message (Default is $Hostname).
    * @var string
    */
-  public $Helo        = '';
+  public $Helo = '';
 
   /**
    * Sets connection prefix.
    * Options are "", "ssl" or "tls"
    * @var string
    */
-  public $SMTPSecure    = '';
+  public $SMTPSecure = '';
 
   /**
    * Sets SMTP authentication. Utilizes the Username and Password variables.
    * @var bool
    */
-  public $SMTPAuth     = false;
+  public $SMTPAuth = false;
 
   /**
    * Sets SMTP username.
    * @var string
    */
-  public $Username     = '';
+  public $Username = '';
 
   /**
    * Sets SMTP password.
    * @var string
    */
-  public $Password     = '';
+  public $Password = '';
 
   /**
    * Sets the SMTP server timeout in seconds.
    * This function will not work with the win32 version.
    * @var int
    */
-  public $Timeout      = 10;
+  public $Timeout = 10;
 
   /**
    * Sets SMTP class debugging on or off.
    * @var bool
    */
-  public $SMTPDebug    = false;
+  public $SMTPDebug = false;
 
   /**
    * Prevents the SMTP connection from being closed after each mail
@@ -254,34 +254,34 @@ 
    * Provides the ability to change the line ending
    * @var string
    */
-  public $LE              = "\n";
+  public $LE = "\n";
 
   /**
    * Used with DKIM DNS Resource Record
    * @var string
    */
-  public $DKIM_selector   = 'phpmailer';
+  public $DKIM_selector = 'phpmailer';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_identity   = '';
+  public $DKIM_identity = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_domain     = '';
+  public $DKIM_domain = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_private    = '';
+  public $DKIM_private = '';
 
   /**
    * Callback Action function name
@@ -300,7 +300,7 @@ 
    * Sets the PHPMailer Version number
    * @var string
    */
-  public $Version         = '5.1';
+  public $Version = '5.1';
 
   /////////////////////////////////////////////////
   // PROPERTIES, PRIVATE AND PROTECTED
@@ -316,12 +316,12 @@ 
   private $CustomHeader    = array();
   private $message_type    = '';
   private $boundary        = array();
-  protected $language       = array();
+  protected $language = array();
   private $error_count     = 0;
   private $sign_cert_file  = "";
   private $sign_key_file   = "";
   private $sign_key_pass   = "";
-  private   $exceptions     = false;
+  private   $exceptions = false;
 
   /////////////////////////////////////////////////
   // CONSTANTS
@@ -451,13 +451,13 @@ 
    */
   private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      echo 'Invalid recipient array: ' . kind;
+      echo 'Invalid recipient array: '.kind;
       return false;
     }
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -485,11 +485,11 @@ 
  * @param string $name
  * @return boolean
  */
-  public function SetFrom($address, $name = '',$auto=1) {
+  public function SetFrom($address, $name = '', $auto = 1) {
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -522,7 +522,7 @@ 
    */
   public static function ValidateAddress($address) {
     if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+      if (filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
         return false;
       } else {
         return true;
@@ -544,12 +544,12 @@ 
    */
   public function Send() {
     try {
-    if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+    if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
         throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
     }
 
       // Set whether the message is multipart/alternative
-    if(!empty($this->AltBody)) {
+    if (!empty($this->AltBody)) {
       $this->ContentType = 'multipart/alternative';
     }
 
@@ -564,12 +564,12 @@ 
 
       // digitally sign with DKIM if enabled
       if ($this->DKIM_domain && $this->DKIM_private) {
-        $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
-        $header = str_replace("\r\n","\n",$header_dkim) . $header;
+        $header_dkim = $this->DKIM_Add($header, $this->Subject, $body);
+        $header = str_replace("\r\n", "\n", $header_dkim).$header;
     }
 
       // Choose the mailer and send through it
-    switch($this->Mailer) {
+    switch ($this->Mailer) {
       case 'sendmail':
           return $this->SendmailSend($header, $body);
       case 'smtp':
@@ -603,32 +603,32 @@ 
     }
     if ($this->SingleTo === true) {
       foreach ($this->SingleToArray as $key => $val) {
-    if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+    if (!@$mail = popen($sendmail, 'w')) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
     }
-        fputs($mail, "To: " . $val . "\n");
+        fputs($mail, "To: ".$val."\n");
     fputs($mail, $header);
     fputs($mail, $body);
     $result = pclose($mail);
         // implement call back function if it exists
         $isSent = ($result == 0) ? 1 : 0;
-        $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
+        if ($result != 0) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
         }
       }
     } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      if (!@$mail = popen($sendmail, 'w')) {
+        throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
     }
       fputs($mail, $header);
       fputs($mail, $body);
       $result = pclose($mail);
       // implement call back function if it exists
       $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-    if($result != 0) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
+    if ($result != 0) {
+        throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
       }
     }
     return true;
@@ -643,13 +643,13 @@ 
    */
   protected function MailSend($header, $body) {
     $toArr = array();
-    foreach($this->to as $t) {
+    foreach ($this->to as $t) {
       $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
 
     $params = sprintf("-oi -f %s", $this->Sender);
-    if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
+    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) {
@@ -657,13 +657,13 @@ 
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     } else {
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -671,19 +671,19 @@ 
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     }
     if (isset($old_from)) {
       ini_set('sendmail_from', $old_from);
     }
-    if(!$rt) {
+    if (!$rt) {
       throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
     return true;
@@ -699,64 +699,64 @@ 
    * @return bool
    */
   protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'smtp.php';
+    require_once $this->PluginDir.'smtp.php';
     $bad_rcpt = array();
 
-    if(!$this->SmtpConnect()) {
+    if (!$this->SmtpConnect()) {
       throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
     }
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+    if (!$this->smtp->Mail($smtp_from)) {
+      throw new phpmailerException($this->Lang('from_failed').$smtp_from, self::STOP_CRITICAL);
     }
 
     // Attempt to send attach all recipients
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       if (!$this->smtp->Recipient($to[0])) {
         $bad_rcpt[] = $to[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       }
     }
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       if (!$this->smtp->Recipient($cc[0])) {
         $bad_rcpt[] = $cc[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       }
     }
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       if (!$this->smtp->Recipient($bcc[0])) {
         $bad_rcpt[] = $bcc[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       }
     }
 
 
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+    if (count($bad_rcpt) > 0) { //Create error message for any bad addresses
       $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+      throw new phpmailerException($this->Lang('recipients_failed').$badaddresses);
     }
-    if(!$this->smtp->Data($header . $body)) {
+    if (!$this->smtp->Data($header.$body)) {
       throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
     }
-    if($this->SMTPKeepAlive == true) {
+    if ($this->SMTPKeepAlive == true) {
       $this->smtp->Reset();
     }
     return true;
@@ -770,7 +770,7 @@ 
    * @return bool
    */
   public function SmtpConnect() {
-    if(is_null($this->smtp)) {
+    if (is_null($this->smtp)) {
       $this->smtp = new SMTP();
     }
 
@@ -781,7 +781,7 @@ 
 
     // Retry while there is no connection
     try {
-      while($index < count($hosts) && !$connection) {
+      while ($index < count($hosts) && !$connection) {
       $hostinfo = array();
         if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
         $host = $hostinfo[1];
@@ -794,13 +794,13 @@ 
       $tls = ($this->SMTPSecure == 'tls');
       $ssl = ($this->SMTPSecure == 'ssl');
 
-      if($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
+      if ($this->smtp->Connect(($ssl ? 'ssl://' : '').$host, $port, $this->Timeout)) {
 
         $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
         $this->smtp->Hello($hello);
 
-        if($tls) {
-          if(!$this->smtp->StartTLS()) {
+        if ($tls) {
+          if (!$this->smtp->StartTLS()) {
               throw new phpmailerException($this->Lang('tls'));
           }
 
@@ -809,14 +809,14 @@ 
         }
 
         $connection = true;
-        if($this->SMTPAuth) {
-          if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
+        if ($this->SMTPAuth) {
+          if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
               throw new phpmailerException($this->Lang('authenticate'));
           }
         }
       }
       $index++;
-    if(!$connection) {
+    if (!$connection) {
           throw new phpmailerException($this->Lang('connect_host'));
     }
       }
@@ -832,8 +832,8 @@ 
    * @return void
    */
   public function SmtpClose() {
-    if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
+    if (!is_null($this->smtp)) {
+      if ($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
       }
@@ -895,7 +895,7 @@ 
    * @return string
    */
   public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
+    $addr_str = $type.': ';
     $addresses = array();
     foreach ($addr as $a) {
       $addresses[] = $this->AddrFormat($a);
@@ -912,10 +912,10 @@ 
    * @return string
    */
   public function AddrFormat($addr) {
-    if(empty($addr[1])) {
+    if (empty($addr[1])) {
       return $this->SecureHeader($addr[0]);
     } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase')." <".$this->SecureHeader($addr[0]).">";
     }
   }
 
@@ -942,10 +942,10 @@ 
 
     $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;
@@ -961,10 +961,10 @@ 
               }
               $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 = '';
           }
@@ -981,22 +981,22 @@ 
             $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;
@@ -1025,8 +1025,7 @@ 
         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
@@ -1050,11 +1049,11 @@ 
    * @return void
    */
   public function SetWordWrap() {
-    if($this->WordWrap < 1) {
+    if ($this->WordWrap < 1) {
       return;
     }
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
       case 'alt_attachments':
         $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
@@ -1075,24 +1074,24 @@ 
 
     // 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', self::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 ($this->Mailer != 'mail') {
       if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
+        foreach ($this->to as $t) {
           $this->SingleToArray[] = $this->AddrFormat($t);
         }
       } else {
-      if(count($this->to) > 0) {
+      if (count($this->to) > 0) {
         $result .= $this->AddrAppend('To', $this->to);
       } elseif (count($this->cc) == 0) {
         $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
@@ -1106,38 +1105,38 @@ 
     $result .= $this->AddrAppend('From', $from);
 
     // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
+    if (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 '.$this->Version.' (phpmailer.sourceforge.net)');
 
-    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) {
@@ -1155,27 +1154,27 @@ 
    */
   public 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);
         break;
       case 'attachments':
       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;
     }
 
@@ -1196,7 +1195,7 @@ 
 
     $this->SetWordWrap();
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
@@ -1217,11 +1216,11 @@ 
         break;
       case 'alt_attachments':
         $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+        $body .= sprintf("Content-Type: %s;%s"."\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '').$this->LE; // Create text body
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '').$this->LE; // Create the HTML body
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[2]);
@@ -1229,7 +1228,7 @@ 
         break;
     }
 
-    if($this->IsError()) {
+    if ($this->IsError()) {
       $body = '';
     } else if ($this->sign_key_file) {
       try {
@@ -1262,16 +1261,16 @@ 
    */
   private 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);
@@ -1285,7 +1284,7 @@ 
    * @access private
    */
   private function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+    return $this->LE.'--'.$boundary.'--'.$this->LE;
   }
 
   /**
@@ -1294,16 +1293,16 @@ 
    * @return void
    */
   private 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';
       }
     }
@@ -1315,7 +1314,7 @@ 
    * @return string
    */
   public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+    return $name.': '.$value.$this->LE;
   }
 
   /**
@@ -1324,7 +1323,7 @@ 
    * @return string
    */
   public function TextLine($value) {
-    return $value . $this->LE;
+    return $value.$this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1343,11 +1342,11 @@ 
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
-    if(!@is_file($path)) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
+    if (!@is_file($path)) {
+        throw new phpmailerException($this->Lang('file_access').$path, self::STOP_CONTINUE);
     }
     $filename = basename($path);
-    if($name == '') {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -1357,7 +1356,7 @@ 
         2 => $name,
         3 => $encoding,
         4 => $type,
-        5 => false,  // isStringAttachment
+        5 => false, // isStringAttachment
         6 => 'attachment',
         7 => 0
       );
@@ -1368,7 +1367,7 @@ 
         throw $e;
       }
       echo $e->getMessage()."\n";
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
+      if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
       }
     }
@@ -1413,29 +1412,29 @@ 
       $disposition = $attachment[6];
       $cid         = $attachment[7];
       $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+      if ($disposition == 'inline' && isset($cidUniq[$cid])) { continue; }
       $cidUniq[$cid] = true;
 
       $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') {
+      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;
@@ -1459,7 +1458,7 @@ 
   private function EncodeFile($path, $encoding = 'base64') {
     try {
       if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
+        throw new phpmailerException($this->Lang('file_open').$path, self::STOP_CONTINUE);
     }
     if (function_exists('get_magic_quotes')) {
         function get_magic_quotes() {
@@ -1488,9 +1487,9 @@ 
    * @access public
    * @return string
    */
-  public function EncodeString ($str, $encoding = 'base64') {
+  public function EncodeString($str, $encoding = 'base64') {
     $encoded = '';
-    switch(strtolower($encoding)) {
+    switch (strtolower($encoding)) {
       case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
@@ -1508,7 +1507,7 @@ 
         $encoded = $this->EncodeQP($str);
         break;
       default:
-        $this->SetError($this->Lang('encoding') . $encoding);
+        $this->SetError($this->Lang('encoding').$encoding);
         break;
     }
     return $encoded;
@@ -1519,7 +1518,7 @@ 
    * @access public
    * @return string
    */
-  public function EncodeHeader ($str, $position = 'text') {
+  public function EncodeHeader($str, $position = 'text') {
     $x = 0;
 
     switch (strtolower($position)) {
@@ -1550,7 +1549,7 @@ 
 
     $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
@@ -1620,7 +1619,7 @@ 
       }
       while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+      $encoded .= $chunk.$this->LE;
     }
 
     // Chomp the last linefeed
@@ -1636,37 +1635,37 @@ 
   * @param integer $line_max Number of chars allowed on a line before wrapping
   * @return string
   */
-  public function EncodeQPphp( $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');
+  public function EncodeQPphp($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';
           }
         }
@@ -1718,7 +1717,7 @@ 
    * @access public
    * @return string
    */
-  public function EncodeQ ($str, $position = 'text') {
+  public function EncodeQ($str, $position = 'text') {
     // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
 
@@ -1761,7 +1760,7 @@ 
       2 => basename($filename),
       3 => $encoding,
       4 => $type,
-      5 => true,  // isStringAttachment
+      5 => true, // isStringAttachment
       6 => 'attachment',
       7 => 0
     );
@@ -1782,13 +1781,13 @@ 
    */
   public 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;
     }
 
@@ -1799,7 +1798,7 @@ 
       2 => $name,
       3 => $encoding,
       4 => $type,
-      5 => false,  // isStringAttachment
+      5 => false, // isStringAttachment
       6 => 'inline',
       7 => $cid
     );
@@ -1813,7 +1812,7 @@ 
    * @return bool
    */
   public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
+    foreach ($this->attachment as $attachment) {
       if ($attachment[6] == 'inline') {
         return true;
       }
@@ -1830,7 +1829,7 @@ 
    * @return void
    */
   public function ClearAddresses() {
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
@@ -1841,7 +1840,7 @@ 
    * @return void
    */
   public function ClearCCs() {
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
@@ -1852,7 +1851,7 @@ 
    * @return void
    */
   public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
@@ -1909,7 +1908,7 @@ 
     if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
       $lasterror = $this->smtp->getError();
       if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+        $msg .= '<p>'.$this->Lang('smtp_error').$lasterror['smtp_msg']."</p>\n";
       }
     }
     $this->ErrorInfo = $msg;
@@ -1925,7 +1924,7 @@ 
     $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;
@@ -1954,14 +1953,14 @@ 
    * @return string
    */
   private 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;
     }
   }
 
@@ -2000,21 +1999,21 @@ 
    * @access public
    * @return $message
    */
-  public function MsgHTML($message,$basedir='') {
+  public 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]+://#',$url)) {
+        if (!preg_match('#^[A-z]+://#', $url)) {
           $filename = basename($url);
           $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
+          ($directory == '.') ? $directory = '' : '';
+          $cid = 'cid:'.md5($filename);
           $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_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) ) {
+          $mimeType = self::_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);
           }
         }
@@ -2022,12 +2021,12 @@ 
     }
     $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 it in a program that understands HTML!' . "\n\n";
+    if (empty($this->AltBody)) {
+      $this->AltBody = 'To view this email message, open it in a program that understands HTML!'."\n\n";
     }
   }
 
@@ -2128,7 +2127,7 @@ 
       'xl'    =>  'application/excel',
       'eml'   =>  'message/rfc822'
     );
-    return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
+    return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
   }
 
   /**
@@ -2143,12 +2142,12 @@ 
    * NOTE: will not work with arrays, there are no arrays to set/reset
   * @todo Should this not be using __set() magic function?
    */
-  public function set ( $name, $value = '' ) {
+  public function set($name, $value = '') {
     try {
-    if ( isset($this->$name) ) {
+    if (isset($this->$name)) {
       $this->$name = $value;
     } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('variable_set').$name, self::STOP_CRITICAL);
   }
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
@@ -2192,14 +2191,14 @@ 
    * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
-    $tmp="";
-    $line="";
-    for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-        $line.=$txt[$i];
+    $tmp = "";
+    $line = "";
+    for ($i = 0; $i < strlen($txt); $i++) {
+      $ord = ord($txt[$i]);
+      if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+        $line .= $txt[$i];
       } else {
-        $line.="=".sprintf("%02X",$ord);
+        $line .= "=".sprintf("%02X", $ord);
       }
     }
     return $line;
@@ -2213,8 +2212,8 @@ 
    */
   public function DKIM_Sign($s) {
     $privKeyStr = file_get_contents($this->DKIM_private);
-    if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+    if ($this->DKIM_passphrase != '') {
+      $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
     } else {
       $privKey = $privKeyStr;
     }
@@ -2230,15 +2229,15 @@ 
    * @param string $s Header
    */
   public function DKIM_HeaderC($s) {
-    $s=preg_replace("/\r\n\s+/"," ",$s);
-    $lines=explode("\r\n",$s);
+    $s = preg_replace("/\r\n\s+/", " ", $s);
+    $lines = explode("\r\n", $s);
     foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+      list($heading, $value) = explode(":", $line, 2);
+      $heading = strtolower($heading);
+      $value = preg_replace("/\s+/", " ", $value); // Compress useless spaces
+      $lines[$key] = $heading.":".trim($value); // Don't forget to remove WSP around the value
     }
-    $s=implode("\r\n",$lines);
+    $s = implode("\r\n", $lines);
     return $s;
   }
 
@@ -2251,11 +2250,11 @@ 
   public function DKIM_BodyC($body) {
     if ($body == '') return "\r\n";
     // stabilize line endings
-    $body=str_replace("\r\n","\n",$body);
-    $body=str_replace("\n","\r\n",$body);
+    $body = str_replace("\r\n", "\n", $body);
+    $body = str_replace("\n", "\r\n", $body);
     // END stabilize line endings
-    while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
+    while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+      $body = substr($body, 0, strlen($body) - 2);
     }
     return $body;
   }
@@ -2268,52 +2267,52 @@ 
    * @param string $subject Subject
    * @param string $body Body
    */
-  public function DKIM_Add($headers_line,$subject,$body) {
+  public function DKIM_Add($headers_line, $subject, $body) {
     $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
     $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
     $DKIMquery            = 'dns/txt'; // Query method
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+    $DKIMtime             = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
     $subject_header       = "Subject: $subject";
-    $headers              = explode("\r\n",$headers_line);
-    foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
-        $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
-        $to_header=$header;
+    $headers              = explode("\r\n", $headers_line);
+    foreach ($headers as $header) {
+      if (strpos($header, 'From:') === 0) {
+        $from_header = $header;
+      } elseif (strpos($header, 'To:') === 0) {
+        $to_header = $header;
       }
     }
-    $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
-    $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
-    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+    $from     = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+    $to       = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+    $subject  = str_replace('|', '=7C', $this->DKIM_QP($subject_header)); // Copied header fields (dkim-quoted-printable
     $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+    $DKIMlen  = strlen($body); // Length of body
+    $DKIMb64  = base64_encode(pack("H*", sha1($body))); // Base64 of packed binary SHA-1 hash of body
+    $ident    = ($this->DKIM_identity == '') ? '' : " i=".$this->DKIM_identity.";";
+    $dkimhdrs = "DKIM-Signature: v=1; a=".$DKIMsignatureType."; q=".$DKIMquery."; l=".$DKIMlen."; s=".$this->DKIM_selector.";\r\n".
+                "\tt=".$DKIMtime."; c=".$DKIMcanonicalization.";\r\n".
                 "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+                "\td=".$this->DKIM_domain.";".$ident."\r\n".
                 "\tz=$from\r\n".
                 "\t|$to\r\n".
                 "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
+                "\tbh=".$DKIMb64.";\r\n".
                 "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+    $toSign   = $this->DKIM_HeaderC($from_header."\r\n".$to_header."\r\n".$subject_header."\r\n".$dkimhdrs);
     $signed   = $this->DKIM_Sign($toSign);
     return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
   }
 
-  protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
+  protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body) {
     if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
+      $params = array($isSent, $to, $cc, $bcc, $subject, $body);
+      call_user_func_array($this->action_function, $params);
     }
   }
 }
 
 class phpmailerException extends Exception {
   public function errorMessage() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+    $errorMsg = '<strong>'.$this->getMessage()."</strong><br />\n";
     return $errorMsg;
   }
 }

libs/phpmailer/smtp.php

Doc Comments +7 added lines

@@ -107,6 +107,7 @@ 
    * SMTP CODE SUCCESS: 220
    * SMTP CODE FAILURE: 421
    * @access public
+   * @param string $host
    * @return bool
    */
   public function Connect($host,$port=0,$tval=30) {
@@ -205,6 +206,8 @@ 
    * Performs SMTP authentication.  Must be run after running the
    * Hello() method.  Returns true if successfully authenticated.
    * @access public
+   * @param string $username
+   * @param string $password
    * @return bool
    */
   public function Authenticate($username, $password) {
@@ -321,6 +324,7 @@ 
    * SMTP CODE FAILURE: 451,554
    * SMTP CODE ERROR  : 500,501,503,421
    * @access public
+   * @param string $msg_data
    * @return bool
    */
   public function Data($msg_data) {
@@ -489,6 +493,8 @@ 
   /**
    * Sends a HELO/EHLO command.
    * @access private
+   * @param string $hello
+   * @param string $host
    * @return bool
    */
   private function SendHello($hello, $host) {
@@ -529,6 +535,7 @@ 
    * SMTP CODE SUCCESS: 552,451,452
    * SMTP CODE SUCCESS: 500,501,421
    * @access public
+   * @param string $from
    * @return bool
    */
   public function Mail($from) {

Indentation +470 added lines, -470 removed lines

@@ -85,11 +85,11 @@ 
    * @return void
    */
   public function __construct() {
-    $this->smtp_conn = 0;
-    $this->error = null;
-    $this->helo_rply = null;
+	$this->smtp_conn = 0;
+	$this->error = null;
+	$this->helo_rply = null;
 
-    $this->do_debug = 0;
+	$this->do_debug = 0;
   }
 
   /////////////////////////////////////////////////
@@ -110,50 +110,50 @@ 
    * @return bool
    */
   public function Connect($host,$port=0,$tval=30) {
-    // set the error val to null so there is no confusion
-    $this->error = null;
-
-    // make sure we are __not__ connected
-    if($this->connected()) {
-      // already connected, generate error
-      $this->error = array("error" => "Already connected to a server");
-      return false;
-    }
-
-    if(empty($port)) {
-      $port = $this->SMTP_PORT;
-    }
-
-    // connect to the smtp server
-    $this->smtp_conn = @fsockopen($host,    // the host of the server
-                                 $port,    // the port to use
-                                 $errno,   // error number if any
-                                 $errstr,  // error message if any
-                                 $tval);   // give up after ? secs
-    // verify we connected properly
-    if(empty($this->smtp_conn)) {
-      $this->error = array("error" => "Failed to connect to server",
-                           "errno" => $errno,
-                           "errstr" => $errstr);
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // SMTP server can take longer to respond, give longer timeout for first read
-    // Windows does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
-     socket_set_timeout($this->smtp_conn, $tval, 0);
-
-    // get any announcement
-    $announce = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
-    }
-
-    return true;
+	// set the error val to null so there is no confusion
+	$this->error = null;
+
+	// make sure we are __not__ connected
+	if($this->connected()) {
+	  // already connected, generate error
+	  $this->error = array("error" => "Already connected to a server");
+	  return false;
+	}
+
+	if(empty($port)) {
+	  $port = $this->SMTP_PORT;
+	}
+
+	// connect to the smtp server
+	$this->smtp_conn = @fsockopen($host,    // the host of the server
+								 $port,    // the port to use
+								 $errno,   // error number if any
+								 $errstr,  // error message if any
+								 $tval);   // give up after ? secs
+	// verify we connected properly
+	if(empty($this->smtp_conn)) {
+	  $this->error = array("error" => "Failed to connect to server",
+						   "errno" => $errno,
+						   "errstr" => $errstr);
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	// SMTP server can take longer to respond, give longer timeout for first read
+	// Windows does not have support for this timeout function
+	if(substr(PHP_OS, 0, 3) != "WIN")
+	 socket_set_timeout($this->smtp_conn, $tval, 0);
+
+	// get any announcement
+	$announce = $this->get_lines();
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
+	}
+
+	return true;
   }
 
   /**
@@ -166,39 +166,39 @@ 
    * @return bool success
    */
   public function StartTLS() {
-    $this->error = null; # to avoid confusion
-
-    if(!$this->connected()) {
-      $this->error = array("error" => "Called StartTLS() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 220) {
-      $this->error =
-         array("error"     => "STARTTLS not accepted from server",
-               "smtp_code" => $code,
-               "smtp_msg"  => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    //Begin encrypted connection
-    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-      return false;
-    }
-
-    return true;
+	$this->error = null; # to avoid confusion
+
+	if(!$this->connected()) {
+	  $this->error = array("error" => "Called StartTLS() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 220) {
+	  $this->error =
+		 array("error"     => "STARTTLS not accepted from server",
+			   "smtp_code" => $code,
+			   "smtp_msg"  => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	//Begin encrypted connection
+	if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -208,58 +208,58 @@ 
    * @return bool
    */
   public function Authenticate($username, $password) {
-    // Start authentication
-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 334) {
-      $this->error =
-        array("error" => "AUTH not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // Send encoded username
-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 334) {
-      $this->error =
-        array("error" => "Username not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // Send encoded password
-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 235) {
-      $this->error =
-        array("error" => "Password not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    return true;
+	// Start authentication
+	fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 334) {
+	  $this->error =
+		array("error" => "AUTH not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	// Send encoded username
+	fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 334) {
+	  $this->error =
+		array("error" => "Username not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	// Send encoded password
+	fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 235) {
+	  $this->error =
+		array("error" => "Password not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -268,19 +268,19 @@ 
    * @return bool
    */
   public function Connected() {
-    if(!empty($this->smtp_conn)) {
-      $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
-        // the socket is valid but we are not connected
-        if($this->do_debug >= 1) {
-            echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
-        }
-        $this->Close();
-        return false;
-      }
-      return true; // everything looks good
-    }
-    return false;
+	if(!empty($this->smtp_conn)) {
+	  $sock_status = socket_get_status($this->smtp_conn);
+	  if($sock_status["eof"]) {
+		// the socket is valid but we are not connected
+		if($this->do_debug >= 1) {
+			echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
+		}
+		$this->Close();
+		return false;
+	  }
+	  return true; // everything looks good
+	}
+	return false;
   }
 
   /**
@@ -291,13 +291,13 @@ 
    * @return void
    */
   public function Close() {
-    $this->error = null; // so there is no confusion
-    $this->helo_rply = null;
-    if(!empty($this->smtp_conn)) {
-      // close the connection and cleanup
-      fclose($this->smtp_conn);
-      $this->smtp_conn = 0;
-    }
+	$this->error = null; // so there is no confusion
+	$this->helo_rply = null;
+	if(!empty($this->smtp_conn)) {
+	  // close the connection and cleanup
+	  fclose($this->smtp_conn);
+	  $this->smtp_conn = 0;
+	}
   }
 
   /////////////////////////////////////////////////
@@ -324,35 +324,35 @@ 
    * @return bool
    */
   public function Data($msg_data) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Data() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"DATA" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 354) {
-      $this->error =
-        array("error" => "DATA command not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    /* the server is ready to accept data!
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Data() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"DATA" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 354) {
+	  $this->error =
+		array("error" => "DATA command not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	/* the server is ready to accept data!
      * according to rfc 821 we should not send more than 1000
      * including the CRLF
      * characters on a single line so we will break the data up
@@ -363,12 +363,12 @@ 
      * line. NOTE: this does not count towards limit.
      */
 
-    // normalize the line breaks so we know the explode works
-    $msg_data = str_replace("\r\n","\n",$msg_data);
-    $msg_data = str_replace("\r","\n",$msg_data);
-    $lines = explode("\n",$msg_data);
+	// normalize the line breaks so we know the explode works
+	$msg_data = str_replace("\r\n","\n",$msg_data);
+	$msg_data = str_replace("\r","\n",$msg_data);
+	$lines = explode("\n",$msg_data);
 
-    /* we need to find a good way to determine is headers are
+	/* we need to find a good way to determine is headers are
      * in the msg_data or if it is a straight msg body
      * currently I am assuming rfc 822 definitions of msg headers
      * and if the first field of the first line (':' sperated)
@@ -377,76 +377,76 @@ 
      * headers.
      */
 
-    $field = substr($lines[0],0,strpos($lines[0],":"));
-    $in_headers = false;
-    if(!empty($field) && !strstr($field," ")) {
-      $in_headers = true;
-    }
-
-    $max_line_length = 998; // used below; set here for ease in change
-
-    while(list(,$line) = @each($lines)) {
-      $lines_out = null;
-      if($line == "" && $in_headers) {
-        $in_headers = false;
-      }
-      // ok we need to break this line up into several smaller lines
-      while(strlen($line) > $max_line_length) {
-        $pos = strrpos(substr($line,0,$max_line_length)," ");
-
-        // Patch to fix DOS attack
-        if(!$pos) {
-          $pos = $max_line_length - 1;
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos);
-        } else {
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos + 1);
-        }
-
-        /* if we are processing headers we need to
+	$field = substr($lines[0],0,strpos($lines[0],":"));
+	$in_headers = false;
+	if(!empty($field) && !strstr($field," ")) {
+	  $in_headers = true;
+	}
+
+	$max_line_length = 998; // used below; set here for ease in change
+
+	while(list(,$line) = @each($lines)) {
+	  $lines_out = null;
+	  if($line == "" && $in_headers) {
+		$in_headers = false;
+	  }
+	  // ok we need to break this line up into several smaller lines
+	  while(strlen($line) > $max_line_length) {
+		$pos = strrpos(substr($line,0,$max_line_length)," ");
+
+		// Patch to fix DOS attack
+		if(!$pos) {
+		  $pos = $max_line_length - 1;
+		  $lines_out[] = substr($line,0,$pos);
+		  $line = substr($line,$pos);
+		} else {
+		  $lines_out[] = substr($line,0,$pos);
+		  $line = substr($line,$pos + 1);
+		}
+
+		/* if we are processing headers we need to
          * add a LWSP-char to the front of the new line
          * rfc 822 on long msg headers
          */
-        if($in_headers) {
-          $line = "\t" . $line;
-        }
-      }
-      $lines_out[] = $line;
-
-      // send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
-        if(strlen($line_out) > 0)
-        {
-          if(substr($line_out, 0, 1) == ".") {
-            $line_out = "." . $line_out;
-          }
-        }
-        fputs($this->smtp_conn,$line_out . $this->CRLF);
-      }
-    }
-
-    // message data has been sent
-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "DATA not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
+		if($in_headers) {
+		  $line = "\t" . $line;
+		}
+	  }
+	  $lines_out[] = $line;
+
+	  // send the lines to the server
+	  while(list(,$line_out) = @each($lines_out)) {
+		if(strlen($line_out) > 0)
+		{
+		  if(substr($line_out, 0, 1) == ".") {
+			$line_out = "." . $line_out;
+		  }
+		}
+		fputs($this->smtp_conn,$line_out . $this->CRLF);
+	  }
+	}
+
+	// message data has been sent
+	fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "DATA not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -462,28 +462,28 @@ 
    * @return bool
    */
   public function Hello($host = '') {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-            "error" => "Called Hello() without being connected");
-      return false;
-    }
-
-    // if hostname for HELO was not specified send default
-    if(empty($host)) {
-      // determine appropriate default to send to server
-      $host = "localhost";
-    }
-
-    // Send extended hello first (RFC 2821)
-    if(!$this->SendHello("EHLO", $host)) {
-      if(!$this->SendHello("HELO", $host)) {
-          return false;
-    }
-    }
-
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			"error" => "Called Hello() without being connected");
+	  return false;
+	}
+
+	// if hostname for HELO was not specified send default
+	if(empty($host)) {
+	  // determine appropriate default to send to server
+	  $host = "localhost";
+	}
+
+	// Send extended hello first (RFC 2821)
+	if(!$this->SendHello("EHLO", $host)) {
+	  if(!$this->SendHello("HELO", $host)) {
+		  return false;
+	}
+	}
+
+	return true;
   }
 
   /**
@@ -492,29 +492,29 @@ 
    * @return bool
    */
   private function SendHello($hello, $host) {
-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
+	fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
 
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
-    }
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
+	}
 
-    if($code != 250) {
-      $this->error =
-        array("error" => $hello . " not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
+	if($code != 250) {
+	  $this->error =
+		array("error" => $hello . " not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
 
-    $this->helo_rply = $rply;
+	$this->helo_rply = $rply;
 
-    return true;
+	return true;
   }
 
   /**
@@ -532,35 +532,35 @@ 
    * @return bool
    */
   public function Mail($from) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Mail() without being connected");
-      return false;
-    }
-
-    $useVerp = ($this->do_verp ? "XVERP" : "");
-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "MAIL not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Mail() without being connected");
+	  return false;
+	}
+
+	$useVerp = ($this->do_verp ? "XVERP" : "");
+	fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "MAIL not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -575,44 +575,44 @@ 
    * @return bool
    */
   public function Quit($close_on_error=true) {
-    $this->error = null; // so there is no confusion
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Quit() without being connected");
-      return false;
-    }
-
-    // send the quit command to the server
-    fputs($this->smtp_conn,"quit" . $this->CRLF);
-
-    // get any good-bye messages
-    $byemsg = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
-    }
-
-    $rval = true;
-    $e = null;
-
-    $code = substr($byemsg,0,3);
-    if($code != 221) {
-      // use e as a tmp var cause Close will overwrite $this->error
-      $e = array("error" => "SMTP server rejected quit command",
-                 "smtp_code" => $code,
-                 "smtp_rply" => substr($byemsg,4));
-      $rval = false;
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
-      }
-    }
-
-    if(empty($e) || $close_on_error) {
-      $this->Close();
-    }
-
-    return $rval;
+	$this->error = null; // so there is no confusion
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Quit() without being connected");
+	  return false;
+	}
+
+	// send the quit command to the server
+	fputs($this->smtp_conn,"quit" . $this->CRLF);
+
+	// get any good-bye messages
+	$byemsg = $this->get_lines();
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
+	}
+
+	$rval = true;
+	$e = null;
+
+	$code = substr($byemsg,0,3);
+	if($code != 221) {
+	  // use e as a tmp var cause Close will overwrite $this->error
+	  $e = array("error" => "SMTP server rejected quit command",
+				 "smtp_code" => $code,
+				 "smtp_rply" => substr($byemsg,4));
+	  $rval = false;
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
+	  }
+	}
+
+	if(empty($e) || $close_on_error) {
+	  $this->Close();
+	}
+
+	return $rval;
   }
 
   /**
@@ -628,34 +628,34 @@ 
    * @return bool
    */
   public function Recipient($to) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Recipient() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250 && $code != 251) {
-      $this->error =
-        array("error" => "RCPT not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Recipient() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250 && $code != 251) {
+	  $this->error =
+		array("error" => "RCPT not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -671,35 +671,35 @@ 
    * @return bool
    */
   public function Reset() {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Reset() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RSET" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "RSET failed",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Reset() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"RSET" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "RSET failed",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -719,34 +719,34 @@ 
    * @return bool
    */
   public function SendAndMail($from) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-          "error" => "Called SendAndMail() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "SAML not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+		  "error" => "Called SendAndMail() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "SAML not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -763,22 +763,22 @@ 
    * @return bool
    */
   public function Turn() {
-    $this->error = array("error" => "This method, TURN, of the SMTP ".
-                                    "is not implemented");
-    if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
-    }
-    return false;
+	$this->error = array("error" => "This method, TURN, of the SMTP ".
+									"is not implemented");
+	if($this->do_debug >= 1) {
+	  echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
+	}
+	return false;
   }
 
   /**
-  * Get the current error
+   * Get the current error
    * @access public
-  * @return array
+   * @return array
    */
   public function getError() {
-    return $this->error;
-    }
+	return $this->error;
+	}
 
   /////////////////////////////////////////////////
   // INTERNAL FUNCTIONS
@@ -794,20 +794,20 @@ 
    * @return string
    */
   private function get_lines() {
-    $data = "";
-    while($str = @fgets($this->smtp_conn,515)) {
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
-        echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
-      }
-      $data .= $str;
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
-      }
-      // if 4th character is a space, we are done reading, break the loop
-      if(substr($str,3,1) == " ") { break; }
-    }
-    return $data;
+	$data = "";
+	while($str = @fgets($this->smtp_conn,515)) {
+	  if($this->do_debug >= 4) {
+		echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
+		echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
+	  }
+	  $data .= $str;
+	  if($this->do_debug >= 4) {
+		echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
+	  }
+	  // if 4th character is a space, we are done reading, break the loop
+	  if(substr($str,3,1) == " ") { break; }
+	}
+	return $data;
   }
 
 }

Braces +3 added lines, -2 removed lines

@@ -143,8 +143,9 @@
 
     // SMTP server can take longer to respond, give longer timeout for first read
     // Windows does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
-     socket_set_timeout($this->smtp_conn, $tval, 0);
+    if(substr(PHP_OS, 0, 3) != "WIN") {
+         socket_set_timeout($this->smtp_conn, $tval, 0);
+    }
 
     // get any announcement
     $announce = $this->get_lines();

Spacing +158 added lines, -158 removed lines

@@ -63,7 +63,7 @@ 
    *  Sets whether debugging is turned on
    *  @var bool
    */
-  public $do_debug;       // the level of debug to perform
+  public $do_debug; // the level of debug to perform
 
   /**
    *  Sets VERP use on/off (default is off)
@@ -75,9 +75,9 @@ 
   // PROPERTIES, PRIVATE AND PROTECTED
   /////////////////////////////////////////////////
 
-  private $smtp_conn;      // the socket to the server
-  private $error;          // error if any on the last call
-  private $helo_rply;      // the reply the server sent to us for HELO
+  private $smtp_conn; // the socket to the server
+  private $error; // error if any on the last call
+  private $helo_rply; // the reply the server sent to us for HELO
 
   /**
    * Initialize the class so that the data is in a known state.
@@ -109,48 +109,48 @@ 
    * @access public
    * @return bool
    */
-  public function Connect($host,$port=0,$tval=30) {
+  public function Connect($host, $port = 0, $tval = 30) {
     // set the error val to null so there is no confusion
     $this->error = null;
 
     // make sure we are __not__ connected
-    if($this->connected()) {
+    if ($this->connected()) {
       // already connected, generate error
       $this->error = array("error" => "Already connected to a server");
       return false;
     }
 
-    if(empty($port)) {
+    if (empty($port)) {
       $port = $this->SMTP_PORT;
     }
 
     // connect to the smtp server
-    $this->smtp_conn = @fsockopen($host,    // the host of the server
-                                 $port,    // the port to use
-                                 $errno,   // error number if any
-                                 $errstr,  // error message if any
-                                 $tval);   // give up after ? secs
+    $this->smtp_conn = @fsockopen($host, // the host of the server
+                                 $port, // the port to use
+                                 $errno, // error number if any
+                                 $errstr, // error message if any
+                                 $tval); // give up after ? secs
     // verify we connected properly
-    if(empty($this->smtp_conn)) {
+    if (empty($this->smtp_conn)) {
       $this->error = array("error" => "Failed to connect to server",
                            "errno" => $errno,
                            "errstr" => $errstr);
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": $errstr ($errno)".$this->CRLF.'<br />';
       }
       return false;
     }
 
     // SMTP server can take longer to respond, give longer timeout for first read
     // Windows does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
+    if (substr(PHP_OS, 0, 3) != "WIN")
      socket_set_timeout($this->smtp_conn, $tval, 0);
 
     // get any announcement
     $announce = $this->get_lines();
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$announce.$this->CRLF.'<br />';
     }
 
     return true;
@@ -168,33 +168,33 @@ 
   public function StartTLS() {
     $this->error = null; # to avoid confusion
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array("error" => "Called StartTLS() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
+    fputs($this->smtp_conn, "STARTTLS".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 220) {
+    if ($code != 220) {
       $this->error =
          array("error"     => "STARTTLS not accepted from server",
                "smtp_code" => $code,
-               "smtp_msg"  => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+               "smtp_msg"  => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
 
     //Begin encrypted connection
-    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+    if (!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
       return false;
     }
 
@@ -209,52 +209,52 @@ 
    */
   public function Authenticate($username, $password) {
     // Start authentication
-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+    fputs($this->smtp_conn, "AUTH LOGIN".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 334) {
+    if ($code != 334) {
       $this->error =
         array("error" => "AUTH not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
 
     // Send encoded username
-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+    fputs($this->smtp_conn, base64_encode($username).$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 334) {
+    if ($code != 334) {
       $this->error =
         array("error" => "Username not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
 
     // Send encoded password
-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
+    fputs($this->smtp_conn, base64_encode($password).$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 235) {
+    if ($code != 235) {
       $this->error =
         array("error" => "Password not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -268,12 +268,12 @@ 
    * @return bool
    */
   public function Connected() {
-    if(!empty($this->smtp_conn)) {
+    if (!empty($this->smtp_conn)) {
       $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
+      if ($sock_status["eof"]) {
         // the socket is valid but we are not connected
-        if($this->do_debug >= 1) {
-            echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
+        if ($this->do_debug >= 1) {
+            echo "SMTP -> NOTICE:".$this->CRLF."EOF caught while checking if connected";
         }
         $this->Close();
         return false;
@@ -293,7 +293,7 @@ 
   public function Close() {
     $this->error = null; // so there is no confusion
     $this->helo_rply = null;
-    if(!empty($this->smtp_conn)) {
+    if (!empty($this->smtp_conn)) {
       // close the connection and cleanup
       fclose($this->smtp_conn);
       $this->smtp_conn = 0;
@@ -326,28 +326,28 @@ 
   public function Data($msg_data) {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Data() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"DATA" . $this->CRLF);
+    fputs($this->smtp_conn, "DATA".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 354) {
+    if ($code != 354) {
       $this->error =
         array("error" => "DATA command not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -364,9 +364,9 @@ 
      */
 
     // normalize the line breaks so we know the explode works
-    $msg_data = str_replace("\r\n","\n",$msg_data);
-    $msg_data = str_replace("\r","\n",$msg_data);
-    $lines = explode("\n",$msg_data);
+    $msg_data = str_replace("\r\n", "\n", $msg_data);
+    $msg_data = str_replace("\r", "\n", $msg_data);
+    $lines = explode("\n", $msg_data);
 
     /* we need to find a good way to determine is headers are
      * in the msg_data or if it is a straight msg body
@@ -377,72 +377,72 @@ 
      * headers.
      */
 
-    $field = substr($lines[0],0,strpos($lines[0],":"));
+    $field = substr($lines[0], 0, strpos($lines[0], ":"));
     $in_headers = false;
-    if(!empty($field) && !strstr($field," ")) {
+    if (!empty($field) && !strstr($field, " ")) {
       $in_headers = true;
     }
 
     $max_line_length = 998; // used below; set here for ease in change
 
-    while(list(,$line) = @each($lines)) {
+    while (list(,$line) = @each($lines)) {
       $lines_out = null;
-      if($line == "" && $in_headers) {
+      if ($line == "" && $in_headers) {
         $in_headers = false;
       }
       // ok we need to break this line up into several smaller lines
-      while(strlen($line) > $max_line_length) {
-        $pos = strrpos(substr($line,0,$max_line_length)," ");
+      while (strlen($line) > $max_line_length) {
+        $pos = strrpos(substr($line, 0, $max_line_length), " ");
 
         // Patch to fix DOS attack
-        if(!$pos) {
+        if (!$pos) {
           $pos = $max_line_length - 1;
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos);
+          $lines_out[] = substr($line, 0, $pos);
+          $line = substr($line, $pos);
         } else {
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos + 1);
+          $lines_out[] = substr($line, 0, $pos);
+          $line = substr($line, $pos + 1);
         }
 
         /* if we are processing headers we need to
          * add a LWSP-char to the front of the new line
          * rfc 822 on long msg headers
          */
-        if($in_headers) {
-          $line = "\t" . $line;
+        if ($in_headers) {
+          $line = "\t".$line;
         }
       }
       $lines_out[] = $line;
 
       // send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
-        if(strlen($line_out) > 0)
+      while (list(,$line_out) = @each($lines_out)) {
+        if (strlen($line_out) > 0)
         {
-          if(substr($line_out, 0, 1) == ".") {
-            $line_out = "." . $line_out;
+          if (substr($line_out, 0, 1) == ".") {
+            $line_out = ".".$line_out;
           }
         }
-        fputs($this->smtp_conn,$line_out . $this->CRLF);
+        fputs($this->smtp_conn, $line_out.$this->CRLF);
       }
     }
 
     // message data has been sent
-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+    fputs($this->smtp_conn, $this->CRLF.".".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "DATA not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -464,21 +464,21 @@ 
   public function Hello($host = '') {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
             "error" => "Called Hello() without being connected");
       return false;
     }
 
     // if hostname for HELO was not specified send default
-    if(empty($host)) {
+    if (empty($host)) {
       // determine appropriate default to send to server
       $host = "localhost";
     }
 
     // Send extended hello first (RFC 2821)
-    if(!$this->SendHello("EHLO", $host)) {
-      if(!$this->SendHello("HELO", $host)) {
+    if (!$this->SendHello("EHLO", $host)) {
+      if (!$this->SendHello("HELO", $host)) {
           return false;
     }
     }
@@ -492,22 +492,22 @@ 
    * @return bool
    */
   private function SendHello($hello, $host) {
-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
+    fputs($this->smtp_conn, $hello." ".$host.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER: ".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
-        array("error" => $hello . " not accepted from server",
+        array("error" => $hello." not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -534,29 +534,29 @@ 
   public function Mail($from) {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Mail() without being connected");
       return false;
     }
 
     $useVerp = ($this->do_verp ? "XVERP" : "");
-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
+    fputs($this->smtp_conn, "MAIL FROM:<".$from.">".$useVerp.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "MAIL not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -574,41 +574,41 @@ 
    * @access public
    * @return bool
    */
-  public function Quit($close_on_error=true) {
+  public function Quit($close_on_error = true) {
     $this->error = null; // so there is no confusion
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Quit() without being connected");
       return false;
     }
 
     // send the quit command to the server
-    fputs($this->smtp_conn,"quit" . $this->CRLF);
+    fputs($this->smtp_conn, "quit".$this->CRLF);
 
     // get any good-bye messages
     $byemsg = $this->get_lines();
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$byemsg.$this->CRLF.'<br />';
     }
 
     $rval = true;
     $e = null;
 
-    $code = substr($byemsg,0,3);
-    if($code != 221) {
+    $code = substr($byemsg, 0, 3);
+    if ($code != 221) {
       // use e as a tmp var cause Close will overwrite $this->error
       $e = array("error" => "SMTP server rejected quit command",
                  "smtp_code" => $code,
-                 "smtp_rply" => substr($byemsg,4));
+                 "smtp_rply" => substr($byemsg, 4));
       $rval = false;
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$e["error"].": ".$byemsg.$this->CRLF.'<br />';
       }
     }
 
-    if(empty($e) || $close_on_error) {
+    if (empty($e) || $close_on_error) {
       $this->Close();
     }
 
@@ -630,28 +630,28 @@ 
   public function Recipient($to) {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Recipient() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+    fputs($this->smtp_conn, "RCPT TO:<".$to.">".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250 && $code != 251) {
+    if ($code != 250 && $code != 251) {
       $this->error =
         array("error" => "RCPT not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -673,28 +673,28 @@ 
   public function Reset() {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Reset() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"RSET" . $this->CRLF);
+    fputs($this->smtp_conn, "RSET".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "RSET failed",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -721,28 +721,28 @@ 
   public function SendAndMail($from) {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
           "error" => "Called SendAndMail() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+    fputs($this->smtp_conn, "SAML FROM:".$from.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "SAML not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -765,8 +765,8 @@ 
   public function Turn() {
     $this->error = array("error" => "This method, TURN, of the SMTP ".
                                     "is not implemented");
-    if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
+    if ($this->do_debug >= 1) {
+      echo "SMTP -> NOTICE: ".$this->error["error"].$this->CRLF.'<br />';
     }
     return false;
   }
@@ -795,17 +795,17 @@ 
    */
   private function get_lines() {
     $data = "";
-    while($str = @fgets($this->smtp_conn,515)) {
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
-        echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
+    while ($str = @fgets($this->smtp_conn, 515)) {
+      if ($this->do_debug >= 4) {
+        echo "SMTP -> get_lines(): \$data was \"$data\"".$this->CRLF.'<br />';
+        echo "SMTP -> get_lines(): \$str is \"$str\"".$this->CRLF.'<br />';
       }
       $data .= $str;
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
+      if ($this->do_debug >= 4) {
+        echo "SMTP -> get_lines(): \$data is \"$data\"".$this->CRLF.'<br />';
       }
       // if 4th character is a space, we are done reading, break the loop
-      if(substr($str,3,1) == " ") { break; }
+      if (substr($str, 3, 1) == " ") { break; }
     }
     return $data;
   }