ntwb / wordpress

src/wp-includes/feed-atom-comments.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Atom Feed Template for displaying Atom Comments feed.
- *
- * @package WordPress
- */
+	 * Atom Feed Template for displaying Atom Comments feed.
+	 *
+	 * @package WordPress
+	 */
 
 header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
 echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>';

Spacing +24 added lines, -24 removed lines

@@ -5,46 +5,46 @@ 
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
-echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>';
+header('Content-Type: '.feed_content_type('atom').'; charset='.get_option('blog_charset'), true);
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'" ?'.'>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
-do_action( 'rss_tag_pre', 'atom-comments' );
+do_action('rss_tag_pre', 'atom-comments');
 ?>
 <feed
 	xmlns="http://www.w3.org/2005/Atom"
-	xml:lang="<?php bloginfo_rss( 'language' ); ?>"
+	xml:lang="<?php bloginfo_rss('language'); ?>"
 	xmlns:thr="http://purl.org/syndication/thread/1.0"
 	<?php
 		/** This action is documented in wp-includes/feed-atom.php */
-		do_action( 'atom_ns' );
+		do_action('atom_ns');
 
 		/**
 		 * Fires inside the feed tag in the Atom comment feed.
 		 *
 		 * @since 2.8.0
 		 */
-		do_action( 'atom_comments_ns' );
+		do_action('atom_comments_ns');
 	?>
 >
 	<title type="text"><?php
-		if ( is_singular() )
-			printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
-		elseif ( is_search() )
-			printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
+		if (is_singular())
+			printf(ent2ncr(__('Comments on %s')), get_the_title_rss());
+		elseif (is_search())
+			printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss('name'), get_search_query());
 		else
-			printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() );
+			printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss('name').get_wp_title_rss());
 	?></title>
 	<subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
 
 	<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastcommentmodified('GMT'), false); ?></updated>
 
-<?php if ( is_singular() ) { ?>
+<?php if (is_singular()) { ?>
 	<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php comments_link_feed(); ?>" />
-	<link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?>" />
-	<id><?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?></id>
+	<link rel="self" type="application/atom+xml" href="<?php echo esc_url(get_post_comments_feed_link('', 'atom')); ?>" />
+	<id><?php echo esc_url(get_post_comments_feed_link('', 'atom')); ?></id>
 <?php } elseif (is_search()) { ?>
-	<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />
+	<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo home_url().'?s='.get_search_query(); ?>" />
 	<link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link('', 'atom'); ?>" />
 	<id><?php echo get_search_comments_feed_link('', 'atom'); ?></id>
 <?php } else { ?>
@@ -58,18 +58,18 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'comments_atom_head' );
+	do_action('comments_atom_head');
 ?>
 <?php
-if ( have_comments() ) : while ( have_comments() ) : the_comment();
-	$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
+if (have_comments()) : while (have_comments()) : the_comment();
+	$comment_post = $GLOBALS['post'] = get_post($comment->comment_post_ID);
 ?>
 	<entry>
 		<title><?php
-			if ( !is_singular() ) {
+			if ( ! is_singular()) {
 				$title = get_the_title($comment_post->ID);
 				/** This filter is documented in wp-includes/feed.php */
-				$title = apply_filters( 'the_title_rss', $title );
+				$title = apply_filters('the_title_rss', $title);
 				printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
 			} else {
 				printf(ent2ncr(__('By: %s')), get_comment_author_rss());
@@ -79,20 +79,20 @@ 
 
 		<author>
 			<name><?php comment_author_rss(); ?></name>
-			<?php if (get_comment_author_url()) echo '<uri>' . get_comment_author_url() . '</uri>'; ?>
+			<?php if (get_comment_author_url()) echo '<uri>'.get_comment_author_url().'</uri>'; ?>
 
 		</author>
 
 		<id><?php comment_guid(); ?></id>
 		<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_comment_time('Y-m-d H:i:s', true, false), false); ?></updated>
 		<published><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_comment_time('Y-m-d H:i:s', true, false), false); ?></published>
-<?php if ( post_password_required($comment_post) ) : ?>
+<?php if (post_password_required($comment_post)) : ?>
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
 <?php else : // post pass ?>
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
 <?php endif; // post pass
 	// Return comment threading information (http://www.ietf.org/rfc/rfc4685.txt)
-	if ( $comment->comment_parent == 0 ) : // This comment is top level ?>
+	if ($comment->comment_parent == 0) : // This comment is top level ?>
 		<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss() ?>" type="<?php bloginfo_rss('html_type'); ?>" />
 <?php else : // This comment is in reply to another comment
 	$parent_comment = get_comment($comment->comment_parent);
@@ -108,7 +108,7 @@ 
 	 * @param int $comment_id      ID of the current comment.
 	 * @param int $comment_post_id ID of the post the current comment is connected to.
 	 */
-	do_action( 'comment_atom_entry', $comment->comment_ID, $comment_post->ID );
+	do_action('comment_atom_entry', $comment->comment_ID, $comment_post->ID);
 ?>
 	</entry>
 <?php endwhile; endif; ?>

Braces +19 added lines, -10 removed lines

@@ -28,12 +28,13 @@ 
 	?>
 >
 	<title type="text"><?php
-		if ( is_singular() )
-			printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
-		elseif ( is_search() )
-			printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
-		else
-			printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() );
+		if ( is_singular() ) {
+					printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
+		} elseif ( is_search() ) {
+					printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
+		} else {
+					printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() );
+		}
 	?></title>
 	<subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
 
@@ -79,7 +80,10 @@ 
 
 		<author>
 			<name><?php comment_author_rss(); ?></name>
-			<?php if (get_comment_author_url()) echo '<uri>' . get_comment_author_url() . '</uri>'; ?>
+			<?php if (get_comment_author_url()) {
+	echo '<uri>' . get_comment_author_url() . '</uri>';
+}
+?>
 
 		</author>
 
@@ -88,14 +92,19 @@ 
 		<published><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_comment_time('Y-m-d H:i:s', true, false), false); ?></published>
 <?php if ( post_password_required($comment_post) ) : ?>
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
-<?php else : // post pass ?>
-		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
+<?php else {
+	: // post pass ?>
+		<content type="html" xml:base="<?php comment_link();
+}
+?>"><![CDATA[<?php comment_text(); ?>]]></content>
 <?php endif; // post pass
 	// Return comment threading information (http://www.ietf.org/rfc/rfc4685.txt)
 	if ( $comment->comment_parent == 0 ) : // This comment is top level ?>
 		<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss() ?>" type="<?php bloginfo_rss('html_type'); ?>" />
-<?php else : // This comment is in reply to another comment
+<?php else {
+	: // This comment is in reply to another comment
 	$parent_comment = get_comment($comment->comment_parent);
+}
 	// The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, it's more important that they both use the same system
 ?>
 		<thr:in-reply-to ref="<?php comment_guid($parent_comment) ?>" href="<?php echo get_comment_link($parent_comment) ?>" type="<?php bloginfo_rss('html_type'); ?>" />

src/wp-includes/class-wp-admin-bar.php

Spacing +170 added lines, -170 removed lines

@@ -16,13 +16,13 @@ 
 	 * @param string $name
 	 * @return string|array|void
 	 */
