Version 3.4.6

upload/admin/sources/handlers/han_email.php

@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * API: Core
- * Last Updated: $Date: 2013-05-22 09:12:58 -0400 (Wed, 22 May 2013) $
+ * Last Updated: $Date: 2013-10-14 15:30:19 -0400 (Mon, 14 Oct 2013) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: AndyMillne $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/company/standards.php#license
  * @package		IP.Board
  * @link		http://www.invisionpower.com
- * @version		$Rev: 12264 $
+ * @version		$Rev: 12376 $
  */
  
 if ( ! defined( 'IN_IPB' ) )
@@ -224,7 +224,7 @@ class hanEmail
 	 * @return	boolean		Email sent successfully
 	 */
 	public function sendMail()
-	{	
+	{
 		$this->init();
 		
 		if( $this->emailer->error )
@@ -752,7 +752,7 @@ class hanEmail
 	/**
 	 * Convert text email to HTML
 	 * Pretty nifty method name too.
-	 * 
+	 *
 	 * @param	string	Plain text email ready to go
 	 * @param	boolean	Raw HTML mode?
 	 * @return	string	We're all HTML'd up in here.
@@ -788,7 +788,7 @@ class hanEmail
 				$this->settings['__noTruncateUrl'] = true;
 			
 				/* Display */
-				$content = $this->parser->display( $content );		
+				$content = $this->parser->display( $content );
 				
 				/* Remove emoticons */
 				$content  = $this->parser->emoticonImgtoCode( $content );
@@ -827,7 +827,7 @@ class hanEmail
 	
 	/**
 	 * Add <html> tags and such if it doesn't have any already
-	 * 
+	 *
 	 * @param	string	Subject
 	 * @param	string	HTML email
 	 * @return	string	VERY HTML email
@@ -845,9 +845,9 @@ class hanEmail
 		 * for good reason, but it can then re-apply the wrapper. So we add a unique comment
 		 * and then check for this.
 		 */
-		if ( ! stristr( $content, '<!--::ipb.wrapper.added::-->' ) )
+		if ( ! stristr( $content, '<!--ipb.wrapper.added-->' ) )
 		{
-			$content = '<!--::ipb.wrapper.added::-->' . $content;
+			$content = '<!--ipb.wrapper.added-->' . $content;
 			
 			/* Inline wrapper */
 			if ( $this->htmlWrapper )
@@ -930,7 +930,7 @@ class hanEmail
 	 * @param	bool		Fix up plain text links
 	 * @return	string		Cleaned email content
 	 */
-	public function cleanMessage( $message = "", $skipAngleBrackets=false, $fixPlainTextLinks=true ) 
+	public function cleanMessage( $message = "", $skipAngleBrackets=false, $fixPlainTextLinks=true )
 	{
 		if ( ! $this->html_email )
 		{
@@ -1059,7 +1059,7 @@ class hanEmail
 	 * @param	array		preg_replace matches
 	 * @return	string		Formatted url
 	 */
-	public function _formatUrl( $matches ) 
+	public function _formatUrl( $matches )
 	{
 		$matches[1]	= str_replace( array( '"', "'", '&quot;', '&#039;', '&#39;' ), '', $matches[1] );
 		
@@ -1157,7 +1157,7 @@ class hanEmail
 	
 	/**
 	 * Default wrapper for HTML emails - edit the one in '/cache/skin_cache/emailWrapper.php'
-	 * 
+	 *
 	 * @param	string HTML content
 	 * @return	string	HTML email done
 	 */