xpressengine / xe-core

classes/context/Context.class.php

Braces +79 added lines, -91 removed lines

@@ -227,7 +227,9 @@ 
 		$this->loadDBInfo();
 		if($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if(is_array($this->db_info->sitelock_whitelist)) {
+				$whitelist = $this->db_info->sitelock_whitelist;
+			}
 
 			if(!IpFilter::filter($whitelist))
 			{
@@ -242,8 +244,7 @@ 
 				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
-				}
-				else
+				} else
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.html';
 				}
@@ -300,8 +301,7 @@ 
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/');
 			}
-		}
-		elseif($_COOKIE['lang_type'])
+		} elseif($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
@@ -338,7 +338,9 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if($sess = $_POST[session_name()]) {
+			session_id($sess);
+		}
 		session_start();
 
 		// set authentication information in Context and session
@@ -391,22 +393,21 @@ 
 						{
 							$url[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif($val)
+					} elseif($val)
 					{
 						$url[] = $key . '=' . urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
-			}
-			else
+				if($url) {
+					$current_url .= '?' . join('&', $url);
+				}
+			} else
 			{
 				$current_url = $this->getUrl();
 			}
-		}
-		else
+		} else
 		{
 			$current_url = self::getRequestUri();
 		}
@@ -491,18 +492,22 @@ 
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
-			$db_info->time_zone = date('O');
+		if(!$db_info->time_zone) {
+					$db_info->time_zone = date('O');
+		}
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
-			$db_info->qmail_compatibility = 'N';
+		if($db_info->qmail_compatibility != 'Y') {
+					$db_info->qmail_compatibility = 'N';
+		}
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
-			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
-			$db_info->use_ssl = 'none';
+		if(!$db_info->use_db_session) {
+					$db_info->use_db_session = 'N';
+		}
+		if(!$db_info->use_ssl) {
+					$db_info->use_ssl = 'none';
+		}
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
@@ -619,8 +624,7 @@ 
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
 				$lang_selected = self::loadLangSupported();
-			}
-			else
+			} else
 			{
 				$langs = file($selected_lang_file);
 				foreach($langs as $val)
@@ -689,8 +693,7 @@ 
 				return FALSE;
 			}
 			// for sites requesting SSO validation
-		}
-		else
+		} else
 		{
 			// result handling : set session_name()
 			if($session_name = self::get('SSOID'))
@@ -701,8 +704,7 @@ 
 				header('location:' . $url);
 				return FALSE;
 				// send SSO request
-			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			} else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()), 0, '/');
 				$url = sprintf("%s?default_url=%s", $default_url, base64_encode(self::getRequestUrl()));
@@ -760,8 +762,7 @@ 
 		if($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
-		}
-		else
+		} else
 		{
 			$self->site_title = $site_title;
 		}
@@ -861,8 +862,7 @@ 
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
-		}
-		else
+		} else
 		{
 			$self->_evalxmlLang($path);
 		}
@@ -878,7 +878,9 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$_path = 'eval://' . $path;
 