-	public function __get( $name ) {
-		switch ( $name ) {
+	public function __get($name) {
+		switch ($name) {
 			case 'proto' :
 				return is_ssl() ? 'https://' : 'http://';
 
 			case 'menu' :
-				_deprecated_argument( 'WP_Admin_Bar', '3.3', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
+				_deprecated_argument('WP_Admin_Bar', '3.3', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.');
 				return array(); // Sorry, folks.
 		}
 	}
@@ -33,61 +33,61 @@ 
 	public function initialize() {
 		$this->user = new stdClass;
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			/* Populate settings we need for the menu based on the current user. */
-			$this->user->blogs = get_blogs_of_user( get_current_user_id() );
-			if ( is_multisite() ) {
-				$this->user->active_blog = get_active_blog_for_user( get_current_user_id() );
-				$this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+			$this->user->blogs = get_blogs_of_user(get_current_user_id());
+			if (is_multisite()) {
+				$this->user->active_blog = get_active_blog_for_user(get_current_user_id());
+				$this->user->domain = empty($this->user->active_blog) ? user_admin_url() : trailingslashit(get_home_url($this->user->active_blog->blog_id));
 				$this->user->account_domain = $this->user->domain;
 			} else {
 				$this->user->active_blog = $this->user->blogs[get_current_blog_id()];
-				$this->user->domain = trailingslashit( home_url() );
+				$this->user->domain = trailingslashit(home_url());
 				$this->user->account_domain = $this->user->domain;
 			}
 		}
 
-		add_action( 'wp_head', 'wp_admin_bar_header' );
+		add_action('wp_head', 'wp_admin_bar_header');
 
-		add_action( 'admin_head', 'wp_admin_bar_header' );
+		add_action('admin_head', 'wp_admin_bar_header');
 
-		if ( current_theme_supports( 'admin-bar' ) ) {
+		if (current_theme_supports('admin-bar')) {
 			/**
 			 * To remove the default padding styles from WordPress for the Toolbar, use the following code:
 			 * add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
 			 */
-			$admin_bar_args = get_theme_support( 'admin-bar' );
+			$admin_bar_args = get_theme_support('admin-bar');
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
+		if (empty($header_callback))
 			$header_callback = '_admin_bar_bump_cb';
 
 		add_action('wp_head', $header_callback);
 
-		wp_enqueue_script( 'admin-bar' );
-		wp_enqueue_style( 'admin-bar' );
+		wp_enqueue_script('admin-bar');
+		wp_enqueue_style('admin-bar');
 
 		/**
 		 * Fires after WP_Admin_Bar is initialized.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'admin_bar_init' );
+		do_action('admin_bar_init');
 	}
 
 	/**
 	 * @param array $node
 	 */
-	public function add_menu( $node ) {
-		$this->add_node( $node );
+	public function add_menu($node) {
+		$this->add_node($node);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	public function remove_menu( $id ) {
-		$this->remove_node( $id );
+	public function remove_menu($id) {
+		$this->remove_node($id);
 	}
 
 	/**
@@ -105,22 +105,22 @@ 
 	 *                          'onclick', 'target', 'title', 'tabindex'. Default empty.
 	 * }
 	 */
-	public function add_node( $args ) {
+	public function add_node($args) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if (func_num_args() >= 3 && is_string(func_get_arg(0)))
+			$args = array_merge(array('parent' => func_get_arg(0)), func_get_arg(2));
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if (is_object($args))
+			$args = get_object_vars($args);
 
 		// Ensure we have a valid title.
-		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
+		if (empty($args['id'])) {
+			if (empty($args['title']))
 				return;
 
-			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3' );
+			_doing_it_wrong(__METHOD__, __('The menu ID should not be empty.'), '3.3');
 			// Deprecated: Generate an ID from the title.
-			$args['id'] = esc_attr( sanitize_title( trim( $args['title'] ) ) );
+			$args['id'] = esc_attr(sanitize_title(trim($args['title'])));
 		}
 
 		$defaults = array(
@@ -133,34 +133,34 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ($maybe_defaults = $this->get_node($args['id']))
+			$defaults = get_object_vars($maybe_defaults);
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty($defaults['meta']) && ! empty($args['meta']))
+			$args['meta'] = wp_parse_args($args['meta'], $defaults['meta']);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$back_compat_parents = array(
-			'my-account-with-avatar' => array( 'my-account', '3.3' ),
-			'my-blogs'               => array( 'my-sites',   '3.3' ),
+			'my-account-with-avatar' => array('my-account', '3.3'),
+			'my-blogs'               => array('my-sites', '3.3'),
 		);
 
-		if ( isset( $back_compat_parents[ $args['parent'] ] ) ) {
-			list( $new_parent, $version ) = $back_compat_parents[ $args['parent'] ];
-			_deprecated_argument( __METHOD__, $version, sprintf( 'Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent'] ) );
+		if (isset($back_compat_parents[$args['parent']])) {
+			list($new_parent, $version) = $back_compat_parents[$args['parent']];
+			_deprecated_argument(__METHOD__, $version, sprintf('Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent']));
 			$args['parent'] = $new_parent;
 		}
 
-		$this->_set_node( $args );
+		$this->_set_node($args);
 	}
 
 	/**
 	 * @param array $args
 	 */
-	final protected function _set_node( $args ) {
-		$this->nodes[ $args['id'] ] = (object) $args;
+	final protected function _set_node($args) {
+		$this->nodes[$args['id']] = (object) $args;
 	}
 
 	/**
@@ -169,8 +169,8 @@ 
 	 * @param string $id
 	 * @return object Node.
 	 */
-	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
+	final public function get_node($id) {
+		if ($node = $this->_get_node($id))
 			return clone $node;
 	}
 
@@ -178,25 +178,25 @@ 
 	 * @param string $id
 	 * @return object|void
 	 */
-	final protected function _get_node( $id ) {
-		if ( $this->bound )
+	final protected function _get_node($id) {
+		if ($this->bound)
 			return;
 
-		if ( empty( $id ) )
+		if (empty($id))
 			$id = 'root';
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if (isset($this->nodes[$id]))
+			return $this->nodes[$id];
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
+		if ( ! $nodes = $this->_get_nodes())
 			return;
 
-		foreach ( $nodes as &$node ) {
+		foreach ($nodes as &$node) {
 			$node = clone $node;
 		}
 		return $nodes;
@@ -206,7 +206,7 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		return $this->nodes;
@@ -226,10 +226,10 @@ 
 	 *                         'class', 'onclick', 'target', and 'title'.
 	 * }
 	 */
-	final public function add_group( $args ) {
+	final public function add_group($args) {
 		$args['group'] = true;
 
-		$this->add_node( $args );
+		$this->add_node($args);
 	}
 
 	/**
@@ -237,15 +237,15 @@ 
 	 *
 	 * @param string $id The ID of the item.
 	 */
-	public function remove_node( $id ) {
-		$this->_unset_node( $id );
+	public function remove_node($id) {
+		$this->_unset_node($id);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	final protected function _unset_node( $id ) {
-		unset( $this->nodes[ $id ] );
+	final protected function _unset_node($id) {
+		unset($this->nodes[$id]);
 	}
 
 	/**
@@ -253,66 +253,66 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ($root)
+			$this->_render($root);
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
-		$this->remove_node( 'root' );
-		$this->add_node( array(
+		$this->remove_node('root');
+		$this->add_node(array(
 			'id'    => 'root',
 			'group' => false,
-		) );
+		));
 
 		// Normalize nodes: define internal 'children' and 'type' properties.
-		foreach ( $this->_get_nodes() as $node ) {
+		foreach ($this->_get_nodes() as $node) {
 			$node->children = array();
-			$node->type = ( $node->group ) ? 'group' : 'item';
-			unset( $node->group );
+			$node->type = ($node->group) ? 'group' : 'item';
+			unset($node->group);
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
+			if ( ! $node->parent)
 				$node->parent = 'root';
 		}
 
-		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
+		foreach ($this->_get_nodes() as $node) {
+			if ('root' == $node->id)
 				continue;
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
-			if ( ! $parent = $this->_get_node( $node->parent ) ) {
+			if ( ! $parent = $this->_get_node($node->parent)) {
 				continue;
 			}
 
 			// Generate the group class (we distinguish between top level and other level groups).
-			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
+			$group_class = ($node->parent == 'root') ? 'ab-top-menu' : 'ab-submenu';
 
-			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
+			if ($node->type == 'group') {
+				if (empty($node->meta['class']))
 					$node->meta['class'] = $group_class;
 				else
-					$node->meta['class'] .= ' ' . $group_class;
+					$node->meta['class'] .= ' '.$group_class;
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
-			if ( $parent->type == 'item' && $node->type == 'item' ) {
-				$default_id = $parent->id . '-default';
-				$default    = $this->_get_node( $default_id );
+			if ($parent->type == 'item' && $node->type == 'item') {
+				$default_id = $parent->id.'-default';
+				$default    = $this->_get_node($default_id);
 
 				// The default group is added here to allow groups that are
 				// added before standard menu items to render first.
-				if ( ! $default ) {
+				if ( ! $default) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'        => $default_id,
 						'parent'    => $parent->id,
 						'type'      => 'group',
@@ -322,45 +322,45 @@ 
 						),
 						'title'     => false,
 						'href'      => false,
-					) );
-					$default = $this->_get_node( $default_id );
+					));
+					$default = $this->_get_node($default_id);
 					$parent->children[] = $default;
 				}
 				$parent = $default;
 
 			// Groups in groups aren't allowed. Add a special 'container' node.
 			// The container will invisibly wrap both groups.
-			} elseif ( $parent->type == 'group' && $node->type == 'group' ) {
-				$container_id = $parent->id . '-container';
-				$container    = $this->_get_node( $container_id );
+			} elseif ($parent->type == 'group' && $node->type == 'group') {
+				$container_id = $parent->id.'-container';
+				$container    = $this->_get_node($container_id);
 
 				// We need to create a container for this group, life is sad.
-				if ( ! $container ) {
+				if ( ! $container) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'       => $container_id,
 						'type'     => 'container',
-						'children' => array( $parent ),
+						'children' => array($parent),
 						'parent'   => false,
 						'title'    => false,
 						'href'     => false,
 						'meta'     => array(),
-					) );
+					));
 
-					$container = $this->_get_node( $container_id );
+					$container = $this->_get_node($container_id);
 
 					// Link the container node if a grandparent node exists.
-					$grandparent = $this->_get_node( $parent->parent );
+					$grandparent = $this->_get_node($parent->parent);
 
-					if ( $grandparent ) {
+					if ($grandparent) {
 						$container->parent = $grandparent->id;
 
-						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
+						$index = array_search($parent, $grandparent->children, true);
+						if ($index === false)
 							$grandparent->children[] = $container;
 						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+							array_splice($grandparent->children, $index, 1, array($container));
 					}
 
 					$parent->parent = $container->id;
@@ -376,7 +376,7 @@ 
 			$parent->children[] = $node;
 		}
 
-		$root = $this->_get_node( 'root' );
+		$root = $this->_get_node('root');
 		$this->bound = true;
 		return $root;
 	}
@@ -386,35 +386,35 @@ 
 	 * @global bool $is_IE
 	 * @param object $root
 	 */
-	final protected function _render( $root ) {
+	final protected function _render($root) {
 		global $is_IE;
 
 		// Add browser classes.
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
-		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
+		if ($is_IE) {
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7'))
 				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8'))
 				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 9'))
 				$class .= ' ie9';
-		} elseif ( wp_is_mobile() ) {
+		} elseif (wp_is_mobile()) {
 			$class .= ' mobile';
 		}
 
 		?>
 		<div id="wpadminbar" class="<?php echo $class; ?>">
-			<?php if ( ! is_admin() ) { ?>
-				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
+			<?php if ( ! is_admin()) { ?>
+				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
 			<?php } ?>
-			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
-				<?php foreach ( $root->children as $group ) {
-					$this->_render_group( $group );
+			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Toolbar'); ?>" tabindex="0">
+				<?php foreach ($root->children as $group) {
+					$this->_render_group($group);
 				} ?>
 			</div>
-			<?php if ( is_user_logged_in() ) : ?>
-			<a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e('Log Out'); ?></a>
+			<?php if (is_user_logged_in()) : ?>
+			<a class="screen-reader-shortcut" href="<?php echo esc_url(wp_logout_url()); ?>"><?php _e('Log Out'); ?></a>
 			<?php endif; ?>
 		</div>
 
@@ -424,13 +424,13 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
+	final protected function _render_container($node) {
+		if ($node->type != 'container' || empty($node->children))
 			return;
 
-		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
-			foreach ( $node->children as $group ) {
-				$this->_render_group( $group );
+		?><div id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>" class="ab-group-container"><?php
+			foreach ($node->children as $group) {
+				$this->_render_group($group);
 			}
 		?></div><?php
 	}
@@ -438,22 +438,22 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_group( $node ) {
-		if ( $node->type == 'container' ) {
-			$this->_render_container( $node );
+	final protected function _render_group($node) {
+		if ($node->type == 'container') {
+			$this->_render_container($node);
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
+		if ($node->type != 'group' || empty($node->children))
 			return;
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		if ( ! empty($node->meta['class']))
+			$class = ' class="'.esc_attr(trim($node->meta['class'])).'"';
 		else
 			$class = '';
 
-		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
-			foreach ( $node->children as $item ) {
-				$this->_render_item( $item );
+		?><ul id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $class; ?>><?php
+			foreach ($node->children as $item) {
+				$this->_render_item($item);
 			}
 		?></ul><?php
 	}
@@ -461,72 +461,72 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
+	final protected function _render_item($node) {
+		if ($node->type != 'item')
 			return;
 
-		$is_parent = ! empty( $node->children );
-		$has_link  = ! empty( $node->href );
+		$is_parent = ! empty($node->children);
+		$has_link  = ! empty($node->href);
 
-		$tabindex = isset( $node->meta['tabindex'] ) ? (int) $node->meta['tabindex'] : '';
-		$aria_attributes = $tabindex ? 'tabindex="' . $tabindex . '"' : '';
+		$tabindex = isset($node->meta['tabindex']) ? (int) $node->meta['tabindex'] : '';
+		$aria_attributes = $tabindex ? 'tabindex="'.$tabindex.'"' : '';
 
 		$menuclass = '';
 
-		if ( $is_parent ) {
+		if ($is_parent) {
 			$menuclass = 'menupop ';
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
+		if ( ! empty($node->meta['class']))
 			$menuclass .= $node->meta['class'];
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ($menuclass)
+			$menuclass = ' class="'.esc_attr(trim($menuclass)).'"';
 
 		?>
 
-		<li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
-			if ( $has_link ):
-				?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
-					if ( ! empty( $node->meta['onclick'] ) ) :
-						?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
+		<li id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $menuclass; ?>><?php
+			if ($has_link):
+				?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url($node->href) ?>"<?php
+					if ( ! empty($node->meta['onclick'])) :
+						?> onclick="<?php echo esc_js($node->meta['onclick']); ?>"<?php
 					endif;
-				if ( ! empty( $node->meta['target'] ) ) :
-					?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
+				if ( ! empty($node->meta['target'])) :
+					?> target="<?php echo esc_attr($node->meta['target']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['rel'] ) ) :
-					?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
+				if ( ! empty($node->meta['rel'])) :
+					?> rel="<?php echo esc_attr($node->meta['rel']); ?>"<?php
 				endif;
 				?>><?php
 			else:
 				?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
 				?>><?php
 			endif;
 
 			echo $node->title;
 
-			if ( $has_link ) :
+			if ($has_link) :
 				?></a><?php
 			else:
 				?></div><?php
 			endif;
 
-			if ( $is_parent ) :
+			if ($is_parent) :
 				?><div class="ab-sub-wrapper"><?php
-					foreach ( $node->children as $group ) {
-						$this->_render_group( $group );
+					foreach ($node->children as $group) {
+						$this->_render_group($group);
 					}
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
+			if ( ! empty($node->meta['html']))
 				echo $node->meta['html'];
 
 			?>
@@ -537,9 +537,9 @@ 
 	 * @param string $id    Unused.
 	 * @param object $node
 	 */
-	public function recursive_render( $id, $node ) {
-		_deprecated_function( __METHOD__, '3.3', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()' );
-		$this->_render_item( $node );
+	public function recursive_render($id, $node) {
+		_deprecated_function(__METHOD__, '3.3', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()');
+		$this->_render_item($node);
 	}
 
 	/**
@@ -547,32 +547,32 @@ 
 	 */
 	public function add_menus() {
 		// User related, aligned right.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 4 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_menu', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_search_menu', 4);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_item', 7);
 
 		// Site related.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );
+		add_action('admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_wp_menu', 10);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20);
+		add_action('admin_bar_menu', 'wp_admin_bar_site_menu', 30);
+		add_action('admin_bar_menu', 'wp_admin_bar_customize_menu', 40);
+		add_action('admin_bar_menu', 'wp_admin_bar_updates_menu', 50);
 
 		// Content related.
-		if ( ! is_network_admin() && ! is_user_admin() ) {
-			add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
-			add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
+		if ( ! is_network_admin() && ! is_user_admin()) {
+			add_action('admin_bar_menu', 'wp_admin_bar_comments_menu', 60);
+			add_action('admin_bar_menu', 'wp_admin_bar_new_content_menu', 70);
 		}
-		add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		add_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 
-		add_action( 'admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200 );
+		add_action('admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200);
 
 		/**
 		 * Fires after menus are added to the menu bar.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'add_admin_bar_menus' );
+		do_action('add_admin_bar_menus');
 	}
 }

Braces +94 added lines, -64 removed lines

@@ -60,8 +60,9 @@ 
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
-			$header_callback = '_admin_bar_bump_cb';
+		if ( empty($header_callback) ) {
+					$header_callback = '_admin_bar_bump_cb';
+		}
 
 		add_action('wp_head', $header_callback);
 
@@ -107,16 +108,19 @@ 
 	 */
 	public function add_node( $args ) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) ) {
+					$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		}
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if ( is_object( $args ) ) {
+					$args = get_object_vars( $args );
+		}
 
 		// Ensure we have a valid title.
 		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
-				return;
+			if ( empty( $args['title'] ) ) {
+							return;
+			}
 
 			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3' );
 			// Deprecated: Generate an ID from the title.
@@ -133,12 +137,14 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ( $maybe_defaults = $this->get_node( $args['id'] ) ) {
+					$defaults = get_object_vars( $maybe_defaults );
+		}
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) ) {
+					$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		}
 
 		$args = wp_parse_args( $args, $defaults );
 
@@ -170,8 +176,9 @@ 
 	 * @return object Node.
 	 */
 	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
-			return clone $node;
+		if ( $node = $this->_get_node( $id ) ) {
+					return clone $node;
+		}
 	}
 
 	/**
@@ -179,22 +186,26 @@ 
 	 * @return object|void
 	 */
 	final protected function _get_node( $id ) {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
-		if ( empty( $id ) )
-			$id = 'root';
+		if ( empty( $id ) ) {
+					$id = 'root';
+		}
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if ( isset( $this->nodes[ $id ] ) ) {
+					return $this->nodes[ $id ];
+		}
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
-			return;
+		if ( ! $nodes = $this->_get_nodes() ) {
+					return;
+		}
 
 		foreach ( $nodes as &$node ) {
 			$node = clone $node;
@@ -206,8 +217,9 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
 		return $this->nodes;
 	}
@@ -253,16 +265,18 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ( $root ) {
+					$this->_render( $root );
+		}
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
@@ -279,13 +293,15 @@ 
 			unset( $node->group );
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
-				$node->parent = 'root';
+			if ( ! $node->parent ) {
+							$node->parent = 'root';
+			}
 		}
 
 		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
-				continue;
+			if ( 'root' == $node->id ) {
+							continue;
+			}
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
 			if ( ! $parent = $this->_get_node( $node->parent ) ) {
@@ -296,10 +312,11 @@ 
 			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
 
 			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
-					$node->meta['class'] = $group_class;
-				else
-					$node->meta['class'] .= ' ' . $group_class;
+				if ( empty( $node->meta['class'] ) ) {
+									$node->meta['class'] = $group_class;
+				} else {
+									$node->meta['class'] .= ' ' . $group_class;
+				}
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
@@ -357,10 +374,11 @@ 
 						$container->parent = $grandparent->id;
 
 						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
-							$grandparent->children[] = $container;
-						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+						if ( $index === false ) {
+													$grandparent->children[] = $container;
+						} else {
+													array_splice( $grandparent->children, $index, 1, array( $container ) );
+						}
 					}
 
 					$parent->parent = $container->id;
@@ -393,12 +411,13 @@ 
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
 		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
-				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
-				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
-				$class .= ' ie9';
+			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) {
+							$class .= ' ie7';
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) {
+							$class .= ' ie8';
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) {
+							$class .= ' ie9';
+			}
 		} elseif ( wp_is_mobile() ) {
 			$class .= ' mobile';
 		}
@@ -425,8 +444,9 @@ 
 	 * @param object $node
 	 */
 	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
-			return;
+		if ( $node->type != 'container' || empty( $node->children ) ) {
+					return;
+		}
 
 		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
 			foreach ( $node->children as $group ) {
@@ -443,13 +463,15 @@ 
 			$this->_render_container( $node );
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
-			return;
+		if ( $node->type != 'group' || empty( $node->children ) ) {
+					return;
+		}
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
-		else
-			$class = '';
+		if ( ! empty( $node->meta['class'] ) ) {
+					$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		} else {
+					$class = '';
+		}
 
 		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
 			foreach ( $node->children as $item ) {
@@ -462,8 +484,9 @@ 
 	 * @param object $node
 	 */
 	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
-			return;
+		if ( $node->type != 'item' ) {
+					return;
+		}
 
 		$is_parent = ! empty( $node->children );
 		$has_link  = ! empty( $node->href );
@@ -478,11 +501,13 @@ 
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
-			$menuclass .= $node->meta['class'];
+		if ( ! empty( $node->meta['class'] ) ) {
+					$menuclass .= $node->meta['class'];
+		}
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ( $menuclass ) {
+					$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		}
 
 		?>
 
@@ -502,8 +527,10 @@ 
 					?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
 				endif;
 				?>><?php
-			else:
+			else {
+				:
 				?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
+			}
 				if ( ! empty( $node->meta['title'] ) ) :
 					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
 				endif;
@@ -514,9 +541,11 @@ 
 
 			if ( $has_link ) :
 				?></a><?php
-			else:
+			else {
+				:
 				?></div><?php
 			endif;
+			}
 
 			if ( $is_parent ) :
 				?><div class="ab-sub-wrapper"><?php
@@ -526,8 +555,9 @@ 
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
-				echo $node->meta['html'];
+			if ( ! empty( $node->meta['html'] ) ) {
+							echo $node->meta['html'];
+			}
 
 			?>
 		</li><?php

src/wp-includes/class-phpmailer.php

Indentation +3600 added lines, -3600 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * PHPMailer - PHP email creation and transport class.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
+	 * PHPMailer - PHP email creation and transport class.
+	 * PHP Version 5
+	 * @package PHPMailer
+	 * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+	 * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+	 * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+	 * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+	 * @author Brent R. Matzelle (original founder)
+	 * @copyright 2012 - 2014 Marcus Bointon
+	 * @copyright 2010 - 2012 Jim Jagielski
+	 * @copyright 2004 - 2009 Andy Prevost
+	 * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+	 * @note This program is distributed in the hope that it will be useful - WITHOUT
+	 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+	 * FITNESS FOR A PARTICULAR PURPOSE.
+	 */
 
 /**
  * PHPMailer - PHP email creation and transport class.
@@ -27,3581 +27,3581 @@ 
  */
 class PHPMailer
 {
-    /**
-     * The PHPMailer Version number.
-     * @type string
-     */
-    public $Version = '5.2.10';
-
-    /**
-     * Email priority.
-     * Options: 1 = High, 3 = Normal, 5 = low.
-     * @type integer
-     */
-    public $Priority = 3;
-
-    /**
-     * The character set of the message.
-     * @type string
-     */
-    public $CharSet = 'iso-8859-1';
-
-    /**
-     * The MIME Content-type of the message.
-     * @type string
-     */
-    public $ContentType = 'text/plain';
-
-    /**
-     * The message encoding.
-     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
-     * @type string
-     */
-    public $Encoding = '8bit';
-
-    /**
-     * Holds the most recent mailer error message.
-     * @type string
-     */
-    public $ErrorInfo = '';
-
-    /**
-     * The From email address for the message.
-     * @type string
-     */
-    public $From = 'root@localhost';
-
-    /**
-     * The From name of the message.
-     * @type string
-     */
-    public $FromName = 'Root User';
-
-    /**
-     * 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.
-     * @type string
-     */
-    public $Sender = '';
-
-    /**
-     * The Return-Path of the message.
-     * If empty, it will be set to either From or Sender.
-     * @type string
-     * @deprecated Email senders should never set a return-path header;
-     * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
-     * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
-     */
-    public $ReturnPath = '';
-
-    /**
-     * The Subject of the message.
-     * @type string
-     */
-    public $Subject = '';
-
-    /**
-     * An HTML or plain text message body.
-     * If HTML then call isHTML(true).
-     * @type string
-     */
-    public $Body = '';
-
-    /**
-     * The plain-text message body.
-     * This body can be read by mail clients that do not have HTML email
-     * capability such as mutt & Eudora.
-     * Clients that can read HTML will view the normal Body.
-     * @type string
-     */
-    public $AltBody = '';
-
-    /**
-     * An iCal message part body.
-     * Only supported in simple alt or alt_inline message types
-     * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
-     * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
-     * @link http://kigkonsult.se/iCalcreator/
-     * @type string
-     */
-    public $Ical = '';
-
-    /**
-     * The complete compiled MIME message body.
-     * @access protected
-     * @type string
-     */
-    protected $MIMEBody = '';
-
-    /**
-     * The complete compiled MIME message headers.
-     * @type string
-     * @access protected
-     */
-    protected $MIMEHeader = '';
-
-    /**
-     * Extra headers that createHeader() doesn't fold in.
-     * @type string
-     * @access protected
-     */
-    protected $mailHeader = '';
-
-    /**
-     * Word-wrap the message body to this number of chars.
-     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
-     * @type integer
-     */
-    public $WordWrap = 0;
-
-    /**
-     * Which method to use to send mail.
-     * Options: "mail", "sendmail", or "smtp".
-     * @type string
-     */
-    public $Mailer = 'mail';
-
-    /**
-     * The path to the sendmail program.
-     * @type string
-     */
-    public $Sendmail = '/usr/sbin/sendmail';
-
-    /**
-     * Whether mail() uses a fully sendmail-compatible MTA.
-     * One which supports sendmail's "-oi -f" options.
-     * @type boolean
-     */
-    public $UseSendmailOptions = true;
-
-    /**
-     * Path to PHPMailer plugins.
-     * Useful if the SMTP class is not in the PHP include path.
-     * @type string
-     * @deprecated Should not be needed now there is an autoloader.
-     */
-    public $PluginDir = '';
-
-    /**
-     * The email address that a reading confirmation should be sent to.
-     * @type string
-     */
-    public $ConfirmReadingTo = '';
-
-    /**
-     * The hostname to use in Message-Id and Received headers
-     * and as default HELO string.
-     * If empty, the value returned
-     * by SERVER_NAME is used or 'localhost.localdomain'.
-     * @type string
-     */
-    public $Hostname = '';
-
-    /**
-     * An ID to be used in the Message-Id header.
-     * If empty, a unique id will be generated.
-     * @type string
-     */
-    public $MessageID = '';
-
-    /**
-     * The message Date to be used in the Date header.
-     * If empty, the current date will be added.
-     * @type string
-     */
-    public $MessageDate = '';
-
-    /**
-     * SMTP hosts.
-     * Either a single hostname or multiple semicolon-delimited hostnames.
-     * You can also specify a different port
-     * for each host by using this format: [hostname:port]
-     * (e.g. "smtp1.example.com:25;smtp2.example.com").
-     * You can also specify encryption type, for example:
-     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
-     * Hosts will be tried in order.
-     * @type string
-     */
-    public $Host = 'localhost';
-
-    /**
-     * The default SMTP server port.
-     * @type integer
-     * @TODO Why is this needed when the SMTP class takes care of it?
-     */
-    public $Port = 25;
-
-    /**
-     * The SMTP HELO of the message.
-     * Default is $Hostname.
-     * @type string
-     * @see PHPMailer::$Hostname
-     */
-    public $Helo = '';
-
-    /**
-     * What kind of encryption to use on the SMTP connection.
-     * Options: '', 'ssl' or 'tls'
-     * @type string
-     */
-    public $SMTPSecure = '';
-
-    /**
-     * Whether to enable TLS encryption automatically if a server supports it,
-     * even if `SMTPSecure` is not set to 'tls'.
-     * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
-     * @type boolean
-     */
-    public $SMTPAutoTLS = true;
-
-    /**
-     * Whether to use SMTP authentication.
-     * Uses the Username and Password properties.
-     * @type boolean
-     * @see PHPMailer::$Username
-     * @see PHPMailer::$Password
-     */
-    public $SMTPAuth = false;
-
-    /**
-     * Options array passed to stream_context_create when connecting via SMTP.
-     * @type array
-     */
-    public $SMTPOptions = array();
-
-    /**
-     * SMTP username.
-     * @type string
-     */
-    public $Username = '';
-
-    /**
-     * SMTP password.
-     * @type string
-     */
-    public $Password = '';
-
-    /**
-     * SMTP auth type.
-     * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5
-     * @type string
-     */
-    public $AuthType = '';
-
-    /**
-     * SMTP realm.
-     * Used for NTLM auth
-     * @type string
-     */
-    public $Realm = '';
-
-    /**
-     * SMTP workstation.
-     * Used for NTLM auth
-     * @type string
-     */
-    public $Workstation = '';
-
-    /**
-     * The SMTP server timeout in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @type integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * SMTP class debug output mode.
-     * Debug output level.
-     * Options:
-     * * `0` No output
-     * * `1` Commands
-     * * `2` Data and commands
-     * * `3` As 2 plus connection status
-     * * `4` Low-level data output
-     * @type integer
-     * @see SMTP::$do_debug
-     */
-    public $SMTPDebug = 0;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * <code>
-     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * </code>
-     * @type string|callable
-     * @see SMTP::$Debugoutput
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to keep SMTP connection open after each message.
-     * If this is set to true then to close the connection
-     * requires an explicit call to smtpClose().
-     * @type boolean
-     */
-    public $SMTPKeepAlive = false;
-
-    /**
-     * Whether to split multiple to addresses into multiple messages
-     * or send them all in one message.
-     * @type boolean
-     */
-    public $SingleTo = false;
-
-    /**
-     * Storage for addresses when SingleTo is enabled.
-     * @type array
-     * @TODO This should really not be public
-     */
-    public $SingleToArray = array();
-
-    /**
-     * Whether to generate VERP addresses on send.
-     * Only applicable when sending via SMTP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Postfix VERP info
-     * @type boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * Whether to allow sending messages with an empty body.
-     * @type boolean
-     */
-    public $AllowEmpty = false;
-
-    /**
-     * The default line ending.
-     * @note The default remains "\n". We force CRLF where we know
-     *        it must be used via self::CRLF.
-     * @type string
-     */
-    public $LE = "\n";
-
-    /**
-     * DKIM selector.
-     * @type string
-     */
-    public $DKIM_selector = '';
-
-    /**
-     * DKIM Identity.
-     * Usually the email address used as the source of the email
-     * @type string
-     */
-    public $DKIM_identity = '';
-
-    /**
-     * DKIM passphrase.
-     * Used if your key is encrypted.
-     * @type string
-     */
-    public $DKIM_passphrase = '';
-
-    /**
-     * DKIM signing domain name.
-     * @example 'example.com'
-     * @type string
-     */
-    public $DKIM_domain = '';
-
-    /**
-     * DKIM private key file path.
-     * @type string
-     */
-    public $DKIM_private = '';
-
-    /**
-     * Callback Action function name.
-     *
-     * The function that handles the result of the send email action.
-     * It is called out by send() for each email sent.
-     *
-     * Value can be any php callable: http://www.php.net/is_callable
-     *
-     * Parameters:
-     *   boolean $result        result of the send action
-     *   string  $to            email address of the recipient
-     *   string  $cc            cc email addresses
-     *   string  $bcc           bcc email addresses
-     *   string  $subject       the subject
-     *   string  $body          the email body
-     *   string  $from          email address of sender
-     * @type string
-     */
-    public $action_function = '';
-
-    /**
-     * What to put in the X-Mailer header.
-     * Options: An empty string for PHPMailer default, whitespace for none, or a string to use
-     * @type string
-     */
-    public $XMailer = '';
-
-    /**
-     * An instance of the SMTP sender class.
-     * @type SMTP
-     * @access protected
-     */
-    protected $smtp = null;
-
-    /**
-     * The array of 'to' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $to = array();
-
-    /**
-     * The array of 'cc' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $cc = array();
-
-    /**
-     * The array of 'bcc' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $bcc = array();
-
-    /**
-     * The array of reply-to names and addresses.
-     * @type array
-     * @access protected
-     */
-    protected $ReplyTo = array();
-
-    /**
-     * An array of all kinds of addresses.
-     * Includes all of $to, $cc, $bcc
-     * @type array
-     * @access protected
-     */
-    protected $all_recipients = array();
-
-    /**
-     * The array of attachments.
-     * @type array
-     * @access protected
-     */
-    protected $attachment = array();
-
-    /**
-     * The array of custom headers.
-     * @type array
-     * @access protected
-     */
-    protected $CustomHeader = array();
-
-    /**
-     * The most recent Message-ID (including angular brackets).
-     * @type string
-     * @access protected
-     */
-    protected $lastMessageID = '';
-
-    /**
-     * The message's MIME type.
-     * @type string
-     * @access protected
-     */
-    protected $message_type = '';
-
-    /**
-     * The array of MIME boundary strings.
-     * @type array
-     * @access protected
-     */
-    protected $boundary = array();
-
-    /**
-     * The array of available languages.
-     * @type array
-     * @access protected
-     */
-    protected $language = array();
-
-    /**
-     * The number of errors encountered.
-     * @type integer
-     * @access protected
-     */
-    protected $error_count = 0;
-
-    /**
-     * The S/MIME certificate file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_cert_file = '';
-
-    /**
-     * The S/MIME key file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_key_file = '';
-
-    /**
-     * The optional S/MIME extra certificates ("CA Chain") file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_extracerts_file = '';
-
-    /**
-     * The S/MIME password for the key.
-     * Used only if the key is encrypted.
-     * @type string
-     * @access protected
-     */
-    protected $sign_key_pass = '';
-
-    /**
-     * Whether to throw exceptions for errors.
-     * @type boolean
-     * @access protected
-     */
-    protected $exceptions = false;
-
-    /**
-     * Unique ID used for message ID and boundaries.
-     * @type string
-     * @access protected
-     */
-    protected $uniqueid = '';
-
-    /**
-     * Error severity: message only, continue processing.
-     */
-    const STOP_MESSAGE = 0;
-
-    /**
-     * Error severity: message, likely ok to continue processing.
-     */
-    const STOP_CONTINUE = 1;
-
-    /**
-     * Error severity: message, plus full stop, critical error reached.
-     */
-    const STOP_CRITICAL = 2;
-
-    /**
-     * SMTP RFC standard line ending.
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * The maximum line length allowed by RFC 2822 section 2.1.1
-     * @type integer
-     */
-    const MAX_LINE_LENGTH = 998;
-
-    /**
-     * Constructor.
-     * @param boolean $exceptions Should we throw external exceptions?
-     */
-    public function __construct($exceptions = false)
-    {
-        $this->exceptions = (boolean)$exceptions;
-    }
-
-    /**
-     * Destructor.
-     */
-    public function __destruct()
-    {
-        //Close any open SMTP connection nicely
-        if ($this->Mailer == 'smtp') {
-            $this->smtpClose();
-        }
-    }
-
-    /**
-     * Call mail() in a safe_mode-aware fashion.
-     * Also, unless sendmail_path points to sendmail (or something that
-     * claims to be sendmail), don't pass params (not a perfect fix,
-     * but it will do)
-     * @param string $to To
-     * @param string $subject Subject
-     * @param string $body Message Body
-     * @param string $header Additional Header(s)
-     * @param string $params Params
-     * @access private
-     * @return boolean
-     */
-    private function mailPassthru($to, $subject, $body, $header, $params)
-    {
-        //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) {
-            $subject = $this->secureHeader($subject);
-        } else {
-            $subject = $this->encodeHeader($this->secureHeader($subject));
-        }
-        if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
-            $result = @mail($to, $subject, $body, $header);
-        } else {
-            $result = @mail($to, $subject, $body, $header, $params);
-        }
-        return $result;
-    }
-
-    /**
-     * Output debugging info via user-defined method.
-     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
-     * @see PHPMailer::$Debugoutput
-     * @see PHPMailer::$SMTPDebug
-     * @param string $str
-     */
-    protected function edebug($str)
-    {
-        if ($this->SMTPDebug <= 0) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "<br>\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                ) . "\n";
-        }
-    }
-
-    /**
-     * Sets message type to HTML or plain.
-     * @param boolean $isHtml True for HTML mode.
-     * @return void
-     */
-    public function isHTML($isHtml = true)
-    {
-        if ($isHtml) {
-            $this->ContentType = 'text/html';
-        } else {
-            $this->ContentType = 'text/plain';
-        }
-    }
-
-    /**
-     * Send messages using SMTP.
-     * @return void
-     */
-    public function isSMTP()
-    {
-        $this->Mailer = 'smtp';
-    }
-
-    /**
-     * Send messages using PHP's mail() function.
-     * @return void
-     */
-    public function isMail()
-    {
-        $this->Mailer = 'mail';
-    }
-
-    /**
-     * Send messages using $Sendmail.
-     * @return void
-     */
-    public function isSendmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (!stristr($ini_sendmail_path, 'sendmail')) {
-            $this->Sendmail = '/usr/sbin/sendmail';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'sendmail';
-    }
-
-    /**
-     * Send messages using qmail.
-     * @return void
-     */
-    public function isQmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (!stristr($ini_sendmail_path, 'qmail')) {
-            $this->Sendmail = '/var/qmail/bin/qmail-inject';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'qmail';
-    }
-
-    /**
-     * Add a "To" address.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addAddress($address, $name = '')
-    {
-        return $this->addAnAddress('to', $address, $name);
-    }
-
-    /**
-     * Add a "CC" address.
-     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addCC($address, $name = '')
-    {
-        return $this->addAnAddress('cc', $address, $name);
-    }
-
-    /**
-     * Add a "BCC" address.
-     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addBCC($address, $name = '')
-    {
-        return $this->addAnAddress('bcc', $address, $name);
-    }
-
-    /**
-     * Add a "Reply-to" address.
-     * @param string $address
-     * @param string $name
-     * @return boolean
-     */
-    public function addReplyTo($address, $name = '')
-    {
-        return $this->addAnAddress('Reply-To', $address, $name);
-    }
-
-    /**
-     * Add an address to one of the recipient arrays.
-     * Addresses that have been added already return false, but do not throw exceptions
-     * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
-     * @param string $address The email address to send to
-     * @param string $name
-     * @throws phpmailerException
-     * @return boolean true on success, false if address already used or invalid in some way
-     * @access protected
-     */
-    protected function addAnAddress($kind, $address, $name = '')
-    {
-        if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
-            $this->setError($this->lang('Invalid recipient array') . ': ' . $kind);
-            $this->edebug($this->lang('Invalid recipient array') . ': ' . $kind);
-            if ($this->exceptions) {
-                throw new phpmailerException('Invalid recipient array: ' . $kind);
-            }
-            return false;
-        }
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
-            }
-            return false;
-        }
-        if ($kind != 'Reply-To') {
-            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;
-    }
-
-    /**
-     * Set the From and FromName properties.
-     * @param string $address
-     * @param string $name
-     * @param boolean $auto Whether to also set the Sender address, defaults to true
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function setFrom($address, $name = '', $auto = true)
-    {
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
-            }
-            return false;
-        }
-        $this->From = $address;
-        $this->FromName = $name;
-        if ($auto) {
-            if (empty($this->Sender)) {
-                $this->Sender = $address;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return the Message-ID header of the last email.
-     * Technically this is the value from the last time the headers were created,
-     * but it's also the message ID of the last sent message except in
-     * pathological cases.
-     * @return string
-     */
-    public function getLastMessageID()
-    {
-        return $this->lastMessageID;
-    }
-
-    /**
-     * Check that a string looks like an email address.
-     * @param string $address The email address to check
-     * @param string $patternselect A selector for the validation pattern to use :
-     * * `auto` Pick strictest one automatically;
-     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
-     * * `pcre` Use old PCRE implementation;
-     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; same as pcre8 but does not allow 'dotless' domains;
-     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
-     * * `noregex` Don't use a regex: super fast, really dumb.
-     * @return boolean
-     * @static
-     * @access public
-     */
-    public static function validateAddress($address, $patternselect = 'auto')
-    {
-        if (!$patternselect or $patternselect == 'auto') {
-            //Check this constant first so it works when extension_loaded() is disabled by safe mode
-            //Constant was added in PHP 5.2.4
-            if (defined('PCRE_VERSION')) {
-                //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
-                if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
-                    $patternselect = 'pcre8';
-                } else {
-                    $patternselect = 'pcre';
-                }
-            } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
-                //Fall back to older PCRE
-                $patternselect = 'pcre';
-            } else {
-                //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
-                if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
-                    $patternselect = 'php';
-                } else {
-                    $patternselect = 'noregex';
-                }
-            }
-        }
-        switch ($patternselect) {
-            case 'pcre8':
-                /**
-                 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
-                 * @link http://squiloople.com/2009/12/20/email-address-validation/
-                 * @copyright 2009-2010 Michael Rushton
-                 * Feel free to use and redistribute this code. But please keep this copyright notice.
-                 */
-                return (boolean)preg_match(
-                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
-                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
-                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
-                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
-                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
-                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
-                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
-                    $address
-                );
-            case 'pcre':
-                //An older regex that doesn't need a recent PCRE
-                return (boolean)preg_match(
-                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
-                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
-                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
-                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
-                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
-                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
-                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
-                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
-                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
-                    $address
-                );
-            case 'html5':
-                /**
-                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
-                 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
-                 */
-                return (boolean)preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[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])?)*$/sD',
-                    $address
-                );
-            case 'noregex':
-                //No PCRE! Do something _very_ approximate!
-                //Check the address is 3 chars or longer and contains an @ that's not the first or last char
-                return (strlen($address) >= 3
-                    and strpos($address, '@') >= 1
-                    and strpos($address, '@') != strlen($address) - 1);
-            case 'php':
-            default:
-                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
-        }
-    }
-
-    /**
-     * Create a message and send it.
-     * Uses the sending method specified by $Mailer.
-     * @throws phpmailerException
-     * @return boolean false on error - See the ErrorInfo property for details of the error.
-     */
-    public function send()
-    {
-        try {
-            if (!$this->preSend()) {
-                return false;
-            }
-            return $this->postSend();
-        } catch (phpmailerException $exc) {
-            $this->mailHeader = '';
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Prepare a message for sending.
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function preSend()
-    {
-        try {
-            $this->mailHeader = '';
-            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();
-            // Refuse to send an empty message unless we are specifically allowing it
-            if (!$this->AllowEmpty and empty($this->Body)) {
-                throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
-            }
-
-            // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
-            $this->MIMEHeader = '';
-            $this->MIMEBody = $this->createBody();
-            // createBody may have added some headers, so retain them
-            $tempheaders = $this->MIMEHeader;
-            $this->MIMEHeader = $this->createHeader();
-            $this->MIMEHeader .= $tempheaders;
-
-            // To capture the complete message when using mail(), create
-            // an extra header list which createHeader() doesn't fold in
-            if ($this->Mailer == 'mail') {
-                if (count($this->to) > 0) {
-                    $this->mailHeader .= $this->addrAppend('To', $this->to);
-                } else {
-                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
-                }
-                $this->mailHeader .= $this->headerLine(
-                    'Subject',
-                    $this->encodeHeader($this->secureHeader(trim($this->Subject)))
-                );
-            }
-
-            // Sign with DKIM if enabled
-            if (!empty($this->DKIM_domain)
-                && !empty($this->DKIM_private)
-                && !empty($this->DKIM_selector)
-                && file_exists($this->DKIM_private)) {
-                $header_dkim = $this->DKIM_Add(
-                    $this->MIMEHeader . $this->mailHeader,
-                    $this->encodeHeader($this->secureHeader($this->Subject)),
-                    $this->MIMEBody
-                );
-                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
-                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
-            }
-            return true;
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Actually send a message.
-     * Send the email via the selected mechanism
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function postSend()
-    {
-        try {
-            // Choose the mailer and send through it
-            switch ($this->Mailer) {
-                case 'sendmail':
-                case 'qmail':
-                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
-                case 'smtp':
-                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
-                case 'mail':
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-                default:
-                    $sendMethod = $this->Mailer.'Send';
-                    if (method_exists($this, $sendMethod)) {
-                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
-                    }
-
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-            }
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Send mail using the $Sendmail program.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @see PHPMailer::$Sendmail
-     * @throws phpmailerException
-     * @access protected
-     * @return boolean
-     */
-    protected function sendmailSend($header, $body)
-    {
-        if ($this->Sender != '') {
-            if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-            } else {
-                $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-            }
-        } else {
-            if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
-            } else {
-                $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail));
-            }
-        }
-        if ($this->SingleTo) {
-            foreach ($this->SingleToArray as $toAddr) {
-                if (!@$mail = popen($sendmail, 'w')) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-                fputs($mail, 'To: ' . $toAddr . "\n");
-                fputs($mail, $header);
-                fputs($mail, $body);
-                $result = pclose($mail);
-                $this->doCallback(
-                    ($result == 0),
-                    array($toAddr),
-                    $this->cc,
-                    $this->bcc,
-                    $this->Subject,
-                    $body,
-                    $this->From
-                );
-                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);
-            $this->doCallback(($result == 0), $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-            if ($result != 0) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Send mail using the PHP mail() function.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @link http://www.php.net/manual/en/book.mail.php
-     * @throws phpmailerException
-     * @access protected
-     * @return boolean
-     */
-    protected function mailSend($header, $body)
-    {
-        $toArr = array();
-        foreach ($this->to as $toaddr) {
-            $toArr[] = $this->addrFormat($toaddr);
-        }
-        $to = implode(', ', $toArr);
-
-        if (empty($this->Sender)) {
-            $params = ' ';
-        } else {
-            $params = sprintf('-f%s', $this->Sender);
-        }
-        if ($this->Sender != '' and !ini_get('safe_mode')) {
-            $old_from = ini_get('sendmail_from');
-            ini_set('sendmail_from', $this->Sender);
-        }
-        $result = false;
-        if ($this->SingleTo && count($toArr) > 1) {
-            foreach ($toArr as $toAddr) {
-                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-            }
-        } else {
-            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
-            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-        }
-        if (isset($old_from)) {
-            ini_set('sendmail_from', $old_from);
-        }
-        if (!$result) {
-            throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
-        }
-        return true;
-    }
-
-    /**
-     * Get an instance to use for SMTP operations.
-     * Override this function to load your own SMTP implementation
-     * @return SMTP
-     */
-    public function getSMTPInstance()
-    {
-        if (!is_object($this->smtp)) {
-        	require_once( 'class-smtp.php' );
-            $this->smtp = new SMTP;
-        }
-        return $this->smtp;
-    }
-
-    /**
-     * Send mail via SMTP.
-     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-     * Uses the PHPMailerSMTP class by default.
-     * @see PHPMailer::getSMTPInstance() to use a different class.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @throws phpmailerException
-     * @uses SMTP
-     * @access protected
-     * @return boolean
-     */
-    protected function smtpSend($header, $body)
-    {
-        $bad_rcpt = array();
-        if (!$this->smtpConnect($this->SMTPOptions)) {
-            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
-        }
-        if ('' == $this->Sender) {
-            $smtp_from = $this->From;
-        } else {
-            $smtp_from = $this->Sender;
-        }
-        if (!$this->smtp->mail($smtp_from)) {
-            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
-            throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
-        }
-
-        // Attempt to send to all recipients
-        foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
-            foreach ($togroup as $to) {
-                if (!$this->smtp->recipient($to[0])) {
-                    $error = $this->smtp->getError();
-                    $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']);
-                    $isSent = false;
-                } else {
-                    $isSent = true;
-                }
-                $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
-            }
-        }
-
-        // Only send the DATA command if we have viable recipients
-        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
-            throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
-        }
-        if ($this->SMTPKeepAlive) {
-            $this->smtp->reset();
-        } else {
-            $this->smtp->quit();
-            $this->smtp->close();
-        }
-        //Create error message for any bad addresses
-        if (count($bad_rcpt) > 0) {
-            $errstr = '';
-            foreach ($bad_rcpt as $bad) {
-                $errstr .= $bad['to'] . ': ' . $bad['error'];
-            }
-            throw new phpmailerException(
-                $this->lang('recipients_failed') . $errstr,
-                self::STOP_CONTINUE
-            );
-        }
-        return true;
-    }
-
-    /**
-     * Initiate a connection to an SMTP server.
-     * Returns false if the operation failed.
-     * @param array $options An array of options compatible with stream_context_create()
-     * @uses SMTP
-     * @access public
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function smtpConnect($options = array())
-    {
-        if (is_null($this->smtp)) {
-            $this->smtp = $this->getSMTPInstance();
-        }
-
-        // Already connected?
-        if ($this->smtp->connected()) {
-            return true;
-        }
-
-        $this->smtp->setTimeout($this->Timeout);
-        $this->smtp->setDebugLevel($this->SMTPDebug);
-        $this->smtp->setDebugOutput($this->Debugoutput);
-        $this->smtp->setVerp($this->do_verp);
-        $hosts = explode(';', $this->Host);
-        $lastexception = null;
-
-        foreach ($hosts as $hostentry) {
-            $hostinfo = array();
-            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
-                // Not a valid host entry
-                continue;
-            }
-            // $hostinfo[2]: optional ssl or tls prefix
-            // $hostinfo[3]: the hostname
-            // $hostinfo[4]: optional port number
-            // The host string prefix can temporarily override the current setting for SMTPSecure
-            // If it's not specified, the default value is used
-            $prefix = '';
-            $secure = $this->SMTPSecure;
-            $tls = ($this->SMTPSecure == 'tls');
-            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
-                $prefix = 'ssl://';
-                $tls = false; // Can't have SSL and TLS at the same time
-                $secure = 'ssl';
-            } elseif ($hostinfo[2] == 'tls') {
-                $tls = true;
-                // tls doesn't use a prefix
-                $secure = 'tls';
-            }
-            //Do we need the OpenSSL extension?
-            $sslext = defined('OPENSSL_ALGO_SHA1');
-            if ('tls' === $secure or 'ssl' === $secure) {
-                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
-                if (!$sslext) {
-                    throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
-                }
-            }
-            $host = $hostinfo[3];
-            $port = $this->Port;
-            $tport = (integer)$hostinfo[4];
-            if ($tport > 0 and $tport < 65536) {
-                $port = $tport;
-            }
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
-                try {
-                    if ($this->Helo) {
-                        $hello = $this->Helo;
-                    } else {
-                        $hello = $this->serverHostname();
-                    }
-                    $this->smtp->hello($hello);
-                    //Automatically enable TLS encryption if:
-                    // * it's not disabled
-                    // * we have openssl extension
-                    // * we are not already using SSL
-                    // * the server offers STARTTLS
-                    if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) {
-                        $tls = true;
-                    }
-                    if ($tls) {
-                        if (!$this->smtp->startTLS()) {
-                            throw new phpmailerException($this->lang('connect_host'));
-                        }
-                        // We must resend HELO after tls negotiation
-                        $this->smtp->hello($hello);
-                    }
-                    if ($this->SMTPAuth) {
-                        if (!$this->smtp->authenticate(
-                            $this->Username,
-                            $this->Password,
-                            $this->AuthType,
-                            $this->Realm,
-                            $this->Workstation
-                        )
-                        ) {
-                            throw new phpmailerException($this->lang('authenticate'));
-                        }
-                    }
-                    return true;
-                } catch (phpmailerException $exc) {
-                    $lastexception = $exc;
-                    $this->edebug($exc->getMessage());
-                    // We must have connected, but then failed TLS or Auth, so close connection nicely
-                    $this->smtp->quit();
-                }
-            }
-        }
-        // If we get here, all connection attempts have failed, so close connection hard
-        $this->smtp->close();
-        // As we've caught all exceptions, just report whatever the last one was
-        if ($this->exceptions and !is_null($lastexception)) {
-            throw $lastexception;
-        }
-        return false;
-    }
-
-    /**
-     * Close the active SMTP session if one exists.
-     * @return void
-     */
-    public function smtpClose()
-    {
-        if ($this->smtp !== null) {
-            if ($this->smtp->connected()) {
-                $this->smtp->quit();
-                $this->smtp->close();
-            }
-        }
-    }
-
-    /**
-     * Set the language for 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. French is "fr")
-     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
-     * @return boolean
-     * @access public
-     */
-    public function setLanguage($langcode = 'en', $lang_path = '')
-    {
-        // Define full set of translatable strings in English
-        $PHPMAILER_LANG = array(
-            'authenticate' => 'SMTP Error: Could not authenticate.',
-            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-            'data_not_accepted' => 'SMTP Error: data not accepted.',
-            'empty_message' => 'Message body empty',
-            'encoding' => 'Unknown encoding: ',
-            'execute' => 'Could not execute: ',
-            'file_access' => 'Could not access file: ',
-            'file_open' => 'File Error: Could not open file: ',
-            'from_failed' => 'The following From address failed: ',
-            'instantiate' => 'Could not instantiate mail function.',
-            'invalid_address' => 'Invalid address',
-            'mailer_not_supported' => ' mailer is not supported.',
-            'provide_address' => 'You must provide at least one recipient email address.',
-            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-            'signing' => 'Signing Error: ',
-            'smtp_connect_failed' => 'SMTP connect() failed.',
-            'smtp_error' => 'SMTP server error: ',
-            'variable_set' => 'Cannot set or reset variable: ',
-            'extension_missing' => 'Extension missing: '
-        );
-        if (empty($lang_path)) {
-            // Calculate an absolute path so it can work if CWD is not here
-            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
-        }
-        $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
-        // There is no English translation file
-        if ($langcode != 'en') {
-            // Make sure language file path is readable
-            if (!is_readable($lang_file)) {
-                $foundlang = false;
-            } else {
-                // Overwrite language-specific strings.
-                // This way we'll never have missing translation keys.
-                $foundlang = include $lang_file;
-            }
-        }
-        $this->language = $PHPMAILER_LANG;
-        return (boolean)$foundlang; // Returns false if language not found
-    }
-
-    /**
-     * Get the array of strings for the current language.
-     * @return array
-     */
-    public function getTranslations()
-    {
-        return $this->language;
-    }
-
-    /**
-     * Create recipient headers.
-     * @access public
-     * @param string $type
-     * @param array $addr An array of recipient,
-     * where each recipient is a 2-element indexed array with element 0 containing an address
-     * and element 1 containing a name, like:
-     * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
-     * @return string
-     */
-    public function addrAppend($type, $addr)
-    {
-        $addresses = array();
-        foreach ($addr as $address) {
-            $addresses[] = $this->addrFormat($address);
-        }
-        return $type . ': ' . implode(', ', $addresses) . $this->LE;
-    }
-
-    /**
-     * Format an address for use in a message header.
-     * @access public
-     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
-     *      like array('joe@example.com', 'Joe User')
-     * @return string
-     */
-    public function addrFormat($addr)
-    {
-        if (empty($addr[1])) { // No name provided
-            return $this->secureHeader($addr[0]);
-        } else {
-            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
-                $addr[0]
-            ) . '>';
-        }
-    }
-
-    /**
-     * Word-wrap message.
-     * For use with mailers that do not automatically perform wrapping
-     * and for quoted-printable encoded messages.
-     * Original written by philippe.
-     * @param string $message The message to wrap
-     * @param integer $length The line length to wrap to
-     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
-     * @access public
-     * @return string
-     */
-    public function wrapText($message, $length, $qp_mode = false)
-    {
-        if ($qp_mode) {
-            $soft_break = sprintf(' =%s', $this->LE);
-        } else {
-            $soft_break = $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');
-        $lelen = strlen($this->LE);
-        $crlflen = strlen(self::CRLF);
-
-        $message = $this->fixEOL($message);
-        //Remove a trailing line break
-        if (substr($message, -$lelen) == $this->LE) {
-            $message = substr($message, 0, -$lelen);
-        }
-
-        //Split message into lines
-        $lines = explode($this->LE, $message);
-        //Message will be rebuilt in here
-        $message = '';
-        foreach ($lines as $line) {
-            $words = explode(' ', $line);
-            $buf = '';
-            $firstword = true;
-            foreach ($words as $word) {
-                if ($qp_mode and (strlen($word) > $length)) {
-                    $space_left = $length - strlen($buf) - $crlflen;
-                    if (!$firstword) {
-                        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', self::CRLF);
-                        } else {
-                            $message .= $buf . $soft_break;
-                        }
-                        $buf = '';
-                    }
-                    while (strlen($word) > 0) {
-                        if ($length <= 0) {
-                            break;
-                        }
-                        $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', self::CRLF);
-                        } else {
-                            $buf = $part;
-                        }
-                    }
-                } else {
-                    $buf_o = $buf;
-                    if (!$firstword) {
-                        $buf .= ' ';
-                    }
-                    $buf .= $word;
-
-                    if (strlen($buf) > $length and $buf_o != '') {
-                        $message .= $buf_o . $soft_break;
-                        $buf = $word;
-                    }
-                }
-                $firstword = false;
-            }
-            $message .= $buf . self::CRLF;
-        }
-
-        return $message;
-    }
-
-    /**
-     * Find the last character boundary prior to $maxLength in a utf-8
-     * quoted-printable encoded string.
-     * Original written by Colin Brown.
-     * @access public
-     * @param string $encodedText utf-8 QP text
-     * @param integer $maxLength Find the last character boundary prior to this length
-     * @return integer
-     */
-    public function utf8CharBoundary($encodedText, $maxLength)
-    {
-        $foundSplitPos = false;
-        $lookBack = 3;
-        while (!$foundSplitPos) {
-            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-            $encodedCharPos = strpos($lastChunk, '=');
-            if (false !== $encodedCharPos) {
-                // 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
-                    if ($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;
-    }
-
-    /**
-     * Apply word wrapping to the message body.
-     * Wraps the message body to the number of chars set in the WordWrap property.
-     * You should only do this to plain-text bodies as wrapping HTML tags may break them.
-     * This is called automatically by createBody(), so you don't need to call it yourself.
-     * @access public
-     * @return void
-     */
-    public function setWordWrap()
-    {
-        if ($this->WordWrap < 1) {
-            return;
-        }
-
-        switch ($this->message_type) {
-            case 'alt':
-            case 'alt_inline':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
-                break;
-            default:
-                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
-                break;
-        }
-    }
-
-    /**
-     * Assemble message headers.
-     * @access public
-     * @return string The assembled headers
-     */
-    public function createHeader()
-    {
-        $result = '';
-
-        if ($this->MessageDate == '') {
-            $this->MessageDate = self::rfcDate();
-        }
-        $result .= $this->headerLine('Date', $this->MessageDate);
-
-
-        // To be created automatically by mail()
-        if ($this->SingleTo) {
-            if ($this->Mailer != 'mail') {
-                foreach ($this->to as $toaddr) {
-                    $this->SingleToArray[] = $this->addrFormat($toaddr);
-                }
-            }
-        } else {
-            if (count($this->to) > 0) {
-                if ($this->Mailer != 'mail') {
-                    $result .= $this->addrAppend('To', $this->to);
-                }
-            } elseif (count($this->cc) == 0) {
-                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
-            }
-        }
-
-        $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
-
-        // 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' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
-            )
-            and 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 != '') {
-            $this->lastMessageID = $this->MessageID;
-        } else {
-            $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->ServerHostname());
-        }
-        $result .= $this->headerLine('Message-ID', $this->lastMessageID);
-        $result .= $this->headerLine('X-Priority', $this->Priority);
-        if ($this->XMailer == '') {
-            $result .= $this->headerLine(
-                'X-Mailer',
-                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)'
-            );
-        } else {
-            $myXmailer = trim($this->XMailer);
-            if ($myXmailer) {
-                $result .= $this->headerLine('X-Mailer', $myXmailer);
-            }
-        }
-
-        if ($this->ConfirmReadingTo != '') {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
-        }
-
-        // Add custom headers
-        foreach ($this->CustomHeader as $header) {
-            $result .= $this->headerLine(
-                trim($header[0]),
-                $this->encodeHeader(trim($header[1]))
-            );
-        }
-        if (!$this->sign_key_file) {
-            $result .= $this->headerLine('MIME-Version', '1.0');
-            $result .= $this->getMailMIME();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get the message MIME type headers.
-     * @access public
-     * @return string
-     */
-    public function getMailMIME()
-    {
-        $result = '';
-        $ismultipart = true;
-        switch ($this->message_type) {
-            case 'inline':
-                $result .= $this->headerLine('Content-Type', 'multipart/related;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            case 'attach':
-            case 'inline_attach':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            case 'alt':
-            case 'alt_inline':
-                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            default:
-                // Catches case 'plain': and case '':
-                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
-                $ismultipart = false;
-                break;
-        }
-        // RFC1341 part 5 says 7bit is assumed if not specified
-        if ($this->Encoding != '7bit') {
-            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
-            if ($ismultipart) {
-                if ($this->Encoding == '8bit') {
-                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
-                }
-                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
-            } else {
-                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
-            }
-        }
-
-        if ($this->Mailer != 'mail') {
-            $result .= $this->LE;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the whole MIME message.
-     * Includes complete headers and body.
-     * Only valid post preSend().
-     * @see PHPMailer::preSend()
-     * @access public
-     * @return string
-     */
-    public function getSentMIMEMessage()
-    {
-        return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
-    }
-
-    /**
-     * Assemble the message body.
-     * Returns an empty string on failure.
-     * @access public
-     * @throws phpmailerException
-     * @return string The assembled message body
-     */
-    public function createBody()
-    {
-        $body = '';
-        //Create unique IDs and preset boundaries
-        $this->uniqueid = md5(uniqid(time()));
-        $this->boundary[1] = 'b1_' . $this->uniqueid;
-        $this->boundary[2] = 'b2_' . $this->uniqueid;
-        $this->boundary[3] = 'b3_' . $this->uniqueid;
-
-        if ($this->sign_key_file) {
-            $body .= $this->getMailMIME() . $this->LE;
-        }
-
-        $this->setWordWrap();
-
-        $bodyEncoding = $this->Encoding;
-        $bodyCharSet = $this->CharSet;
-        //Can we do a 7-bit downgrade?
-        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
-            $bodyEncoding = '7bit';
-            $bodyCharSet = 'us-ascii';
-        }
-        //If lines are too long, change to quoted-printable transfer encoding
-        if (self::hasLineLongerThanMax($this->Body)) {
-            $this->Encoding = 'quoted-printable';
-            $bodyEncoding = 'quoted-printable';
-        }
-
-        $altBodyEncoding = $this->Encoding;
-        $altBodyCharSet = $this->CharSet;
-        //Can we do a 7-bit downgrade?
-        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
-            $altBodyEncoding = '7bit';
-            $altBodyCharSet = 'us-ascii';
-        }
-        //If lines are too long, change to quoted-printable transfer encoding
-        if (self::hasLineLongerThanMax($this->AltBody)) {
-            $altBodyEncoding = 'quoted-printable';
-        }
-        //Use this as a preamble in all multipart message types
-        $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
-        switch ($this->message_type) {
-            case 'inline':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[1]);
-                break;
-            case 'attach':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'inline_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                if (!empty($this->Ical)) {
-                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
-                    $body .= $this->encodeString($this->Ical, $this->Encoding);
-                    $body .= $this->LE . $this->LE;
-                }
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_inline':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt_inline_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[3]);
-                $body .= $this->LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            default:
-                // catch case 'plain' and case ''
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                break;
-        }
-
-        if ($this->isError()) {
-            $body = '';
-        } elseif ($this->sign_key_file) {
-            try {
-                if (!defined('PKCS7_TEXT')) {
-                    throw new phpmailerException($this->lang('extension_missing') . 'openssl');
-                }
-                // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
-                $file = tempnam(sys_get_temp_dir(), 'mail');
-                if (false === file_put_contents($file, $body)) {
-                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
-                }
-                $signed = tempnam(sys_get_temp_dir(), 'signed');
-                //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
-                if (empty($this->sign_extracerts_file)) {
-                    $sign = @openssl_pkcs7_sign(
-                        $file,
-                        $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
-                        null
-                    );
-                } else {
-                    $sign = @openssl_pkcs7_sign(
-                        $file,
-                        $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
-                        null,
-                        PKCS7_DETACHED,
-                        $this->sign_extracerts_file
-                    );
-                }
-                if ($sign) {
-                    @unlink($file);
-                    $body = file_get_contents($signed);
-                    @unlink($signed);
-                    //The message returned by openssl contains both headers and body, so need to split them up
-                    $parts = explode("\n\n", $body, 2);
-                    $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
-                    $body = $parts[1];
-                } else {
-                    @unlink($file);
-                    @unlink($signed);
-                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
-                }
-            } catch (phpmailerException $exc) {
-                $body = '';
-                if ($this->exceptions) {
-                    throw $exc;
-                }
-            }
-        }
-        return $body;
-    }
-
-    /**
-     * Return the start of a message boundary.
-     * @access protected
-     * @param string $boundary
-     * @param string $charSet
-     * @param string $contentType
-     * @param string $encoding
-     * @return string
-     */
-    protected 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;
-        // RFC1341 part 5 says 7bit is assumed if not specified
-        if ($encoding != '7bit') {
-            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
-        }
-        $result .= $this->LE;
-
-        return $result;
-    }
-
-    /**
-     * Return the end of a message boundary.
-     * @access protected
-     * @param string $boundary
-     * @return string
-     */
-    protected function endBoundary($boundary)
-    {
-        return $this->LE . '--' . $boundary . '--' . $this->LE;
-    }
-
-    /**
-     * Set the message type.
-     * PHPMailer only supports some preset message types,
-     * not arbitrary MIME structures.
-     * @access protected
-     * @return void
-     */
-    protected function setMessageType()
-    {
-        $type = array();
-        if ($this->alternativeExists()) {
-            $type[] = 'alt';
-        }
-        if ($this->inlineImageExists()) {
-            $type[] = 'inline';
-        }
-        if ($this->attachmentExists()) {
-            $type[] = 'attach';
-        }
-        $this->message_type = implode('_', $type);
-        if ($this->message_type == '') {
-            $this->message_type = 'plain';
-        }
-    }
-
-    /**
-     * Format a header line.
-     * @access public
-     * @param string $name
-     * @param string $value
-     * @return string
-     */
-    public function headerLine($name, $value)
-    {
-        return $name . ': ' . $value . $this->LE;
-    }
-
-    /**
-     * Return a formatted mail line.
-     * @access public
-     * @param string $value
-     * @return string
-     */
-    public function textLine($value)
-    {
-        return $value . $this->LE;
-    }
-
-    /**
-     * Add an attachment from a path on the filesystem.
-     * Returns false if the file could not be found or read.
-     * @param string $path Path to the attachment.
-     * @param string $name Overrides the attachment name.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File extension (MIME) type.
-     * @param string $disposition Disposition to use
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
-    {
-        try {
-            if (!@is_file($path)) {
-                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
-            }
-
-            // If a MIME type is not specified, try to work it out from the file name
-            if ($type == '') {
-                $type = self::filenameToType($path);
-            }
-
-            $filename = basename($path);
-            if ($name == '') {
-                $name = $filename;
-            }
-
-            $this->attachment[] = array(
-                0 => $path,
-                1 => $filename,
-                2 => $name,
-                3 => $encoding,
-                4 => $type,
-                5 => false, // isStringAttachment
-                6 => $disposition,
-                7 => 0
-            );
-
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return the array of attachments.
-     * @return array
-     */
-    public function getAttachments()
-    {
-        return $this->attachment;
-    }
-
-    /**
-     * Attach all file, string, and binary attachments to the message.
-     * Returns an empty string on failure.
-     * @access protected
-     * @param string $disposition_type
-     * @param string $boundary
-     * @return string
-     */
-    protected function attachAll($disposition_type, $boundary)
-    {
-        // Return text of body
-        $mime = array();
-        $cidUniq = array();
-        $incl = array();
-
-        // Add all attachments
-        foreach ($this->attachment as $attachment) {
-            // Check if it is a valid disposition_filter
-            if ($attachment[6] == $disposition_type) {
-                // Check for string attachment
-                $string = '';
-                $path = '';
-                $bString = $attachment[5];
-                if ($bString) {
-                    $string = $attachment[0];
-                } else {
-                    $path = $attachment[0];
-                }
-
-                $inclhash = md5(serialize($attachment));
-                if (in_array($inclhash, $incl)) {
-                    continue;
-                }
-                $incl[] = $inclhash;
-                $name = $attachment[2];
-                $encoding = $attachment[3];
-                $type = $attachment[4];
-                $disposition = $attachment[6];
-                $cid = $attachment[7];
-                if ($disposition == 'inline' && isset($cidUniq[$cid])) {
-                    continue;
-                }
-                $cidUniq[$cid] = true;
-
-                $mime[] = sprintf('--%s%s', $boundary, $this->LE);
-                $mime[] = sprintf(
-                    'Content-Type: %s; name="%s"%s',
-                    $type,
-                    $this->encodeHeader($this->secureHeader($name)),
-                    $this->LE
-                );
-                // RFC1341 part 5 says 7bit is assumed if not specified
-                if ($encoding != '7bit') {
-                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
-                }
-
-                if ($disposition == 'inline') {
-                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
-                }
-
-                // If a filename contains any of these chars, it should be quoted,
-                // but not otherwise: RFC2183 & RFC2045 5.1
-                // Fixes a warning in IETF's msglint MIME checker
-                // Allow for bypassing the Content-Disposition header totally
-                if (!(empty($disposition))) {
-                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
-                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename="%s"%s',
-                            $disposition,
-                            $encoded_name,
-                            $this->LE . $this->LE
-                        );
-                    } else {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename=%s%s',
-                            $disposition,
-                            $encoded_name,
-                            $this->LE . $this->LE
-                        );
-                    }
-                } else {
-                    $mime[] = $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', $boundary, $this->LE);
-
-        return implode('', $mime);
-    }
-
-    /**
-     * Encode a file attachment in requested format.
-     * Returns an empty string on failure.
-     * @param string $path The full path to the file
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     * @throws phpmailerException
-     * @see EncodeFile(encodeFile
-     * @access protected
-     * @return string
-     */
-    protected function encodeFile($path, $encoding = 'base64')
-    {
-        try {
-            if (!is_readable($path)) {
-                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
-            }
-            $magic_quotes = get_magic_quotes_runtime();
-            if ($magic_quotes) {
-                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime(false);
-                } else {
-                    //Doesn't exist in PHP 5.4, but we don't need to check because
-                    //get_magic_quotes_runtime always returns false in 5.4+
-                    //so it will never get here
-                    ini_set('magic_quotes_runtime', false);
-                }
-            }
-            $file_buffer = file_get_contents($path);
-            $file_buffer = $this->encodeString($file_buffer, $encoding);
-            if ($magic_quotes) {
-                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime($magic_quotes);
-                } else {
-                    ini_set('magic_quotes_runtime', $magic_quotes);
-                }
-            }
-            return $file_buffer;
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            return '';
-        }
-    }
-
-    /**
-     * Encode a string in requested format.
-     * Returns an empty string on failure.
-     * @param string $str The text to encode
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     * @access public
-     * @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;
-    }
-
-    /**
-     * Encode a header string optimally.
-     * Picks shortest of Q, B, quoted-printable or none.
-     * @access public
-     * @param string $str
-     * @param string $position
-     * @return string
-     */
-    public function encodeHeader($str, $position = 'text')
-    {
-        $matchcount = 0;
-        switch (strtolower($position)) {
-            case 'phrase':
-                if (!preg_match('/[\200-\377]/', $str)) {
-                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
-                    $encoded = addcslashes($str, "\0..\37\177\\\"");
-                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-                        return ($encoded);
-                    } else {
-                        return ("\"$encoded\"");
-                    }
-                }
-                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                $matchcount = preg_match_all('/[()"]/', $str, $matches);
-                // Intentional fall-through
-            case 'text':
-            default:
-                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-                break;
-        }
-
-        //There are no chars that need encoding
-        if ($matchcount == 0) {
-            return ($str);
-        }
-
-        $maxlen = 75 - 7 - strlen($this->CharSet);
-        // Try to select the encoding which should produce the shortest output
-        if ($matchcount > strlen($str) / 3) {
-            // More than a third of the content will need encoding, so B encoding will be most efficient
-            $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, "\n");
-            } 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('=' . self::CRLF, "\n", trim($encoded));
-        }
-
-        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
-        $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
-        return $encoded;
-    }
-
-    /**
-     * Check if a string contains multi-byte characters.
-     * @access public
-     * @param string $str multi-byte text to wrap encode
-     * @return boolean
-     */
-    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;
-        }
-    }
-
-    /**
-     * Does a string contain any 8-bit chars (in any charset)?
-     * @param string $text
-     * @return boolean
-     */
-    public function has8bitChars($text)
-    {
-        return (boolean)preg_match('/[\x80-\xFF]/', $text);
-    }
-
-    /**
-     * Encode and wrap long multibyte strings for mail headers
-     * without breaking lines within a character.
-     * Adapted from a function by paravoid
-     * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
-     * @access public
-     * @param string $str multi-byte text to wrap encode
-     * @param string $linebreak string to use as linefeed/end-of-line
-     * @return string
-     */
-    public function base64EncodeWrapMB($str, $linebreak = null)
-    {
-        $start = '=?' . $this->CharSet . '?B?';
-        $end = '?=';
-        $encoded = '';
-        if ($linebreak === null) {
-            $linebreak = $this->LE;
-        }
-
-        $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
-        $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 . $linebreak;
-        }
-
-        // Chomp the last linefeed
-        $encoded = substr($encoded, 0, -strlen($linebreak));
-        return $encoded;
-    }
-
-    /**
-     * Encode a string in quoted-printable format.
-     * According to RFC2045 section 6.7.
-     * @access public
-     * @param string $string The text to encode
-     * @param integer $line_max Number of chars allowed on a line before wrapping
-     * @return string
-     * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
-     */
-    public function encodeQP($string, $line_max = 76)
-    {
-        // Use native function if it's available (>= PHP5.3)
-        if (function_exists('quoted_printable_encode')) {
-            return $this->fixEOL(quoted_printable_encode($string));
-        }
-        // Fall back to a pure PHP implementation
-        $string = str_replace(
-            array('%20', '%0D%0A.', '%0D%0A', '%'),
-            array(' ', "\r\n=2E", "\r\n", '='),
-            rawurlencode($string)
-        );
-        $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
-        return $this->fixEOL($string);
-    }
-
-    /**
-     * Backward compatibility wrapper for an old QP encoding function that was removed.
-     * @see PHPMailer::encodeQP()
-     * @access public
-     * @param string $string
-     * @param integer $line_max
-     * @param boolean $space_conv
-     * @return string
-     * @deprecated Use encodeQP instead.
-     */
-    public function encodeQPphp(
-        $string,
-        $line_max = 76,
-        /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
-    ) {
-        return $this->encodeQP($string, $line_max);
-    }
-
-    /**
-     * Encode a string using Q encoding.
-     * @link http://tools.ietf.org/html/rfc2047
-     * @param string $str the text to encode
-     * @param string $position Where the text is going to be used, see the RFC for what that means
-     * @access public
-     * @return string
-     */
-    public function encodeQ($str, $position = 'text')
-    {
-        // There should not be any EOL in the string
-        $pattern = '';
-        $encoded = str_replace(array("\r", "\n"), '', $str);
-        switch (strtolower($position)) {
-            case 'phrase':
-                // RFC 2047 section 5.3
-                $pattern = '^A-Za-z0-9!*+\/ -';
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                // RFC 2047 section 5.2
-                $pattern = '\(\)"';
-                // intentional fall-through
-                // for this reason we build the $pattern without including delimiters and []
-            case 'text':
-            default:
-                // RFC 2047 section 5.1
-                // Replace every high ascii, control, =, ? and _ characters
-                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
-                break;
-        }
-        $matches = array();
-        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
-            // If the string contains an '=', make sure it's the first thing we replace
-            // so as to avoid double-encoding
-            $eqkey = array_search('=', $matches[0]);
-            if (false !== $eqkey) {
-                unset($matches[0][$eqkey]);
-                array_unshift($matches[0], '=');
-            }
-            foreach (array_unique($matches[0]) as $char) {
-                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
-            }
-        }
-        // Replace every spaces to _ (more readable than =20)
-        return str_replace(' ', '_', $encoded);
-    }
-
-
-    /**
-     * Add a string or binary attachment (non-filesystem).
-     * This method can be used to attach ascii or binary data,
-     * such as a BLOB record from a database.
-     * @param string $string String attachment data.
-     * @param string $filename Name of the attachment.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File extension (MIME) type.
-     * @param string $disposition Disposition to use
-     * @return void
-     */
-    public function addStringAttachment(
-        $string,
-        $filename,
-        $encoding = 'base64',
-        $type = '',
-        $disposition = 'attachment'
-    ) {
-        // If a MIME type is not specified, try to work it out from the file name
-        if ($type == '') {
-            $type = self::filenameToType($filename);
-        }
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $string,
-            1 => $filename,
-            2 => basename($filename),
-            3 => $encoding,
-            4 => $type,
-            5 => true, // isStringAttachment
-            6 => $disposition,
-            7 => 0
-        );
-    }
-
-    /**
-     * Add an embedded (inline) attachment from a file.
-     * This can include images, sounds, and just about any other document type.
-     * These differ from 'regular' attachments in that they are intended to be
-     * displayed inline with the message, not just attached for download.
-     * This is used in HTML messages that embed the images
-     * the HTML refers to using the $cid value.
-     * @param string $path Path to the attachment.
-     * @param string $cid Content ID of the attachment; Use this to reference
-     *        the content when using an embedded image in HTML.
-     * @param string $name Overrides the attachment name.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File MIME type.
-     * @param string $disposition Disposition to use
-     * @return boolean True on successfully adding an attachment
-     */
-    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
-    {
-        if (!@is_file($path)) {
-            $this->setError($this->lang('file_access') . $path);
-            return false;
-        }
-
-        // If a MIME type is not specified, try to work it out from the file name
-        if ($type == '') {
-            $type = self::filenameToType($path);
-        }
-
-        $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 => $disposition,
-            7 => $cid
-        );
-        return true;
-    }
-
-    /**
-     * Add an embedded stringified attachment.
-     * This can include images, sounds, and just about any other document type.
-     * Be sure to set the $type to an image type for images:
-     * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
-     * @param string $string The attachment binary data.
-     * @param string $cid Content ID of the attachment; Use this to reference
-     *        the content when using an embedded image in HTML.
-     * @param string $name
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type MIME type.
-     * @param string $disposition Disposition to use
-     * @return boolean True on successfully adding an attachment
-     */
-    public function addStringEmbeddedImage(
-        $string,
-        $cid,
-        $name = '',
-        $encoding = 'base64',
-        $type = '',
-        $disposition = 'inline'
-    ) {
-        // If a MIME type is not specified, try to work it out from the name
-        if ($type == '') {
-            $type = self::filenameToType($name);
-        }
-
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $string,
-            1 => $name,
-            2 => $name,
-            3 => $encoding,
-            4 => $type,
-            5 => true, // isStringAttachment
-            6 => $disposition,
-            7 => $cid
-        );
-        return true;
-    }
-
-    /**
-     * Check if an inline attachment is present.
-     * @access public
-     * @return boolean
-     */
-    public function inlineImageExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ($attachment[6] == 'inline') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if an attachment (non-inline) is present.
-     * @return boolean
-     */
-    public function attachmentExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ($attachment[6] == 'attachment') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if this message has an alternative body set.
-     * @return boolean
-     */
-    public function alternativeExists()
-    {
-        return !empty($this->AltBody);
-    }
-
-    /**
-     * Clear all To recipients.
-     * @return void
-     */
-    public function clearAddresses()
-    {
-        foreach ($this->to as $to) {
-            unset($this->all_recipients[strtolower($to[0])]);
-        }
-        $this->to = array();
-    }
-
-    /**
-     * Clear all CC recipients.
-     * @return void
-     */
-    public function clearCCs()
-    {
-        foreach ($this->cc as $cc) {
-            unset($this->all_recipients[strtolower($cc[0])]);
-        }
-        $this->cc = array();
-    }
-
-    /**
-     * Clear all BCC recipients.
-     * @return void
-     */
-    public function clearBCCs()
-    {
-        foreach ($this->bcc as $bcc) {
-            unset($this->all_recipients[strtolower($bcc[0])]);
-        }
-        $this->bcc = array();
-    }
-
-    /**
-     * Clear all ReplyTo recipients.
-     * @return void
-     */
-    public function clearReplyTos()
-    {
-        $this->ReplyTo = array();
-    }
-
-    /**
-     * Clear all recipient types.
-     * @return void
-     */
-    public function clearAllRecipients()
-    {
-        $this->to = array();
-        $this->cc = array();
-        $this->bcc = array();
-        $this->all_recipients = array();
-    }
-
-    /**
-     * Clear all filesystem, string, and binary attachments.
-     * @return void
-     */
-    public function clearAttachments()
-    {
-        $this->attachment = array();
-    }
-
-    /**
-     * Clear all custom headers.
-     * @return void
-     */
-    public function clearCustomHeaders()
-    {
-        $this->CustomHeader = array();
-    }
-
-    /**
-     * Add an error message to the error container.
-     * @access protected
-     * @param string $msg
-     * @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['error'])) {
-                $msg .= $this->lang('smtp_error') . $lasterror['error'];
-                if (!empty($lasterror['detail'])) {
-                    $msg .= ' Detail: '. $lasterror['detail'];
-                }
-                if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
-                }
-                if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
-                }
-            }
-        }
-        $this->ErrorInfo = $msg;
-    }
-
-    /**
-     * Return an RFC 822 formatted date.
-     * @access public
-     * @return string
-     * @static
-     */
-    public static function rfcDate()
-    {
-        // Set the time zone to whatever the default is to avoid 500 errors
-        // Will default to UTC if it's not set properly in php.ini
-        date_default_timezone_set(@date_default_timezone_get());
-        return date('D, j M Y H:i:s O');
-    }
-
-    /**
-     * Get the server hostname.
-     * Returns 'localhost.localdomain' if unknown.
-     * @access protected
-     * @return string
-     */
-    protected function serverHostname()
-    {
-        $result = 'localhost.localdomain';
-        if (!empty($this->Hostname)) {
-            $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
-            $result = $_SERVER['SERVER_NAME'];
-        } elseif (function_exists('gethostname') && gethostname() !== false) {
-            $result = gethostname();
-        } elseif (php_uname('n') !== false) {
-            $result = php_uname('n');
-        }
-        return $result;
-    }
-
-    /**
-     * Get an error message in the current language.
-     * @access protected
-     * @param string $key
-     * @return string
-     */
-    protected function lang($key)
-    {
-        if (count($this->language) < 1) {
-            $this->setLanguage('en'); // set the default language
-        }
-
-        if (array_key_exists($key, $this->language)) {
-            if ($key == 'smtp_connect_failed') {
-                //Include a link to troubleshooting docs on SMTP connection failure
-                //this is by far the biggest cause of support questions
-                //but it's usually not PHPMailer's fault.
-                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
-            }
-            return $this->language[$key];
-        } else {
-            //Return the key as a fallback
-            return $key;
-        }
-    }
-
-    /**
-     * Check if an error occurred.
-     * @access public
-     * @return boolean True if an error did occur.
-     */
-    public function isError()
-    {
-        return ($this->error_count > 0);
-    }
-
-    /**
-     * Ensure consistent line endings in a string.
-     * Changes every end of line from CRLF, CR or LF to $this->LE.
-     * @access public
-     * @param string $str String to fixEOL
-     * @return string
-     */
-    public function fixEOL($str)
-    {
-        // Normalise to \n
-        $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
-        // Now convert LE as needed
-        if ($this->LE !== "\n") {
-            $nstr = str_replace("\n", $this->LE, $nstr);
-        }
-        return $nstr;
-    }
-
-    /**
-     * Add a custom header.
-     * $name value can be overloaded to contain
-     * both header name and value (name:value)
-     * @access public
-     * @param string $name Custom header name
-     * @param string $value Header value
-     * @return void
-     */
-    public function addCustomHeader($name, $value = null)
-    {
-        if ($value === null) {
-            // Value passed in as name:value
-            $this->CustomHeader[] = explode(':', $name, 2);
-        } else {
-            $this->CustomHeader[] = array($name, $value);
-        }
-    }
-
-    /**
-     * Returns all custom headers
-     *
-     * @return array
-     */
-    public function getCustomHeaders()
-    {
-        return $this->CustomHeader;
-    }
-
-    /**
-     * Create a message from an HTML string.
-     * Automatically makes modifications for inline images and backgrounds
-     * and creates a plain-text version by converting the HTML.
-     * Overwrites any existing values in $this->Body and $this->AltBody
-     * @access public
-     * @param string $message HTML message string
-     * @param string $basedir baseline directory for path
-     * @param boolean|callable $advanced Whether to use the internal HTML to text converter
-     *    or your own custom converter @see html2text()
-     * @return string $message
-     */
-    public function msgHTML($message, $basedir = '', $advanced = false)
-    {
-        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
-        if (isset($images[2])) {
-            foreach ($images[2] as $imgindex => $url) {
-                // Convert data URIs into embedded images
-                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
-                    $data = substr($url, strpos($url, ','));
-                    if ($match[2]) {
-                        $data = base64_decode($data);
-                    } else {
-                        $data = rawurldecode($data);
-                    }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
-                        $message = str_replace(
-                            $images[0][$imgindex],
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
-                            $message
-                        );
-                    }
-                } elseif (!preg_match('#^[A-z]+://#', $url)) {
-                    // Do not change urls for absolute images (thanks to corvuscorax)
-                    $filename = basename($url);
-                    $directory = dirname($url);
-                    if ($directory == '.') {
-                        $directory = '';
-                    }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
-                        $basedir .= '/';
-                    }
-                    if (strlen($directory) > 1 && substr($directory, -1) != '/') {
-                        $directory .= '/';
-                    }
-                    if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
-                        $cid,
-                        $filename,
-                        'base64',
-                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
-                    )
-                    ) {
-                        $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
-                            $message
-                        );
-                    }
-                }
-            }
-        }
-        $this->isHTML(true);
-        // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
-        $this->Body = $this->normalizeBreaks($message);
-        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
-        if (empty($this->AltBody)) {
-            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
-                self::CRLF . self::CRLF;
-        }
-        return $this->Body;
-    }
-
-    /**
-     * Convert an HTML string into plain text.
-     * This is used by msgHTML().
-     * Note - older versions of this function used a bundled advanced converter
-     * which was been removed for license reasons in #232
-     * Example usage:
-     * <code>
-     * // Use default conversion
-     * $plain = $mail->html2text($html);
-     * // Use your own custom converter
-     * $plain = $mail->html2text($html, function($html) {
-     *     $converter = new MyHtml2text($html);
-     *     return $converter->get_text();
-     * });
-     * </code>
-     * @param string $html The HTML text to convert
-     * @param boolean|callable $advanced Any boolean value to use the internal converter,
-     *   or provide your own callable for custom conversion.
-     * @return string
-     */
-    public function html2text($html, $advanced = false)
-    {
-        if (is_callable($advanced)) {
-            return call_user_func($advanced, $html);
-        }
-        return html_entity_decode(
-            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
-            ENT_QUOTES,
-            $this->CharSet
-        );
-    }
-
-    /**
-     * Get the MIME type for a file extension.
-     * @param string $ext File extension
-     * @access public
-     * @return string MIME type of file.
-     * @static
-     */
-    public static function _mime_types($ext = '')
-    {
-        $mimes = array(
-            'xl'    => 'application/excel',
-            'js'    => 'application/javascript',
-            'hqx'   => 'application/mac-binhex40',
-            'cpt'   => 'application/mac-compactpro',
-            'bin'   => 'application/macbinary',
-            'doc'   => 'application/msword',
-            'word'  => 'application/msword',
-            'class' => 'application/octet-stream',
-            'dll'   => 'application/octet-stream',
-            'dms'   => 'application/octet-stream',
-            'exe'   => 'application/octet-stream',
-            'lha'   => 'application/octet-stream',
-            'lzh'   => 'application/octet-stream',
-            'psd'   => 'application/octet-stream',
-            'sea'   => 'application/octet-stream',
-            'so'    => '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',
-            'php3'  => 'application/x-httpd-php',
-            'php4'  => 'application/x-httpd-php',
-            'php'   => 'application/x-httpd-php',
-            'phtml' => 'application/x-httpd-php',
-            'phps'  => 'application/x-httpd-php-source',
-            'swf'   => 'application/x-shockwave-flash',
-            'sit'   => 'application/x-stuffit',
-            'tar'   => 'application/x-tar',
-            'tgz'   => 'application/x-tar',
-            'xht'   => 'application/xhtml+xml',
-            'xhtml' => 'application/xhtml+xml',
-            'zip'   => 'application/zip',
-            'mid'   => 'audio/midi',
-            'midi'  => 'audio/midi',
-            'mp2'   => 'audio/mpeg',
-            'mp3'   => 'audio/mpeg',
-            'mpga'  => 'audio/mpeg',
-            'aif'   => 'audio/x-aiff',
-            'aifc'  => 'audio/x-aiff',
-            'aiff'  => 'audio/x-aiff',
-            'ram'   => 'audio/x-pn-realaudio',
-            'rm'    => 'audio/x-pn-realaudio',
-            'rpm'   => 'audio/x-pn-realaudio-plugin',
-            'ra'    => 'audio/x-realaudio',
-            'wav'   => 'audio/x-wav',
-            'bmp'   => 'image/bmp',
-            'gif'   => 'image/gif',
-            'jpeg'  => 'image/jpeg',
-            'jpe'   => 'image/jpeg',
-            'jpg'   => 'image/jpeg',
-            'png'   => 'image/png',
-            'tiff'  => 'image/tiff',
-            'tif'   => 'image/tiff',
-            'eml'   => 'message/rfc822',
-            'css'   => 'text/css',
-            'html'  => 'text/html',
-            'htm'   => 'text/html',
-            'shtml' => 'text/html',
-            'log'   => 'text/plain',
-            'text'  => 'text/plain',
-            'txt'   => 'text/plain',
-            'rtx'   => 'text/richtext',
-            'rtf'   => 'text/rtf',
-            'vcf'   => 'text/vcard',
-            'vcard' => 'text/vcard',
-            'xml'   => 'text/xml',
-            'xsl'   => 'text/xml',
-            'mpeg'  => 'video/mpeg',
-            'mpe'   => 'video/mpeg',
-            'mpg'   => 'video/mpeg',
-            'mov'   => 'video/quicktime',
-            'qt'    => 'video/quicktime',
-            'rv'    => 'video/vnd.rn-realvideo',
-            'avi'   => 'video/x-msvideo',
-            'movie' => 'video/x-sgi-movie'
-        );
-        if (array_key_exists(strtolower($ext), $mimes)) {
-            return $mimes[strtolower($ext)];
-        }
-        return 'application/octet-stream';
-    }
-
-    /**
-     * Map a file name to a MIME type.
-     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
-     * @param string $filename A file name or full path, does not need to exist as a file
-     * @return string
-     * @static
-     */
-    public static function filenameToType($filename)
-    {
-        // In case the path is a URL, strip any query string before getting extension
-        $qpos = strpos($filename, '?');
-        if (false !== $qpos) {
-            $filename = substr($filename, 0, $qpos);
-        }
-        $pathinfo = self::mb_pathinfo($filename);
-        return self::_mime_types($pathinfo['extension']);
-    }
-
-    /**
-     * Multi-byte-safe pathinfo replacement.
-     * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
-     * Works similarly to the one in PHP >= 5.2.0
-     * @link http://www.php.net/manual/en/function.pathinfo.php#107461
-     * @param string $path A filename or path, does not need to exist as a file
-     * @param integer|string $options Either a PATHINFO_* constant,
-     *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
-     * @return string|array
-     * @static
-     */
-    public static function mb_pathinfo($path, $options = null)
-    {
-        $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
-        $pathinfo = array();
-        if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
-            if (array_key_exists(1, $pathinfo)) {
-                $ret['dirname'] = $pathinfo[1];
-            }
-            if (array_key_exists(2, $pathinfo)) {
-                $ret['basename'] = $pathinfo[2];
-            }
-            if (array_key_exists(5, $pathinfo)) {
-                $ret['extension'] = $pathinfo[5];
-            }
-            if (array_key_exists(3, $pathinfo)) {
-                $ret['filename'] = $pathinfo[3];
-            }
-        }
-        switch ($options) {
-            case PATHINFO_DIRNAME:
-            case 'dirname':
-                return $ret['dirname'];
-            case PATHINFO_BASENAME:
-            case 'basename':
-                return $ret['basename'];
-            case PATHINFO_EXTENSION:
-            case 'extension':
-                return $ret['extension'];
-            case PATHINFO_FILENAME:
-            case 'filename':
-                return $ret['filename'];
-            default:
-                return $ret;
-        }
-    }
-
-    /**
-     * Set or reset instance properties.
-     * You should avoid this function - it's more verbose, less efficient, more error-prone and
-     * harder to debug than setting properties directly.
-     * Usage Example:
-     * `$mail->set('SMTPSecure', 'tls');`
-     *   is the same as:
-     * `$mail->SMTPSecure = 'tls';`
-     * @access public
-     * @param string $name The property name to set
-     * @param mixed $value The value to set the property to
-     * @return boolean
-     * @TODO Should this not be using the __set() magic function?
-     */
-    public function set($name, $value = '')
-    {
-        if (property_exists($this, $name)) {
-            $this->$name = $value;
-            return true;
-        } else {
-            $this->setError($this->lang('variable_set') . $name);
-            return false;
-        }
-    }
-
-    /**
-     * Strip newlines to prevent header injection.
-     * @access public
-     * @param string $str
-     * @return string
-     */
-    public function secureHeader($str)
-    {
-        return trim(str_replace(array("\r", "\n"), '', $str));
-    }
-
-    /**
-     * Normalize line breaks in a string.
-     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
-     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
-     * @param string $text
-     * @param string $breaktype What kind of line break to use, defaults to CRLF
-     * @return string
-     * @access public
-     * @static
-     */
-    public static function normalizeBreaks($text, $breaktype = "\r\n")
-    {
-        return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
-    }
-
-
-    /**
-     * Set the public and private key files and password for S/MIME signing.
-     * @access public
-     * @param string $cert_filename
-     * @param string $key_filename
-     * @param string $key_pass Password for private key
-     * @param string $extracerts_filename Optional path to chain certificate
-     */
-    public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
-    {
-        $this->sign_cert_file = $cert_filename;
-        $this->sign_key_file = $key_filename;
-        $this->sign_key_pass = $key_pass;
-        $this->sign_extracerts_file = $extracerts_filename;
-    }
-
-    /**
-     * Quoted-Printable-encode a DKIM header.
-     * @access public
-     * @param string $txt
-     * @return string
-     */
-    public function DKIM_QP($txt)
-    {
-        $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;
-    }
-
-    /**
-     * Generate a DKIM signature.
-     * @access public
-     * @param string $signHeader
-     * @throws phpmailerException
-     * @return string
-     */
-    public function DKIM_Sign($signHeader)
-    {
-        if (!defined('PKCS7_TEXT')) {
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('extension_missing') . 'openssl');
-            }
-            return '';
-        }
-        $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($signHeader, $signature, $privKey)) {
-            return base64_encode($signature);
-        }
-        return '';
-    }
-
-    /**
-     * Generate a DKIM canonicalization header.
-     * @access public
-     * @param string $signHeader Header
-     * @return string
-     */
-    public function DKIM_HeaderC($signHeader)
-    {
-        $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
-        $lines = explode("\r\n", $signHeader);
-        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
-        }
-        $signHeader = implode("\r\n", $lines);
-        return $signHeader;
-    }
-
-    /**
-     * Generate a DKIM canonicalization body.
-     * @access public
-     * @param string $body Message Body
-     * @return string
-     */
-    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;
-    }
-
-    /**
-     * Create the DKIM header and body in a new message header.
-     * @access public
-     * @param string $headers_line Header lines
-     * @param string $subject Subject
-     * @param string $body Body
-     * @return string
-     */
-    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($this->LE, $headers_line);
-        $from_header = '';
-        $to_header = '';
-        $current = '';
-        foreach ($headers as $header) {
-            if (strpos($header, 'From:') === 0) {
-                $from_header = $header;
-                $current = 'from_header';
-            } elseif (strpos($header, 'To:') === 0) {
-                $to_header = $header;
-                $current = 'to_header';
-            } else {
-                if (!empty($$current) && strpos($header, ' =?') === 0) {
-                    $$current .= $header;
-                } else {
-                    $current = '';
-                }
-            }
-        }
-        $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
-        if ('' == $this->DKIM_identity) {
-            $ident = '';
-        } else {
-            $ident = ' 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 $dkimhdrs . $signed . "\r\n";
-    }
-
-    /**
-     * Detect if a string contains a line longer than the maximum line length allowed.
-     * @param string $str
-     * @return boolean
-     * @static
-     */
-    public static function hasLineLongerThanMax($str)
-    {
-        //+2 to include CRLF line break for a 1000 total
-        return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
-    }
-
-    /**
-     * Allows for public read access to 'to' property.
-     * @access public
-     * @return array
-     */
-    public function getToAddresses()
-    {
-        return $this->to;
-    }
-
-    /**
-     * Allows for public read access to 'cc' property.
-     * @access public
-     * @return array
-     */
-    public function getCcAddresses()
-    {
-        return $this->cc;
-    }
-
-    /**
-     * Allows for public read access to 'bcc' property.
-     * @access public
-     * @return array
-     */
-    public function getBccAddresses()
-    {
-        return $this->bcc;
-    }
-
-    /**
-     * Allows for public read access to 'ReplyTo' property.
-     * @access public
-     * @return array
-     */
-    public function getReplyToAddresses()
-    {
-        return $this->ReplyTo;
-    }
-
-    /**
-     * Allows for public read access to 'all_recipients' property.
-     * @access public
-     * @return array
-     */
-    public function getAllRecipientAddresses()
-    {
-        return $this->all_recipients;
-    }
-
-    /**
-     * Perform a callback.
-     * @param boolean $isSent
-     * @param array $to
-     * @param array $cc
-     * @param array $bcc
-     * @param string $subject
-     * @param string $body
-     * @param string $from
-     */
-    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
-    {
-        if (!empty($this->action_function) && is_callable($this->action_function)) {
-            $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
-            call_user_func_array($this->action_function, $params);
-        }
-    }
+	/**
+	 * The PHPMailer Version number.
+	 * @type string
+	 */
+	public $Version = '5.2.10';
+
+	/**
+	 * Email priority.
+	 * Options: 1 = High, 3 = Normal, 5 = low.
+	 * @type integer
+	 */
+	public $Priority = 3;
+
+	/**
+	 * The character set of the message.
+	 * @type string
+	 */
+	public $CharSet = 'iso-8859-1';
+
+	/**
+	 * The MIME Content-type of the message.
+	 * @type string
+	 */
+	public $ContentType = 'text/plain';
+
+	/**
+	 * The message encoding.
+	 * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
+	 * @type string
+	 */
+	public $Encoding = '8bit';
+
+	/**
+	 * Holds the most recent mailer error message.
+	 * @type string
+	 */
+	public $ErrorInfo = '';
+
+	/**
+	 * The From email address for the message.
+	 * @type string
+	 */
+	public $From = 'root@localhost';
+
+	/**
+	 * The From name of the message.
+	 * @type string
+	 */
+	public $FromName = 'Root User';
+
+	/**
+	 * 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.
+	 * @type string
+	 */
+	public $Sender = '';
+
+	/**
+	 * The Return-Path of the message.
+	 * If empty, it will be set to either From or Sender.
+	 * @type string
+	 * @deprecated Email senders should never set a return-path header;
+	 * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
+	 * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
+	 */
+	public $ReturnPath = '';
+
+	/**
+	 * The Subject of the message.
+	 * @type string
+	 */
+	public $Subject = '';
+
+	/**
+	 * An HTML or plain text message body.
+	 * If HTML then call isHTML(true).
+	 * @type string
+	 */
+	public $Body = '';
+
+	/**
+	 * The plain-text message body.
+	 * This body can be read by mail clients that do not have HTML email
+	 * capability such as mutt & Eudora.
+	 * Clients that can read HTML will view the normal Body.
+	 * @type string
+	 */
+	public $AltBody = '';
+
+	/**
+	 * An iCal message part body.
+	 * Only supported in simple alt or alt_inline message types
+	 * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
+	 * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
+	 * @link http://kigkonsult.se/iCalcreator/
+	 * @type string
+	 */
+	public $Ical = '';
+
+	/**
+	 * The complete compiled MIME message body.
+	 * @access protected
+	 * @type string
+	 */
+	protected $MIMEBody = '';
+
+	/**
+	 * The complete compiled MIME message headers.
+	 * @type string
+	 * @access protected
+	 */
+	protected $MIMEHeader = '';
+
+	/**
+	 * Extra headers that createHeader() doesn't fold in.
+	 * @type string
+	 * @access protected
+	 */
+	protected $mailHeader = '';
+
+	/**
+	 * Word-wrap the message body to this number of chars.
+	 * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
+	 * @type integer
+	 */
+	public $WordWrap = 0;
+
+	/**
+	 * Which method to use to send mail.
+	 * Options: "mail", "sendmail", or "smtp".
+	 * @type string
+	 */
+	public $Mailer = 'mail';
+
+	/**
+	 * The path to the sendmail program.
+	 * @type string
+	 */
+	public $Sendmail = '/usr/sbin/sendmail';
+
+	/**
+	 * Whether mail() uses a fully sendmail-compatible MTA.
+	 * One which supports sendmail's "-oi -f" options.
+	 * @type boolean
+	 */
+	public $UseSendmailOptions = true;
+
+	/**
+	 * Path to PHPMailer plugins.
+	 * Useful if the SMTP class is not in the PHP include path.
+	 * @type string
+	 * @deprecated Should not be needed now there is an autoloader.
+	 */
+	public $PluginDir = '';
+
+	/**
+	 * The email address that a reading confirmation should be sent to.
+	 * @type string
+	 */
+	public $ConfirmReadingTo = '';
+
+	/**
+	 * The hostname to use in Message-Id and Received headers
+	 * and as default HELO string.
+	 * If empty, the value returned
+	 * by SERVER_NAME is used or 'localhost.localdomain'.
+	 * @type string
+	 */
+	public $Hostname = '';
+
+	/**
+	 * An ID to be used in the Message-Id header.
+	 * If empty, a unique id will be generated.
+	 * @type string
+	 */
+	public $MessageID = '';
+
+	/**
+	 * The message Date to be used in the Date header.
+	 * If empty, the current date will be added.
+	 * @type string
+	 */
+	public $MessageDate = '';
+
+	/**
+	 * SMTP hosts.
+	 * Either a single hostname or multiple semicolon-delimited hostnames.
+	 * You can also specify a different port
+	 * for each host by using this format: [hostname:port]
+	 * (e.g. "smtp1.example.com:25;smtp2.example.com").
+	 * You can also specify encryption type, for example:
+	 * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
+	 * Hosts will be tried in order.
+	 * @type string
+	 */
+	public $Host = 'localhost';
+
+	/**
+	 * The default SMTP server port.
+	 * @type integer
+	 * @TODO Why is this needed when the SMTP class takes care of it?
+	 */
+	public $Port = 25;
+
+	/**
+	 * The SMTP HELO of the message.
+	 * Default is $Hostname.
+	 * @type string
+	 * @see PHPMailer::$Hostname
+	 */
+	public $Helo = '';
+
+	/**
+	 * What kind of encryption to use on the SMTP connection.
+	 * Options: '', 'ssl' or 'tls'
+	 * @type string
+	 */
+	public $SMTPSecure = '';
+
+	/**
+	 * Whether to enable TLS encryption automatically if a server supports it,
+	 * even if `SMTPSecure` is not set to 'tls'.
+	 * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
+	 * @type boolean
+	 */
+	public $SMTPAutoTLS = true;
+
+	/**
+	 * Whether to use SMTP authentication.
+	 * Uses the Username and Password properties.
+	 * @type boolean
+	 * @see PHPMailer::$Username
+	 * @see PHPMailer::$Password
+	 */
+	public $SMTPAuth = false;
+
+	/**
+	 * Options array passed to stream_context_create when connecting via SMTP.
+	 * @type array
+	 */
+	public $SMTPOptions = array();
+
+	/**
+	 * SMTP username.
+	 * @type string
+	 */
+	public $Username = '';
+
+	/**
+	 * SMTP password.
+	 * @type string
+	 */
+	public $Password = '';
+
+	/**
+	 * SMTP auth type.
+	 * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5
+	 * @type string
+	 */
+	public $AuthType = '';
+
+	/**
+	 * SMTP realm.
+	 * Used for NTLM auth
+	 * @type string
+	 */
+	public $Realm = '';
+
+	/**
+	 * SMTP workstation.
+	 * Used for NTLM auth
+	 * @type string
+	 */
+	public $Workstation = '';
+
+	/**
+	 * The SMTP server timeout in seconds.
+	 * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+	 * @type integer
+	 */
+	public $Timeout = 300;
+
+	/**
+	 * SMTP class debug output mode.
+	 * Debug output level.
+	 * Options:
+	 * * `0` No output
+	 * * `1` Commands
+	 * * `2` Data and commands
+	 * * `3` As 2 plus connection status
+	 * * `4` Low-level data output
+	 * @type integer
+	 * @see SMTP::$do_debug
+	 */
+	public $SMTPDebug = 0;
+
+	/**
+	 * How to handle debug output.
+	 * Options:
+	 * * `echo` Output plain-text as-is, appropriate for CLI
+	 * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+	 * * `error_log` Output to error log as configured in php.ini
+	 *
+	 * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+	 * <code>
+	 * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+	 * </code>
+	 * @type string|callable
+	 * @see SMTP::$Debugoutput
+	 */
+	public $Debugoutput = 'echo';
+
+	/**
+	 * Whether to keep SMTP connection open after each message.
+	 * If this is set to true then to close the connection
+	 * requires an explicit call to smtpClose().
+	 * @type boolean
+	 */
+	public $SMTPKeepAlive = false;
+
+	/**
+	 * Whether to split multiple to addresses into multiple messages
+	 * or send them all in one message.
+	 * @type boolean
+	 */
+	public $SingleTo = false;
+
+	/**
+	 * Storage for addresses when SingleTo is enabled.
+	 * @type array
+	 * @TODO This should really not be public
+	 */
+	public $SingleToArray = array();
+
+	/**
+	 * Whether to generate VERP addresses on send.
+	 * Only applicable when sending via SMTP.
+	 * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
+	 * @link http://www.postfix.org/VERP_README.html Postfix VERP info
+	 * @type boolean
+	 */
+	public $do_verp = false;
+
+	/**
+	 * Whether to allow sending messages with an empty body.
+	 * @type boolean
+	 */
+	public $AllowEmpty = false;
+
+	/**
+	 * The default line ending.
+	 * @note The default remains "\n". We force CRLF where we know
+	 *        it must be used via self::CRLF.
+	 * @type string
+	 */
+	public $LE = "\n";
+
+	/**
+	 * DKIM selector.
+	 * @type string
+	 */
+	public $DKIM_selector = '';
+
+	/**
+	 * DKIM Identity.
+	 * Usually the email address used as the source of the email
+	 * @type string
+	 */
+	public $DKIM_identity = '';
+
+	/**
+	 * DKIM passphrase.
+	 * Used if your key is encrypted.
+	 * @type string
+	 */
+	public $DKIM_passphrase = '';
+
+	/**
+	 * DKIM signing domain name.
+	 * @example 'example.com'
+	 * @type string
+	 */
+	public $DKIM_domain = '';
+
+	/**
+	 * DKIM private key file path.
+	 * @type string
+	 */
+	public $DKIM_private = '';
+
+	/**
+	 * Callback Action function name.
+	 *
+	 * The function that handles the result of the send email action.
+	 * It is called out by send() for each email sent.
+	 *
+	 * Value can be any php callable: http://www.php.net/is_callable
+	 *
+	 * Parameters:
+	 *   boolean $result        result of the send action
+	 *   string  $to            email address of the recipient
+	 *   string  $cc            cc email addresses
+	 *   string  $bcc           bcc email addresses
+	 *   string  $subject       the subject
+	 *   string  $body          the email body
+	 *   string  $from          email address of sender
+	 * @type string
+	 */
+	public $action_function = '';
+
+	/**
+	 * What to put in the X-Mailer header.
+	 * Options: An empty string for PHPMailer default, whitespace for none, or a string to use
+	 * @type string
+	 */
+	public $XMailer = '';
+
+	/**
+	 * An instance of the SMTP sender class.
+	 * @type SMTP
+	 * @access protected
+	 */
+	protected $smtp = null;
+
+	/**
+	 * The array of 'to' addresses.
+	 * @type array
+	 * @access protected
+	 */
+	protected $to = array();
+
+	/**
+	 * The array of 'cc' addresses.
+	 * @type array
+	 * @access protected
+	 */
+	protected $cc = array();
+
+	/**
+	 * The array of 'bcc' addresses.
+	 * @type array
+	 * @access protected
+	 */
+	protected $bcc = array();
+
+	/**
+	 * The array of reply-to names and addresses.
+	 * @type array
+	 * @access protected
+	 */
+	protected $ReplyTo = array();
+
+	/**
+	 * An array of all kinds of addresses.
+	 * Includes all of $to, $cc, $bcc
+	 * @type array
+	 * @access protected
+	 */
+	protected $all_recipients = array();
+
+	/**
+	 * The array of attachments.
+	 * @type array
+	 * @access protected
+	 */
+	protected $attachment = array();
+
+	/**
+	 * The array of custom headers.
+	 * @type array
+	 * @access protected
+	 */
+	protected $CustomHeader = array();
+
+	/**
+	 * The most recent Message-ID (including angular brackets).
+	 * @type string
+	 * @access protected
+	 */
+	protected $lastMessageID = '';
+
+	/**
+	 * The message's MIME type.
+	 * @type string
+	 * @access protected
+	 */
+	protected $message_type = '';
+
+	/**
+	 * The array of MIME boundary strings.
+	 * @type array
+	 * @access protected
+	 */
+	protected $boundary = array();
+
+	/**
+	 * The array of available languages.
+	 * @type array
+	 * @access protected
+	 */
+	protected $language = array();
+
+	/**
+	 * The number of errors encountered.
+	 * @type integer
+	 * @access protected
+	 */
+	protected $error_count = 0;
+
+	/**
+	 * The S/MIME certificate file path.
+	 * @type string
+	 * @access protected
+	 */
+	protected $sign_cert_file = '';
+
+	/**
+	 * The S/MIME key file path.
+	 * @type string
+	 * @access protected
+	 */
+	protected $sign_key_file = '';
+
+	/**
+	 * The optional S/MIME extra certificates ("CA Chain") file path.
+	 * @type string
+	 * @access protected
+	 */
+	protected $sign_extracerts_file = '';
+
+	/**
+	 * The S/MIME password for the key.
+	 * Used only if the key is encrypted.
+	 * @type string
+	 * @access protected
+	 */
+	protected $sign_key_pass = '';
+
+	/**
+	 * Whether to throw exceptions for errors.
+	 * @type boolean
+	 * @access protected
+	 */
+	protected $exceptions = false;
+
+	/**
+	 * Unique ID used for message ID and boundaries.
+	 * @type string
+	 * @access protected
+	 */
+	protected $uniqueid = '';
+
+	/**
+	 * Error severity: message only, continue processing.
+	 */
+	const STOP_MESSAGE = 0;
+
+	/**
+	 * Error severity: message, likely ok to continue processing.
+	 */
+	const STOP_CONTINUE = 1;
+
+	/**
+	 * Error severity: message, plus full stop, critical error reached.
+	 */
+	const STOP_CRITICAL = 2;
+
+	/**
+	 * SMTP RFC standard line ending.
+	 */
+	const CRLF = "\r\n";
+
+	/**
+	 * The maximum line length allowed by RFC 2822 section 2.1.1
+	 * @type integer
+	 */
+	const MAX_LINE_LENGTH = 998;
+
+	/**
+	 * Constructor.
+	 * @param boolean $exceptions Should we throw external exceptions?
+	 */
+	public function __construct($exceptions = false)
+	{
+		$this->exceptions = (boolean)$exceptions;
+	}
+
+	/**
+	 * Destructor.
+	 */
+	public function __destruct()
+	{
+		//Close any open SMTP connection nicely
+		if ($this->Mailer == 'smtp') {
+			$this->smtpClose();
+		}
+	}
+
+	/**
+	 * Call mail() in a safe_mode-aware fashion.
+	 * Also, unless sendmail_path points to sendmail (or something that
+	 * claims to be sendmail), don't pass params (not a perfect fix,
+	 * but it will do)
+	 * @param string $to To
+	 * @param string $subject Subject
+	 * @param string $body Message Body
+	 * @param string $header Additional Header(s)
+	 * @param string $params Params
+	 * @access private
+	 * @return boolean
+	 */
+	private function mailPassthru($to, $subject, $body, $header, $params)
+	{
+		//Check overloading of mail function to avoid double-encoding
+		if (ini_get('mbstring.func_overload') & 1) {
+			$subject = $this->secureHeader($subject);
+		} else {
+			$subject = $this->encodeHeader($this->secureHeader($subject));
+		}
+		if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
+			$result = @mail($to, $subject, $body, $header);
+		} else {
+			$result = @mail($to, $subject, $body, $header, $params);
+		}
+		return $result;
+	}
+
+	/**
+	 * Output debugging info via user-defined method.
+	 * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+	 * @see PHPMailer::$Debugoutput
+	 * @see PHPMailer::$SMTPDebug
+	 * @param string $str
+	 */
+	protected function edebug($str)
+	{
+		if ($this->SMTPDebug <= 0) {
+			return;
+		}
+		//Avoid clash with built-in function names
+		if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+			call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
+			return;
+		}
+		switch ($this->Debugoutput) {
+			case 'error_log':
+				//Don't output, just log
+				error_log($str);
+				break;
+			case 'html':
+				//Cleans up output a bit for a better looking, HTML-safe output
+				echo htmlentities(
+					preg_replace('/[\r\n]+/', '', $str),
+					ENT_QUOTES,
+					'UTF-8'
+				)
+				. "<br>\n";
+				break;
+			case 'echo':
+			default:
+				//Normalize line breaks
+				$str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+				echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+					"\n",
+					"\n                   \t                  ",
+					trim($str)
+				) . "\n";
+		}
+	}
+
+	/**
+	 * Sets message type to HTML or plain.
+	 * @param boolean $isHtml True for HTML mode.
+	 * @return void
+	 */
+	public function isHTML($isHtml = true)
+	{
+		if ($isHtml) {
+			$this->ContentType = 'text/html';
+		} else {
+			$this->ContentType = 'text/plain';
+		}
+	}
+
+	/**
+	 * Send messages using SMTP.
+	 * @return void
+	 */
+	public function isSMTP()
+	{
+		$this->Mailer = 'smtp';
+	}
+
+	/**
+	 * Send messages using PHP's mail() function.
+	 * @return void
+	 */
+	public function isMail()
+	{
+		$this->Mailer = 'mail';
+	}
+
+	/**
+	 * Send messages using $Sendmail.
+	 * @return void
+	 */
+	public function isSendmail()
+	{
+		$ini_sendmail_path = ini_get('sendmail_path');
+
+		if (!stristr($ini_sendmail_path, 'sendmail')) {
+			$this->Sendmail = '/usr/sbin/sendmail';
+		} else {
+			$this->Sendmail = $ini_sendmail_path;
+		}
+		$this->Mailer = 'sendmail';
+	}
+
+	/**
+	 * Send messages using qmail.
+	 * @return void
+	 */
+	public function isQmail()
+	{
+		$ini_sendmail_path = ini_get('sendmail_path');
+
+		if (!stristr($ini_sendmail_path, 'qmail')) {
+			$this->Sendmail = '/var/qmail/bin/qmail-inject';
+		} else {
+			$this->Sendmail = $ini_sendmail_path;
+		}
+		$this->Mailer = 'qmail';
+	}
+
+	/**
+	 * Add a "To" address.
+	 * @param string $address
+	 * @param string $name
+	 * @return boolean true on success, false if address already used
+	 */
+	public function addAddress($address, $name = '')
+	{
+		return $this->addAnAddress('to', $address, $name);
+	}
+
+	/**
+	 * Add a "CC" address.
+	 * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+	 * @param string $address
+	 * @param string $name
+	 * @return boolean true on success, false if address already used
+	 */
+	public function addCC($address, $name = '')
+	{
+		return $this->addAnAddress('cc', $address, $name);
+	}
+
+	/**
+	 * Add a "BCC" address.
+	 * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+	 * @param string $address
+	 * @param string $name
+	 * @return boolean true on success, false if address already used
+	 */
+	public function addBCC($address, $name = '')
+	{
+		return $this->addAnAddress('bcc', $address, $name);
+	}
+
+	/**
+	 * Add a "Reply-to" address.
+	 * @param string $address
+	 * @param string $name
+	 * @return boolean
+	 */
+	public function addReplyTo($address, $name = '')
+	{
+		return $this->addAnAddress('Reply-To', $address, $name);
+	}
+
+	/**
+	 * Add an address to one of the recipient arrays.
+	 * Addresses that have been added already return false, but do not throw exceptions
+	 * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
+	 * @param string $address The email address to send to
+	 * @param string $name
+	 * @throws phpmailerException
+	 * @return boolean true on success, false if address already used or invalid in some way
+	 * @access protected
+	 */
+	protected function addAnAddress($kind, $address, $name = '')
+	{
+		if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
+			$this->setError($this->lang('Invalid recipient array') . ': ' . $kind);
+			$this->edebug($this->lang('Invalid recipient array') . ': ' . $kind);
+			if ($this->exceptions) {
+				throw new phpmailerException('Invalid recipient array: ' . $kind);
+			}
+			return false;
+		}
+		$address = trim($address);
+		$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+		if (!$this->validateAddress($address)) {
+			$this->setError($this->lang('invalid_address') . ': ' . $address);
+			$this->edebug($this->lang('invalid_address') . ': ' . $address);
+			if ($this->exceptions) {
+				throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
+			}
+			return false;
+		}
+		if ($kind != 'Reply-To') {
+			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;
+	}
+
+	/**
+	 * Set the From and FromName properties.
+	 * @param string $address
+	 * @param string $name
+	 * @param boolean $auto Whether to also set the Sender address, defaults to true
+	 * @throws phpmailerException
+	 * @return boolean
+	 */
+	public function setFrom($address, $name = '', $auto = true)
+	{
+		$address = trim($address);
+		$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+		if (!$this->validateAddress($address)) {
+			$this->setError($this->lang('invalid_address') . ': ' . $address);
+			$this->edebug($this->lang('invalid_address') . ': ' . $address);
+			if ($this->exceptions) {
+				throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
+			}
+			return false;
+		}
+		$this->From = $address;
+		$this->FromName = $name;
+		if ($auto) {
+			if (empty($this->Sender)) {
+				$this->Sender = $address;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Return the Message-ID header of the last email.
+	 * Technically this is the value from the last time the headers were created,
+	 * but it's also the message ID of the last sent message except in
+	 * pathological cases.
+	 * @return string
+	 */
+	public function getLastMessageID()
+	{
+		return $this->lastMessageID;
+	}
+
+	/**
+	 * Check that a string looks like an email address.
+	 * @param string $address The email address to check
+	 * @param string $patternselect A selector for the validation pattern to use :
+	 * * `auto` Pick strictest one automatically;
+	 * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
+	 * * `pcre` Use old PCRE implementation;
+	 * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; same as pcre8 but does not allow 'dotless' domains;
+	 * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+	 * * `noregex` Don't use a regex: super fast, really dumb.
+	 * @return boolean
+	 * @static
+	 * @access public
+	 */
+	public static function validateAddress($address, $patternselect = 'auto')
+	{
+		if (!$patternselect or $patternselect == 'auto') {
+			//Check this constant first so it works when extension_loaded() is disabled by safe mode
+			//Constant was added in PHP 5.2.4
+			if (defined('PCRE_VERSION')) {
+				//This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
+				if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
+					$patternselect = 'pcre8';
+				} else {
+					$patternselect = 'pcre';
+				}
+			} elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
+				//Fall back to older PCRE
+				$patternselect = 'pcre';
+			} else {
+				//Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
+				if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
+					$patternselect = 'php';
+				} else {
+					$patternselect = 'noregex';
+				}
+			}
+		}
+		switch ($patternselect) {
+			case 'pcre8':
+				/**
+				 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
+				 * @link http://squiloople.com/2009/12/20/email-address-validation/
+				 * @copyright 2009-2010 Michael Rushton
+				 * Feel free to use and redistribute this code. But please keep this copyright notice.
+				 */
+				return (boolean)preg_match(
+					'/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
+					'((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
+					'(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
+					'([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
+					'(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
+					'(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
+					'|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
+					'|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+					'|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
+					$address
+				);
+			case 'pcre':
+				//An older regex that doesn't need a recent PCRE
+				return (boolean)preg_match(
+					'/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
+					'[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
+					'(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
+					'@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
+					'(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
+					'[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
+					'::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
+					'[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
+					'::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+					'|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
+					$address
+				);
+			case 'html5':
+				/**
+				 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
+				 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+				 */
+				return (boolean)preg_match(
+					'/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[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])?)*$/sD',
+					$address
+				);
+			case 'noregex':
+				//No PCRE! Do something _very_ approximate!
+				//Check the address is 3 chars or longer and contains an @ that's not the first or last char
+				return (strlen($address) >= 3
+					and strpos($address, '@') >= 1
+					and strpos($address, '@') != strlen($address) - 1);
+			case 'php':
+			default:
+				return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
+		}
+	}
+
+	/**
+	 * Create a message and send it.
+	 * Uses the sending method specified by $Mailer.
+	 * @throws phpmailerException
+	 * @return boolean false on error - See the ErrorInfo property for details of the error.
+	 */
+	public function send()
+	{
+		try {
+			if (!$this->preSend()) {
+				return false;
+			}
+			return $this->postSend();
+		} catch (phpmailerException $exc) {
+			$this->mailHeader = '';
+			$this->setError($exc->getMessage());
+			if ($this->exceptions) {
+				throw $exc;
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Prepare a message for sending.
+	 * @throws phpmailerException
+	 * @return boolean
+	 */
+	public function preSend()
+	{
+		try {
+			$this->mailHeader = '';
+			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();
+			// Refuse to send an empty message unless we are specifically allowing it
+			if (!$this->AllowEmpty and empty($this->Body)) {
+				throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
+			}
+
+			// Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
+			$this->MIMEHeader = '';
+			$this->MIMEBody = $this->createBody();
+			// createBody may have added some headers, so retain them
+			$tempheaders = $this->MIMEHeader;
+			$this->MIMEHeader = $this->createHeader();
+			$this->MIMEHeader .= $tempheaders;
+
+			// To capture the complete message when using mail(), create
+			// an extra header list which createHeader() doesn't fold in
+			if ($this->Mailer == 'mail') {
+				if (count($this->to) > 0) {
+					$this->mailHeader .= $this->addrAppend('To', $this->to);
+				} else {
+					$this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
+				}
+				$this->mailHeader .= $this->headerLine(
+					'Subject',
+					$this->encodeHeader($this->secureHeader(trim($this->Subject)))
+				);
+			}
+
+			// Sign with DKIM if enabled
+			if (!empty($this->DKIM_domain)
+				&& !empty($this->DKIM_private)
+				&& !empty($this->DKIM_selector)
+				&& file_exists($this->DKIM_private)) {
+				$header_dkim = $this->DKIM_Add(
+					$this->MIMEHeader . $this->mailHeader,
+					$this->encodeHeader($this->secureHeader($this->Subject)),
+					$this->MIMEBody
+				);
+				$this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
+					str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
+			}
+			return true;
+		} catch (phpmailerException $exc) {
+			$this->setError($exc->getMessage());
+			if ($this->exceptions) {
+				throw $exc;
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Actually send a message.
+	 * Send the email via the selected mechanism
+	 * @throws phpmailerException
+	 * @return boolean
+	 */
+	public function postSend()
+	{
+		try {
+			// Choose the mailer and send through it
+			switch ($this->Mailer) {
+				case 'sendmail':
+				case 'qmail':
+					return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
+				case 'smtp':
+					return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
+				case 'mail':
+					return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+				default:
+					$sendMethod = $this->Mailer.'Send';
+					if (method_exists($this, $sendMethod)) {
+						return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+					}
+
+					return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+			}
+		} catch (phpmailerException $exc) {
+			$this->setError($exc->getMessage());
+			$this->edebug($exc->getMessage());
+			if ($this->exceptions) {
+				throw $exc;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Send mail using the $Sendmail program.
+	 * @param string $header The message headers
+	 * @param string $body The message body
+	 * @see PHPMailer::$Sendmail
+	 * @throws phpmailerException
+	 * @access protected
+	 * @return boolean
+	 */
+	protected function sendmailSend($header, $body)
+	{
+		if ($this->Sender != '') {
+			if ($this->Mailer == 'qmail') {
+				$sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+			} else {
+				$sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+			}
+		} else {
+			if ($this->Mailer == 'qmail') {
+				$sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
+			} else {
+				$sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail));
+			}
+		}
+		if ($this->SingleTo) {
+			foreach ($this->SingleToArray as $toAddr) {
+				if (!@$mail = popen($sendmail, 'w')) {
+					throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+				}
+				fputs($mail, 'To: ' . $toAddr . "\n");
+				fputs($mail, $header);
+				fputs($mail, $body);
+				$result = pclose($mail);
+				$this->doCallback(
+					($result == 0),
+					array($toAddr),
+					$this->cc,
+					$this->bcc,
+					$this->Subject,
+					$body,
+					$this->From
+				);
+				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);
+			$this->doCallback(($result == 0), $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+			if ($result != 0) {
+				throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Send mail using the PHP mail() function.
+	 * @param string $header The message headers
+	 * @param string $body The message body
+	 * @link http://www.php.net/manual/en/book.mail.php
+	 * @throws phpmailerException
+	 * @access protected
+	 * @return boolean
+	 */
+	protected function mailSend($header, $body)
+	{
+		$toArr = array();
+		foreach ($this->to as $toaddr) {
+			$toArr[] = $this->addrFormat($toaddr);
+		}
+		$to = implode(', ', $toArr);
+
+		if (empty($this->Sender)) {
+			$params = ' ';
+		} else {
+			$params = sprintf('-f%s', $this->Sender);
+		}
+		if ($this->Sender != '' and !ini_get('safe_mode')) {
+			$old_from = ini_get('sendmail_from');
+			ini_set('sendmail_from', $this->Sender);
+		}
+		$result = false;
+		if ($this->SingleTo && count($toArr) > 1) {
+			foreach ($toArr as $toAddr) {
+				$result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
+				$this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+			}
+		} else {
+			$result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
+			$this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+		}
+		if (isset($old_from)) {
+			ini_set('sendmail_from', $old_from);
+		}
+		if (!$result) {
+			throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
+		}
+		return true;
+	}
+
+	/**
+	 * Get an instance to use for SMTP operations.
+	 * Override this function to load your own SMTP implementation
+	 * @return SMTP
+	 */
+	public function getSMTPInstance()
+	{
+		if (!is_object($this->smtp)) {
+			require_once( 'class-smtp.php' );
+			$this->smtp = new SMTP;
+		}
+		return $this->smtp;
+	}
+
+	/**
+	 * Send mail via SMTP.
+	 * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+	 * Uses the PHPMailerSMTP class by default.
+	 * @see PHPMailer::getSMTPInstance() to use a different class.
+	 * @param string $header The message headers
+	 * @param string $body The message body
+	 * @throws phpmailerException
+	 * @uses SMTP
+	 * @access protected
+	 * @return boolean
+	 */
+	protected function smtpSend($header, $body)
+	{
+		$bad_rcpt = array();
+		if (!$this->smtpConnect($this->SMTPOptions)) {
+			throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
+		}
+		if ('' == $this->Sender) {
+			$smtp_from = $this->From;
+		} else {
+			$smtp_from = $this->Sender;
+		}
+		if (!$this->smtp->mail($smtp_from)) {
+			$this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+			throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
+		}
+
+		// Attempt to send to all recipients
+		foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
+			foreach ($togroup as $to) {
+				if (!$this->smtp->recipient($to[0])) {
+					$error = $this->smtp->getError();
+					$bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']);
+					$isSent = false;
+				} else {
+					$isSent = true;
+				}
+				$this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
+			}
+		}
+
+		// Only send the DATA command if we have viable recipients
+		if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+			throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
+		}
+		if ($this->SMTPKeepAlive) {
+			$this->smtp->reset();
+		} else {
+			$this->smtp->quit();
+			$this->smtp->close();
+		}
+		//Create error message for any bad addresses
+		if (count($bad_rcpt) > 0) {
+			$errstr = '';
+			foreach ($bad_rcpt as $bad) {
+				$errstr .= $bad['to'] . ': ' . $bad['error'];
+			}
+			throw new phpmailerException(
+				$this->lang('recipients_failed') . $errstr,
+				self::STOP_CONTINUE
+			);
+		}
+		return true;
+	}
+
+	/**
+	 * Initiate a connection to an SMTP server.
+	 * Returns false if the operation failed.
+	 * @param array $options An array of options compatible with stream_context_create()
+	 * @uses SMTP
+	 * @access public
+	 * @throws phpmailerException
+	 * @return boolean
+	 */
+	public function smtpConnect($options = array())
+	{
+		if (is_null($this->smtp)) {
+			$this->smtp = $this->getSMTPInstance();
+		}
+
+		// Already connected?
+		if ($this->smtp->connected()) {
+			return true;
+		}
+
+		$this->smtp->setTimeout($this->Timeout);
+		$this->smtp->setDebugLevel($this->SMTPDebug);
+		$this->smtp->setDebugOutput($this->Debugoutput);
+		$this->smtp->setVerp($this->do_verp);
+		$hosts = explode(';', $this->Host);
+		$lastexception = null;
+
+		foreach ($hosts as $hostentry) {
+			$hostinfo = array();
+			if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
+				// Not a valid host entry
+				continue;
+			}
+			// $hostinfo[2]: optional ssl or tls prefix
+			// $hostinfo[3]: the hostname
+			// $hostinfo[4]: optional port number
+			// The host string prefix can temporarily override the current setting for SMTPSecure
+			// If it's not specified, the default value is used
+			$prefix = '';
+			$secure = $this->SMTPSecure;
+			$tls = ($this->SMTPSecure == 'tls');
+			if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
+				$prefix = 'ssl://';
+				$tls = false; // Can't have SSL and TLS at the same time
+				$secure = 'ssl';
+			} elseif ($hostinfo[2] == 'tls') {
+				$tls = true;
+				// tls doesn't use a prefix
+				$secure = 'tls';
+			}
+			//Do we need the OpenSSL extension?
+			$sslext = defined('OPENSSL_ALGO_SHA1');
+			if ('tls' === $secure or 'ssl' === $secure) {
+				//Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+				if (!$sslext) {
+					throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
+				}
+			}
+			$host = $hostinfo[3];
+			$port = $this->Port;
+			$tport = (integer)$hostinfo[4];
+			if ($tport > 0 and $tport < 65536) {
+				$port = $tport;
+			}
+			if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+				try {
+					if ($this->Helo) {
+						$hello = $this->Helo;
+					} else {
+						$hello = $this->serverHostname();
+					}
+					$this->smtp->hello($hello);
+					//Automatically enable TLS encryption if:
+					// * it's not disabled
+					// * we have openssl extension
+					// * we are not already using SSL
+					// * the server offers STARTTLS
+					if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) {
+						$tls = true;
+					}
+					if ($tls) {
+						if (!$this->smtp->startTLS()) {
+							throw new phpmailerException($this->lang('connect_host'));
+						}
+						// We must resend HELO after tls negotiation
+						$this->smtp->hello($hello);
+					}
+					if ($this->SMTPAuth) {
+						if (!$this->smtp->authenticate(
+							$this->Username,
+							$this->Password,
+							$this->AuthType,
+							$this->Realm,
+							$this->Workstation
+						)
+						) {
+							throw new phpmailerException($this->lang('authenticate'));
+						}
+					}
+					return true;
+				} catch (phpmailerException $exc) {
+					$lastexception = $exc;
+					$this->edebug($exc->getMessage());
+					// We must have connected, but then failed TLS or Auth, so close connection nicely
+					$this->smtp->quit();
+				}
+			}
+		}
+		// If we get here, all connection attempts have failed, so close connection hard
+		$this->smtp->close();
+		// As we've caught all exceptions, just report whatever the last one was
+		if ($this->exceptions and !is_null($lastexception)) {
+			throw $lastexception;
+		}
+		return false;
+	}
+
+	/**
+	 * Close the active SMTP session if one exists.
+	 * @return void
+	 */
+	public function smtpClose()
+	{
+		if ($this->smtp !== null) {
+			if ($this->smtp->connected()) {
+				$this->smtp->quit();
+				$this->smtp->close();
+			}
+		}
+	}
+
+	/**
+	 * Set the language for 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. French is "fr")
+	 * @param string $lang_path Path to the language file directory, with trailing separator (slash)
+	 * @return boolean
+	 * @access public
+	 */
+	public function setLanguage($langcode = 'en', $lang_path = '')
+	{
+		// Define full set of translatable strings in English
+		$PHPMAILER_LANG = array(
+			'authenticate' => 'SMTP Error: Could not authenticate.',
+			'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+			'data_not_accepted' => 'SMTP Error: data not accepted.',
+			'empty_message' => 'Message body empty',
+			'encoding' => 'Unknown encoding: ',
+			'execute' => 'Could not execute: ',
+			'file_access' => 'Could not access file: ',
+			'file_open' => 'File Error: Could not open file: ',
+			'from_failed' => 'The following From address failed: ',
+			'instantiate' => 'Could not instantiate mail function.',
+			'invalid_address' => 'Invalid address',
+			'mailer_not_supported' => ' mailer is not supported.',
+			'provide_address' => 'You must provide at least one recipient email address.',
+			'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+			'signing' => 'Signing Error: ',
+			'smtp_connect_failed' => 'SMTP connect() failed.',
+			'smtp_error' => 'SMTP server error: ',
+			'variable_set' => 'Cannot set or reset variable: ',
+			'extension_missing' => 'Extension missing: '
+		);
+		if (empty($lang_path)) {
+			// Calculate an absolute path so it can work if CWD is not here
+			$lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
+		}
+		$foundlang = true;
+		$lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+		// There is no English translation file
+		if ($langcode != 'en') {
+			// Make sure language file path is readable
+			if (!is_readable($lang_file)) {
+				$foundlang = false;
+			} else {
+				// Overwrite language-specific strings.
+				// This way we'll never have missing translation keys.
+				$foundlang = include $lang_file;
+			}
+		}
+		$this->language = $PHPMAILER_LANG;
+		return (boolean)$foundlang; // Returns false if language not found
+	}
+
+	/**
+	 * Get the array of strings for the current language.
+	 * @return array
+	 */
+	public function getTranslations()
+	{
+		return $this->language;
+	}
+
+	/**
+	 * Create recipient headers.
+	 * @access public
+	 * @param string $type
+	 * @param array $addr An array of recipient,
+	 * where each recipient is a 2-element indexed array with element 0 containing an address
+	 * and element 1 containing a name, like:
+	 * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
+	 * @return string
+	 */
+	public function addrAppend($type, $addr)
+	{
+		$addresses = array();
+		foreach ($addr as $address) {
+			$addresses[] = $this->addrFormat($address);
+		}
+		return $type . ': ' . implode(', ', $addresses) . $this->LE;
+	}
+
+	/**
+	 * Format an address for use in a message header.
+	 * @access public
+	 * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
+	 *      like array('joe@example.com', 'Joe User')
+	 * @return string
+	 */
+	public function addrFormat($addr)
+	{
+		if (empty($addr[1])) { // No name provided
+			return $this->secureHeader($addr[0]);
+		} else {
+			return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+				$addr[0]
+			) . '>';
+		}
+	}
+
+	/**
+	 * Word-wrap message.
+	 * For use with mailers that do not automatically perform wrapping
+	 * and for quoted-printable encoded messages.
+	 * Original written by philippe.
+	 * @param string $message The message to wrap
+	 * @param integer $length The line length to wrap to
+	 * @param boolean $qp_mode Whether to run in Quoted-Printable mode
+	 * @access public
+	 * @return string
+	 */
+	public function wrapText($message, $length, $qp_mode = false)
+	{
+		if ($qp_mode) {
+			$soft_break = sprintf(' =%s', $this->LE);
+		} else {
+			$soft_break = $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');
+		$lelen = strlen($this->LE);
+		$crlflen = strlen(self::CRLF);
+
+		$message = $this->fixEOL($message);
+		//Remove a trailing line break
+		if (substr($message, -$lelen) == $this->LE) {
+			$message = substr($message, 0, -$lelen);
+		}
+
+		//Split message into lines
+		$lines = explode($this->LE, $message);
+		//Message will be rebuilt in here
+		$message = '';
+		foreach ($lines as $line) {
+			$words = explode(' ', $line);
+			$buf = '';
+			$firstword = true;
+			foreach ($words as $word) {
+				if ($qp_mode and (strlen($word) > $length)) {
+					$space_left = $length - strlen($buf) - $crlflen;
+					if (!$firstword) {
+						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', self::CRLF);
+						} else {
+							$message .= $buf . $soft_break;
+						}
+						$buf = '';
+					}
+					while (strlen($word) > 0) {
+						if ($length <= 0) {
+							break;
+						}
+						$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', self::CRLF);
+						} else {
+							$buf = $part;
+						}
+					}
+				} else {
+					$buf_o = $buf;
+					if (!$firstword) {
+						$buf .= ' ';
+					}
+					$buf .= $word;
+
+					if (strlen($buf) > $length and $buf_o != '') {
+						$message .= $buf_o . $soft_break;
+						$buf = $word;
+					}
+				}
+				$firstword = false;
+			}
+			$message .= $buf . self::CRLF;
+		}
+
+		return $message;
+	}
+
+	/**
+	 * Find the last character boundary prior to $maxLength in a utf-8
+	 * quoted-printable encoded string.
+	 * Original written by Colin Brown.
+	 * @access public
+	 * @param string $encodedText utf-8 QP text
+	 * @param integer $maxLength Find the last character boundary prior to this length
+	 * @return integer
+	 */
+	public function utf8CharBoundary($encodedText, $maxLength)
+	{
+		$foundSplitPos = false;
+		$lookBack = 3;
+		while (!$foundSplitPos) {
+			$lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+			$encodedCharPos = strpos($lastChunk, '=');
+			if (false !== $encodedCharPos) {
+				// 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
+					if ($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;
+	}
+
+	/**
+	 * Apply word wrapping to the message body.
+	 * Wraps the message body to the number of chars set in the WordWrap property.
+	 * You should only do this to plain-text bodies as wrapping HTML tags may break them.
+	 * This is called automatically by createBody(), so you don't need to call it yourself.
+	 * @access public
+	 * @return void
+	 */
+	public function setWordWrap()
+	{
+		if ($this->WordWrap < 1) {
+			return;
+		}
+
+		switch ($this->message_type) {
+			case 'alt':
+			case 'alt_inline':
+			case 'alt_attach':
+			case 'alt_inline_attach':
+				$this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
+				break;
+			default:
+				$this->Body = $this->wrapText($this->Body, $this->WordWrap);
+				break;
+		}
+	}
+
+	/**
+	 * Assemble message headers.
+	 * @access public
+	 * @return string The assembled headers
+	 */
+	public function createHeader()
+	{
+		$result = '';
+
+		if ($this->MessageDate == '') {
+			$this->MessageDate = self::rfcDate();
+		}
+		$result .= $this->headerLine('Date', $this->MessageDate);
+
+
+		// To be created automatically by mail()
+		if ($this->SingleTo) {
+			if ($this->Mailer != 'mail') {
+				foreach ($this->to as $toaddr) {
+					$this->SingleToArray[] = $this->addrFormat($toaddr);
+				}
+			}
+		} else {
+			if (count($this->to) > 0) {
+				if ($this->Mailer != 'mail') {
+					$result .= $this->addrAppend('To', $this->to);
+				}
+			} elseif (count($this->cc) == 0) {
+				$result .= $this->headerLine('To', 'undisclosed-recipients:;');
+			}
+		}
+
+		$result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
+
+		// 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' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
+			)
+			and 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 != '') {
+			$this->lastMessageID = $this->MessageID;
+		} else {
+			$this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->ServerHostname());
+		}
+		$result .= $this->headerLine('Message-ID', $this->lastMessageID);
+		$result .= $this->headerLine('X-Priority', $this->Priority);
+		if ($this->XMailer == '') {
+			$result .= $this->headerLine(
+				'X-Mailer',
+				'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)'
+			);
+		} else {
+			$myXmailer = trim($this->XMailer);
+			if ($myXmailer) {
+				$result .= $this->headerLine('X-Mailer', $myXmailer);
+			}
+		}
+
+		if ($this->ConfirmReadingTo != '') {
+			$result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+		}
+
+		// Add custom headers
+		foreach ($this->CustomHeader as $header) {
+			$result .= $this->headerLine(
+				trim($header[0]),
+				$this->encodeHeader(trim($header[1]))
+			);
+		}
+		if (!$this->sign_key_file) {
+			$result .= $this->headerLine('MIME-Version', '1.0');
+			$result .= $this->getMailMIME();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the message MIME type headers.
+	 * @access public
+	 * @return string
+	 */
+	public function getMailMIME()
+	{
+		$result = '';
+		$ismultipart = true;
+		switch ($this->message_type) {
+			case 'inline':
+				$result .= $this->headerLine('Content-Type', 'multipart/related;');
+				$result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+				break;
+			case 'attach':
+			case 'inline_attach':
+			case 'alt_attach':
+			case 'alt_inline_attach':
+				$result .= $this->headerLine('Content-Type', 'multipart/mixed;');
+				$result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+				break;
+			case 'alt':
+			case 'alt_inline':
+				$result .= $this->headerLine('Content-Type', 'multipart/alternative;');
+				$result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+				break;
+			default:
+				// Catches case 'plain': and case '':
+				$result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+				$ismultipart = false;
+				break;
+		}
+		// RFC1341 part 5 says 7bit is assumed if not specified
+		if ($this->Encoding != '7bit') {
+			// RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
+			if ($ismultipart) {
+				if ($this->Encoding == '8bit') {
+					$result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
+				}
+				// The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
+			} else {
+				$result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
+			}
+		}
+
+		if ($this->Mailer != 'mail') {
+			$result .= $this->LE;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns the whole MIME message.
+	 * Includes complete headers and body.
+	 * Only valid post preSend().
+	 * @see PHPMailer::preSend()
+	 * @access public
+	 * @return string
+	 */
+	public function getSentMIMEMessage()
+	{
+		return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
+	}
+
+	/**
+	 * Assemble the message body.
+	 * Returns an empty string on failure.
+	 * @access public
+	 * @throws phpmailerException
+	 * @return string The assembled message body
+	 */
+	public function createBody()
+	{
+		$body = '';
+		//Create unique IDs and preset boundaries
+		$this->uniqueid = md5(uniqid(time()));
+		$this->boundary[1] = 'b1_' . $this->uniqueid;
+		$this->boundary[2] = 'b2_' . $this->uniqueid;
+		$this->boundary[3] = 'b3_' . $this->uniqueid;
+
+		if ($this->sign_key_file) {
+			$body .= $this->getMailMIME() . $this->LE;
+		}
+
+		$this->setWordWrap();
+
+		$bodyEncoding = $this->Encoding;
+		$bodyCharSet = $this->CharSet;
+		//Can we do a 7-bit downgrade?
+		if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
+			$bodyEncoding = '7bit';
+			$bodyCharSet = 'us-ascii';
+		}
+		//If lines are too long, change to quoted-printable transfer encoding
+		if (self::hasLineLongerThanMax($this->Body)) {
+			$this->Encoding = 'quoted-printable';
+			$bodyEncoding = 'quoted-printable';
+		}
+
+		$altBodyEncoding = $this->Encoding;
+		$altBodyCharSet = $this->CharSet;
+		//Can we do a 7-bit downgrade?
+		if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
+			$altBodyEncoding = '7bit';
+			$altBodyCharSet = 'us-ascii';
+		}
+		//If lines are too long, change to quoted-printable transfer encoding
+		if (self::hasLineLongerThanMax($this->AltBody)) {
+			$altBodyEncoding = 'quoted-printable';
+		}
+		//Use this as a preamble in all multipart message types
+		$mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
+		switch ($this->message_type) {
+			case 'inline':
+				$body .= $mimepre;
+				$body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+				$body .= $this->encodeString($this->Body, $bodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->attachAll('inline', $this->boundary[1]);
+				break;
+			case 'attach':
+				$body .= $mimepre;
+				$body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+				$body .= $this->encodeString($this->Body, $bodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->attachAll('attachment', $this->boundary[1]);
+				break;
+			case 'inline_attach':
+				$body .= $mimepre;
+				$body .= $this->textLine('--' . $this->boundary[1]);
+				$body .= $this->headerLine('Content-Type', 'multipart/related;');
+				$body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+				$body .= $this->LE;
+				$body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
+				$body .= $this->encodeString($this->Body, $bodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->attachAll('inline', $this->boundary[2]);
+				$body .= $this->LE;
+				$body .= $this->attachAll('attachment', $this->boundary[1]);
+				break;
+			case 'alt':
+				$body .= $mimepre;
+				$body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+				$body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
+				$body .= $this->encodeString($this->Body, $bodyEncoding);
+				$body .= $this->LE . $this->LE;
+				if (!empty($this->Ical)) {
+					$body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
+					$body .= $this->encodeString($this->Ical, $this->Encoding);
+					$body .= $this->LE . $this->LE;
+				}
+				$body .= $this->endBoundary($this->boundary[1]);
+				break;
+			case 'alt_inline':
+				$body .= $mimepre;
+				$body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+				$body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->textLine('--' . $this->boundary[1]);
+				$body .= $this->headerLine('Content-Type', 'multipart/related;');
+				$body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+				$body .= $this->LE;
+				$body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+				$body .= $this->encodeString($this->Body, $bodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->attachAll('inline', $this->boundary[2]);
+				$body .= $this->LE;
+				$body .= $this->endBoundary($this->boundary[1]);
+				break;
+			case 'alt_attach':
+				$body .= $mimepre;
+				$body .= $this->textLine('--' . $this->boundary[1]);
+				$body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+				$body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+				$body .= $this->LE;
+				$body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+				$body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+				$body .= $this->encodeString($this->Body, $bodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->endBoundary($this->boundary[2]);
+				$body .= $this->LE;
+				$body .= $this->attachAll('attachment', $this->boundary[1]);
+				break;
+			case 'alt_inline_attach':
+				$body .= $mimepre;
+				$body .= $this->textLine('--' . $this->boundary[1]);
+				$body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+				$body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+				$body .= $this->LE;
+				$body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+				$body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->textLine('--' . $this->boundary[2]);
+				$body .= $this->headerLine('Content-Type', 'multipart/related;');
+				$body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+				$body .= $this->LE;
+				$body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
+				$body .= $this->encodeString($this->Body, $bodyEncoding);
+				$body .= $this->LE . $this->LE;
+				$body .= $this->attachAll('inline', $this->boundary[3]);
+				$body .= $this->LE;
+				$body .= $this->endBoundary($this->boundary[2]);
+				$body .= $this->LE;
+				$body .= $this->attachAll('attachment', $this->boundary[1]);
+				break;
+			default:
+				// catch case 'plain' and case ''
+				$body .= $this->encodeString($this->Body, $bodyEncoding);
+				break;
+		}
+
+		if ($this->isError()) {
+			$body = '';
+		} elseif ($this->sign_key_file) {
+			try {
+				if (!defined('PKCS7_TEXT')) {
+					throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+				}
+				// @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
+				$file = tempnam(sys_get_temp_dir(), 'mail');
+				if (false === file_put_contents($file, $body)) {
+					throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
+				}
+				$signed = tempnam(sys_get_temp_dir(), 'signed');
+				//Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
+				if (empty($this->sign_extracerts_file)) {
+					$sign = @openssl_pkcs7_sign(
+						$file,
+						$signed,
+						'file://' . realpath($this->sign_cert_file),
+						array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+						null
+					);
+				} else {
+					$sign = @openssl_pkcs7_sign(
+						$file,
+						$signed,
+						'file://' . realpath($this->sign_cert_file),
+						array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+						null,
+						PKCS7_DETACHED,
+						$this->sign_extracerts_file
+					);
+				}
+				if ($sign) {
+					@unlink($file);
+					$body = file_get_contents($signed);
+					@unlink($signed);
+					//The message returned by openssl contains both headers and body, so need to split them up
+					$parts = explode("\n\n", $body, 2);
+					$this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
+					$body = $parts[1];
+				} else {
+					@unlink($file);
+					@unlink($signed);
+					throw new phpmailerException($this->lang('signing') . openssl_error_string());
+				}
+			} catch (phpmailerException $exc) {
+				$body = '';
+				if ($this->exceptions) {
+					throw $exc;
+				}
+			}
+		}
+		return $body;
+	}
+
+	/**
+	 * Return the start of a message boundary.
+	 * @access protected
+	 * @param string $boundary
+	 * @param string $charSet
+	 * @param string $contentType
+	 * @param string $encoding
+	 * @return string
+	 */
+	protected 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;
+		// RFC1341 part 5 says 7bit is assumed if not specified
+		if ($encoding != '7bit') {
+			$result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
+		}
+		$result .= $this->LE;
+
+		return $result;
+	}
+
+	/**
+	 * Return the end of a message boundary.
+	 * @access protected
+	 * @param string $boundary
+	 * @return string
+	 */
+	protected function endBoundary($boundary)
+	{
+		return $this->LE . '--' . $boundary . '--' . $this->LE;
+	}
+
+	/**
+	 * Set the message type.
+	 * PHPMailer only supports some preset message types,
+	 * not arbitrary MIME structures.
+	 * @access protected
+	 * @return void
+	 */
+	protected function setMessageType()
+	{
+		$type = array();
+		if ($this->alternativeExists()) {
+			$type[] = 'alt';
+		}
+		if ($this->inlineImageExists()) {
+			$type[] = 'inline';
+		}
+		if ($this->attachmentExists()) {
+			$type[] = 'attach';
+		}
+		$this->message_type = implode('_', $type);
+		if ($this->message_type == '') {
+			$this->message_type = 'plain';
+		}
+	}
+
+	/**
+	 * Format a header line.
+	 * @access public
+	 * @param string $name
+	 * @param string $value
+	 * @return string
+	 */
+	public function headerLine($name, $value)
+	{
+		return $name . ': ' . $value . $this->LE;
+	}
+
+	/**
+	 * Return a formatted mail line.
+	 * @access public
+	 * @param string $value
+	 * @return string
+	 */
+	public function textLine($value)
+	{
+		return $value . $this->LE;
+	}
+
+	/**
+	 * Add an attachment from a path on the filesystem.
+	 * Returns false if the file could not be found or read.
+	 * @param string $path Path to the attachment.
+	 * @param string $name Overrides the attachment name.
+	 * @param string $encoding File encoding (see $Encoding).
+	 * @param string $type File extension (MIME) type.
+	 * @param string $disposition Disposition to use
+	 * @throws phpmailerException
+	 * @return boolean
+	 */
+	public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
+	{
+		try {
+			if (!@is_file($path)) {
+				throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
+			}
+
+			// If a MIME type is not specified, try to work it out from the file name
+			if ($type == '') {
+				$type = self::filenameToType($path);
+			}
+
+			$filename = basename($path);
+			if ($name == '') {
+				$name = $filename;
+			}
+
+			$this->attachment[] = array(
+				0 => $path,
+				1 => $filename,
+				2 => $name,
+				3 => $encoding,
+				4 => $type,
+				5 => false, // isStringAttachment
+				6 => $disposition,
+				7 => 0
+			);
+
+		} catch (phpmailerException $exc) {
+			$this->setError($exc->getMessage());
+			$this->edebug($exc->getMessage());
+			if ($this->exceptions) {
+				throw $exc;
+			}
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Return the array of attachments.
+	 * @return array
+	 */
+	public function getAttachments()
+	{
+		return $this->attachment;
+	}
+
+	/**
+	 * Attach all file, string, and binary attachments to the message.
+	 * Returns an empty string on failure.
+	 * @access protected
+	 * @param string $disposition_type
+	 * @param string $boundary
+	 * @return string
+	 */
+	protected function attachAll($disposition_type, $boundary)
+	{
+		// Return text of body
+		$mime = array();
+		$cidUniq = array();
+		$incl = array();
+
+		// Add all attachments
+		foreach ($this->attachment as $attachment) {
+			// Check if it is a valid disposition_filter
+			if ($attachment[6] == $disposition_type) {
+				// Check for string attachment
+				$string = '';
+				$path = '';
+				$bString = $attachment[5];
+				if ($bString) {
+					$string = $attachment[0];
+				} else {
+					$path = $attachment[0];
+				}
+
+				$inclhash = md5(serialize($attachment));
+				if (in_array($inclhash, $incl)) {
+					continue;
+				}
+				$incl[] = $inclhash;
+				$name = $attachment[2];
+				$encoding = $attachment[3];
+				$type = $attachment[4];
+				$disposition = $attachment[6];
+				$cid = $attachment[7];
+				if ($disposition == 'inline' && isset($cidUniq[$cid])) {
+					continue;
+				}
+				$cidUniq[$cid] = true;
+
+				$mime[] = sprintf('--%s%s', $boundary, $this->LE);
+				$mime[] = sprintf(
+					'Content-Type: %s; name="%s"%s',
+					$type,
+					$this->encodeHeader($this->secureHeader($name)),
+					$this->LE
+				);
+				// RFC1341 part 5 says 7bit is assumed if not specified
+				if ($encoding != '7bit') {
+					$mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
+				}
+
+				if ($disposition == 'inline') {
+					$mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
+				}
+
+				// If a filename contains any of these chars, it should be quoted,
+				// but not otherwise: RFC2183 & RFC2045 5.1
+				// Fixes a warning in IETF's msglint MIME checker
+				// Allow for bypassing the Content-Disposition header totally
+				if (!(empty($disposition))) {
+					$encoded_name = $this->encodeHeader($this->secureHeader($name));
+					if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
+						$mime[] = sprintf(
+							'Content-Disposition: %s; filename="%s"%s',
+							$disposition,
+							$encoded_name,
+							$this->LE . $this->LE
+						);
+					} else {
+						$mime[] = sprintf(
+							'Content-Disposition: %s; filename=%s%s',
+							$disposition,
+							$encoded_name,
+							$this->LE . $this->LE
+						);
+					}
+				} else {
+					$mime[] = $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', $boundary, $this->LE);
+
+		return implode('', $mime);
+	}
+
+	/**
+	 * Encode a file attachment in requested format.
+	 * Returns an empty string on failure.
+	 * @param string $path The full path to the file
+	 * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+	 * @throws phpmailerException
+	 * @see EncodeFile(encodeFile
+	 * @access protected
+	 * @return string
+	 */
+	protected function encodeFile($path, $encoding = 'base64')
+	{
+		try {
+			if (!is_readable($path)) {
+				throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
+			}
+			$magic_quotes = get_magic_quotes_runtime();
+			if ($magic_quotes) {
+				if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+					set_magic_quotes_runtime(false);
+				} else {
+					//Doesn't exist in PHP 5.4, but we don't need to check because
+					//get_magic_quotes_runtime always returns false in 5.4+
+					//so it will never get here
+					ini_set('magic_quotes_runtime', false);
+				}
+			}
+			$file_buffer = file_get_contents($path);
+			$file_buffer = $this->encodeString($file_buffer, $encoding);
+			if ($magic_quotes) {
+				if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+					set_magic_quotes_runtime($magic_quotes);
+				} else {
+					ini_set('magic_quotes_runtime', $magic_quotes);
+				}
+			}
+			return $file_buffer;
+		} catch (Exception $exc) {
+			$this->setError($exc->getMessage());
+			return '';
+		}
+	}
+
+	/**
+	 * Encode a string in requested format.
+	 * Returns an empty string on failure.
+	 * @param string $str The text to encode
+	 * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+	 * @access public
+	 * @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;
+	}
+
+	/**
+	 * Encode a header string optimally.
+	 * Picks shortest of Q, B, quoted-printable or none.
+	 * @access public
+	 * @param string $str
+	 * @param string $position
+	 * @return string
+	 */
+	public function encodeHeader($str, $position = 'text')
+	{
+		$matchcount = 0;
+		switch (strtolower($position)) {
+			case 'phrase':
+				if (!preg_match('/[\200-\377]/', $str)) {
+					// Can't use addslashes as we don't know the value of magic_quotes_sybase
+					$encoded = addcslashes($str, "\0..\37\177\\\"");
+					if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+						return ($encoded);
+					} else {
+						return ("\"$encoded\"");
+					}
+				}
+				$matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+				break;
+			/** @noinspection PhpMissingBreakStatementInspection */
+			case 'comment':
+				$matchcount = preg_match_all('/[()"]/', $str, $matches);
+				// Intentional fall-through
+			case 'text':
+			default:
+				$matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+				break;
+		}
+
+		//There are no chars that need encoding
+		if ($matchcount == 0) {
+			return ($str);
+		}
+
+		$maxlen = 75 - 7 - strlen($this->CharSet);
+		// Try to select the encoding which should produce the shortest output
+		if ($matchcount > strlen($str) / 3) {
+			// More than a third of the content will need encoding, so B encoding will be most efficient
+			$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, "\n");
+			} 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('=' . self::CRLF, "\n", trim($encoded));
+		}
+
+		$encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+		$encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+		return $encoded;
+	}
+
+	/**
+	 * Check if a string contains multi-byte characters.
+	 * @access public
+	 * @param string $str multi-byte text to wrap encode
+	 * @return boolean
+	 */
+	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;
+		}
+	}
+
+	/**
+	 * Does a string contain any 8-bit chars (in any charset)?
+	 * @param string $text
+	 * @return boolean
+	 */
+	public function has8bitChars($text)
+	{
+		return (boolean)preg_match('/[\x80-\xFF]/', $text);
+	}
+
+	/**
+	 * Encode and wrap long multibyte strings for mail headers
+	 * without breaking lines within a character.
+	 * Adapted from a function by paravoid
+	 * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+	 * @access public
+	 * @param string $str multi-byte text to wrap encode
+	 * @param string $linebreak string to use as linefeed/end-of-line
+	 * @return string
+	 */
+	public function base64EncodeWrapMB($str, $linebreak = null)
+	{
+		$start = '=?' . $this->CharSet . '?B?';
+		$end = '?=';
+		$encoded = '';
+		if ($linebreak === null) {
+			$linebreak = $this->LE;
+		}
+
+		$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
+		$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 . $linebreak;
+		}
+
+		// Chomp the last linefeed
+		$encoded = substr($encoded, 0, -strlen($linebreak));
+		return $encoded;
+	}
+
+	/**
+	 * Encode a string in quoted-printable format.
+	 * According to RFC2045 section 6.7.
+	 * @access public
+	 * @param string $string The text to encode
+	 * @param integer $line_max Number of chars allowed on a line before wrapping
+	 * @return string
+	 * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
+	 */
+	public function encodeQP($string, $line_max = 76)
+	{
+		// Use native function if it's available (>= PHP5.3)
+		if (function_exists('quoted_printable_encode')) {
+			return $this->fixEOL(quoted_printable_encode($string));
+		}
+		// Fall back to a pure PHP implementation
+		$string = str_replace(
+			array('%20', '%0D%0A.', '%0D%0A', '%'),
+			array(' ', "\r\n=2E", "\r\n", '='),
+			rawurlencode($string)
+		);
+		$string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
+		return $this->fixEOL($string);
+	}
+
+	/**
+	 * Backward compatibility wrapper for an old QP encoding function that was removed.
+	 * @see PHPMailer::encodeQP()
+	 * @access public
+	 * @param string $string
+	 * @param integer $line_max
+	 * @param boolean $space_conv
+	 * @return string
+	 * @deprecated Use encodeQP instead.
+	 */
+	public function encodeQPphp(
+		$string,
+		$line_max = 76,
+		/** @noinspection PhpUnusedParameterInspection */ $space_conv = false
+	) {
+		return $this->encodeQP($string, $line_max);
+	}
+
+	/**
+	 * Encode a string using Q encoding.
+	 * @link http://tools.ietf.org/html/rfc2047
+	 * @param string $str the text to encode
+	 * @param string $position Where the text is going to be used, see the RFC for what that means
+	 * @access public
+	 * @return string
+	 */
+	public function encodeQ($str, $position = 'text')
+	{
+		// There should not be any EOL in the string
+		$pattern = '';
+		$encoded = str_replace(array("\r", "\n"), '', $str);
+		switch (strtolower($position)) {
+			case 'phrase':
+				// RFC 2047 section 5.3
+				$pattern = '^A-Za-z0-9!*+\/ -';
+				break;
+			/** @noinspection PhpMissingBreakStatementInspection */
+			case 'comment':
+				// RFC 2047 section 5.2
+				$pattern = '\(\)"';
+				// intentional fall-through
+				// for this reason we build the $pattern without including delimiters and []
+			case 'text':
+			default:
+				// RFC 2047 section 5.1
+				// Replace every high ascii, control, =, ? and _ characters
+				$pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+				break;
+		}
+		$matches = array();
+		if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
+			// If the string contains an '=', make sure it's the first thing we replace
+			// so as to avoid double-encoding
+			$eqkey = array_search('=', $matches[0]);
+			if (false !== $eqkey) {
+				unset($matches[0][$eqkey]);
+				array_unshift($matches[0], '=');
+			}
+			foreach (array_unique($matches[0]) as $char) {
+				$encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+			}
+		}
+		// Replace every spaces to _ (more readable than =20)
+		return str_replace(' ', '_', $encoded);
+	}
+
+
+	/**
+	 * Add a string or binary attachment (non-filesystem).
+	 * This method can be used to attach ascii or binary data,
+	 * such as a BLOB record from a database.
+	 * @param string $string String attachment data.
+	 * @param string $filename Name of the attachment.
+	 * @param string $encoding File encoding (see $Encoding).
+	 * @param string $type File extension (MIME) type.
+	 * @param string $disposition Disposition to use
+	 * @return void
+	 */
+	public function addStringAttachment(
+		$string,
+		$filename,
+		$encoding = 'base64',
+		$type = '',
+		$disposition = 'attachment'
+	) {
+		// If a MIME type is not specified, try to work it out from the file name
+		if ($type == '') {
+			$type = self::filenameToType($filename);
+		}
+		// Append to $attachment array
+		$this->attachment[] = array(
+			0 => $string,
+			1 => $filename,
+			2 => basename($filename),
+			3 => $encoding,
+			4 => $type,
+			5 => true, // isStringAttachment
+			6 => $disposition,
+			7 => 0
+		);
+	}
+
+	/**
+	 * Add an embedded (inline) attachment from a file.
+	 * This can include images, sounds, and just about any other document type.
+	 * These differ from 'regular' attachments in that they are intended to be
+	 * displayed inline with the message, not just attached for download.
+	 * This is used in HTML messages that embed the images
+	 * the HTML refers to using the $cid value.
+	 * @param string $path Path to the attachment.
+	 * @param string $cid Content ID of the attachment; Use this to reference
+	 *        the content when using an embedded image in HTML.
+	 * @param string $name Overrides the attachment name.
+	 * @param string $encoding File encoding (see $Encoding).
+	 * @param string $type File MIME type.
+	 * @param string $disposition Disposition to use
+	 * @return boolean True on successfully adding an attachment
+	 */
+	public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
+	{
+		if (!@is_file($path)) {
+			$this->setError($this->lang('file_access') . $path);
+			return false;
+		}
+
+		// If a MIME type is not specified, try to work it out from the file name
+		if ($type == '') {
+			$type = self::filenameToType($path);
+		}
+
+		$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 => $disposition,
+			7 => $cid
+		);
+		return true;
+	}
+
+	/**
+	 * Add an embedded stringified attachment.
+	 * This can include images, sounds, and just about any other document type.
+	 * Be sure to set the $type to an image type for images:
+	 * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
+	 * @param string $string The attachment binary data.
+	 * @param string $cid Content ID of the attachment; Use this to reference
+	 *        the content when using an embedded image in HTML.
+	 * @param string $name
+	 * @param string $encoding File encoding (see $Encoding).
+	 * @param string $type MIME type.
+	 * @param string $disposition Disposition to use
+	 * @return boolean True on successfully adding an attachment
+	 */
+	public function addStringEmbeddedImage(
+		$string,
+		$cid,
+		$name = '',
+		$encoding = 'base64',
+		$type = '',
+		$disposition = 'inline'
+	) {
+		// If a MIME type is not specified, try to work it out from the name
+		if ($type == '') {
+			$type = self::filenameToType($name);
+		}
+
+		// Append to $attachment array
+		$this->attachment[] = array(
+			0 => $string,
+			1 => $name,
+			2 => $name,
+			3 => $encoding,
+			4 => $type,
+			5 => true, // isStringAttachment
+			6 => $disposition,
+			7 => $cid
+		);
+		return true;
+	}
+
+	/**
+	 * Check if an inline attachment is present.
+	 * @access public
+	 * @return boolean
+	 */
+	public function inlineImageExists()
+	{
+		foreach ($this->attachment as $attachment) {
+			if ($attachment[6] == 'inline') {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Check if an attachment (non-inline) is present.
+	 * @return boolean
+	 */
+	public function attachmentExists()
+	{
+		foreach ($this->attachment as $attachment) {
+			if ($attachment[6] == 'attachment') {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Check if this message has an alternative body set.
+	 * @return boolean
+	 */
+	public function alternativeExists()
+	{
+		return !empty($this->AltBody);
+	}
+
+	/**
+	 * Clear all To recipients.
+	 * @return void
+	 */
+	public function clearAddresses()
+	{
+		foreach ($this->to as $to) {
+			unset($this->all_recipients[strtolower($to[0])]);
+		}
+		$this->to = array();
+	}
+
+	/**
+	 * Clear all CC recipients.
+	 * @return void
+	 */
+	public function clearCCs()
+	{
+		foreach ($this->cc as $cc) {
+			unset($this->all_recipients[strtolower($cc[0])]);
+		}
+		$this->cc = array();
+	}
+
+	/**
+	 * Clear all BCC recipients.
+	 * @return void
+	 */
+	public function clearBCCs()
+	{
+		foreach ($this->bcc as $bcc) {
+			unset($this->all_recipients[strtolower($bcc[0])]);
+		}
+		$this->bcc = array();
+	}
+
+	/**
+	 * Clear all ReplyTo recipients.
+	 * @return void
+	 */
+	public function clearReplyTos()
+	{
+		$this->ReplyTo = array();
+	}
+
+	/**
+	 * Clear all recipient types.
+	 * @return void
+	 */
+	public function clearAllRecipients()
+	{
+		$this->to = array();
+		$this->cc = array();
+		$this->bcc = array();
+		$this->all_recipients = array();
+	}
+
+	/**
+	 * Clear all filesystem, string, and binary attachments.
+	 * @return void
+	 */
+	public function clearAttachments()
+	{
+		$this->attachment = array();
+	}
+
+	/**
+	 * Clear all custom headers.
+	 * @return void
+	 */
+	public function clearCustomHeaders()
+	{
+		$this->CustomHeader = array();
+	}
+
+	/**
+	 * Add an error message to the error container.
+	 * @access protected
+	 * @param string $msg
+	 * @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['error'])) {
+				$msg .= $this->lang('smtp_error') . $lasterror['error'];
+				if (!empty($lasterror['detail'])) {
+					$msg .= ' Detail: '. $lasterror['detail'];
+				}
+				if (!empty($lasterror['smtp_code'])) {
+					$msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+				}
+				if (!empty($lasterror['smtp_code_ex'])) {
+					$msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+				}
+			}
+		}
+		$this->ErrorInfo = $msg;
+	}
+
+	/**
+	 * Return an RFC 822 formatted date.
+	 * @access public
+	 * @return string
+	 * @static
+	 */
+	public static function rfcDate()
+	{
+		// Set the time zone to whatever the default is to avoid 500 errors
+		// Will default to UTC if it's not set properly in php.ini
+		date_default_timezone_set(@date_default_timezone_get());
+		return date('D, j M Y H:i:s O');
+	}
+
+	/**
+	 * Get the server hostname.
+	 * Returns 'localhost.localdomain' if unknown.
+	 * @access protected
+	 * @return string
+	 */
+	protected function serverHostname()
+	{
+		$result = 'localhost.localdomain';
+		if (!empty($this->Hostname)) {
+			$result = $this->Hostname;
+		} elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+			$result = $_SERVER['SERVER_NAME'];
+		} elseif (function_exists('gethostname') && gethostname() !== false) {
+			$result = gethostname();
+		} elseif (php_uname('n') !== false) {
+			$result = php_uname('n');
+		}
+		return $result;
+	}
+
+	/**
+	 * Get an error message in the current language.
+	 * @access protected
+	 * @param string $key
+	 * @return string
+	 */
+	protected function lang($key)
+	{
+		if (count($this->language) < 1) {
+			$this->setLanguage('en'); // set the default language
+		}
+
+		if (array_key_exists($key, $this->language)) {
+			if ($key == 'smtp_connect_failed') {
+				//Include a link to troubleshooting docs on SMTP connection failure
+				//this is by far the biggest cause of support questions
+				//but it's usually not PHPMailer's fault.
+				return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
+			}
+			return $this->language[$key];
+		} else {
+			//Return the key as a fallback
+			return $key;
+		}
+	}
+
+	/**
+	 * Check if an error occurred.
+	 * @access public
+	 * @return boolean True if an error did occur.
+	 */
+	public function isError()
+	{
+		return ($this->error_count > 0);
+	}
+
+	/**
+	 * Ensure consistent line endings in a string.
+	 * Changes every end of line from CRLF, CR or LF to $this->LE.
+	 * @access public
+	 * @param string $str String to fixEOL
+	 * @return string
+	 */
+	public function fixEOL($str)
+	{
+		// Normalise to \n
+		$nstr = str_replace(array("\r\n", "\r"), "\n", $str);
+		// Now convert LE as needed
+		if ($this->LE !== "\n") {
+			$nstr = str_replace("\n", $this->LE, $nstr);
+		}
+		return $nstr;
+	}
+
+	/**
+	 * Add a custom header.
+	 * $name value can be overloaded to contain
+	 * both header name and value (name:value)
+	 * @access public
+	 * @param string $name Custom header name
+	 * @param string $value Header value
+	 * @return void
+	 */
+	public function addCustomHeader($name, $value = null)
+	{
+		if ($value === null) {
+			// Value passed in as name:value
+			$this->CustomHeader[] = explode(':', $name, 2);
+		} else {
+			$this->CustomHeader[] = array($name, $value);
+		}
+	}
+
+	/**
+	 * Returns all custom headers
+	 *
+	 * @return array
+	 */
+	public function getCustomHeaders()
+	{
+		return $this->CustomHeader;
+	}
+
+	/**
+	 * Create a message from an HTML string.
+	 * Automatically makes modifications for inline images and backgrounds
+	 * and creates a plain-text version by converting the HTML.
+	 * Overwrites any existing values in $this->Body and $this->AltBody
+	 * @access public
+	 * @param string $message HTML message string
+	 * @param string $basedir baseline directory for path
+	 * @param boolean|callable $advanced Whether to use the internal HTML to text converter
+	 *    or your own custom converter @see html2text()
+	 * @return string $message
+	 */
+	public function msgHTML($message, $basedir = '', $advanced = false)
+	{
+		preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
+		if (isset($images[2])) {
+			foreach ($images[2] as $imgindex => $url) {
+				// Convert data URIs into embedded images
+				if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
+					$data = substr($url, strpos($url, ','));
+					if ($match[2]) {
+						$data = base64_decode($data);
+					} else {
+						$data = rawurldecode($data);
+					}
+					$cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+					if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
+						$message = str_replace(
+							$images[0][$imgindex],
+							$images[1][$imgindex] . '="cid:' . $cid . '"',
+							$message
+						);
+					}
+				} elseif (!preg_match('#^[A-z]+://#', $url)) {
+					// Do not change urls for absolute images (thanks to corvuscorax)
+					$filename = basename($url);
+					$directory = dirname($url);
+					if ($directory == '.') {
+						$directory = '';
+					}
+					$cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+					if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
+						$basedir .= '/';
+					}
+					if (strlen($directory) > 1 && substr($directory, -1) != '/') {
+						$directory .= '/';
+					}
+					if ($this->addEmbeddedImage(
+						$basedir . $directory . $filename,
+						$cid,
+						$filename,
+						'base64',
+						self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
+					)
+					) {
+						$message = preg_replace(
+							'/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
+							$images[1][$imgindex] . '="cid:' . $cid . '"',
+							$message
+						);
+					}
+				}
+			}
+		}
+		$this->isHTML(true);
+		// Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
+		$this->Body = $this->normalizeBreaks($message);
+		$this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
+		if (empty($this->AltBody)) {
+			$this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
+				self::CRLF . self::CRLF;
+		}
+		return $this->Body;
+	}
+
+	/**
+	 * Convert an HTML string into plain text.
+	 * This is used by msgHTML().
+	 * Note - older versions of this function used a bundled advanced converter
+	 * which was been removed for license reasons in #232
+	 * Example usage:
+	 * <code>
+	 * // Use default conversion
+	 * $plain = $mail->html2text($html);
+	 * // Use your own custom converter
+	 * $plain = $mail->html2text($html, function($html) {
+	 *     $converter = new MyHtml2text($html);
+	 *     return $converter->get_text();
+	 * });
+	 * </code>
+	 * @param string $html The HTML text to convert
+	 * @param boolean|callable $advanced Any boolean value to use the internal converter,
+	 *   or provide your own callable for custom conversion.
+	 * @return string
+	 */
+	public function html2text($html, $advanced = false)
+	{
+		if (is_callable($advanced)) {
+			return call_user_func($advanced, $html);
+		}
+		return html_entity_decode(
+			trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
+			ENT_QUOTES,
+			$this->CharSet
+		);
+	}
+
+	/**
+	 * Get the MIME type for a file extension.
+	 * @param string $ext File extension
+	 * @access public
+	 * @return string MIME type of file.
+	 * @static
+	 */
+	public static function _mime_types($ext = '')
+	{
+		$mimes = array(
+			'xl'    => 'application/excel',
+			'js'    => 'application/javascript',
+			'hqx'   => 'application/mac-binhex40',
+			'cpt'   => 'application/mac-compactpro',
+			'bin'   => 'application/macbinary',
+			'doc'   => 'application/msword',
+			'word'  => 'application/msword',
+			'class' => 'application/octet-stream',
+			'dll'   => 'application/octet-stream',
+			'dms'   => 'application/octet-stream',
+			'exe'   => 'application/octet-stream',
+			'lha'   => 'application/octet-stream',
+			'lzh'   => 'application/octet-stream',
+			'psd'   => 'application/octet-stream',
+			'sea'   => 'application/octet-stream',
+			'so'    => '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',
+			'php3'  => 'application/x-httpd-php',
+			'php4'  => 'application/x-httpd-php',
+			'php'   => 'application/x-httpd-php',
+			'phtml' => 'application/x-httpd-php',
+			'phps'  => 'application/x-httpd-php-source',
+			'swf'   => 'application/x-shockwave-flash',
+			'sit'   => 'application/x-stuffit',
+			'tar'   => 'application/x-tar',
+			'tgz'   => 'application/x-tar',
+			'xht'   => 'application/xhtml+xml',
+			'xhtml' => 'application/xhtml+xml',
+			'zip'   => 'application/zip',
+			'mid'   => 'audio/midi',
+			'midi'  => 'audio/midi',
+			'mp2'   => 'audio/mpeg',
+			'mp3'   => 'audio/mpeg',
+			'mpga'  => 'audio/mpeg',
+			'aif'   => 'audio/x-aiff',
+			'aifc'  => 'audio/x-aiff',
+			'aiff'  => 'audio/x-aiff',
+			'ram'   => 'audio/x-pn-realaudio',
+			'rm'    => 'audio/x-pn-realaudio',
+			'rpm'   => 'audio/x-pn-realaudio-plugin',
+			'ra'    => 'audio/x-realaudio',
+			'wav'   => 'audio/x-wav',
+			'bmp'   => 'image/bmp',
+			'gif'   => 'image/gif',
+			'jpeg'  => 'image/jpeg',
+			'jpe'   => 'image/jpeg',
+			'jpg'   => 'image/jpeg',
+			'png'   => 'image/png',
+			'tiff'  => 'image/tiff',
+			'tif'   => 'image/tiff',
+			'eml'   => 'message/rfc822',
+			'css'   => 'text/css',
+			'html'  => 'text/html',
+			'htm'   => 'text/html',
+			'shtml' => 'text/html',
+			'log'   => 'text/plain',
+			'text'  => 'text/plain',
+			'txt'   => 'text/plain',
+			'rtx'   => 'text/richtext',
+			'rtf'   => 'text/rtf',
+			'vcf'   => 'text/vcard',
+			'vcard' => 'text/vcard',
+			'xml'   => 'text/xml',
+			'xsl'   => 'text/xml',
+			'mpeg'  => 'video/mpeg',
+			'mpe'   => 'video/mpeg',
+			'mpg'   => 'video/mpeg',
+			'mov'   => 'video/quicktime',
+			'qt'    => 'video/quicktime',
+			'rv'    => 'video/vnd.rn-realvideo',
+			'avi'   => 'video/x-msvideo',
+			'movie' => 'video/x-sgi-movie'
+		);
+		if (array_key_exists(strtolower($ext), $mimes)) {
+			return $mimes[strtolower($ext)];
+		}
+		return 'application/octet-stream';
+	}
+
+	/**
+	 * Map a file name to a MIME type.
+	 * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
+	 * @param string $filename A file name or full path, does not need to exist as a file
+	 * @return string
+	 * @static
+	 */
+	public static function filenameToType($filename)
+	{
+		// In case the path is a URL, strip any query string before getting extension
+		$qpos = strpos($filename, '?');
+		if (false !== $qpos) {
+			$filename = substr($filename, 0, $qpos);
+		}
+		$pathinfo = self::mb_pathinfo($filename);
+		return self::_mime_types($pathinfo['extension']);
+	}
+
+	/**
+	 * Multi-byte-safe pathinfo replacement.
+	 * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
+	 * Works similarly to the one in PHP >= 5.2.0
+	 * @link http://www.php.net/manual/en/function.pathinfo.php#107461
+	 * @param string $path A filename or path, does not need to exist as a file
+	 * @param integer|string $options Either a PATHINFO_* constant,
+	 *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
+	 * @return string|array
+	 * @static
+	 */
+	public static function mb_pathinfo($path, $options = null)
+	{
+		$ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
+		$pathinfo = array();
+		if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
+			if (array_key_exists(1, $pathinfo)) {
+				$ret['dirname'] = $pathinfo[1];
+			}
+			if (array_key_exists(2, $pathinfo)) {
+				$ret['basename'] = $pathinfo[2];
+			}
+			if (array_key_exists(5, $pathinfo)) {
+				$ret['extension'] = $pathinfo[5];
+			}
+			if (array_key_exists(3, $pathinfo)) {
+				$ret['filename'] = $pathinfo[3];
+			}
+		}
+		switch ($options) {
+			case PATHINFO_DIRNAME:
+			case 'dirname':
+				return $ret['dirname'];
+			case PATHINFO_BASENAME:
+			case 'basename':
+				return $ret['basename'];
+			case PATHINFO_EXTENSION:
+			case 'extension':
+				return $ret['extension'];
+			case PATHINFO_FILENAME:
+			case 'filename':
+				return $ret['filename'];
+			default:
+				return $ret;
+		}
+	}
+
+	/**
+	 * Set or reset instance properties.
+	 * You should avoid this function - it's more verbose, less efficient, more error-prone and
+	 * harder to debug than setting properties directly.
+	 * Usage Example:
+	 * `$mail->set('SMTPSecure', 'tls');`
+	 *   is the same as:
+	 * `$mail->SMTPSecure = 'tls';`
+	 * @access public
+	 * @param string $name The property name to set
+	 * @param mixed $value The value to set the property to
+	 * @return boolean
+	 * @TODO Should this not be using the __set() magic function?
+	 */
+	public function set($name, $value = '')
+	{
+		if (property_exists($this, $name)) {
+			$this->$name = $value;
+			return true;
+		} else {
+			$this->setError($this->lang('variable_set') . $name);
+			return false;
+		}
+	}
+
+	/**
+	 * Strip newlines to prevent header injection.
+	 * @access public
+	 * @param string $str
+	 * @return string
+	 */
+	public function secureHeader($str)
+	{
+		return trim(str_replace(array("\r", "\n"), '', $str));
+	}
+
+	/**
+	 * Normalize line breaks in a string.
+	 * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
+	 * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
+	 * @param string $text
+	 * @param string $breaktype What kind of line break to use, defaults to CRLF
+	 * @return string
+	 * @access public
+	 * @static
+	 */
+	public static function normalizeBreaks($text, $breaktype = "\r\n")
+	{
+		return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
+	}
+
+
+	/**
+	 * Set the public and private key files and password for S/MIME signing.
+	 * @access public
+	 * @param string $cert_filename
+	 * @param string $key_filename
+	 * @param string $key_pass Password for private key
+	 * @param string $extracerts_filename Optional path to chain certificate
+	 */
+	public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
+	{
+		$this->sign_cert_file = $cert_filename;
+		$this->sign_key_file = $key_filename;
+		$this->sign_key_pass = $key_pass;
+		$this->sign_extracerts_file = $extracerts_filename;
+	}
+
+	/**
+	 * Quoted-Printable-encode a DKIM header.
+	 * @access public
+	 * @param string $txt
+	 * @return string
+	 */
+	public function DKIM_QP($txt)
+	{
+		$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;
+	}
+
+	/**
+	 * Generate a DKIM signature.
+	 * @access public
+	 * @param string $signHeader
+	 * @throws phpmailerException
+	 * @return string
+	 */
+	public function DKIM_Sign($signHeader)
+	{
+		if (!defined('PKCS7_TEXT')) {
+			if ($this->exceptions) {
+				throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+			}
+			return '';
+		}
+		$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($signHeader, $signature, $privKey)) {
+			return base64_encode($signature);
+		}
+		return '';
+	}
+
+	/**
+	 * Generate a DKIM canonicalization header.
+	 * @access public
+	 * @param string $signHeader Header
+	 * @return string
+	 */
+	public function DKIM_HeaderC($signHeader)
+	{
+		$signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
+		$lines = explode("\r\n", $signHeader);
+		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
+		}
+		$signHeader = implode("\r\n", $lines);
+		return $signHeader;
+	}
+
+	/**
+	 * Generate a DKIM canonicalization body.
+	 * @access public
+	 * @param string $body Message Body
+	 * @return string
+	 */
+	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;
+	}
+
+	/**
+	 * Create the DKIM header and body in a new message header.
+	 * @access public
+	 * @param string $headers_line Header lines
+	 * @param string $subject Subject
+	 * @param string $body Body
+	 * @return string
+	 */
+	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($this->LE, $headers_line);
+		$from_header = '';
+		$to_header = '';
+		$current = '';
+		foreach ($headers as $header) {
+			if (strpos($header, 'From:') === 0) {
+				$from_header = $header;
+				$current = 'from_header';
+			} elseif (strpos($header, 'To:') === 0) {
+				$to_header = $header;
+				$current = 'to_header';
+			} else {
+				if (!empty($$current) && strpos($header, ' =?') === 0) {
+					$$current .= $header;
+				} else {
+					$current = '';
+				}
+			}
+		}
+		$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
+		if ('' == $this->DKIM_identity) {
+			$ident = '';
+		} else {
+			$ident = ' 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 $dkimhdrs . $signed . "\r\n";
+	}
+
+	/**
+	 * Detect if a string contains a line longer than the maximum line length allowed.
+	 * @param string $str
+	 * @return boolean
+	 * @static
+	 */
+	public static function hasLineLongerThanMax($str)
+	{
+		//+2 to include CRLF line break for a 1000 total
+		return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
+	}
+
+	/**
+	 * Allows for public read access to 'to' property.
+	 * @access public
+	 * @return array
+	 */
+	public function getToAddresses()
+	{
+		return $this->to;
+	}
+
+	/**
+	 * Allows for public read access to 'cc' property.
+	 * @access public
+	 * @return array
+	 */
+	public function getCcAddresses()
+	{
+		return $this->cc;
+	}
+
+	/**
+	 * Allows for public read access to 'bcc' property.
+	 * @access public
+	 * @return array
+	 */
+	public function getBccAddresses()
+	{
+		return $this->bcc;
+	}
+
+	/**
+	 * Allows for public read access to 'ReplyTo' property.
+	 * @access public
+	 * @return array
+	 */
+	public function getReplyToAddresses()
+	{
+		return $this->ReplyTo;
+	}
+
+	/**
+	 * Allows for public read access to 'all_recipients' property.
+	 * @access public
+	 * @return array
+	 */
+	public function getAllRecipientAddresses()
+	{
+		return $this->all_recipients;
+	}
+
+	/**
+	 * Perform a callback.
+	 * @param boolean $isSent
+	 * @param array $to
+	 * @param array $cc
+	 * @param array $bcc
+	 * @param string $subject
+	 * @param string $body
+	 * @param string $from
+	 */
+	protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
+	{
+		if (!empty($this->action_function) && is_callable($this->action_function)) {
+			$params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
+			call_user_func_array($this->action_function, $params);
+		}
+	}
 }
 
 /**
@@ -3610,13 +3610,13 @@ 
  */
 class phpmailerException extends Exception
 {
-    /**
-     * Prettify error message output
-     * @return string
-     */
-    public function errorMessage()
-    {
-        $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
-        return $errorMsg;
-    }
+	/**
+	 * Prettify error message output
+	 * @return string
+	 */
+	public function errorMessage()
+	{
+		$errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+		return $errorMsg;
+	}
 }