@@ -910,7 +912,9 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
@@ -924,7 +928,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if(substr_compare($path, '/', -1) !== 0)
 		{
@@ -1060,12 +1066,14 @@ 
 		static $flag = TRUE;
 		if($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
-			else $flag = FALSE;
-		}
-		else
+			if(is_array($val)) {
+							array_walk($val,'Context::checkConvertFlag',$charset);
+			} else if($val && iconv($charset,$charset,$val)!=$val) {
+				$flag = FALSE;
+			} else {
+				$flag = FALSE;
+			}
+		} else
 		{
 			$return = $flag;
 			$flag = TRUE;
@@ -1087,8 +1095,9 @@ 
 		if (is_array($val))
 		{
 			array_walk($val,'Context::doConvertEncoding',$charset);
+		} else {
+			$val = iconv($charset,'UTF-8',$val);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
 	}
 
 	/**
@@ -1099,7 +1108,9 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if(!$str) {
+        	return null;
+        }
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1212,16 +1223,13 @@ 
 			if($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			} elseif($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			} elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
-			}
-			else
+			} else
 			{
 				$set_to_vars = FALSE;
 			}
@@ -1247,8 +1255,7 @@ 
 					return;
 				}
 			}
-		}
-		else if(is_array($val))
+		} else if(is_array($val))
 		{
 			foreach($val as $val2)
 			{
@@ -1388,16 +1395,13 @@ 
 			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
-			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			} elseif($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
-			}
-			elseif($key === 'vid')
+			} elseif($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
-			}
-			else
+			} else
 			{
 				$result[$k] = $v;
 
@@ -1451,8 +1455,7 @@ 
 				$val['name'] = htmlspecialchars($val['name'], ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 				$this->set($key, $val, TRUE);
 				$this->is_uploaded = TRUE;
-			}
-			else
+			} else
 			{
 				for($i = 0, $c = count($tmp_name); $i < $c; $i++)
 				{
@@ -1558,8 +1561,7 @@ 
 			if($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
-			}
-			else
+			} else
 			{
 				$domain = $site_module_info->domain;
 			}
@@ -1576,8 +1578,7 @@ 
 			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
 			{
 				unset($domain);
-			}
-			else
+			} else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
 				if(substr_compare($domain, '/', -1) !== 0)
@@ -1597,8 +1598,7 @@ 
 			{
 				array_shift($args_list);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
@@ -1625,8 +1625,7 @@ 
 		if($vid)
 		{
 			$get_vars['vid'] = $vid;
-		}
-		else
+		} else
 		{
 			unset($get_vars['vid']);
 		}
@@ -1698,8 +1697,7 @@ 
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif(!is_array($val))
+					} elseif(!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
@@ -1717,25 +1715,23 @@ 
 		{
 			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			// optional SSL use
-		}
-		elseif($_use_ssl == 'optional')
+		} elseif($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
 			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
 			// no SSL
-		}
-		else
+		} else
 		{
 			// currently on SSL but target is not based on SSL
 			if($_SERVER['HTTPS'] == 'on')
 			{
 				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
-			}
-			else if($domain) // if $domain is set
+			} else if($domain) {
+				// if $domain is set
 			{
 				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
 			}
-			else
+			} else
 			{
 				$query = getScriptPath() . $query;
 			}
@@ -1792,8 +1788,7 @@ 
 		if($domain)
 		{
 			$domain_key = md5($domain);
-		}
-		else
+		} else
 		{
 			$domain_key = 'default';
 		}
@@ -1822,8 +1817,7 @@ 
 			{
 				$target_url.= '/';
 			}
-		}
-		else
+		} else
 		{
 			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
 		}
@@ -1841,20 +1835,17 @@ 
 			if($port && $port != 443)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 443)
+			} elseif($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
-		}
-		else
+		} else
 		{
 			$port = self::get('_http_port');
 			if($port && $port != 80)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 80)
+			} elseif($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
@@ -2090,8 +2081,7 @@ 
 		if(strpos($file, './') === 0)
 		{
 			$file = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($file, 2);
-		}
-		elseif(strpos($file, '../') === 0)
+		} elseif(strpos($file, '../') === 0)
 		{
 			$file = self::normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$file}");
 		}
@@ -2353,8 +2343,7 @@ 
 			if(substr_compare($filename, '.js', -3) === 0)
 			{
 				$result->jsList[] = $plugin_path . $filename;
-			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			} elseif(substr_compare($filename, '.css', -4) === 0)
 			{
 				$result->cssList[] = $plugin_path . $filename;
 			}
@@ -2611,8 +2600,7 @@ 
 			if(count($_base) > 0)
 			{
 				array_shift($_base);
-			}
-			else
+			} else
 			{
 				array_unshift($_base, '..');
 			}

Spacing +237 added lines, -237 removed lines

@@ -162,7 +162,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance = null;
-		if(!$theInstance)
+		if (!$theInstance)
 		{
 			$theInstance = new Context();
 		}
@@ -182,10 +182,10 @@ 
 
 		// include ssl action cache file
 		$this->sslActionCacheFile = FileHandler::getRealPath($this->sslActionCacheFile);
-		if(is_readable($this->sslActionCacheFile))
+		if (is_readable($this->sslActionCacheFile))
 		{
 			require($this->sslActionCacheFile);
-			if(isset($sslActions))
+			if (isset($sslActions))
 			{
 				$this->ssl_actions = $sslActions;
 			}
@@ -201,12 +201,12 @@ 
 	function init()
 	{
 		// fix missing HTTP_RAW_POST_DATA in PHP 5.6 and above
-		if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
+		if (!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
 		{
 			$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
 			
 			// If content is not XML JSON, unset
-			if(!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
+			if (!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
 			{
 				unset($GLOBALS['HTTP_RAW_POST_DATA']);
 			}
@@ -228,11 +228,11 @@ 
 		$this->_setUploadedArgument();
 
 		$this->loadDBInfo();
-		if($this->db_info->use_sitelock == 'Y')
+		if ($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if (is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
 
-			if(!IpFilter::filter($whitelist))
+			if (!IpFilter::filter($whitelist))
 			{
 				$title = ($this->db_info->sitelock_title) ? $this->db_info->sitelock_title : 'Maintenance in progress...';
 				$message = $this->db_info->sitelock_message;
@@ -242,7 +242,7 @@ 
 				define('_XE_SITELOCK_MESSAGE_', $message);
 
 				header("HTTP/1.1 403 Forbidden");
-				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
+				if (FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
 				}
@@ -255,39 +255,39 @@ 
 		}
 
 		// If XE is installed, get virtual site information
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$site_module_info = $oModuleModel->getDefaultMid();
 
-			if(!isset($site_module_info))
+			if (!isset($site_module_info))
 			{
 				$site_module_info = new stdClass();
 			}
 
 			// if site_srl of site_module_info is 0 (default site), compare the domain to default_url of db_config
-			if($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
+			if ($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
 			{
 				$site_module_info->domain = $this->db_info->default_url;
 			}
 
 			$this->set('site_module_info', $site_module_info);
-			if($site_module_info->site_srl && isSiteID($site_module_info->domain))
+			if ($site_module_info->site_srl && isSiteID($site_module_info->domain))
 			{
 				$this->set('vid', $site_module_info->domain, TRUE);
 			}
 
-			if(!isset($this->db_info))
+			if (!isset($this->db_info))
 			{
 				$this->db_info = new stdClass();
 			}
 
 			$this->db_info->lang_type = $site_module_info->default_language;
-			if(!$this->db_info->lang_type)
+			if (!$this->db_info->lang_type)
 			{
 				$this->db_info->lang_type = 'en';
 			}
-			if(!$this->db_info->use_db_session)
+			if (!$this->db_info->use_db_session)
 			{
 				$this->db_info->use_db_session = 'N';
 			}
@@ -297,30 +297,30 @@ 
 		$lang_supported = $this->loadLangSelected();
 
 		// Retrieve language type set in user's cookie
-		if($this->lang_type = $this->get('l'))
+		if ($this->lang_type = $this->get('l'))
 		{
-			if($_COOKIE['lang_type'] != $this->lang_type)
+			if ($_COOKIE['lang_type'] != $this->lang_type)
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/');
 			}
 		}
-		elseif($_COOKIE['lang_type'])
+		elseif ($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
 
 		// If it's not exists, follow default language type set in db_info
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = $this->db_info->lang_type;
 		}
 
 		// if still lang_type has not been set or has not-supported type , set as English.
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = 'en';
 		}
-		if(is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
+		if (is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
 		{
 			$this->lang_type = 'en';
 		}
@@ -332,7 +332,7 @@ 
 		$this->loadLang(_XE_PATH_ . 'modules/module/lang');
 
 		// set session handler
-		if(self::isInstalled() && $this->db_info->use_db_session == 'Y')
+		if (self::isInstalled() && $this->db_info->use_db_session == 'Y')
 		{
 			$oSessionModel = getModel('session');
 			$oSessionController = getController('session');
@@ -341,11 +341,11 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if ($sess = $_POST[session_name()]) session_id($sess);
 		session_start();
 
 		// set authentication information in Context and session
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$oModuleModel->loadModuleExtends();
@@ -353,15 +353,15 @@ 
 			$oMemberModel = getModel('member');
 			$oMemberController = getController('member');
 
-			if($oMemberController && $oMemberModel)
+			if ($oMemberController && $oMemberModel)
 			{
 				// if signed in, validate it.
-				if($oMemberModel->isLogged())
+				if ($oMemberModel->isLogged())
 				{
 					$oMemberController->setSessionInfo();
 				}
 				// check auto sign-in
-				elseif($_COOKIE['xeak'])
+				elseif ($_COOKIE['xeak'])
 				{
 					$oMemberController->doAutologin();
 				}
@@ -381,28 +381,28 @@ 
 		// set locations for javascript use
 		$url = array();
 		$current_url = self::getRequestUri();
-		if($_SERVER['REQUEST_METHOD'] == 'GET')
+		if ($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
-			if($this->get_vars)
+			if ($this->get_vars)
 			{
 				$url = array();
-				foreach($this->get_vars as $key => $val)
+				foreach ($this->get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
 							$url[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
 					}
-					elseif($val)
+					elseif ($val)
 					{
 						$url[] = $key . '=' . urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
+				if ($url) $current_url .= '?' . join('&', $url);
 			}
 			else
 			{
@@ -417,12 +417,12 @@ 
 		$this->set('current_url', $current_url);
 		$this->set('request_uri', self::getRequestUri());
 
-		if(strpos($current_url, 'xn--') !== FALSE)
+		if (strpos($current_url, 'xn--') !== FALSE)
 		{
 			$this->set('current_url', self::decodeIdna($current_url));
 		}
 
-		if(strpos(self::getRequestUri(), 'xn--') !== FALSE)
+		if (strpos(self::getRequestUri(), 'xn--') !== FALSE)
 		{
 			$this->set('request_uri', self::decodeIdna(self::getRequestUri()));
 		}
@@ -447,19 +447,19 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!$self->isInstalled())
+		if (!$self->isInstalled())
 		{
 			return;
 		}
 
 		$config_file = $self->getConfigFile();
-		if(is_readable($config_file))
+		if (is_readable($config_file))
 		{
 			include($config_file);
 		}
 
 		// If master_db information does not exist, the config file needs to be updated
-		if(!isset($db_info->master_db))
+		if (!isset($db_info->master_db))
 		{
 			$db_info->master_db = array();
 			$db_info->master_db["db_type"] = $db_info->db_type;
@@ -477,7 +477,7 @@ 
 			$db_info->master_db["db_table_prefix"] = $db_info->db_table_prefix;
 			unset($db_info->db_table_prefix);
 
-			if(isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
+			if (isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
 			{
 				$db_info->master_db["db_table_prefix"] .= '_';
 			}
@@ -489,33 +489,33 @@ 
 			$oInstallController->makeConfigFile();
 		}
 
-		if(!$db_info->use_prepared_statements)
+		if (!$db_info->use_prepared_statements)
 		{
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
+		if (!$db_info->time_zone)
 			$db_info->time_zone = date('O');
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
+		if ($db_info->qmail_compatibility != 'Y')
 			$db_info->qmail_compatibility = 'N';
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
+		if (!$db_info->use_db_session)
 			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
+		if (!$db_info->use_ssl)
 			$db_info->use_ssl = 'none';
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
 		$self->set('_https_port', ($db_info->https_port) ? $db_info->https_port : NULL);
 
-		if(!$db_info->sitelock_whitelist) {
+		if (!$db_info->sitelock_whitelist) {
 			$db_info->sitelock_whitelist = '127.0.0.1';
 		}
 
-		if(is_string($db_info->sitelock_whitelist)) {
+		if (is_string($db_info->sitelock_whitelist)) {
 			$db_info->sitelock_whitelist = explode(',', $db_info->sitelock_whitelist);
 		}
 
@@ -586,10 +586,10 @@ 
 	function loadLangSupported()
 	{
 		static $lang_supported = null;
-		if(!$lang_supported)
+		if (!$lang_supported)
 		{
 			$langs = file(_XE_PATH_ . 'common/lang/lang.info');
-			foreach($langs as $val)
+			foreach ($langs as $val)
 			{
 				list($lang_prefix, $lang_text) = explode(',', $val);
 				$lang_text = trim($lang_text);
@@ -607,17 +607,17 @@ 
 	function loadLangSelected()
 	{
 		static $lang_selected = null;
-		if(!$lang_selected)
+		if (!$lang_selected)
 		{
 			$orig_lang_file = _XE_PATH_ . 'common/lang/lang.info';
 			$selected_lang_file = _XE_PATH_ . 'files/config/lang_selected.info';
-			if(!FileHandler::hasContent($selected_lang_file))
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
 				$old_selected_lang_file = _XE_PATH_ . 'files/cache/lang_selected.info';
 				FileHandler::moveFile($old_selected_lang_file, $selected_lang_file);
 			}
 
-			if(!FileHandler::hasContent($selected_lang_file))
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
@@ -626,7 +626,7 @@ 
 			else
 			{
 				$langs = file($selected_lang_file);
-				foreach($langs as $val)
+				foreach ($langs as $val)
 				{
 					list($lang_prefix, $lang_text) = explode(',', $val);
 					$lang_text = trim($lang_text);
@@ -645,32 +645,32 @@ 
 	function checkSSO()
 	{
 		// pass if it's not GET request or XE is not yet installed
-		if($this->db_info->use_sso != 'Y' || isCrawler())
+		if ($this->db_info->use_sso != 'Y' || isCrawler())
 		{
 			return TRUE;
 		}
 		$checkActList = array('rss' => 1, 'atom' => 1);
-		if(self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
+		if (self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
 		{
 			return TRUE;
 		}
 
 		// pass if default URL is not set
 		$default_url = trim($this->db_info->default_url);
-		if(!$default_url)
+		if (!$default_url)
 		{
 			return TRUE;
 		}
 
-		if(substr_compare($default_url, '/', -1) !== 0)
+		if (substr_compare($default_url, '/', -1) !== 0)
 		{
 			$default_url .= '/';
 		}
 
 		// for sites recieving SSO valdiation
-		if($default_url == self::getRequestUri())
+		if ($default_url == self::getRequestUri())
 		{
-			if(self::get('default_url'))
+			if (self::get('default_url'))
 			{
 				$url = base64_decode(self::get('default_url'));
 				$url_info = parse_url($url);
@@ -678,14 +678,14 @@ 
 				$oModuleModel = getModel('module');
 				$target_domain = (stripos($url, $default_url) !== 0) ? $url_info['host'] : $default_url;
 				$site_info = $oModuleModel->getSiteInfoByDomain($target_domain);
-				if(!$site_info->site_srl) {
+				if (!$site_info->site_srl) {
 					$oModuleObject = new ModuleObject();
 					$oModuleObject->stop('msg_invalid_request');
 
 					return false;
 				}
 
-				$url_info['query'].= ($url_info['query'] ? '&' : '') . 'SSOID=' . session_id();
+				$url_info['query'] .= ($url_info['query'] ? '&' : '') . 'SSOID=' . session_id();
 				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':' . $url_info['port'] : '', $url_info['path'], $url_info['query']);
 				header('location:' . $redirect_url);
 
@@ -696,7 +696,7 @@ 
 		else
 		{
 			// result handling : set session_name()
-			if($session_name = self::get('SSOID'))
+			if ($session_name = self::get('SSOID'))
 			{
 				setcookie(session_name(), $session_name);
 
@@ -705,7 +705,7 @@ 
 				return FALSE;
 				// send SSO request
 			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			else if (!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()), 0, '/');
 				$url = sprintf("%s?default_url=%s", $default_url, base64_encode(self::getRequestUrl()));
@@ -736,7 +736,7 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!$self->isFTPRegisted())
+		if (!$self->isFTPRegisted())
 		{
 			return null;
 		}
@@ -754,13 +754,13 @@ 
 	 */
 	function addBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if($self->site_title)
+		if ($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
 		}
@@ -778,7 +778,7 @@ 
 	 */
 	function setBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
@@ -810,7 +810,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
 
-		if(isset($moduleConfig->siteTitle))
+		if (isset($moduleConfig->siteTitle))
 		{
 			return $moduleConfig->siteTitle;
 		}
@@ -837,30 +837,30 @@ 
 		global $lang;
 
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
-		if(!$self->lang_type)
+		if (!$self->lang_type)
 		{
 			return;
 		}
-		if(!is_object($lang))
+		if (!is_object($lang))
 		{
 			$lang = new stdClass;
 		}
 
-		if(!($filename = $self->_loadXmlLang($path)))
+		if (!($filename = $self->_loadXmlLang($path)))
 		{
 			$filename = $self->_loadPhpLang($path);
 		}
 
-		if(!is_array($self->loaded_lang_files))
+		if (!is_array($self->loaded_lang_files))
 		{
 			$self->loaded_lang_files = array();
 		}
-		if(in_array($filename, $self->loaded_lang_files))
+		if (in_array($filename, $self->loaded_lang_files))
 		{
 			return;
 		}
 
-		if($filename && is_readable($filename))
+		if ($filename && is_readable($filename))
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
@@ -881,16 +881,16 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if (!$path) return;
 
 		$_path = 'eval://' . $path;
 
-		if(in_array($_path, $this->loaded_lang_files))
+		if (in_array($_path, $this->loaded_lang_files))
 		{
 			return;
 		}
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -898,7 +898,7 @@ 
 		$oXmlLangParser = new XmlLangParser($path . 'lang.xml', $this->lang_type);
 		$content = $oXmlLangParser->getCompileContent();
 
-		if($content)
+		if ($content)
 		{
 			$this->loaded_lang_files[] = $_path;
 			eval($content);
@@ -913,7 +913,7 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
 		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
@@ -927,9 +927,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -937,12 +937,12 @@ 
 		$file = sprintf($path_tpl, $this->lang_type);
 
 		$langs = array('ko', 'en'); // this will be configurable.
-		while(!is_readable($file) && $langs[0])
+		while (!is_readable($file) && $langs[0])
 		{
 			$file = sprintf($path_tpl, array_shift($langs));
 		}
 
-		if(!is_readable($file))
+		if (!is_readable($file))
 		{
 			return FALSE;
 		}
@@ -984,11 +984,11 @@ 
 	 */
 	function getLang($code)
 	{
-		if(!$code)
+		if (!$code)
 		{
 			return;
 		}
-		if($GLOBALS['lang']->{$code})
+		if ($GLOBALS['lang']->{$code})
 		{
 			return $GLOBALS['lang']->{$code};
 		}
@@ -1004,7 +1004,7 @@ 
 	 */
 	function setLang($code, $val)
 	{
-		if(!isset($GLOBALS['lang']))
+		if (!isset($GLOBALS['lang']))
 		{
 			$GLOBALS['lang'] = new stdClass();
 		}
@@ -1032,17 +1032,17 @@ 
 
 		$obj = clone $source_obj;
 
-		foreach($charset_list as $charset)
+		foreach ($charset_list as $charset)
 		{
-			array_walk($obj,'Context::checkConvertFlag',$charset);
+			array_walk($obj, 'Context::checkConvertFlag', $charset);
 			$flag = self::checkConvertFlag($flag = TRUE);
-			if($flag)
+			if ($flag)
 			{
-				if($charset == 'UTF-8')
+				if ($charset == 'UTF-8')
 				{
 					return $obj;
 				}
-				array_walk($obj,'Context::doConvertEncoding',$charset);
+				array_walk($obj, 'Context::doConvertEncoding', $charset);
 				return $obj;
 			}
 		}
@@ -1061,11 +1061,11 @@ 
 	function checkConvertFlag(&$val, $key = null, $charset = null)
 	{
 		static $flag = TRUE;
-		if($charset)
+		if ($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
+			if (is_array($val))
+				array_walk($val, 'Context::checkConvertFlag', $charset);
+			else if ($val && iconv($charset, $charset, $val) != $val) $flag = FALSE;
 			else $flag = FALSE;
 		}
 		else
@@ -1089,9 +1089,9 @@ 
 	{
 		if (is_array($val))
 		{
-			array_walk($val,'Context::doConvertEncoding',$charset);
+			array_walk($val, 'Context::doConvertEncoding', $charset);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
+		else $val = iconv($charset, 'UTF-8', $val);
 	}
 
 	/**
@@ -1102,7 +1102,7 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if (!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1111,7 +1111,7 @@ 
 
 	function decodeIdna($domain)
 	{
-		if(strpos($domain, 'xn--') !== FALSE)
+		if (strpos($domain, 'xn--') !== FALSE)
 		{
 			require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
 			$IDN = new idna_convert(array('idn_version' => 2008));
@@ -1144,7 +1144,7 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if($self->response_method)
+		if ($self->response_method)
 		{
 			return $self->response_method;
 		}
@@ -1184,7 +1184,7 @@ 
 		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
 
 		$pattern = "/[\,\"\'\{\}\[\]\(\);$]/";
-		if(preg_match($pattern, $_SERVER['HTTP_HOST']))
+		if (preg_match($pattern, $_SERVER['HTTP_HOST']))
 		{
 			$this->isSuccessInit = FALSE;
 		}
@@ -1197,30 +1197,30 @@ 
 	 */
 	function _setRequestArgument()
 	{
-		if(!count($_REQUEST))
+		if (!count($_REQUEST))
 		{
 			return;
 		}
 
 		$requestMethod = $this->getRequestMethod();
-		foreach($_REQUEST as $key => $val)
+		foreach ($_REQUEST as $key => $val)
 		{
-			if($val === '' || self::get($key))
+			if ($val === '' || self::get($key))
 			{
 				continue;
 			}
 			$key = htmlentities($key);
 			$val = $this->_filterRequestVar($key, $val);
 
-			if($requestMethod == 'GET' && isset($_GET[$key]))
+			if ($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			elseif ($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			elseif ($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
 			}
@@ -1229,7 +1229,7 @@ 
 				$set_to_vars = FALSE;
 			}
 
-			if($set_to_vars)
+			if ($set_to_vars)
 			{
 				$this->_recursiveCheckVar($val);
 			}
@@ -1240,20 +1240,20 @@ 
 
 	function _recursiveCheckVar($val)
 	{
-		if(is_string($val))
+		if (is_string($val))
 		{
-			foreach($this->patterns as $pattern)
+			foreach ($this->patterns as $pattern)
 			{
-				if(preg_match($pattern, $val))
+				if (preg_match($pattern, $val))
 				{
 					$this->isSuccessInit = FALSE;
 					return;
 				}
 			}
 		}
-		else if(is_array($val))
+		else if (is_array($val))
 		{
-			foreach($val as $val2)
+			foreach ($val as $val2)
 			{
 				$this->_recursiveCheckVar($val2);
 			}
@@ -1267,7 +1267,7 @@ 
 	 */
 	function _setJSONRequestArgument()
 	{
-		if($this->getRequestMethod() != 'JSON')
+		if ($this->getRequestMethod() != 'JSON')
 		{
 			return;
 		}
@@ -1275,7 +1275,7 @@ 
 		$params = array();
 		parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $params);
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterRequestVar($key, $val, 1), TRUE);
 		}
@@ -1288,13 +1288,13 @@ 
 	 */
 	function _setXmlRpcArgument()
 	{
-		if($this->getRequestMethod() != 'XMLRPC')
+		if ($this->getRequestMethod() != 'XMLRPC')
 		{
 			return;
 		}
 
 		$xml = $GLOBALS['HTTP_RAW_POST_DATA'];
-		if(Security::detectingXEE($xml))
+		if (Security::detectingXEE($xml))
 		{
 			header("HTTP/1.0 400 Bad Request");
 			exit;
@@ -1306,12 +1306,12 @@ 
 		$params = $xml_obj->methodcall->params;
 		unset($params->node_name, $params->attrs, $params->body);
 
-		if(!count(get_object_vars($params)))
+		if (!count(get_object_vars($params)))
 		{
 			return;
 		}
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterXmlVars($key, $val), TRUE);
 		}
@@ -1326,10 +1326,10 @@ 
 	 */
 	function _filterXmlVars($key, $val)
 	{
-		if(is_array($val))
+		if (is_array($val))
 		{
 			$stack = array();
-			foreach($val as $k => $v)
+			foreach ($val as $k => $v)
 			{
 				$stack[$k] = $this->_filterXmlVars($k, $v);
 			}
@@ -1339,20 +1339,20 @@ 
 
 		$body = $val->body;
 		unset($val->node_name, $val->attrs, $val->body);
-		if(!count(get_object_vars($val)))
+		if (!count(get_object_vars($val)))
 		{
 			return $this->_filterRequestVar($key, $body, 0);
 		}
 
 		$stack = new stdClass();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$output = $this->_filterXmlVars($k, $v);
-			if(is_object($v) && $v->attrs->type == 'array')
+			if (is_object($v) && $v->attrs->type == 'array')
 			{
 				$output = array($output);
 			}
-			if($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
+			if ($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
 			{
 				return $output;
 			}
@@ -1360,7 +1360,7 @@ 
 			$stack->{$k} = $output;
 		}
 
-		if(!count(get_object_vars($stack)))
+		if (!count(get_object_vars($stack)))
 		{
 			return NULL;
 		}
@@ -1379,24 +1379,24 @@ 
 	 */
 	function _filterRequestVar($key, $val, $do_stripslashes = 1)
 	{
-		if(!($isArray = is_array($val)))
+		if (!($isArray = is_array($val)))
 		{
 			$val = array($val);
 		}
 
 		$result = array();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$k = htmlentities($k);
-			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
+			if ($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
 			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			elseif ($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
-			elseif($key === 'vid')
+			elseif ($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
 			}
@@ -1404,12 +1404,12 @@ 
 			{
 				$result[$k] = $v;
 
-				if($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
+				if ($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
 				{
 					$result[$k] = stripslashes($result[$k]);
 				}
 
-				if(!is_array($result[$k]))
+				if (!is_array($result[$k]))
 				{
 					$result[$k] = trim($result[$k]);
 				}
@@ -1437,17 +1437,17 @@ 
 	 */
 	function _setUploadedArgument()
 	{
-		if($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
+		if ($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
 		{
 			return;
 		}
 
-		foreach($_FILES as $key => $val)
+		foreach ($_FILES as $key => $val)
 		{
 			$tmp_name = $val['tmp_name'];
-			if(!is_array($tmp_name))
+			if (!is_array($tmp_name))
 			{
-				if(!$tmp_name || !is_uploaded_file($tmp_name))
+				if (!$tmp_name || !is_uploaded_file($tmp_name))
 				{
 					continue;
 				}
@@ -1457,9 +1457,9 @@ 
 			}
 			else
 			{
-				for($i = 0, $c = count($tmp_name); $i < $c; $i++)
+				for ($i = 0, $c = count($tmp_name); $i < $c; $i++)
 				{
-					if($val['size'][$i] > 0)
+					if ($val['size'][$i] > 0)
 					{
 						$file['name'] = $val['name'][$i];
 						$file['type'] = $val['type'][$i];
@@ -1491,12 +1491,12 @@ 
 	function getRequestUrl()
 	{
 		static $url = null;
-		if(is_null($url))
+		if (is_null($url))
 		{
 			$url = self::getRequestUri();
-			if(count($_GET) > 0)
+			if (count($_GET) > 0)
 			{
-				foreach($_GET as $key => $val)
+				foreach ($_GET as $key => $val)
 				{
 					$vars[] = $key . '=' . ($val ? urlencode(self::convertEncodingStr($val)) : '');
 				}
@@ -1515,7 +1515,7 @@ 
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 		$js_callback_func = isset($_GET['xe_js_callback']) ? $_GET['xe_js_callback'] : $_POST['xe_js_callback'];
 
-		if(!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
+		if (!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
 		{
 			unset($js_callback_func);
 			unset($_GET['xe_js_callback']);
@@ -1543,22 +1543,22 @@ 
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
 		// retrieve virtual site information
-		if(is_null($site_module_info))
+		if (is_null($site_module_info))
 		{
 			$site_module_info = self::get('site_module_info');
 		}
 
 		// If $domain is set, handle it (if $domain is vid type, remove $domain and handle with $vid)
-		if($domain && isSiteID($domain))
+		if ($domain && isSiteID($domain))
 		{
 			$vid = $domain;
 			$domain = '';
 		}
 
 		// If $domain, $vid are not set, use current site information
-		if(!$domain && !$vid)
+		if (!$domain && !$vid)
 		{
-			if($site_module_info->domain && isSiteID($site_module_info->domain))
+			if ($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
 			}
@@ -1569,21 +1569,21 @@ 
 		}
 
 		// if $domain is set, compare current URL. If they are same, remove the domain, otherwise link to the domain.
-		if($domain)
+		if ($domain)
 		{
 			$domain_info = parse_url($domain);
-			if(is_null($current_info))
+			if (is_null($current_info))
 			{
 				$current_info = parse_url(($_SERVER['HTTPS'] == 'on' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . getScriptPath());
 			}
-			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
+			if ($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
 			{
 				unset($domain);
 			}
 			else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
-				if(substr_compare($domain, '/', -1) !== 0)
+				if (substr_compare($domain, '/', -1) !== 0)
 				{
 					$domain .= '/';
 				}
@@ -1593,10 +1593,10 @@ 
 		$get_vars = array();
 
 		// If there is no GET variables or first argument is '' to reset variables
-		if(!$self->get_vars || $args_list[0] == '')
+		if (!$self->get_vars || $args_list[0] == '')
 		{
 			// rearrange args_list
-			if(is_array($args_list) && $args_list[0] == '')
+			if (is_array($args_list) && $args_list[0] == '')
 			{
 				array_shift($args_list);
 			}
@@ -1608,13 +1608,13 @@ 
 		}
 
 		// arrange args_list
-		for($i = 0, $c = count($args_list); $i < $c; $i += 2)
+		for ($i = 0, $c = count($args_list); $i < $c; $i += 2)
 		{
 			$key = $args_list[$i];
 			$val = trim($args_list[$i + 1]);
 
 			// If value is not set, remove the key
-			if(!isset($val) || !strlen($val))
+			if (!isset($val) || !strlen($val))
 			{
 				unset($get_vars[$key]);
 				continue;
@@ -1625,7 +1625,7 @@ 
 
 		// remove vid, rnd
 		unset($get_vars['rnd']);
-		if($vid)
+		if ($vid)
 		{
 			$get_vars['vid'] = $vid;
 		}
@@ -1642,17 +1642,17 @@ 
 			'dispDocumentAdminManageDocument' => 'dispDocumentManageDocument',
 			'dispModuleAdminSelectList' => 'dispModuleSelectList'
 		);
-		if($act_alias[$act])
+		if ($act_alias[$act])
 		{
 			$get_vars['act'] = $act_alias[$act];
 		}
 
 		// organize URL
 		$query = '';
-		if(count($get_vars) > 0)
+		if (count($get_vars) > 0)
 		{
 			// if using rewrite mod
-			if($self->allow_rewrite)
+			if ($self->allow_rewrite)
 			{
 				$var_keys = array_keys($get_vars);
 				sort($var_keys);
@@ -1690,24 +1690,24 @@ 
 				$query = $target_map[$target];
 			}
 
-			if(!$query)
+			if (!$query)
 			{
 				$queries = array();
-				foreach($get_vars as $key => $val)
+				foreach ($get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
 					}
-					elseif(!is_array($val))
+					elseif (!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
 				}
-				if(count($queries) > 0)
+				if (count($queries) > 0)
 				{
 					$query = 'index.php?' . join('&', $queries);
 				}
@@ -1716,12 +1716,12 @@ 
 
 		// If using SSL always
 		$_use_ssl = $self->get('_use_ssl');
-		if($_use_ssl == 'always')
+		if ($_use_ssl == 'always')
 		{
 			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			// optional SSL use
 		}
-		elseif($_use_ssl == 'optional')
+		elseif ($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
 			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
@@ -1730,11 +1730,11 @@ 
 		else
 		{
 			// currently on SSL but target is not based on SSL
-			if($_SERVER['HTTPS'] == 'on')
+			if ($_SERVER['HTTPS'] == 'on')
 			{
 				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			}
-			else if($domain) // if $domain is set
+			else if ($domain) // if $domain is set
 			{
 				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
 			}
@@ -1744,12 +1744,12 @@ 
 			}
 		}
 
-		if(!$encode)
+		if (!$encode)
 		{
 			return $query;
 		}
 
-		if(!$autoEncode)
+		if (!$autoEncode)
 		{
 			return htmlspecialchars($query, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 		}
@@ -1758,9 +1758,9 @@ 
 		$encode_queries = array();
 		$parsedUrl = parse_url($query);
 		parse_str($parsedUrl['query'], $output);
-		foreach($output as $key => $value)
+		foreach ($output as $key => $value)
 		{
-			if(preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
+			if (preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
 			{
 				$value = urlencode(htmlspecialchars_decode(urldecode($value)));
 			}
@@ -1782,17 +1782,17 @@ 
 		static $url = array();
 
 		// Check HTTP Request
-		if(!isset($_SERVER['SERVER_PROTOCOL']))
+		if (!isset($_SERVER['SERVER_PROTOCOL']))
 		{
 			return;
 		}
 
-		if(self::get('_use_ssl') == 'always')
+		if (self::get('_use_ssl') == 'always')
 		{
 			$ssl_mode = ENFORCE_SSL;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$domain_key = md5($domain);
 		}
@@ -1801,14 +1801,14 @@ 
 			$domain_key = 'default';
 		}
 
-		if(isset($url[$ssl_mode][$domain_key]))
+		if (isset($url[$ssl_mode][$domain_key]))
 		{
 			return $url[$ssl_mode][$domain_key];
 		}
 
 		$current_use_ssl = ($_SERVER['HTTPS'] == 'on');
 
-		switch($ssl_mode)
+		switch ($ssl_mode)
 		{
 			case FOLLOW_REQUEST_SSL: $use_ssl = $current_use_ssl;
 				break;
@@ -1818,12 +1818,12 @@ 
 				break;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$target_url = trim($domain);
-			if(substr_compare($target_url, '/', -1) !== 0)
+			if (substr_compare($target_url, '/', -1) !== 0)
 			{
-				$target_url.= '/';
+				$target_url .= '/';
 			}
 		}
 		else
@@ -1833,19 +1833,19 @@ 
 
 		$url_info = parse_url('http://' . $target_url);
 
-		if($current_use_ssl != $use_ssl)
+		if ($current_use_ssl != $use_ssl)
 		{
 			unset($url_info['port']);
 		}
 
-		if($use_ssl)
+		if ($use_ssl)
 		{
 			$port = self::get('_https_port');
-			if($port && $port != 443)
+			if ($port && $port != 443)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 443)
+			elseif ($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
@@ -1853,11 +1853,11 @@ 
 		else
 		{
 			$port = self::get('_http_port');
-			if($port && $port != 80)
+			if ($port && $port != 80)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 80)
+			elseif ($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
@@ -1880,16 +1880,16 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 		$self->context->{$key} = $val;
-		if($set_to_get_vars === FALSE)
+		if ($set_to_get_vars === FALSE)
 		{
 			return;
 		}
-		if($val === NULL || $val === '')
+		if ($val === NULL || $val === '')
 		{
 			unset($self->get_vars->{$key});
 			return;
 		}
-		if($set_to_get_vars || $self->get_vars->{$key})
+		if ($set_to_get_vars || $self->get_vars->{$key})
 		{
 			$self->get_vars->{$key} = $val;
 		}
@@ -1905,7 +1905,7 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!isset($self->context->{$key}))
+		if (!isset($self->context->{$key}))
 		{
 			return null;
 		}
@@ -1920,7 +1920,7 @@ 
 	function gets()
 	{
 		$num_args = func_num_args();
-		if($num_args < 1)
+		if ($num_args < 1)
 		{
 			return;
 		}
@@ -1928,7 +1928,7 @@ 
 
 		$args_list = func_get_args();
 		$output = new stdClass();
-		foreach($args_list as $v)
+		foreach ($args_list as $v)
 		{
 			$output->{$v} = $self->get($v);
 		}
@@ -1954,7 +1954,7 @@ 
 	function getRequestVars()
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
-		if($self->get_vars)
+		if ($self->get_vars)
 		{
 			return clone($self->get_vars);
 		}
@@ -1971,13 +1971,13 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		if(!isset($self->ssl_actions[$action]))
+		if (!isset($self->ssl_actions[$action]))
 		{
 			$self->ssl_actions[$action] = 1;
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -1995,16 +1995,16 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			unset($self->ssl_actions);
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		foreach($action_array as $action)
+		foreach ($action_array as $action)
 		{
-			if(!isset($self->ssl_actions[$action]))
+			if (!isset($self->ssl_actions[$action]))
 			{
 				$self->ssl_actions[$action] = 1;
 				$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -2023,7 +2023,7 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if($self->isExistsSSLAction($action))
+		if ($self->isExistsSSLAction($action))
 		{
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
 			$buff = FileHandler::readFile($self->sslActionCacheFile);
@@ -2040,7 +2040,7 @@ 
 	function getSSLActions()
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
-		if($self->getSslStatus() == 'optional')
+		if ($self->getSslStatus() == 'optional')
 		{
 			return $self->ssl_actions;
 		}
@@ -2067,12 +2067,12 @@ 
 	 */
 	function normalizeFilePath($file)
 	{
-		if($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
+		if ($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
 		{
 			$file = './' . $file;
 		}
 		$file = preg_replace('@/\./|(?<!:)\/\/@', '/', $file);
-		while(strpos($file, '/../') !== FALSE)
+		while (strpos($file, '/../') !== FALSE)
 		{
 			$file = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $file, 1);
 		}
@@ -2090,11 +2090,11 @@ 
 	function getAbsFileUrl($file)
 	{
 		$file = self::normalizeFilePath($file);
-		if(strpos($file, './') === 0)
+		if (strpos($file, './') === 0)
 		{
 			$file = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($file, 2);
 		}
-		elseif(strpos($file, '../') === 0)
+		elseif (strpos($file, '../') === 0)
 		{
 			$file = self::normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$file}");
 		}
@@ -2166,12 +2166,12 @@ 
 	 */
 	function addJsFile($file, $optimized = FALSE, $targetie = '', $index = 0, $type = 'head', $isRuleset = FALSE, $autoPath = null)
 	{
-		if($isRuleset)
+		if ($isRuleset)
 		{
-			if(strpos($file, '#') !== FALSE)
+			if (strpos($file, '#') !== FALSE)
 			{
 				$file = str_replace('#', '', $file);
-				if(!is_readable($file))
+				if (!is_readable($file))
 				{
 					$file = $autoPath;
 				}
@@ -2236,9 +2236,9 @@ 
 		ksort($files);
 		$files = array_values($files);
 		$filenames = array();
-		for($i = 0, $c = count($files); $i < $c; ++$i)
+		for ($i = 0, $c = count($files); $i < $c; ++$i)
 		{
-			if(in_array($files[$i]['file'], $filenames))
+			if (in_array($files[$i]['file'], $filenames))
 			{
 				unset($files[$i]);
 			}
@@ -2323,14 +2323,14 @@ 
 	 */
 	function getJavascriptPluginInfo($pluginName)
 	{
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
 		$plugin_path = './common/js/plugins/' . $pluginName . '/';
 		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		if (!is_readable($info_file))
 		{
 			return;
 		}
@@ -2340,30 +2340,30 @@ 
 		$result->jsList = array();
 		$result->cssList = array();
 
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
 
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
 				$result->jsList[] = $plugin_path . $filename;
 			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			elseif (substr_compare($filename, '.css', -4) === 0)
 			{
 				$result->cssList[] = $plugin_path . $filename;
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path . 'lang'))
 		{
 			$result->langPath = $plugin_path . 'lang';
 		}
@@ -2381,12 +2381,12 @@ 
 		static $loaded_plugins = array();
 
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
-		if($loaded_plugins[$plugin_name])
+		if ($loaded_plugins[$plugin_name])
 		{
 			return;
 		}
@@ -2394,35 +2394,35 @@ 
 
 		$plugin_path = './common/js/plugins/' . $plugin_name . '/';
 		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		if (!is_readable($info_file))
 		{
 			return;
 		}
 
 		$list = file($info_file);
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
 				$self->loadFile(array($plugin_path . $filename, 'body', '', 0), TRUE);
 			}
-			if(substr_compare($filename, '.css', -4) === 0)
+			if (substr_compare($filename, '.css', -4) === 0)
 			{
 				$self->loadFile(array($plugin_path . $filename, 'all', '', 0), TRUE);
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path . 'lang'))
 		{
 			$self->loadLang($plugin_path . 'lang');
 		}
@@ -2594,14 +2594,14 @@ 
 		$_path = explode('/', $path);
 		$_base = explode('/', $base_url);
 
-		if(!$_base[count($_base) - 1])
+		if (!$_base[count($_base) - 1])
 		{
 			array_pop($_base);
 		}
 
-		foreach($_xe as $idx => $dir)
+		foreach ($_xe as $idx => $dir)
 		{
-			if($_path[0] != $dir)
+			if ($_path[0] != $dir)
 			{
 				break;
 			}
@@ -2609,9 +2609,9 @@ 
 		}
 
 		$idx = count($_xe) - $idx - 1;
-		while($idx--)
+		while ($idx--)
 		{
-			if(count($_base) > 0)
+			if (count($_base) > 0)
 			{
 				array_shift($_base);
 			}
@@ -2621,13 +2621,13 @@ 
 			}
 		}
 
-		if(count($_base) > 0)
+		if (count($_base) > 0)
 		{
 			array_unshift($_path, join('/', $_base));
 		}
 
 		$path = '/' . join('/', $_path);
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -2642,13 +2642,13 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!is_array($self->meta_tags))
+		if (!is_array($self->meta_tags))
 		{
 			$self->meta_tags = array();
 		}
 
 		$ret = array();
-		foreach($self->meta_tags as $key => $val)
+		foreach ($self->meta_tags as $key => $val)
 		{
 			list($name, $is_http_equiv) = explode("\t", $key);
 			$ret[] = array('name' => $name, 'is_http_equiv' => $is_http_equiv, 'content' => $val);

libs/phpmailer/phpmailer.php

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 +241 added lines, -242 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
@@ -457,11 +457,11 @@ 
     $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);
+        throw new phpmailerException($this->Lang('invalid_address') . ': ' . $address);
       }
-      echo $this->Lang('invalid_address').': '.$address;
+      echo $this->Lang('invalid_address') . ': ' . $address;
       return false;
     }
     if ($kind != 'ReplyTo') {
@@ -485,15 +485,15 @@ 
  * @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);
+        throw new phpmailerException($this->Lang('invalid_address') . ': ' . $address);
       }
-      echo $this->Lang('invalid_address').': '.$address;
+      echo $this->Lang('invalid_address') . ': ' . $address;
       return false;
     }
     $this->From = $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':
@@ -583,7 +583,7 @@ 
       if ($this->exceptions) {
         throw $e;
       }
-      echo $e->getMessage()."\n";
+      echo $e->getMessage() . "\n";
       return false;
     }
   }
@@ -603,7 +603,7 @@ 
     }
     if ($this->SingleTo === true) {
       foreach ($this->SingleToArray as $key => $val) {
-    if(!@$mail = popen($sendmail, 'w')) {
+    if (!@$mail = popen($sendmail, 'w')) {
           throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
     }
         fputs($mail, "To: " . $val . "\n");
@@ -612,13 +612,13 @@ 
     $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) {
+        $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')) {
+      if (!@$mail = popen($sendmail, 'w')) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
     }
       fputs($mail, $header);
@@ -626,8 +626,8 @@ 
       $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) {
+      $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);
       }
     }
@@ -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;
@@ -702,61 +702,61 @@ 
     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)) {
+    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);
     }
-    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();
       }
@@ -871,7 +871,7 @@ 
     //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';
+      $l = @include $lang_path . 'phpmailer.lang-' . $langcode . '.php';
     }
     $this->language = $PHPMAILER_LANG;
     return ($l == true); //Returns false if language not found
@@ -912,7 +912,7 @@ 
    * @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]) . ">";
@@ -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;
@@ -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);
@@ -1079,20 +1078,20 @@ 
     $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)');
+    $result .= $this->HeaderLine('X-Mailer', 'PHPMailer ' . $this->Version . ' (phpmailer.sourceforge.net)');
 
-    if($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,14 +1154,14 @@ 
    */
   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;');
@@ -1175,8 +1174,8 @@ 
         break;
     }
 
-    if($this->Mailer != 'mail') {
-      $result .= $this->LE.$this->LE;
+    if ($this->Mailer != 'mail') {
+      $result .= $this->LE . $this->LE;
     }
 
     return $result;
@@ -1196,14 +1195,14 @@ 
 
     $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);
-        $body .= $this->LE.$this->LE;
+        $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->LE . $this->LE;
         $body .= $this->EndBoundary($this->boundary[1]);
         break;
       case 'plain':
@@ -1217,33 +1216,33 @@ 
         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 .= 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->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->LE . $this->LE;
         $body .= $this->EndBoundary($this->boundary[2]);
         $body .= $this->AttachAll();
         break;
     }
 
-    if($this->IsError()) {
+    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)) {
+        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());
+          throw new phpmailerException($this->Lang("signing") . openssl_error_string());
         }
       } catch (phpmailerException $e) {
         $body = '';
@@ -1262,13 +1261,13 @@ 
    */
   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);
@@ -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';
       }
     }
@@ -1343,11 +1342,11 @@ 
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
-    if(!@is_file($path)) {
+    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
       );
@@ -1367,8 +1366,8 @@ 
       if ($this->exceptions) {
         throw $e;
       }
-      echo $e->getMessage()."\n";
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
+      echo $e->getMessage() . "\n";
+      if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
       }
     }
@@ -1413,32 +1412,32 @@ 
       $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);
+      $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;
+        $mime[] = $this->LE . $this->LE;
       } else {
         $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
-        $mime[] = $this->LE.$this->LE;
+        $mime[] = $this->LE . $this->LE;
       }
     }
 
@@ -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;
@@ -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
@@ -1565,10 +1564,10 @@ 
       $encoding = 'Q';
       $encoded = $this->EncodeQ($str, $position);
       $encoded = $this->WrapText($encoded, $maxlen, true);
-      $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
+      $encoded = str_replace('=' . $this->LE, "\n", trim($encoded));
     }
 
-    $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
+    $encoded = preg_replace('/^(.*)$/m', " =?" . $this->CharSet . "?$encoding?\\1?=", $encoded);
     $encoded = trim(str_replace("\n", $this->LE, $encoded));
 
     return $encoded;
@@ -1597,7 +1596,7 @@ 
    * @return string
    */
   public function Base64EncodeWrapMB($str) {
-    $start = "=?".$this->CharSet."?B?";
+    $start = "=?" . $this->CharSet . "?B?";
     $end = "?=";
     $encoded = "";
 
@@ -1636,43 +1635,43 @@ 
   * @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);
-          $c = $escape.$hex[$h2].$hex[$h1];
+        } 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
+        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';
           }
         }
         $newline .= $c;
       } // end of for
-      $output .= $newline.$eol;
+      $output .= $newline . $eol;
     } // end of while
     return $output;
   }
@@ -1718,16 +1717,16 @@ 
    * @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);
 
     switch (strtolower($position)) {
       case 'phrase':
-		$encoded = preg_replace_callback('/([^A-Za-z0-9!*+\/ -])/', function($n) { return '='.sprintf('%02X', ord('\\1')); }, $encoded);
+		$encoded = preg_replace_callback('/([^A-Za-z0-9!*+\/ -])/', function($n) { return '=' . sprintf('%02X', ord('\\1')); }, $encoded);
         break;
       case 'comment':
-		$encoded = preg_replace_callback('/([\(\)\"])/', function($n) { return '='.sprintf('%02X', ord('\\1')); }, $encoded);
+		$encoded = preg_replace_callback('/([\(\)\"])/', function($n) { return '=' . sprintf('%02X', ord('\\1')); }, $encoded);
       case 'text':
       default:
         // Replace every high ascii, control =, ? and _ characters
@@ -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)) {
+    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();
@@ -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,11 +1953,11 @@ 
    * @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;
@@ -2000,33 +1999,33 @@ 
    * @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='':'';
+          ($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);
+          $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) ) {
+    $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) ) {
+    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,9 +2142,9 @@ 
    * 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);
@@ -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,45 +2267,45 @@ 
    * @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".
-                "\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".
+    $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";
+    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);
     }
   }
 }

classes/security/Purifier.class.php

Spacing +15 added lines, -15 removed lines

@@ -22,7 +22,7 @@ 
 
 	public function getInstance()
 	{
-		if(!isset($GLOBALS['__PURIFIER_INSTANCE__']))
+		if (!isset($GLOBALS['__PURIFIER_INSTANCE__']))
 		{
 			$GLOBALS['__PURIFIER_INSTANCE__'] = new Purifier();
 		}
@@ -52,9 +52,9 @@ 
 	{
 		// add attribute for edit component
 		$editComponentAttrs = $this->_searchEditComponent($content);
-		if(is_array($editComponentAttrs))
+		if (is_array($editComponentAttrs))
 		{
-			foreach($editComponentAttrs AS $k => $v)
+			foreach ($editComponentAttrs AS $k => $v)
 			{
 				$this->_def->addAttribute('img', $v, 'CDATA');
 				$this->_def->addAttribute('div', $v, 'CDATA');
@@ -63,9 +63,9 @@ 
 
 		// add attribute for widget component
 		$widgetAttrs = $this->_searchWidget($content);
-		if(is_array($widgetAttrs))
+		if (is_array($widgetAttrs))
 		{
-			foreach($widgetAttrs AS $k => $v)
+			foreach ($widgetAttrs AS $k => $v)
 			{
 				$this->_def->addAttribute('img', $v, 'CDATA');
 			}
@@ -82,19 +82,19 @@ 
 		preg_match_all('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', $content, $m);
 
 		$attributeList = array();
-		if(is_array($m[2]))
+		if (is_array($m[2]))
 		{
-			foreach($m[2] as $key => $value)
+			foreach ($m[2] as $key => $value)
 			{
 				unset($script, $m2);
 				$script = " {$m[2][$key]} editor_component={$m[3][$key]}";
 
-				if(preg_match_all('/([a-z0-9_-]+)="([^"]+)"/is', $script, $m2))
+				if (preg_match_all('/([a-z0-9_-]+)="([^"]+)"/is', $script, $m2))
 				{
-					foreach($m2[1] as $value2)
+					foreach ($m2[1] as $value2)
 					{
 						//SECISSUE check style attr
-						if($value2 == 'style')
+						if ($value2 == 'style')
 						{
 							continue;
 						}
@@ -117,18 +117,18 @@ 
 		preg_match_all('!<(?:(div)|img)([^>]*)class="zbxe_widget_output"([^>]*)>(?(1)(.*?)</div>)!is', $content, $m);
 
 		$attributeList = array();
-		if(is_array($m[3]))
+		if (is_array($m[3]))
 		{
 			$content = str_replace('<img class="zbxe_widget_output"', '<img src="" class="zbxe_widget_output"', $content);
 
-			foreach($m[3] as $key => $value)
+			foreach ($m[3] as $key => $value)
 			{
 				if (preg_match_all('/([a-z0-9_-]+)="([^"]+)"/is', $m[3][$key], $m2))
 				{
-					foreach($m2[1] as $value2)
+					foreach ($m2[1] as $value2)
 					{
 						//SECISSUE check style attr
-						if($value2 == 'style')
+						if ($value2 == 'style')
 						{
 							continue;
 						}
@@ -146,7 +146,7 @@ 
 		$whiteIframeUrlList = $oEmbedFilter->getWhiteIframeUrlList();
 
 		$whiteDomain = array();
-		foreach($whiteIframeUrlList as $value)
+		foreach ($whiteIframeUrlList as $value)
 		{
 			$whiteDomain[] = preg_quote($value, '%');
 		}