Spacing +216 added lines, -216 removed lines

@@ -611,7 +611,7 @@ 
      */
     public function __construct($exceptions = false)
     {
-        $this->exceptions = (boolean)$exceptions;
+        $this->exceptions = (boolean) $exceptions;
     }
 
     /**
@@ -646,7 +646,7 @@ 
         } else {
             $subject = $this->encodeHeader($this->secureHeader($subject));
         }
-        if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
+        if (ini_get('safe_mode') || ! ($this->UseSendmailOptions)) {
             $result = @mail($to, $subject, $body, $header);
         } else {
             $result = @mail($to, $subject, $body, $header, $params);
@@ -667,7 +667,7 @@ 
             return;
         }
         //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+        if ( ! in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
             call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
             return;
         }
@@ -689,11 +689,11 @@ 
             default:
                 //Normalize line breaks
                 $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                echo gmdate('Y-m-d H:i:s')."\t".str_replace(
                     "\n",
                     "\n                   \t                  ",
                     trim($str)
-                ) . "\n";
+                )."\n";
         }
     }
 
@@ -737,7 +737,7 @@ 
     {
         $ini_sendmail_path = ini_get('sendmail_path');
 
-        if (!stristr($ini_sendmail_path, 'sendmail')) {
+        if ( ! stristr($ini_sendmail_path, 'sendmail')) {
             $this->Sendmail = '/usr/sbin/sendmail';
         } else {
             $this->Sendmail = $ini_sendmail_path;
@@ -753,7 +753,7 @@ 
     {
         $ini_sendmail_path = ini_get('sendmail_path');
 
-        if (!stristr($ini_sendmail_path, 'qmail')) {
+        if ( ! stristr($ini_sendmail_path, 'qmail')) {
             $this->Sendmail = '/var/qmail/bin/qmail-inject';
         } else {
             $this->Sendmail = $ini_sendmail_path;
@@ -819,32 +819,32 @@ 
      */
     protected function addAnAddress($kind, $address, $name = '')
     {
-        if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
-            $this->setError($this->lang('Invalid recipient array') . ': ' . $kind);
-            $this->edebug($this->lang('Invalid recipient array') . ': ' . $kind);
+        if ( ! preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
+            $this->setError($this->lang('Invalid recipient array').': '.$kind);
+            $this->edebug($this->lang('Invalid recipient array').': '.$kind);
             if ($this->exceptions) {
-                throw new phpmailerException('Invalid recipient array: ' . $kind);
+                throw new phpmailerException('Invalid recipient array: '.$kind);
             }
             return false;
         }
         $address = trim($address);
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
+        if ( ! $this->validateAddress($address)) {
+            $this->setError($this->lang('invalid_address').': '.$address);
+            $this->edebug($this->lang('invalid_address').': '.$address);
             if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
+                throw new phpmailerException($this->lang('invalid_address').': '.$address);
             }
             return false;
         }
         if ($kind != 'Reply-To') {
-            if (!isset($this->all_recipients[strtolower($address)])) {
+            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)) {
+            if ( ! array_key_exists(strtolower($address), $this->ReplyTo)) {
                 $this->ReplyTo[strtolower($address)] = array($address, $name);
                 return true;
             }
@@ -864,11 +864,11 @@ 
     {
         $address = trim($address);
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
+        if ( ! $this->validateAddress($address)) {
+            $this->setError($this->lang('invalid_address').': '.$address);
+            $this->edebug($this->lang('invalid_address').': '.$address);
             if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
+                throw new phpmailerException($this->lang('invalid_address').': '.$address);
             }
             return false;
         }
@@ -910,7 +910,7 @@ 
      */
     public static function validateAddress($address, $patternselect = 'auto')
     {
-        if (!$patternselect or $patternselect == 'auto') {
+        if ( ! $patternselect or $patternselect == 'auto') {
             //Check this constant first so it works when extension_loaded() is disabled by safe mode
             //Constant was added in PHP 5.2.4
             if (defined('PCRE_VERSION')) {
@@ -940,30 +940,30 @@ 
                  * @copyright 2009-2010 Michael Rushton
                  * Feel free to use and redistribute this code. But please keep this copyright notice.
                  */
-                return (boolean)preg_match(
-                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
-                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
-                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
-                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
-                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
-                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
-                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                return (boolean) preg_match(
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)'.
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)'.
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)'.
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*'.
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)'.
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}'.
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:'.
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}'.
                     '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
                     $address
                 );
             case 'pcre':
                 //An older regex that doesn't need a recent PCRE
-                return (boolean)preg_match(
-                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
-                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
-                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
-                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
-                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
-                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
-                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
-                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
-                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                return (boolean) preg_match(
+                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>'.
+                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")'.
+                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*'.
+                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})'.
+                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:'.
+                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?'.
+                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:'.
+                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?'.
+                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}'.
                     '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
                     $address
                 );
@@ -972,8 +972,8 @@ 
                  * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
                  * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
                  */
-                return (boolean)preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                return (boolean) preg_match(
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[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])?)*$/sD',
                     $address
                 );
@@ -985,7 +985,7 @@ 
                     and strpos($address, '@') != strlen($address) - 1);
             case 'php':
             default:
-                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
+                return (boolean) filter_var($address, FILTER_VALIDATE_EMAIL);
         }
     }
 
@@ -998,7 +998,7 @@ 
     public function send()
     {
         try {
-            if (!$this->preSend()) {
+            if ( ! $this->preSend()) {
                 return false;
             }
             return $this->postSend();
@@ -1026,14 +1026,14 @@ 
             }
 
             // Set whether the message is multipart/alternative
-            if (!empty($this->AltBody)) {
+            if ( ! empty($this->AltBody)) {
                 $this->ContentType = 'multipart/alternative';
             }
 
             $this->error_count = 0; // Reset errors
             $this->setMessageType();
             // Refuse to send an empty message unless we are specifically allowing it
-            if (!$this->AllowEmpty and empty($this->Body)) {
+            if ( ! $this->AllowEmpty and empty($this->Body)) {
                 throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
             }
 
@@ -1060,17 +1060,17 @@ 
             }
 
             // Sign with DKIM if enabled
-            if (!empty($this->DKIM_domain)
-                && !empty($this->DKIM_private)
-                && !empty($this->DKIM_selector)
+            if ( ! empty($this->DKIM_domain)
+                && ! empty($this->DKIM_private)
+                && ! empty($this->DKIM_selector)
                 && file_exists($this->DKIM_private)) {
                 $header_dkim = $this->DKIM_Add(
-                    $this->MIMEHeader . $this->mailHeader,
+                    $this->MIMEHeader.$this->mailHeader,
                     $this->encodeHeader($this->secureHeader($this->Subject)),
                     $this->MIMEBody
                 );
-                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
-                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ").self::CRLF.
+                    str_replace("\r\n", "\n", $header_dkim).self::CRLF;
             }
             return true;
         } catch (phpmailerException $exc) {
@@ -1144,10 +1144,10 @@ 
         }
         if ($this->SingleTo) {
             foreach ($this->SingleToArray as $toAddr) {
-                if (!@$mail = popen($sendmail, 'w')) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                if ( ! @$mail = popen($sendmail, 'w')) {
+                    throw new phpmailerException($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
                 }
-                fputs($mail, 'To: ' . $toAddr . "\n");
+                fputs($mail, 'To: '.$toAddr."\n");
                 fputs($mail, $header);
                 fputs($mail, $body);
                 $result = pclose($mail);
@@ -1161,19 +1161,19 @@ 
                     $this->From
                 );
                 if ($result != 0) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                    throw new phpmailerException($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
                 }
             }
         } else {
-            if (!@$mail = popen($sendmail, 'w')) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            if ( ! @$mail = popen($sendmail, 'w')) {
+                throw new phpmailerException($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
             }
             fputs($mail, $header);
             fputs($mail, $body);
             $result = pclose($mail);
             $this->doCallback(($result == 0), $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
             if ($result != 0) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                throw new phpmailerException($this->lang('execute').$this->Sendmail, self::STOP_CRITICAL);
             }
         }
         return true;
@@ -1201,7 +1201,7 @@ 
         } else {
             $params = sprintf('-f%s', $this->Sender);
         }
-        if ($this->Sender != '' and !ini_get('safe_mode')) {
+        if ($this->Sender != '' and ! ini_get('safe_mode')) {
             $old_from = ini_get('sendmail_from');
             ini_set('sendmail_from', $this->Sender);
         }
@@ -1218,7 +1218,7 @@ 
         if (isset($old_from)) {
             ini_set('sendmail_from', $old_from);
         }
-        if (!$result) {
+        if ( ! $result) {
             throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
         }
         return true;
@@ -1231,8 +1231,8 @@ 
      */
     public function getSMTPInstance()
     {
-        if (!is_object($this->smtp)) {
-        	require_once( 'class-smtp.php' );
+        if ( ! is_object($this->smtp)) {
+        	require_once('class-smtp.php');
             $this->smtp = new SMTP;
         }
         return $this->smtp;
@@ -1253,7 +1253,7 @@ 
     protected function smtpSend($header, $body)
     {
         $bad_rcpt = array();
-        if (!$this->smtpConnect($this->SMTPOptions)) {
+        if ( ! $this->smtpConnect($this->SMTPOptions)) {
             throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
         }
         if ('' == $this->Sender) {
@@ -1261,15 +1261,15 @@ 
         } else {
             $smtp_from = $this->Sender;
         }
-        if (!$this->smtp->mail($smtp_from)) {
-            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+        if ( ! $this->smtp->mail($smtp_from)) {
+            $this->setError($this->lang('from_failed').$smtp_from.' : '.implode(',', $this->smtp->getError()));
             throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
         }
 
         // Attempt to send to all recipients
         foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
             foreach ($togroup as $to) {
-                if (!$this->smtp->recipient($to[0])) {
+                if ( ! $this->smtp->recipient($to[0])) {
                     $error = $this->smtp->getError();
                     $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']);
                     $isSent = false;
@@ -1281,7 +1281,7 @@ 
         }
 
         // Only send the DATA command if we have viable recipients
-        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+        if ((count($this->all_recipients) > count($bad_rcpt)) and ! $this->smtp->data($header.$body)) {
             throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
         }
         if ($this->SMTPKeepAlive) {
@@ -1294,10 +1294,10 @@ 
         if (count($bad_rcpt) > 0) {
             $errstr = '';
             foreach ($bad_rcpt as $bad) {
-                $errstr .= $bad['to'] . ': ' . $bad['error'];
+                $errstr .= $bad['to'].': '.$bad['error'];
             }
             throw new phpmailerException(
-                $this->lang('recipients_failed') . $errstr,
+                $this->lang('recipients_failed').$errstr,
                 self::STOP_CONTINUE
             );
         }
@@ -1333,7 +1333,7 @@ 
 
         foreach ($hosts as $hostentry) {
             $hostinfo = array();
-            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
+            if ( ! preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
                 // Not a valid host entry
                 continue;
             }
@@ -1358,17 +1358,17 @@ 
             $sslext = defined('OPENSSL_ALGO_SHA1');
             if ('tls' === $secure or 'ssl' === $secure) {
                 //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
-                if (!$sslext) {
+                if ( ! $sslext) {
                     throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
                 }
             }
             $host = $hostinfo[3];
             $port = $this->Port;
-            $tport = (integer)$hostinfo[4];
+            $tport = (integer) $hostinfo[4];
             if ($tport > 0 and $tport < 65536) {
                 $port = $tport;
             }
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+            if ($this->smtp->connect($prefix.$host, $port, $this->Timeout, $options)) {
                 try {
                     if ($this->Helo) {
                         $hello = $this->Helo;
@@ -1385,14 +1385,14 @@ 
                         $tls = true;
                     }
                     if ($tls) {
-                        if (!$this->smtp->startTLS()) {
+                        if ( ! $this->smtp->startTLS()) {
                             throw new phpmailerException($this->lang('connect_host'));
                         }
                         // We must resend HELO after tls negotiation
                         $this->smtp->hello($hello);
                     }
                     if ($this->SMTPAuth) {
-                        if (!$this->smtp->authenticate(
+                        if ( ! $this->smtp->authenticate(
                             $this->Username,
                             $this->Password,
                             $this->AuthType,
@@ -1415,7 +1415,7 @@ 
         // If we get here, all connection attempts have failed, so close connection hard
         $this->smtp->close();
         // As we've caught all exceptions, just report whatever the last one was
-        if ($this->exceptions and !is_null($lastexception)) {
+        if ($this->exceptions and ! is_null($lastexception)) {
             throw $lastexception;
         }
         return false;
@@ -1470,14 +1470,14 @@ 
         );
         if (empty($lang_path)) {
             // Calculate an absolute path so it can work if CWD is not here
-            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
+            $lang_path = dirname(__FILE__).DIRECTORY_SEPARATOR.'language'.DIRECTORY_SEPARATOR;
         }
         $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        $lang_file = $lang_path.'phpmailer.lang-'.$langcode.'.php';
         // There is no English translation file
         if ($langcode != 'en') {
             // Make sure language file path is readable
-            if (!is_readable($lang_file)) {
+            if ( ! is_readable($lang_file)) {
                 $foundlang = false;
             } else {
                 // Overwrite language-specific strings.
@@ -1486,7 +1486,7 @@ 
             }
         }
         $this->language = $PHPMAILER_LANG;
-        return (boolean)$foundlang; // Returns false if language not found
+        return (boolean) $foundlang; // Returns false if language not found
     }
 
     /**
@@ -1514,7 +1514,7 @@ 
         foreach ($addr as $address) {
             $addresses[] = $this->addrFormat($address);
         }
-        return $type . ': ' . implode(', ', $addresses) . $this->LE;
+        return $type.': '.implode(', ', $addresses).$this->LE;
     }
 
     /**
@@ -1529,9 +1529,9 @@ 
         if (empty($addr[1])) { // No name provided
             return $this->secureHeader($addr[0]);
         } else {
-            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase').' <'.$this->secureHeader(
                 $addr[0]
-            ) . '>';
+            ).'>';
         }
     }
 
@@ -1576,7 +1576,7 @@ 
             foreach ($words as $word) {
                 if ($qp_mode and (strlen($word) > $length)) {
                     $space_left = $length - strlen($buf) - $crlflen;
-                    if (!$firstword) {
+                    if ( ! $firstword) {
                         if ($space_left > 20) {
                             $len = $space_left;
                             if ($is_utf8) {
@@ -1588,10 +1588,10 @@ 
                             }
                             $part = substr($word, 0, $len);
                             $word = substr($word, $len);
-                            $buf .= ' ' . $part;
-                            $message .= $buf . sprintf('=%s', self::CRLF);
+                            $buf .= ' '.$part;
+                            $message .= $buf.sprintf('=%s', self::CRLF);
                         } else {
-                            $message .= $buf . $soft_break;
+                            $message .= $buf.$soft_break;
                         }
                         $buf = '';
                     }
@@ -1611,26 +1611,26 @@ 
                         $word = substr($word, $len);
 
                         if (strlen($word) > 0) {
-                            $message .= $part . sprintf('=%s', self::CRLF);
+                            $message .= $part.sprintf('=%s', self::CRLF);
                         } else {
                             $buf = $part;
                         }
                     }
                 } else {
                     $buf_o = $buf;
-                    if (!$firstword) {
+                    if ( ! $firstword) {
                         $buf .= ' ';
                     }
                     $buf .= $word;
 
                     if (strlen($buf) > $length and $buf_o != '') {
-                        $message .= $buf_o . $soft_break;
+                        $message .= $buf_o.$soft_break;
                         $buf = $word;
                     }
                 }
                 $firstword = false;
             }
-            $message .= $buf . self::CRLF;
+            $message .= $buf.self::CRLF;
         }
 
         return $message;
@@ -1649,7 +1649,7 @@ 
     {
         $foundSplitPos = false;
         $lookBack = 3;
-        while (!$foundSplitPos) {
+        while ( ! $foundSplitPos) {
             $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
             $encodedCharPos = strpos($lastChunk, '=');
             if (false !== $encodedCharPos) {
@@ -1776,7 +1776,7 @@ 
         if ($this->XMailer == '') {
             $result .= $this->headerLine(
                 'X-Mailer',
-                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)'
+                'PHPMailer '.$this->Version.' (https://github.com/PHPMailer/PHPMailer/)'
             );
         } else {
             $myXmailer = trim($this->XMailer);
@@ -1786,7 +1786,7 @@ 
         }
 
         if ($this->ConfirmReadingTo != '') {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+            $result .= $this->headerLine('Disposition-Notification-To', '<'.trim($this->ConfirmReadingTo).'>');
         }
 
         // Add custom headers
@@ -1796,7 +1796,7 @@ 
                 $this->encodeHeader(trim($header[1]))
             );
         }
-        if (!$this->sign_key_file) {
+        if ( ! $this->sign_key_file) {
             $result .= $this->headerLine('MIME-Version', '1.0');
             $result .= $this->getMailMIME();
         }
@@ -1816,23 +1816,23 @@ 
         switch ($this->message_type) {
             case 'inline':
                 $result .= $this->headerLine('Content-Type', 'multipart/related;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                $result .= $this->textLine("\tboundary=\"".$this->boundary[1].'"');
                 break;
             case 'attach':
             case 'inline_attach':
             case 'alt_attach':
             case 'alt_inline_attach':
                 $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                $result .= $this->textLine("\tboundary=\"".$this->boundary[1].'"');
                 break;
             case 'alt':
             case 'alt_inline':
                 $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                $result .= $this->textLine("\tboundary=\"".$this->boundary[1].'"');
                 break;
             default:
                 // Catches case 'plain': and case '':
-                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+                $result .= $this->textLine('Content-Type: '.$this->ContentType.'; charset='.$this->CharSet);
                 $ismultipart = false;
                 break;
         }
@@ -1866,7 +1866,7 @@ 
      */
     public function getSentMIMEMessage()
     {
-        return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
+        return $this->MIMEHeader.$this->mailHeader.self::CRLF.$this->MIMEBody;
     }
 
     /**
@@ -1881,12 +1881,12 @@ 
         $body = '';
         //Create unique IDs and preset boundaries
         $this->uniqueid = md5(uniqid(time()));
-        $this->boundary[1] = 'b1_' . $this->uniqueid;
-        $this->boundary[2] = 'b2_' . $this->uniqueid;
-        $this->boundary[3] = 'b3_' . $this->uniqueid;
+        $this->boundary[1] = 'b1_'.$this->uniqueid;
+        $this->boundary[2] = 'b2_'.$this->uniqueid;
+        $this->boundary[3] = 'b3_'.$this->uniqueid;
 
         if ($this->sign_key_file) {
-            $body .= $this->getMailMIME() . $this->LE;
+            $body .= $this->getMailMIME().$this->LE;
         }
 
         $this->setWordWrap();
@@ -1894,7 +1894,7 @@ 
         $bodyEncoding = $this->Encoding;
         $bodyCharSet = $this->CharSet;
         //Can we do a 7-bit downgrade?
-        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
+        if ($bodyEncoding == '8bit' and ! $this->has8bitChars($this->Body)) {
             $bodyEncoding = '7bit';
             $bodyCharSet = 'us-ascii';
         }
@@ -1907,7 +1907,7 @@ 
         $altBodyEncoding = $this->Encoding;
         $altBodyCharSet = $this->CharSet;
         //Can we do a 7-bit downgrade?
-        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
+        if ($altBodyEncoding == '8bit' and ! $this->has8bitChars($this->AltBody)) {
             $altBodyEncoding = '7bit';
             $altBodyCharSet = 'us-ascii';
         }
@@ -1916,31 +1916,31 @@ 
             $altBodyEncoding = 'quoted-printable';
         }
         //Use this as a preamble in all multipart message types
-        $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
+        $mimepre = "This is a multi-part message in MIME format.".$this->LE.$this->LE;
         switch ($this->message_type) {
             case 'inline':
                 $body .= $mimepre;
                 $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('inline', $this->boundary[1]);
                 break;
             case 'attach':
                 $body .= $mimepre;
                 $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('attachment', $this->boundary[1]);
                 break;
             case 'inline_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('inline', $this->boundary[2]);
                 $body .= $this->LE;
                 $body .= $this->attachAll('attachment', $this->boundary[1]);
@@ -1949,14 +1949,14 @@ 
                 $body .= $mimepre;
                 $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                if (!empty($this->Ical)) {
+                $body .= $this->LE.$this->LE;
+                if ( ! empty($this->Ical)) {
                     $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
                     $body .= $this->encodeString($this->Ical, $this->Encoding);
-                    $body .= $this->LE . $this->LE;
+                    $body .= $this->LE.$this->LE;
                 }
                 $body .= $this->endBoundary($this->boundary[1]);
                 break;
@@ -1964,50 +1964,50 @@ 
                 $body .= $mimepre;
                 $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->LE.$this->LE;
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('inline', $this->boundary[2]);
                 $body .= $this->LE;
                 $body .= $this->endBoundary($this->boundary[1]);
                 break;
             case 'alt_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->endBoundary($this->boundary[2]);
                 $body .= $this->LE;
                 $body .= $this->attachAll('attachment', $this->boundary[1]);
                 break;
             case 'alt_inline_attach':
                 $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->textLine('--'.$this->boundary[1]);
                 $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[2].'"');
                 $body .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
                 $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->LE.$this->LE;
+                $body .= $this->textLine('--'.$this->boundary[2]);
                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= $this->textLine("\tboundary=\"".$this->boundary[3].'"');
                 $body .= $this->LE;
                 $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
                 $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
+                $body .= $this->LE.$this->LE;
                 $body .= $this->attachAll('inline', $this->boundary[3]);
                 $body .= $this->LE;
                 $body .= $this->endBoundary($this->boundary[2]);
@@ -2024,13 +2024,13 @@ 
             $body = '';
         } elseif ($this->sign_key_file) {
             try {
-                if (!defined('PKCS7_TEXT')) {
-                    throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+                if ( ! defined('PKCS7_TEXT')) {
+                    throw new phpmailerException($this->lang('extension_missing').'openssl');
                 }
                 // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
                 $file = tempnam(sys_get_temp_dir(), 'mail');
                 if (false === file_put_contents($file, $body)) {
-                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
+                    throw new phpmailerException($this->lang('signing').' Could not write temp file');
                 }
                 $signed = tempnam(sys_get_temp_dir(), 'signed');
                 //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
@@ -2038,16 +2038,16 @@ 
                     $sign = @openssl_pkcs7_sign(
                         $file,
                         $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        'file://'.realpath($this->sign_cert_file),
+                        array('file://'.realpath($this->sign_key_file), $this->sign_key_pass),
                         null
                     );
                 } else {
                     $sign = @openssl_pkcs7_sign(
                         $file,
                         $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        'file://'.realpath($this->sign_cert_file),
+                        array('file://'.realpath($this->sign_key_file), $this->sign_key_pass),
                         null,
                         PKCS7_DETACHED,
                         $this->sign_extracerts_file
@@ -2059,12 +2059,12 @@ 
                     @unlink($signed);
                     //The message returned by openssl contains both headers and body, so need to split them up
                     $parts = explode("\n\n", $body, 2);
-                    $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
+                    $this->MIMEHeader .= $parts[0].$this->LE.$this->LE;
                     $body = $parts[1];
                 } 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 $exc) {
                 $body = '';
@@ -2097,7 +2097,7 @@ 
         if ($encoding == '') {
             $encoding = $this->Encoding;
         }
-        $result .= $this->textLine('--' . $boundary);
+        $result .= $this->textLine('--'.$boundary);
         $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
         $result .= $this->LE;
         // RFC1341 part 5 says 7bit is assumed if not specified
@@ -2117,7 +2117,7 @@ 
      */
     protected function endBoundary($boundary)
     {
-        return $this->LE . '--' . $boundary . '--' . $this->LE;
+        return $this->LE.'--'.$boundary.'--'.$this->LE;
     }
 
     /**
@@ -2154,7 +2154,7 @@ 
      */
     public function headerLine($name, $value)
     {
-        return $name . ': ' . $value . $this->LE;
+        return $name.': '.$value.$this->LE;
     }
 
     /**
@@ -2165,7 +2165,7 @@ 
      */
     public function textLine($value)
     {
-        return $value . $this->LE;
+        return $value.$this->LE;
     }
 
     /**
@@ -2182,8 +2182,8 @@ 
     public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
     {
         try {
-            if (!@is_file($path)) {
-                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
+            if ( ! @is_file($path)) {
+                throw new phpmailerException($this->lang('file_access').$path, self::STOP_CONTINUE);
             }
 
             // If a MIME type is not specified, try to work it out from the file name
@@ -2291,21 +2291,21 @@ 
                 // but not otherwise: RFC2183 & RFC2045 5.1
                 // Fixes a warning in IETF's msglint MIME checker
                 // Allow for bypassing the Content-Disposition header totally
-                if (!(empty($disposition))) {
+                if ( ! (empty($disposition))) {
                     $encoded_name = $this->encodeHeader($this->secureHeader($name));
                     if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
                         $mime[] = sprintf(
                             'Content-Disposition: %s; filename="%s"%s',
                             $disposition,
                             $encoded_name,
-                            $this->LE . $this->LE
+                            $this->LE.$this->LE
                         );
                     } else {
                         $mime[] = sprintf(
                             'Content-Disposition: %s; filename=%s%s',
                             $disposition,
                             $encoded_name,
-                            $this->LE . $this->LE
+                            $this->LE.$this->LE
                         );
                     }
                 } else {
@@ -2318,13 +2318,13 @@ 
                     if ($this->isError()) {
                         return '';
                     }
-                    $mime[] = $this->LE . $this->LE;
+                    $mime[] = $this->LE.$this->LE;
                 } else {
                     $mime[] = $this->encodeFile($path, $encoding);
                     if ($this->isError()) {
                         return '';
                     }
-                    $mime[] = $this->LE . $this->LE;
+                    $mime[] = $this->LE.$this->LE;
                 }
             }
         }
@@ -2347,8 +2347,8 @@ 
     protected function encodeFile($path, $encoding = 'base64')
     {
         try {
-            if (!is_readable($path)) {
-                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            if ( ! is_readable($path)) {
+                throw new phpmailerException($this->lang('file_open').$path, self::STOP_CONTINUE);
             }
             $magic_quotes = get_magic_quotes_runtime();
             if ($magic_quotes) {
@@ -2407,7 +2407,7 @@ 
                 $encoded = $this->encodeQP($str);
                 break;
             default:
-                $this->setError($this->lang('encoding') . $encoding);
+                $this->setError($this->lang('encoding').$encoding);
                 break;
         }
         return $encoded;
@@ -2426,10 +2426,10 @@ 
         $matchcount = 0;
         switch (strtolower($position)) {
             case 'phrase':
-                if (!preg_match('/[\200-\377]/', $str)) {
+                if ( ! preg_match('/[\200-\377]/', $str)) {
                     // Can't use addslashes as we don't know the value of magic_quotes_sybase
                     $encoded = addcslashes($str, "\0..\37\177\\\"");
-                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+                    if (($str == $encoded) && ! preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
                         return ($encoded);
                     } else {
                         return ("\"$encoded\"");
@@ -2470,10 +2470,10 @@ 
             $encoding = 'Q';
             $encoded = $this->encodeQ($str, $position);
             $encoded = $this->wrapText($encoded, $maxlen, true);
-            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
+            $encoded = str_replace('='.self::CRLF, "\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;
@@ -2501,7 +2501,7 @@ 
      */
     public function has8bitChars($text)
     {
-        return (boolean)preg_match('/[\x80-\xFF]/', $text);
+        return (boolean) preg_match('/[\x80-\xFF]/', $text);
     }
 
     /**
@@ -2516,7 +2516,7 @@ 
      */
     public function base64EncodeWrapMB($str, $linebreak = null)
     {
-        $start = '=?' . $this->CharSet . '?B?';
+        $start = '=?'.$this->CharSet.'?B?';
         $end = '?=';
         $encoded = '';
         if ($linebreak === null) {
@@ -2539,7 +2539,7 @@ 
                 $chunk = base64_encode($chunk);
                 $lookBack++;
             } while (strlen($chunk) > $length);
-            $encoded .= $chunk . $linebreak;
+            $encoded .= $chunk.$linebreak;
         }
 
         // Chomp the last linefeed
@@ -2568,7 +2568,7 @@ 
             array(' ', "\r\n=2E", "\r\n", '='),
             rawurlencode($string)
         );
-        $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
+        $string = preg_replace('/[^\r\n]{'.($line_max - 3).'}[^=\r\n]{2}/', "$0=\r\n", $string);
         return $this->fixEOL($string);
     }
 
@@ -2618,7 +2618,7 @@ 
             default:
                 // RFC 2047 section 5.1
                 // Replace every high ascii, control, =, ? and _ characters
-                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377'.$pattern;
                 break;
         }
         $matches = array();
@@ -2631,7 +2631,7 @@ 
                 array_unshift($matches[0], '=');
             }
             foreach (array_unique($matches[0]) as $char) {
-                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+                $encoded = str_replace($char, '='.sprintf('%02X', ord($char)), $encoded);
             }
         }
         // Replace every spaces to _ (more readable than =20)
@@ -2692,8 +2692,8 @@ 
      */
     public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
     {
-        if (!@is_file($path)) {
-            $this->setError($this->lang('file_access') . $path);
+        if ( ! @is_file($path)) {
+            $this->setError($this->lang('file_access').$path);
             return false;
         }
 
@@ -2797,7 +2797,7 @@ 
      */
     public function alternativeExists()
     {
-        return !empty($this->AltBody);
+        return ! empty($this->AltBody);
     }
 
     /**
@@ -2884,18 +2884,18 @@ 
     protected function setError($msg)
     {
         $this->error_count++;
-        if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+        if ($this->Mailer == 'smtp' and ! is_null($this->smtp)) {
             $lasterror = $this->smtp->getError();
-            if (!empty($lasterror['error'])) {
-                $msg .= $this->lang('smtp_error') . $lasterror['error'];
-                if (!empty($lasterror['detail'])) {
-                    $msg .= ' Detail: '. $lasterror['detail'];
+            if ( ! empty($lasterror['error'])) {
+                $msg .= $this->lang('smtp_error').$lasterror['error'];
+                if ( ! empty($lasterror['detail'])) {
+                    $msg .= ' Detail: '.$lasterror['detail'];
                 }
-                if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                if ( ! empty($lasterror['smtp_code'])) {
+                    $msg .= ' SMTP code: '.$lasterror['smtp_code'];
                 }
-                if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                if ( ! empty($lasterror['smtp_code_ex'])) {
+                    $msg .= ' Additional SMTP info: '.$lasterror['smtp_code_ex'];
                 }
             }
         }
@@ -2925,9 +2925,9 @@ 
     protected function serverHostname()
     {
         $result = 'localhost.localdomain';
-        if (!empty($this->Hostname)) {
+        if ( ! empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and ! empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();
@@ -2954,7 +2954,7 @@ 
                 //Include a link to troubleshooting docs on SMTP connection failure
                 //this is by far the biggest cause of support questions
                 //but it's usually not PHPMailer's fault.
-                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
+                return $this->language[$key].' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
             }
             return $this->language[$key];
         } else {
@@ -3045,22 +3045,22 @@ 
                     } else {
                         $data = rawurldecode($data);
                     }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    $cid = md5($url).'@phpmailer.0'; // RFC2392 S 2
                     if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
                         $message = str_replace(
                             $images[0][$imgindex],
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $images[1][$imgindex].'="cid:'.$cid.'"',
                             $message
                         );
                     }
-                } elseif (!preg_match('#^[A-z]+://#', $url)) {
+                } elseif ( ! preg_match('#^[A-z]+://#', $url)) {
                     // Do not change urls for absolute images (thanks to corvuscorax)
                     $filename = basename($url);
                     $directory = dirname($url);
                     if ($directory == '.') {
                         $directory = '';
                     }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    $cid = md5($url).'@phpmailer.0'; // RFC2392 S 2
                     if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
                         $basedir .= '/';
                     }
@@ -3068,16 +3068,16 @@ 
                         $directory .= '/';
                     }
                     if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
+                        $basedir.$directory.$filename,
                         $cid,
                         $filename,
                         'base64',
-                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                        self::_mime_types((string) self::mb_pathinfo($filename, PATHINFO_EXTENSION))
                     )
                     ) {
                         $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            '/'.$images[1][$imgindex].'=["\']'.preg_quote($url, '/').'["\']/Ui',
+                            $images[1][$imgindex].'="cid:'.$cid.'"',
                             $message
                         );
                     }
@@ -3089,8 +3089,8 @@ 
         $this->Body = $this->normalizeBreaks($message);
         $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
         if (empty($this->AltBody)) {
-            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
-                self::CRLF . self::CRLF;
+            $this->AltBody = 'To view this email message, open it in a program that understands HTML!'.
+                self::CRLF.self::CRLF;
         }
         return $this->Body;
     }
@@ -3317,7 +3317,7 @@ 
             $this->$name = $value;
             return true;
         } else {
-            $this->setError($this->lang('variable_set') . $name);
+            $this->setError($this->lang('variable_set').$name);
             return false;
         }
     }
@@ -3379,7 +3379,7 @@ 
             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;
@@ -3394,9 +3394,9 @@ 
      */
     public function DKIM_Sign($signHeader)
     {
-        if (!defined('PKCS7_TEXT')) {
+        if ( ! defined('PKCS7_TEXT')) {
             if ($this->exceptions) {
-                throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+                throw new phpmailerException($this->lang('extension_missing').'openssl');
             }
             return '';
         }
@@ -3426,7 +3426,7 @@ 
             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
+            $lines[$key] = $heading.':'.trim($value); // Don't forget to remove WSP around the value
         }
         $signHeader = implode("\r\n", $lines);
         return $signHeader;
@@ -3480,7 +3480,7 @@ 
                 $to_header = $header;
                 $current = 'to_header';
             } else {
-                if (!empty($$current) && strpos($header, ' =?') === 0) {
+                if ( ! empty($$current) && strpos($header, ' =?') === 0) {
                     $$current .= $header;
                 } else {
                     $current = '';
@@ -3500,27 +3500,27 @@ 
         if ('' == $this->DKIM_identity) {
             $ident = '';
         } else {
-            $ident = ' 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" .
+            $ident = ' 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
+            $from_header."\r\n".$to_header."\r\n".$subject_header."\r\n".$dkimhdrs
         );
         $signed = $this->DKIM_Sign($toSign);
-        return $dkimhdrs . $signed . "\r\n";
+        return $dkimhdrs.$signed."\r\n";
     }
 
     /**
@@ -3532,7 +3532,7 @@ 
     public static function hasLineLongerThanMax($str)
     {
         //+2 to include CRLF line break for a 1000 total
-        return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
+        return (boolean) preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
     }
 
     /**
@@ -3597,7 +3597,7 @@ 
      */
     protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
     {
-        if (!empty($this->action_function) && is_callable($this->action_function)) {
+        if ( ! empty($this->action_function) && is_callable($this->action_function)) {
             $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
             call_user_func_array($this->action_function, $params);
         }
@@ -3616,7 +3616,7 @@ 
      */
     public function errorMessage()
     {
-        $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+        $errorMsg = '<strong>'.$this->getMessage()."</strong><br />\n";
         return $errorMsg;
     }
 }

src/wp-includes/theme-compat/footer.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package WordPress
- * @subpackage Theme_Compat
- * @deprecated 3.0
- *
- * This file is here for Backwards compatibility with old themes and will be removed in a future version
- *
- */
+	 * @package WordPress
+	 * @subpackage Theme_Compat
+	 * @deprecated 3.0
+	 *
+	 * This file is here for Backwards compatibility with old themes and will be removed in a future version
+	 *
+	 */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 ?>
 

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  *
  */
-_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
+_deprecated_file(sprintf(__('Theme without %1$s'), basename(__FILE__)), '3.0', null, sprintf(__('Please include a %1$s template in your theme.'), basename(__FILE__)));
 ?>
 
 <hr />
@@ -16,7 +16,7 @@ 
 	<p>
 		<?php printf(__('%1$s is proudly powered by %2$s'), get_bloginfo('name'),
 		'<a href="https://wordpress.org/">WordPress</a>'); ?>
-		<br /><?php printf(__('%1$s and %2$s.'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)') . '</a>'); ?>
+		<br /><?php printf(__('%1$s and %2$s.'), '<a href="'.get_bloginfo('rss2_url').'">'.__('Entries (RSS)').'</a>', '<a href="'.get_bloginfo('comments_rss2_url').'">'.__('Comments (RSS)').'</a>'); ?>
 		<!-- <?php printf(__('%d queries. %s seconds.'), get_num_queries(), timer_stop(0, 3)); ?> -->
 	</p>
 </div>

src/wp-includes/theme-compat/header.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package WordPress
- * @subpackage Theme_Compat
- * @deprecated 3.0
- *
- * This file is here for Backwards compatibility with old themes and will be removed in a future version
- *
- */
+		 * @package WordPress
+		 * @subpackage Theme_Compat
+		 * @deprecated 3.0
+		 *
+		 * This file is here for Backwards compatibility with old themes and will be removed in a future version
+		 *
+		 */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 ?>
 <!DOCTYPE html>

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  *
  */
-_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
+_deprecated_file(sprintf(__('Theme without %1$s'), basename(__FILE__)), '3.0', null, sprintf(__('Please include a %1$s template in your theme.'), basename(__FILE__)));
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
@@ -20,12 +20,12 @@ 
 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 
-<?php if ( file_exists( get_stylesheet_directory() . '/images/kubrickbgwide.jpg' ) ) { ?>
+<?php if (file_exists(get_stylesheet_directory().'/images/kubrickbgwide.jpg')) { ?>
 <style type="text/css" media="screen">
 
 <?php
 // Checks to see whether it needs a sidebar
-if ( empty($withcomments) && !is_single() ) {
+if (empty($withcomments) && ! is_single()) {
 ?>
 	#page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg-<?php bloginfo('text_direction'); ?>.jpg") repeat-y top; border: none; }
 <?php } else { // No sidebar ?>
@@ -35,7 +35,7 @@ 
 </style>
 <?php } ?>
 
-<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+<?php if (is_singular()) wp_enqueue_script('comment-reply'); ?>
 
 <?php wp_head(); ?>
 </head>

Braces +4 added lines, -1 removed lines

@@ -35,7 +35,10 @@
 </style>
 <?php } ?>
 
-<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+<?php if ( is_singular() ) {
+	wp_enqueue_script( 'comment-reply' );
+}
+?>
 
 <?php wp_head(); ?>
 </head>

src/wp-includes/theme-compat/sidebar.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package WordPress
- * @subpackage Theme_Compat
- * @deprecated 3.0
- *
- * This file is here for Backwards compatibility with old themes and will be removed in a future version
- *
- */
+		 * @package WordPress
+		 * @subpackage Theme_Compat
+		 * @deprecated 3.0
+		 *
+		 * This file is here for Backwards compatibility with old themes and will be removed in a future version
+		 *
+		 */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 ?>
 	<div id="sidebar" role="complementary">

Spacing +9 added lines, -9 removed lines

@@ -7,12 +7,12 @@ 
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  *
  */
-_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
+_deprecated_file(sprintf(__('Theme without %1$s'), basename(__FILE__)), '3.0', null, sprintf(__('Please include a %1$s template in your theme.'), basename(__FILE__)));
 ?>
 	<div id="sidebar" role="complementary">
 		<ul>
 			<?php 	/* Widgetized sidebar, if you have the plugin installed. */
-					if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
+					if ( ! function_exists('dynamic_sidebar') || ! dynamic_sidebar()) : ?>
 			<li>
 				<?php get_search_form(); ?>
 			</li>
@@ -23,8 +23,8 @@ 
 			</li>
 			-->
 
-			<?php if ( is_404() || is_category() || is_day() || is_month() ||
-						is_year() || is_search() || is_paged() ) {
+			<?php if (is_404() || is_category() || is_day() || is_month() ||
+						is_year() || is_search() || is_paged()) {
 			?> <li>
 
 			<?php /* If this is a 404 page */ if (is_404()) { ?>
@@ -41,9 +41,9 @@ 
 			<p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for the year %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time('Y')); ?></p>
 
 			<?php /* If this is a search result */ } elseif (is_search()) { ?>
-			<p><?php printf(__('You have searched the <a href="%1$s/">%2$s</a> blog archives for <strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links.'), get_bloginfo('url'), get_bloginfo('name'), esc_html( get_search_query() ) ); ?></p>
+			<p><?php printf(__('You have searched the <a href="%1$s/">%2$s</a> blog archives for <strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links.'), get_bloginfo('url'), get_bloginfo('name'), esc_html(get_search_query())); ?></p>
 
-			<?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+			<?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && ! empty($_GET['paged'])) { ?>
 			<p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives.'), get_bloginfo('url'), get_bloginfo('name')); ?></p>
 
 			<?php } ?>
@@ -52,7 +52,7 @@ 
 		<?php }?>
 		</ul>
 		<ul role="navigation">
-			<?php wp_list_pages('title_li=<h2>' . __('Pages') . '</h2>' ); ?>
+			<?php wp_list_pages('title_li=<h2>'.__('Pages').'</h2>'); ?>
 
 			<li><h2><?php _e('Archives'); ?></h2>
 				<ul>
@@ -60,10 +60,10 @@ 
 				</ul>
 			</li>
 
-			<?php wp_list_categories(array('show_count' => 1, 'title_li' => '<h2>' . __('Categories') . '</h2>')); ?>
+			<?php wp_list_categories(array('show_count' => 1, 'title_li' => '<h2>'.__('Categories').'</h2>')); ?>
 		</ul>
 		<ul>
-			<?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
+			<?php /* If this is the frontpage */ if (is_home() || is_page()) { ?>
 				<?php wp_list_bookmarks(); ?>
 
 				<li><h2><?php _e('Meta'); ?></h2>

src/wp-includes/theme-compat/comments-popup.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package WordPress
- * @subpackage Theme_Compat
- * @deprecated 3.0
- *
- * This file is here for Backwards compatibility with old themes and will be removed in a future version
- *
- */
+			 * @package WordPress
+			 * @subpackage Theme_Compat
+			 * @deprecated 3.0
+			 *
+			 * This file is here for Backwards compatibility with old themes and will be removed in a future version
+			 *
+			 */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 ?><!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">

Spacing +14 added lines, -14 removed lines

@@ -7,11 +7,11 @@ 
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  *
  */
-_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
+_deprecated_file(sprintf(__('Theme without %1$s'), basename(__FILE__)), '3.0', null, sprintf(__('Please include a %1$s template in your theme.'), basename(__FILE__)));
 ?><!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-     <title><?php printf(__('%1$s - Comments on %2$s'), get_option('blogname'), the_title('','',false)); ?></title>
+     <title><?php printf(__('%1$s - Comments on %2$s'), get_option('blogname'), the_title('', '', false)); ?></title>
 
 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 	<style type="text/css" media="screen">
@@ -27,14 +27,14 @@ 
 <?php
 /* Don't remove these lines. */
 add_filter('comment_text', 'popuplinks');
-if ( have_posts() ) :
-while( have_posts()) : the_post();
+if (have_posts()) :
+while (have_posts()) : the_post();
 ?>
 <h2 id="comments"><?php _e('Comments'); ?></h2>
 
-<p><a href="<?php echo esc_url( get_post_comments_feed_link($post->ID) ); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></a></p>
+<p><a href="<?php echo esc_url(get_post_comments_feed_link($post->ID)); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></a></p>
 
-<?php if ( pings_open() ) { ?>
+<?php if (pings_open()) { ?>
 <p><?php printf(__('The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em>%s</em>'), get_trackback_url()); ?></p>
 <?php } ?>
 
@@ -43,7 +43,7 @@ 
 $commenter = wp_get_current_commenter();
 $comments = get_approved_comments($id);
 $post = get_post($id);
-if ( post_password_required($post) ) {  // and it doesn't match the cookie
+if (post_password_required($post)) {  // and it doesn't match the cookie
 	echo(get_the_password_form());
 } else { ?>
 
@@ -61,26 +61,26 @@ 
 	<p><?php _e('No comments yet.'); ?></p>
 <?php } ?>
 
-<?php if ( comments_open() ) { ?>
+<?php if (comments_open()) { ?>
 <h2><?php _e('Leave a comment'); ?></h2>
 <p><?php printf(__('Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
 
 <form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
-<?php if ( $user_ID ) : ?>
+<?php if ($user_ID) : ?>
 	<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out &raquo;</a>'), get_edit_user_link(), $user_identity, wp_logout_url(get_permalink())); ?></p>
 <?php else : ?>
 	<p>
-	  <input type="text" name="author" id="author" class="textarea" value="<?php echo esc_attr( $commenter['comment_author'] ); ?>" size="28" tabindex="1" />
+	  <input type="text" name="author" id="author" class="textarea" value="<?php echo esc_attr($commenter['comment_author']); ?>" size="28" tabindex="1" />
 	   <label for="author"><?php _e('Name'); ?></label>
 	</p>
 
 	<p>
-	  <input type="text" name="email" id="email" value="<?php echo esc_attr( $commenter['comment_author_email'] ); ?>" size="28" tabindex="2" />
+	  <input type="text" name="email" id="email" value="<?php echo esc_attr($commenter['comment_author_email']); ?>" size="28" tabindex="2" />
 	   <label for="email"><?php _e('E-mail'); ?></label>
 	</p>
 
 	<p>
-	  <input type="text" name="url" id="url" value="<?php echo esc_attr( $commenter['comment_author_url'] ); ?>" size="28" tabindex="3" />
+	  <input type="text" name="url" id="url" value="<?php echo esc_attr($commenter['comment_author_url']); ?>" size="28" tabindex="3" />
 	   <label for="url"><?php _e('<abbr title="Universal Resource Locator">URL</abbr>'); ?></label>
 	</p>
 <?php endif; ?>
@@ -94,11 +94,11 @@ 
 	<p>
 	  <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
 	  <input type="hidden" name="redirect_to" value="<?php echo esc_attr($_SERVER["REQUEST_URI"]); ?>" />
-	  <input name="submit" type="submit" tabindex="5" value="<?php esc_attr_e('Say It!' ); ?>" />
+	  <input name="submit" type="submit" tabindex="5" value="<?php esc_attr_e('Say It!'); ?>" />
 	</p>
 	<?php
 	/** This filter is documented in wp-includes/comment-template.php */
-	do_action( 'comment_form', $post->ID );
+	do_action('comment_form', $post->ID);
 	?>
 </form>
 <?php } else { // comments are closed ?>

Braces +10 added lines, -4 removed lines

@@ -68,9 +68,12 @@ 
 <form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
 <?php if ( $user_ID ) : ?>
 	<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out &raquo;</a>'), get_edit_user_link(), $user_identity, wp_logout_url(get_permalink())); ?></p>
-<?php else : ?>
+<?php else {
+	: ?>
 	<p>
-	  <input type="text" name="author" id="author" class="textarea" value="<?php echo esc_attr( $commenter['comment_author'] ); ?>" size="28" tabindex="1" />
+	  <input type="text" name="author" id="author" class="textarea" value="<?php echo esc_attr( $commenter['comment_author'] );
+}
+?>" size="28" tabindex="1" />
 	   <label for="author"><?php _e('Name'); ?></label>
 	</p>
 
@@ -111,9 +114,12 @@ 
 
 <?php // if you delete this the sky will fall on your head
 endwhile; // have_posts()
-else: // have_posts()
+else {
+	: // have_posts()
 ?>
-<p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
+<p><?php _e('Sorry, no posts matched your criteria.');
+}
+?></p>
 <?php endif; ?>
 <!-- // this is just the end of the motor - don't touch that line either :) -->
 <?php //} ?>

src/wp-includes/theme-compat/comments.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package WordPress
- * @subpackage Theme_Compat
- * @deprecated 3.0
- *
- * This file is here for Backwards compatibility with old themes and will be removed in a future version
- *
- */
+	 * @package WordPress
+	 * @subpackage Theme_Compat
+	 * @deprecated 3.0
+	 *
+	 * This file is here for Backwards compatibility with old themes and will be removed in a future version
+	 *
+	 */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 
 // Do not delete these lines

Spacing +16 added lines, -16 removed lines

@@ -7,13 +7,13 @@ 
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  *
  */
-_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
+_deprecated_file(sprintf(__('Theme without %1$s'), basename(__FILE__)), '3.0', null, sprintf(__('Please include a %1$s template in your theme.'), basename(__FILE__)));
 
 // Do not delete these lines
-	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+	if ( ! empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
 		die ('Please do not load this page directly. Thanks!');
 
-	if ( post_password_required() ) { ?>
+	if (post_password_required()) { ?>
 		<p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
 	<?php
 		return;
@@ -22,16 +22,16 @@ 
 
 <!-- You can start editing here. -->
 
-<?php if ( have_comments() ) : ?>
+<?php if (have_comments()) : ?>
 	<h3 id="comments">
 		<?php
-			if ( 1 == get_comments_number() ) {
+			if (1 == get_comments_number()) {
 				/* translators: %s: post title */
-				printf( __( 'One response to %s' ),  '&#8220;' . get_the_title() . '&#8221;' );
+				printf(__('One response to %s'), '&#8220;'.get_the_title().'&#8221;');
 			} else {
 				/* translators: 1: number of comments, 2: post title */
-				printf( _n( '%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number() ),
-					number_format_i18n( get_comments_number() ),  '&#8220;' . get_the_title() . '&#8221;' );
+				printf(_n('%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number()),
+					number_format_i18n(get_comments_number()), '&#8220;'.get_the_title().'&#8221;');
 			}
 		?>
 	</h3>
@@ -42,7 +42,7 @@ 
 	</div>
 
 	<ol class="commentlist">
-	<?php wp_list_comments();?>
+	<?php wp_list_comments(); ?>
 	</ol>
 
 	<div class="navigation">
@@ -51,7 +51,7 @@ 
 	</div>
  <?php else : // this is displayed if there are no comments so far ?>
 
-	<?php if ( comments_open() ) : ?>
+	<?php if (comments_open()) : ?>
 		<!-- If comments are open, but there are no comments. -->
 
 	 <?php else : // comments are closed ?>
@@ -61,23 +61,23 @@ 
 	<?php endif; ?>
 <?php endif; ?>
 
-<?php if ( comments_open() ) : ?>
+<?php if (comments_open()) : ?>
 
 <div id="respond">
 
-<h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
+<h3><?php comment_form_title(__('Leave a Reply'), __('Leave a Reply to %s')); ?></h3>
 
 <div id="cancel-comment-reply">
 	<small><?php cancel_comment_reply_link() ?></small>
 </div>
 
-<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
-<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p>
+<?php if (get_option('comment_registration') && ! is_user_logged_in()) : ?>
+<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url(get_permalink())); ?></p>
 <?php else : ?>
 
 <form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
 
-<?php if ( is_user_logged_in() ) : ?>
+<?php if (is_user_logged_in()) : ?>
 
 <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_edit_user_link(), $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php esc_attr_e('Log out of this account'); ?>"><?php _e('Log out &raquo;'); ?></a></p>
 
@@ -103,7 +103,7 @@ 
 </p>
 <?php
 /** This filter is documented in wp-includes/comment-template.php */
-do_action( 'comment_form', $post->ID );
+do_action('comment_form', $post->ID);
 ?>
 
 </form>

Braces +35 added lines, -13 removed lines

@@ -10,8 +10,9 @@ 
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 
 // Do not delete these lines
-	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
-		die ('Please do not load this page directly. Thanks!');
+	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) {
+			die ('Please do not load this page directly. Thanks!');
+	}
 
 	if ( post_password_required() ) { ?>
 		<p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
@@ -49,14 +50,17 @@ 
 		<div class="alignleft"><?php previous_comments_link() ?></div>
 		<div class="alignright"><?php next_comments_link() ?></div>
 	</div>
- <?php else : // this is displayed if there are no comments so far ?>
+ <?php else {
+	: // this is displayed if there are no comments so far ?>
 
 	<?php if ( comments_open() ) : ?>
 		<!-- If comments are open, but there are no comments. -->
 
 	 <?php else : // comments are closed ?>
 		<!-- If comments are closed. -->
-		<p class="nocomments"><?php _e('Comments are closed.'); ?></p>
+		<p class="nocomments"><?php _e('Comments are closed.');
+}
+?></p>
 
 	<?php endif; ?>
 <?php endif; ?>
@@ -73,21 +77,39 @@ 
 
 <?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
 <p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p>
-<?php else : ?>
+<?php else {
+	: ?>
 
-<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo site_url();
+}
+?>/wp-comments-post.php" method="post" id="commentform">
 
 <?php if ( is_user_logged_in() ) : ?>
 
 <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_edit_user_link(), $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php esc_attr_e('Log out of this account'); ?>"><?php _e('Log out &raquo;'); ?></a></p>
 
-<?php else : ?>
-
-<p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
-<label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
-
-<p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
-<label for="email"><small><?php _e('Mail (will not be published)'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
+<?php else {
+	: ?>
+
+<p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author);
+}
+?>" size="22" tabindex="1" <?php if ($req) {
+	echo "aria-required='true'";
+}
+?> />
+<label for="author"><small><?php _e('Name'); ?> <?php if ($req) {
+	_e('(required)');
+}
+?></small></label></p>
+
+<p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) {
+	echo "aria-required='true'";
+}
+?> />
+<label for="email"><small><?php _e('Mail (will not be published)'); ?> <?php if ($req) {
+	_e('(required)');
+}
+?></small></label></p>
 
 <p><input type="text" name="url" id="url" value="<?php echo  esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
 <label for="url"><small><?php _e('Website'); ?></small></label></p>

src/wp-includes/cron.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * WordPress CRON API
- *
- * @package WordPress
- */
+		 * WordPress CRON API
+		 *
+		 * @package WordPress
+		 */
 
 /**
  * Schedules a hook to run only once.

Spacing +94 added lines, -94 removed lines

@@ -20,15 +20,15 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return void|false
  */
-function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
+function wp_schedule_single_event($timestamp, $hook, $args = array()) {
 	// don't schedule a duplicate if there's already an identical event due within 10 minutes of it
 	$next = wp_next_scheduled($hook, $args);
-	if ( $next && abs( $next - $timestamp ) <= 10 * MINUTE_IN_SECONDS ) {
+	if ($next && abs($next - $timestamp) <= 10 * MINUTE_IN_SECONDS) {
 		return;
 	}
 
 	$crons = _get_cron_array();
-	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args );
+	$event = (object) array('hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args);
 	/**
 	 * Filter a single event before it is scheduled.
 	 *
@@ -36,17 +36,17 @@ 
 	 *
 	 * @param object $event An object containing an event's data.
 	 */
-	$event = apply_filters( 'schedule_event', $event );
+	$event = apply_filters('schedule_event', $event);
 
 	// A plugin disallowed this event
-	if ( ! $event )
+	if ( ! $event)
 		return false;
 
 	$key = md5(serialize($event->args));
 
-	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args );
-	uksort( $crons, "strnatcasecmp" );
-	_set_cron_array( $crons );
+	$crons[$event->timestamp][$event->hook][$key] = array('schedule' => $event->schedule, 'args' => $event->args);
+	uksort($crons, "strnatcasecmp");
+	_set_cron_array($crons);
 }
 
 /**
@@ -69,26 +69,26 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|void False when does not schedule event.
  */
-function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
+function wp_schedule_event($timestamp, $recurrence, $hook, $args = array()) {
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
 
-	if ( !isset( $schedules[$recurrence] ) )
+	if ( ! isset($schedules[$recurrence]))
 		return false;
 
-	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+	$event = (object) array('hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval']);
 	/** This filter is documented in wp-includes/cron.php */
-	$event = apply_filters( 'schedule_event', $event );
+	$event = apply_filters('schedule_event', $event);
 
 	// A plugin disallowed this event
-	if ( ! $event )
+	if ( ! $event)
 		return false;
 
 	$key = md5(serialize($event->args));
 
-	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval );
-	uksort( $crons, "strnatcasecmp" );
-	_set_cron_array( $crons );
+	$crons[$event->timestamp][$event->hook][$key] = array('schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval);
+	uksort($crons, "strnatcasecmp");
+	_set_cron_array($crons);
 }
 
 /**
@@ -102,34 +102,34 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|void False when does not schedule event.
  */
-function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
+function wp_reschedule_event($timestamp, $recurrence, $hook, $args = array()) {
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
-	$key = md5( serialize( $args ) );
+	$key = md5(serialize($args));
 	$interval = 0;
 
 	// First we try to get it from the schedule
-	if ( isset( $schedules[ $recurrence ] ) ) {
-		$interval = $schedules[ $recurrence ]['interval'];
+	if (isset($schedules[$recurrence])) {
+		$interval = $schedules[$recurrence]['interval'];
 	}
 	// Now we try to get it from the saved interval in case the schedule disappears
-	if ( 0 == $interval ) {
-		$interval = $crons[ $timestamp ][ $hook ][ $key ]['interval'];
+	if (0 == $interval) {
+		$interval = $crons[$timestamp][$hook][$key]['interval'];
 	}
 	// Now we assume something is wrong and fail to schedule
-	if ( 0 == $interval ) {
+	if (0 == $interval) {
 		return false;
 	}
 
 	$now = time();
 
-	if ( $timestamp >= $now ) {
+	if ($timestamp >= $now) {
 		$timestamp = $now + $interval;
 	} else {
-		$timestamp = $now + ( $interval - ( ( $now - $timestamp ) % $interval ) );
+		$timestamp = $now + ($interval - (($now - $timestamp) % $interval));
 	}
 
-	wp_schedule_event( $timestamp, $recurrence, $hook, $args );
+	wp_schedule_event($timestamp, $recurrence, $hook, $args);
 }
 
 /**
@@ -147,15 +147,15 @@ 
  * to uniquely identify the scheduled event, so they should be the same
  * as those used when originally scheduling the event.
  */
-function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
+function wp_unschedule_event($timestamp, $hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	unset( $crons[$timestamp][$hook][$key] );
-	if ( empty($crons[$timestamp][$hook]) )
-		unset( $crons[$timestamp][$hook] );
-	if ( empty($crons[$timestamp]) )
-		unset( $crons[$timestamp] );
-	_set_cron_array( $crons );
+	unset($crons[$timestamp][$hook][$key]);
+	if (empty($crons[$timestamp][$hook]))
+		unset($crons[$timestamp][$hook]);
+	if (empty($crons[$timestamp]))
+		unset($crons[$timestamp]);
+	_set_cron_array($crons);
 }
 
 /**
@@ -166,25 +166,25 @@ 
  * @param string $hook Action hook, the execution of which will be unscheduled.
  * @param array $args Optional. Arguments that were to be pass to the hook's callback function.
  */
-function wp_clear_scheduled_hook( $hook, $args = array() ) {
+function wp_clear_scheduled_hook($hook, $args = array()) {
 	// Backward compatibility
 	// Previously this function took the arguments as discrete vars rather than an array like the rest of the API
-	if ( !is_array($args) ) {
-		_deprecated_argument( __FUNCTION__, '3.0', __('This argument has changed to an array to match the behavior of the other cron functions.') );
-		$args = array_slice( func_get_args(), 1 );
+	if ( ! is_array($args)) {
+		_deprecated_argument(__FUNCTION__, '3.0', __('This argument has changed to an array to match the behavior of the other cron functions.'));
+		$args = array_slice(func_get_args(), 1);
 	}
 
 	// This logic duplicates wp_next_scheduled()
 	// It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,
 	// and, wp_next_scheduled() returns the same schedule in an infinite loop.
 	$crons = _get_cron_array();
-	if ( empty( $crons ) )
+	if (empty($crons))
 		return;
 
-	$key = md5( serialize( $args ) );
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[ $hook ][ $key ] ) ) {
-			wp_unschedule_event( $timestamp, $hook, $args );
+	$key = md5(serialize($args));
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key])) {
+			wp_unschedule_event($timestamp, $hook, $args);
 		}
 	}
 }
@@ -198,13 +198,13 @@ 
  * @param array $args Optional. Arguments to pass to the hook's callback function.
  * @return false|int The UNIX timestamp of the next time the scheduled event will occur.
  */
-function wp_next_scheduled( $hook, $args = array() ) {
+function wp_next_scheduled($hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
+	if (empty($crons))
 		return false;
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key]))
 			return $timestamp;
 	}
 	return false;
@@ -215,11 +215,11 @@ 
  *
  * @since 2.1.0
  */
-function spawn_cron( $gmt_time = 0 ) {
-	if ( ! $gmt_time )
-		$gmt_time = microtime( true );
+function spawn_cron($gmt_time = 0) {
+	if ( ! $gmt_time)
+		$gmt_time = microtime(true);
 
-	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
+	if (defined('DOING_CRON') || isset($_GET['doing_wp_cron']))
 		return;
 
 	/*
@@ -231,45 +231,45 @@ 
 	 */
 	$lock = get_transient('doing_cron');
 
-	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS )
+	if ($lock > $gmt_time + 10 * MINUTE_IN_SECONDS)
 		$lock = 0;
 
 	// don't run if another process is currently running it or more than once every 60 sec.
-	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
+	if ($lock + WP_CRON_LOCK_TIMEOUT > $gmt_time)
 		return;
 
 	//sanity check
 	$crons = _get_cron_array();
-	if ( !is_array($crons) )
+	if ( ! is_array($crons))
 		return;
 
-	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	$keys = array_keys($crons);
+	if (isset($keys[0]) && $keys[0] > $gmt_time)
 		return;
 
-	if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
-		if ( ! empty( $_POST ) || defined( 'DOING_AJAX' ) ||  defined( 'XMLRPC_REQUEST' ) ) {
+	if (defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON) {
+		if ( ! empty($_POST) || defined('DOING_AJAX') || defined('XMLRPC_REQUEST')) {
 			return;
 		}
 
-		$doing_wp_cron = sprintf( '%.22F', $gmt_time );
-		set_transient( 'doing_cron', $doing_wp_cron );
+		$doing_wp_cron = sprintf('%.22F', $gmt_time);
+		set_transient('doing_cron', $doing_wp_cron);
 
 		ob_start();
-		wp_redirect( add_query_arg( 'doing_wp_cron', $doing_wp_cron, wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+		wp_redirect(add_query_arg('doing_wp_cron', $doing_wp_cron, wp_unslash($_SERVER['REQUEST_URI'])));
 		echo ' ';
 
 		// flush any buffers and send the headers
-		while ( @ob_end_flush() );
+		while (@ob_end_flush());
 		flush();
 
-		WP_DEBUG ? include_once( ABSPATH . 'wp-cron.php' ) : @include_once( ABSPATH . 'wp-cron.php' );
+		WP_DEBUG ? include_once(ABSPATH.'wp-cron.php') : @include_once(ABSPATH.'wp-cron.php');
 		return;
 	}
 
 	// Set the cron lock with the current unix timestamp, when the cron is being spawned.
-	$doing_wp_cron = sprintf( '%.22F', $gmt_time );
-	set_transient( 'doing_cron', $doing_wp_cron );
+	$doing_wp_cron = sprintf('%.22F', $gmt_time);
+	set_transient('doing_cron', $doing_wp_cron);
 
 	/**
 	 * Filter the cron request arguments.
@@ -290,18 +290,18 @@ 
 	 *     }
 	 * }
 	 */
-	$cron_request = apply_filters( 'cron_request', array(
-		'url'  => add_query_arg( 'doing_wp_cron', $doing_wp_cron, site_url( 'wp-cron.php' ) ),
+	$cron_request = apply_filters('cron_request', array(
+		'url'  => add_query_arg('doing_wp_cron', $doing_wp_cron, site_url('wp-cron.php')),
 		'key'  => $doing_wp_cron,
 		'args' => array(
 			'timeout'   => 0.01,
 			'blocking'  => false,
 			/** This filter is documented in wp-includes/class-http.php */
-			'sslverify' => apply_filters( 'https_local_ssl_verify', false )
+			'sslverify' => apply_filters('https_local_ssl_verify', false)
 		)
-	) );
+	));
 
-	wp_remote_post( $cron_request['url'], $cron_request['args'] );
+	wp_remote_post($cron_request['url'], $cron_request['args']);
 }
 
 /**
@@ -311,24 +311,24 @@ 
  */
 function wp_cron() {
 	// Prevent infinite loops caused by lack of wp-cron.php
-	if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
+	if (strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || (defined('DISABLE_WP_CRON') && DISABLE_WP_CRON))
 		return;
 
-	if ( false === $crons = _get_cron_array() )
+	if (false === $crons = _get_cron_array())
 		return;
 
-	$gmt_time = microtime( true );
-	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	$gmt_time = microtime(true);
+	$keys = array_keys($crons);
+	if (isset($keys[0]) && $keys[0] > $gmt_time)
 		return;
 
 	$schedules = wp_get_schedules();
-	foreach ( $crons as $timestamp => $cronhooks ) {
-		if ( $timestamp > $gmt_time ) break;
-		foreach ( (array) $cronhooks as $hook => $args ) {
-			if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
+	foreach ($crons as $timestamp => $cronhooks) {
+		if ($timestamp > $gmt_time) break;
+		foreach ((array) $cronhooks as $hook => $args) {
+			if (isset($schedules[$hook]['callback']) && ! call_user_func($schedules[$hook]['callback']))
 				continue;
-			spawn_cron( $gmt_time );
+			spawn_cron($gmt_time);
 			break 2;
 		}
 	}
@@ -366,9 +366,9 @@ 
  */
 function wp_get_schedules() {
 	$schedules = array(
-		'hourly'     => array( 'interval' => HOUR_IN_SECONDS,      'display' => __( 'Once Hourly' ) ),
-		'twicedaily' => array( 'interval' => 12 * HOUR_IN_SECONDS, 'display' => __( 'Twice Daily' ) ),
-		'daily'      => array( 'interval' => DAY_IN_SECONDS,       'display' => __( 'Once Daily' ) ),
+		'hourly'     => array('interval' => HOUR_IN_SECONDS, 'display' => __('Once Hourly')),
+		'twicedaily' => array('interval' => 12 * HOUR_IN_SECONDS, 'display' => __('Twice Daily')),
+		'daily'      => array('interval' => DAY_IN_SECONDS, 'display' => __('Once Daily')),
 	);
 	/**
 	 * Filter the non-default cron schedules.
@@ -377,7 +377,7 @@ 
 	 *
 	 * @param array $new_schedules An array of non-default cron schedules. Default empty.
 	 */
-	return array_merge( apply_filters( 'cron_schedules', array() ), $schedules );
+	return array_merge(apply_filters('cron_schedules', array()), $schedules);
 }
 
 /**
@@ -392,10 +392,10 @@ 
 function wp_get_schedule($hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
+	if (empty($crons))
 		return false;
-	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
+	foreach ($crons as $timestamp => $cron) {
+		if (isset($cron[$hook][$key]))
 			return $cron[$hook][$key]['schedule'];
 	}
 	return false;
@@ -413,12 +413,12 @@ 
  *
  * @return false|array CRON info array.
  */
-function _get_cron_array()  {
+function _get_cron_array() {
 	$cron = get_option('cron');
-	if ( ! is_array($cron) )
+	if ( ! is_array($cron))
 		return false;
 
-	if ( !isset($cron['version']) )
+	if ( ! isset($cron['version']))
 		$cron = _upgrade_cron_array($cron);
 
 	unset($cron['version']);
@@ -436,7 +436,7 @@ 
  */
 function _set_cron_array($cron) {
 	$cron['version'] = 2;
-	update_option( 'cron', $cron );
+	update_option('cron', $cron);
 }
 
 /**
@@ -451,19 +451,19 @@ 
  * @return array An upgraded Cron info array.
  */
 function _upgrade_cron_array($cron) {
-	if ( isset($cron['version']) && 2 == $cron['version'])
+	if (isset($cron['version']) && 2 == $cron['version'])
 		return $cron;
 
 	$new_cron = array();
 
-	foreach ( (array) $cron as $timestamp => $hooks) {
-		foreach ( (array) $hooks as $hook => $args ) {
+	foreach ((array) $cron as $timestamp => $hooks) {
+		foreach ((array) $hooks as $hook => $args) {
 			$key = md5(serialize($args['args']));
 			$new_cron[$timestamp][$hook][$key] = $args;
 		}
 	}
 
 	$new_cron['version'] = 2;
-	update_option( 'cron', $new_cron );
+	update_option('cron', $new_cron);
 	return $new_cron;
 }

Braces +72 added lines, -47 removed lines

@@ -39,8 +39,9 @@ 
 	$event = apply_filters( 'schedule_event', $event );
 
 	// A plugin disallowed this event
-	if ( ! $event )
-		return false;
+	if ( ! $event ) {
+			return false;
+	}
 
 	$key = md5(serialize($event->args));
 
@@ -73,16 +74,18 @@ 
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
 
-	if ( !isset( $schedules[$recurrence] ) )
-		return false;
+	if ( !isset( $schedules[$recurrence] ) ) {
+			return false;
+	}
 
 	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
 	/** This filter is documented in wp-includes/cron.php */
 	$event = apply_filters( 'schedule_event', $event );
 
 	// A plugin disallowed this event
-	if ( ! $event )
-		return false;
+	if ( ! $event ) {
+			return false;
+	}
 
 	$key = md5(serialize($event->args));
 
@@ -151,10 +154,12 @@ 
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
 	unset( $crons[$timestamp][$hook][$key] );
-	if ( empty($crons[$timestamp][$hook]) )
-		unset( $crons[$timestamp][$hook] );
-	if ( empty($crons[$timestamp]) )
-		unset( $crons[$timestamp] );
+	if ( empty($crons[$timestamp][$hook]) ) {
+			unset( $crons[$timestamp][$hook] );
+	}
+	if ( empty($crons[$timestamp]) ) {
+			unset( $crons[$timestamp] );
+	}
 	_set_cron_array( $crons );
 }
 
@@ -178,8 +183,9 @@ 
 	// It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,
 	// and, wp_next_scheduled() returns the same schedule in an infinite loop.
 	$crons = _get_cron_array();
-	if ( empty( $crons ) )
-		return;
+	if ( empty( $crons ) ) {
+			return;
+	}
 
 	$key = md5( serialize( $args ) );
 	foreach ( $crons as $timestamp => $cron ) {
@@ -201,11 +207,13 @@ 
 function wp_next_scheduled( $hook, $args = array() ) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
-		return false;
+	if ( empty($crons) ) {
+			return false;
+	}
 	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
-			return $timestamp;
+		if ( isset( $cron[$hook][$key] ) ) {
+					return $timestamp;
+		}
 	}
 	return false;
 }
@@ -216,11 +224,13 @@ 
  * @since 2.1.0
  */
 function spawn_cron( $gmt_time = 0 ) {
-	if ( ! $gmt_time )
-		$gmt_time = microtime( true );
+	if ( ! $gmt_time ) {
+			$gmt_time = microtime( true );
+	}
 
-	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
-		return;
+	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) ) {
+			return;
+	}
 
 	/*
 	 * Get the cron lock, which is a unix timestamp of when the last cron was spawned
@@ -231,21 +241,25 @@ 
 	 */
 	$lock = get_transient('doing_cron');
 
-	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS )
-		$lock = 0;
+	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS ) {
+			$lock = 0;
+	}
 
 	// don't run if another process is currently running it or more than once every 60 sec.
-	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
-		return;
+	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time ) {
+			return;
+	}
 
 	//sanity check
 	$crons = _get_cron_array();
-	if ( !is_array($crons) )
-		return;
+	if ( !is_array($crons) ) {
+			return;
+	}
 
 	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
-		return;
+	if ( isset($keys[0]) && $keys[0] > $gmt_time ) {
+			return;
+	}
 
 	if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
 		if ( ! empty( $_POST ) || defined( 'DOING_AJAX' ) ||  defined( 'XMLRPC_REQUEST' ) ) {
@@ -311,23 +325,29 @@ 
  */
 function wp_cron() {
 	// Prevent infinite loops caused by lack of wp-cron.php
-	if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
-		return;
+	if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) ) {
+			return;
+	}
 
-	if ( false === $crons = _get_cron_array() )
-		return;
+	if ( false === $crons = _get_cron_array() ) {
+			return;
+	}
 
 	$gmt_time = microtime( true );
 	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
-		return;
+	if ( isset($keys[0]) && $keys[0] > $gmt_time ) {
+			return;
+	}
 
 	$schedules = wp_get_schedules();
 	foreach ( $crons as $timestamp => $cronhooks ) {
-		if ( $timestamp > $gmt_time ) break;
+		if ( $timestamp > $gmt_time ) {
+			break;
+		}
 		foreach ( (array) $cronhooks as $hook => $args ) {
-			if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
-				continue;
+			if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) ) {
+							continue;
+			}
 			spawn_cron( $gmt_time );
 			break 2;
 		}
@@ -392,11 +412,13 @@ 
 function wp_get_schedule($hook, $args = array()) {
 	$crons = _get_cron_array();
 	$key = md5(serialize($args));
-	if ( empty($crons) )
-		return false;
+	if ( empty($crons) ) {
+			return false;
+	}
 	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
-			return $cron[$hook][$key]['schedule'];
+		if ( isset( $cron[$hook][$key] ) ) {
+					return $cron[$hook][$key]['schedule'];
+		}
 	}
 	return false;
 }
@@ -415,11 +437,13 @@ 
  */
 function _get_cron_array()  {
 	$cron = get_option('cron');
-	if ( ! is_array($cron) )
-		return false;
+	if ( ! is_array($cron) ) {
+			return false;
+	}
 
-	if ( !isset($cron['version']) )
-		$cron = _upgrade_cron_array($cron);
+	if ( !isset($cron['version']) ) {
+			$cron = _upgrade_cron_array($cron);
+	}
 
 	unset($cron['version']);
 
@@ -451,8 +475,9 @@ 
  * @return array An upgraded Cron info array.
  */
 function _upgrade_cron_array($cron) {
-	if ( isset($cron['version']) && 2 == $cron['version'])
-		return $cron;
+	if ( isset($cron['version']) && 2 == $cron['version']) {
+			return $cron;
+	}
 
 	$new_cron = array();