Version 3.4.8

2025-12-19 00:42:42 -08:00
1 parent b45ea0dffb
commit c603205a25
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Admin Bookmarks Model
 * Last Updated: $Date: 2012-05-10 21:10:13 +0100 (Thu, 10 May 2012) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Advertisements
 * </pre>
 *
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Archive: Reader
 * By Matt Mecham
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Archive: Writer
 * By Matt Mecham
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Archive: Reader
 * By Matt Mecham
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Archive: Restore
 * By Matt Mecham
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Archive: Writer
 * By Matt Mecham
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Archive: Writer
 * By Matt Mecham
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Back Up Model
 * Last Updated: $Date: 2012-05-10 21:10:13 +0100 (Thu, 10 May 2012) $
 * </pre>
@@ -726,7 +726,7 @@ class ipsBackup
 	 */
 	private function _getBackupServerUrl()
 	{
-		//return 'http://gateway.backuptest.lw.ipslink.com/index.php';
+		return 'http://gateway.backuptest.lw.ipslink.com/index.php';
 	}
 	
 	/**
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Back Up Model
 * Last Updated: $Date: 2012-05-10 21:10:13 +0100 (Thu, 10 May 2012) $
 * </pre>
@@ -3,18 +3,18 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * BBCode parsing core - common methods
- * Last Updated: $Date: 2013-05-28 10:00:25 -0400 (Tue, 28 May 2013) $
+ * Last Updated: $Date: 2014-12-31 17:46:06 -0500 (Wed, 31 Dec 2014) $
 * </pre>
 *
- * @author 		$Author: AndyMillne $
+ * @author 		$Author: rashbrook $
 * @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
 * @since		9th March 2005 11:03
- * @version		$Revision: 12273 $
+ * @version		$Revision: 12581 $
 *
 * Basic usage examples
 * <code>
@@ -1301,6 +1301,19 @@ class class_bbcode_core
 		
 		$this->noParseStorage	= array();
 		
+		//-----------------------------------------
+		// Line Break Replacements
+		//-----------------------------------------
+		if ( substr( $txt, 0, 3 ) != '<p>' AND !empty( $txt ) )
+		{
+			$txt = '<p>' . $txt . '</p>';
+			
+			if ( strpos( $txt, "<br />\n<br />" ) !== FALSE )
+			{
+				$txt = str_replace( "<br />\n<br />", '</p><p>&nbsp;</p><p>', $txt );
+			}
+		}
+		
 		//-----------------------------------------
 		// Badwords
 		//-----------------------------------------
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * IP.Content custom bbcode
 * Last Updated: $Date: 2012-06-01 13:11:08 -0400 (Fri, 01 Jun 2012) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Custom bbcode plugin interfaces
 * Last Updated: $Date: 2013-10-21 09:41:15 -0400 (Mon, 21 Oct 2013) $
 * </pre>
@@ -53,7 +53,7 @@ interface bbcodePlugin
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * BBCode parser: default custom bbcodes: img, quote, list, size, member, media, url, snapback
 * Last Updated: $Date: 2013-10-21 09:41:15 -0400 (Mon, 21 Oct 2013) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * BBCode parsing core - legacy routine
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Simple caching class
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Control Panel Functions
 * Last Updated: $Date: 2012-11-21 14:26:15 -0500 (Wed, 21 Nov 2012) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Localization Class.
 *
 * Used for handling language text, money formatting, etc.
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * ACP Restrictions
 * Last Updated: $Date: 2013-01-22 16:10:36 -0500 (Tue, 22 Jan 2013) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Manages public permissions
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -2,9 +2,9 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Facilitates reputation plugins
- * Last Updated: $Date: 2013-03-05 09:42:55 -0500 (Tue, 05 Mar 2013) $
+ * Last Updated: $Date: 2014-11-11 15:53:26 -0500 (Tue, 11 Nov 2014) $
 * </pre>
 *
 * @author		Joshua Williams <josh@invisionpower.com>
@@ -806,10 +806,15 @@ class classReputationCache
 		/* Fetch LIKE data */
 		$store = $this->getLikeRawData( array( 'id' => $type_id, 'type' => $type, 'app' => $app ) );
 		
+		if ( ! $type_id )
+		{
+			return 0;
+		}
+		
 		/* Update cache */
 		$this->DB->replace( 'reputation_cache', array( 'app'	        => $app,
 													   'type'           => $type,
-													   'type_id'        => $type_id,
+													   'type_id'        => intval( $type_id ),
 													   'rep_points'		=> intval($data['sum']),
 													   'cache_date'     => time(),
 													   'rep_like_cache' => serialize( $store ) ), array( 'app', 'type', 'type_id' ) );
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Task Manager Library
 * Last Updated: $Date: 2012-09-18 10:15:15 -0400 (Tue, 18 Sep 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Editor Library: Core Class
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Editor Library: RTE (WYSIWYG) Class
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Editor Library: Standard Class
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -3,18 +3,18 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Editor Library: RTE (WYSIWYG) Class
- * Last Updated: $Date: 2013-10-15 10:08:51 -0400 (Tue, 15 Oct 2013) $
+ * Last Updated: $Date: 2014-10-13 15:22:47 -0400 (Mon, 13 Oct 2014) $
 * </pre>
 *
- * @author 		$Author: AndyMillne $
+ * @author 		$Author: rashbrook $
 * @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
 * @since		9th March 2005 11:03
- * @version		$Revision: 12378 $
+ * @version		$Revision: 12540 $
 */

 if ( ! defined( 'IN_IPB' ) )
@@ -380,6 +380,24 @@ class classes_editor_composite

 		/* Make {style_images_url} safe */
 		$content = str_replace( '{style_images_url}', '&#123;style_images_url}', $content );
+
+		/* Make remote images safe in ACP */
+		if( IN_ACP )
+		{
+			preg_match_all( "/\<img.+?src=['\"](.+?)[\"'].+?>/ims", $content, $matches );
+
+			$ourHost = parse_url( $this->settings['base_url'], PHP_URL_HOST );
+
+			foreach( $matches[1] as $index => $url )
+			{
+				$host = parse_url( $url, PHP_URL_HOST );
+
+				if( $host != $ourHost )
+				{
+					$content = str_replace( $matches[0][ $index ], "[img]" . $url . "[/img]", $content );
+				}
+			}
+		}
 		
 		$this->content = $content;
 	}
@@ -445,7 +463,7 @@ class classes_editor_composite
 		{
 			$options['isRte'] = intval( $this->request['isRte'] );
 		}
-		
+
 		$_autoSaveKeyOrig		     = ( ! empty( $options['autoSaveKey'] ) ) ? $options['autoSaveKey'] : '';
 		$options['editorName']       = ( ! empty( $options['editorName'] ) ) ? $options['editorName'] : $this->_fetchEditorName();
 		$options['autoSaveKey']      = ( $_autoSaveKeyOrig && $this->memberData['member_id'] ) ? $this->_generateAutoSaveKey( $_autoSaveKeyOrig ) : '';
@@ -1181,17 +1199,17 @@ class classes_editor_composite
 		$content = preg_replace( '#<img src="<a href="([^"]+?)(?:%5D)?"([^>]+?)?>([^"]+?)"#i', '<img src="\1"', $content );
 		
 		/* @link http://community.invisionpower.com/resources/bugs.html/_/ip-board/img-tag-no-http-r40534 */
-		preg_match_all( '#<img src=[\'"]([^\'"]+?)[\'"]([^>]+?)?>#i', $content, $matches, PREG_SET_ORDER );
+		preg_match_all( '#<img src=([\'"])([^\1]+?)(?:\1)([^>]+?)?>#i', $content, $matches, PREG_SET_ORDER );
 		
 		foreach( $matches as $val )
 		{
 			$all     = $val[0];
-			$src     = $val[1];
-			$rest    = $val[2];
-				
+			$src     = $val[2];
+			$rest    = $val[3];
+			
 			if ( substr( $src, 0, 4 ) != 'http' )
 			{
-				$content = str_replace( $all, '<img src="http://' . $src . '"' . $rest . '>', $content );
+				$content = str_replace( $all, '<img src="http://' . str_replace( "'", '%27', $src ) . '"' . $rest . '>', $content );
 			}
 		}
 		
@@ -1206,8 +1224,8 @@ class classes_editor_composite
 		{
 			$content = $this->_stripNonAllowedClasses( $content, 'pre'       , array( '_prettyXprint', '_linenums*', '_lang*' ) );
 			$content = $this->_stripNonAllowedClasses( $content, 'blockquote', array( 'ipsBlockquote' ) );
-			$content = $this->_stripNonAllowedClasses( $content, 'ol'        , array( 'bbc', 'bbcol', 'decimal' ) );
-			$content = $this->_stripNonAllowedClasses( $content, 'ul'        , array( 'bbc', 'bbcol', 'decimal' ) );
+			$content = $this->_stripNonAllowedClasses( $content, 'ol'        , array( 'bbc', 'bbcol', 'decimal', 'lower-alpha', 'upper-alpha', 'lower-roman', 'upper-roman' ) );
+			$content = $this->_stripNonAllowedClasses( $content, 'ul'        , array( 'bbc', 'bbcol', 'decimal', 'lower-alpha', 'upper-alpha', 'lower-roman', 'upper-roman' ) );
 			$content = $this->_stripNonAllowedClasses( $content, 'a'         , array( 'bbc*' ) );
 			$content = $this->_stripNonAllowedClasses( $content, 'p'         , array( 'bbc*' ) );
 		}
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -2,19 +2,19 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Parse Incoming Emails
- * Last Updated: $Date: 2013-05-08 17:43:20 -0400 (Wed, 08 May 2013) $
+ * Last Updated: $Date: 2015-04-02 13:29:54 -0400 (Thu, 02 Apr 2015) $
 * </pre>
 *
- * @author 		$Author: bfarber $
+ * @author 		$Author: rashbrook $
 * @copyright	© 2010 Invision Power Services, Inc.
 * @license		http://www.invisionpower.com/company/standards.php#license
 * @package		IP.Board
 * @subpackage	Kernel
 * @link		http://www.invisionpower.com
 * @since		25th June 2010
- * @version		$Revision: 12240 $
+ * @version		$Revision: 12616 $
 */
 
 class incomingEmail
@@ -208,7 +208,7 @@ class incomingEmail
 			if ( $log['log_id'] )
 			{
 				$oneMinuteAgo = time() - 60;
-				if ( $log['log_time'] > $oneMinuteAgo && $this->settings['sixty_second_rule'] )
+				if ( $log['log_time'] > $oneMinuteAgo && $obj->settings['sixty_second_rule'] )
 				{
 					$ignore = TRUE;
 				}
@@ -741,6 +741,7 @@ class incomingEmail
 						$masked_name = md5( uniqid( 'email' ) . microtime() ) . "-{$name}";
 					}
 					file_put_contents( $this->settings['upload_dir'] . "/{$masked_name}", $part->body );
+					@chmod( $this->settings['upload_dir'] . "/{$masked_name}", IPS_FILE_PERMISSION );
 																	
 					/* Store attachment data */
 					$this->akey++;
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Item Marking
 * Owner: Matt "Oh Lord, why did I get assigned this?" Mecham
 * Last Updated: $Date: 2012-11-06 15:14:35 -0500 (Tue, 06 Nov 2012) $
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -4,11 +4,11 @@
 *~TERABYTE_DOC_READY~
 * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
 * $License: http://www.invisionpower.com/company/standards.php#license$
- * $Author: mmecham $
+ * $Author: stuarts $
 * @since		11th October 2010
- * $LastChangedDate: 2013-08-14 06:45:49 -0400 (Wed, 14 Aug 2013) $
- * @version		v3.4.6
- * $Revision: 12334 $
+ * $LastChangedDate: 2014-10-12 16:26:57 -0400 (Sun, 12 Oct 2014) $
+ * @version		v3.4.8
+ * $Revision: 12538 $
 * 
 * <b>Example Usage:</b>
 * @code
@@ -641,7 +641,7 @@ abstract class classes_like_composite
 		$expire = IPS_UNIX_TIME_NOW - $_limit;
 				
 		/* Fetch data by relID */
-		$data = $this->getDataByRelationshipId( $relId, false, (array) $notificationOpts['ignore_data'], $type );
+		$data = $this->getDataByRelationshipId( $relId, false, (array) $notificationOpts['ignore_data'], $type, ipsRegistry::$settings['like_notifications_limit'] );
 				
 		/* Remove ourselves from notifications... */
 		if ( $this->memberData['member_id'] && isset($data[ $this->memberData['member_id'] ]) && $notificationOpts['includeOwner'] !== true )
@@ -752,6 +752,9 @@ abstract class classes_like_composite
 			$notifyLibrary->setNotificationTitle( $notificationOpts['email_subject'] ? $notificationOpts['email_subject'] : IPSText::getTextClass('email')->subject );
 			$notifyLibrary->setNotificationText( $thisTextMessage );
 			$notifyLibrary->setNotificationHtml( $thisHtmlMessage );
+
+			/* Make sure we save meta data - #897885 */
+			$notifyLibrary->setMetaData( array( 'meta_area' => $row['like_area'], 'meta_id' => $row['like_rel_id'], 'meta_app' => $row['like_app'] ) );
 			
 			if ( ! empty( $notificationOpts['email_only_subject'] ) && $notificationOpts['email_only_subject'] != IPSText::getTextClass('email')->subject )
 			{
@@ -1337,7 +1340,7 @@ abstract class classes_like_composite
 	 * @param	array		Type of follow (immediate, none, offline, daily, etc)
 	 * @return	@e mixed	Array of likes data OR null
 	 */
-	public function getDataByRelationshipId( $relId, $skipAnon=true, $ignoreData=array(), $followType=array() )
+	public function getDataByRelationshipId( $relId, $skipAnon=true, $ignoreData=array(), $followType=array(), $limit = 500 )
 	{
 		/* Init */
 		$mids	    = array();
@@ -1368,7 +1371,7 @@ abstract class classes_like_composite
 					   			 'from'   => 'core_like',
 								 'where'  => implode( " AND ", $where ),
 								 'order'  => 'like_added DESC',
-								 'limit'  => array( 0, 500 ) ) );
+								 'limit'  => array( 0, $limit ) ) );
 		$o = $this->DB->execute();
 		
 		while( $row = $this->DB->fetch( $o ) )
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Generic Mapping Class
 * Owner: Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Bing mapping class
 * Owner: Matt Mecham
 * Last Updated: $Date: 2013-04-30 21:56:42 -0400 (Tue, 30 Apr 2013) $
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Bing mapping class
 * Owner: Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Extended Member Functions. Disparate functions that are not required
 * on every page view.
 * Last Updated: $Date: 2013-04-19 07:51:40 -0400 (Fri, 19 Apr 2013) $
@@ -3,18 +3,18 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Notification library
- * Last Updated: $Date: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
+ * Last Updated: $Date: 2014-12-31 17:46:06 -0500 (Wed, 31 Dec 2014) $
 * </pre>
 *
- * @author 		$Author: AndyMillne $ (Original: bfarber)
+ * @author 		$Author: rashbrook $ (Original: bfarber)
 * @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
 * @since		Thursday Jan 7, 2010
- * @version		$Revision: 12380 $
+ * @version		$Revision: 12581 $
 *
 */

@@ -1249,7 +1249,6 @@ class notifications
 			$this->DB->build( array( 'select' => 'notify_id, notify_to_id, notify_sent, notify_read',
 									 'from'   => 'inline_notifications',
 									 'where'  => 'notify_sent <= ' . $unix,
-									 'order'  => 'notify_sent ASC',
 									 'limit'  => array( 0, 500 ) ) );
 			
 			$this->DB->execute();
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Mobile iOS App image class
 * Owner: Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Navigation Builder
 * Owner: Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -3,17 +3,17 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Admin Output Library
- * Last Updated: $LastChangedDate: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
+ * Last Updated: $LastChangedDate: 2015-05-11 04:44:42 -0400 (Mon, 11 May 2015) $
 * </pre>
 *
- * @author 		$Author: AndyMillne $
+ * @author 		$Author: stuarts $
 * @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: 12380 $
+ * @version		$Rev: 12637 $
 *
 */

@@ -149,6 +149,27 @@ class adminOutput extends output
 		$this->settings['base_url'] =  $this->settings['base_url'] . 'app=' . IPS_APP_COMPONENT . '&amp;';

 		$this->settings['extraJsModules']	= '';
+
+		/* HTTPS fixes */
+		if( $this->isHTTPS )
+		{
+			$this->enableAcpHTTPS();
+		}
+	}
+
+	/**
+	 * Enable HTTPS
+	 *
+	 * @return	@e void
+	 */
+	public function enableAcpHTTPS()
+	{
+		$this->settings['skin_acp_url']		= str_replace( 'http://', 'https://', $this->settings['skin_acp_url'] );
+		$this->settings['js_main_url']		= str_replace( 'http://', 'https://', $this->settings['js_main_url'] );
+		$this->settings['css_base_url']		= str_replace( 'http://', 'https://', $this->settings['css_base_url'] );
+		$this->settings['js_base_url']		= str_replace( 'http://', 'https://', $this->settings['js_base_url'] );
+		$this->settings['base_url']			= str_replace( 'http://', 'https://', $this->settings['base_url'] );
+		$this->settings['js_app_url']		= str_replace( 'http://', 'https://', $this->settings['js_app_url'] );
 	}
 	
 	/**
@@ -666,7 +687,9 @@ class adminOutput extends output
 	 */
 	public function multipleRedirectFinish($text='')
 	{
-		$text = ( $text ) ? $text :  $this->lang->words['mr_completed'];
+		$this->lang->loadLanguageFile( array( 'admin_tools' ), 'core' );
+		
+		$text = ! empty( $text ) ? $text :  $this->lang->words['mr_completed'];
 		
 		print $this->global_template->global_redirect_done( $text );
 		exit();
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Ouput format: HTML
 * (Matt Mecham)
 * Last Updated: $Date: 2013-03-12 16:14:42 -0400 (Tue, 12 Mar 2013) $
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Ouput format: HTML
 * (Matt Mecham)
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
@@ -3,22 +3,22 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Ouput format: HTML
 * (Matt Mecham)
- * Last Updated: $Date: 2013-05-20 16:38:23 -0400 (Mon, 20 May 2013) $
+ * Last Updated: $Date: 2014-10-01 13:50:54 -0400 (Wed, 01 Oct 2014) $
 * </pre>
 *
- * @author 		$Author: bfarber $
+ * @author 		$Author: rashbrook $
 * @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
 * @since		9th March 2005 11:03
- * @version		$Revision: 12261 $
+ * @version		$Revision: 12522 $
 *
 */
-
+require_once( IPS_ROOT_PATH . 'sources/base/darkLAE.php' );/*noLibHook*/
 class htmlOutput extends coreOutput implements interface_output 
 {
 	/**
@@ -65,7 +65,7 @@ class htmlOutput extends coreOutput implements interface_output
 		parent::__construct( $output );
 		
 		/* Print only seems only relevant to html method, so... */
-		if ( !empty( $_GET['forcePrint'] ) AND ( $_GET['_k'] == $this->member->form_hash ) )
+		if ( !empty( $_GET['forcePrint'] ) )
 		{
 			$this->_printOnly = true;
 		}
@@ -291,12 +291,20 @@ class htmlOutput extends coreOutput implements interface_output
 		        $title = $title . ' ' . $this->lang->words['page_title_page'] . ' '  . $this->_current_page_title;
 	        }
 	        
+	        $ieCompatible = "<meta http-equiv='X-UA-Compatible' content='IE=edge' />";
+	        
+	        if ( strpos( $this->member->user_agent, 'Trident/7' ) !== FALSE )
+	        {
+		        $ieCompatible = "<meta http-equiv='X-UA-Compatible' content='IE=EmulateIE10' />";
+	        }
+	        
 	        $finalOutput = $this->output->getTemplate($templateGroup)->$templateName( $output, $documentHeadItems, $this->_css, $jsLoaderItems, $this->_metaTags,
 																									   array( 'title'			=> $title,
 																											  'applications'	=> $this->core_fetchApplicationData(),
 																											  'page'			=> $this->_current_page_title,
 																									   		  'notifications'	=>( $notificationLatest ) ? IPSText::jsonEncodeForTemplate( $notificationLatest ) : '',
-																									   		  'inlineMsg'		=> $inlineMsg  ),
+																									   		  'inlineMsg'		=> $inlineMsg,
+																									   		  'ie_compatible'	=> $ieCompatible  ),
 																									   array( 'navigation'		=> $navigation,
 																									 		  'adHeaderCode'	=> ! empty( $extraData['adHeaderCode'] ) ? $extraData['adHeaderCode'] : '',
 																											  'adFooterCode'	=> ! empty( $extraData['adFooterCode'] ) ? $extraData['adFooterCode'] : '' ),
@@ -614,7 +622,7 @@ class htmlOutput extends coreOutput implements interface_output
        
 		$version = ( $this->settings['ipb_display_version'] AND $this->settings['ipb_display_version'] != 0 ) ? ' ' . IPB_VERSION : '';
 		
-        if ($this->settings['ipb_copy_number'] && $this->settings['ips_cp_purchase'])
+        if (!darkLAE::$settings['ipboard_copyright_showing'])
        {
        	/**
        	 * @link	http://community.invisionpower.com/tracker/issue-23750-licensed-to-wont-work-if-copyright-removal-purchased/
@@ -635,7 +643,7 @@ class htmlOutput extends coreOutput implements interface_output
        {
        	$copyright = "<!-- Copyright Information -->
        				  <p id='copyright'>
-        				  	<a href='' title='Community Forum Software by Invision Power Services'>Community Forum Software by IP.Board{$version}</a>";
+        				  	<a href='http://www.invisionpower.com/apps/board/' title='Community Forum Software by Invision Power Services'>Community Forum Software by IP.Board{$version}</a>";
        				  
        	if ( $this->settings['ipb_reg_name'] )
        	{
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Ouput format: XML
 * (Matt Mecham)
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Ouput format: HTML
 * (Matt Mecham)
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
@@ -314,8 +314,8 @@ class xmlOutput extends coreOutput implements interface_output
        {
        	$copyright = "<!-- Copyright Information -->
        				  <p id='copyright'>
-        				  	Powered By <a href='' title='IP.Board Homepage'>IP.Board</a>
-        				  	{$version} &copy; ".date("Y")." &nbsp;IPS, <abbr title='Incorporated'>Inc</abbr>.
+        				  	Powered By <a href='http://www.invisionboard.com' title='IP.Board Homepage'>IP.Board</a>
+        				  	{$version} &copy; ".date("Y")." &nbsp;<a href='http://www.invisionpower.com' title='IPS Homepage'>IPS, <abbr title='Incorporated'>Inc</abbr></a>.
        				  ";
        				  
        	if ( $this->settings['ipb_reg_name'] )
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,18 +3,18 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Public output methods
- * Last Updated: $Date: 2013-05-20 16:38:23 -0400 (Mon, 20 May 2013) $
+ * Last Updated: $Date: 2015-05-11 05:07:45 -0400 (Mon, 11 May 2015) $
 * </pre>
 *
- * @author 		$Author: bfarber $
+ * @author 		$Author: stuarts $
 * @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
 * @since		Who knows...
- * @version		$Revision: 12261 $
+ * @version		$Revision: 12638 $
 *
 */

@@ -1938,6 +1938,9 @@ class output
 				case 'http':
 					$base = str_replace( 'https://', 'http://', $this->settings['base_url'] );
 				break;
+				case 'preferHttps':
+					$base = $this->isHTTPS ? str_replace( 'http://', 'https://', $this->settings['base_url'] ) : str_replace( 'https://', 'http://', $this->settings['base_url'] );
+				break;
 			}
 		}
 		
@@ -2591,7 +2594,7 @@ class output
 			
 				/* preg_match is to prevent redirecting in older Android and IE browsers (Does not affect IE10).  They will take %c5%82, break down to separate characters and re-encode as %c3%85%c2%82, creating
 					an infinite redirect loop.  Ticket 848516, 853009 and @link http://community.invisionpower.com/resources/bugs.html/_/ip-board/urls-with-multi-byte-characters-causing-infinite-redirect-on-old-android-devices-r41601 */
-				if ( $base_url . $_toTest != $newurl AND !preg_match( "/(android 2|msie)/i", $this->member->user_agent ) )
+				if ( $base_url . $_toTest != $newurl AND !preg_match( "/(android 2|msie|trident|safari)/i", $this->member->user_agent ) )
 				{
 					/* Load information file */ 
 					if( $storeData['app'] && is_file( IPSLib::getAppDir( $storeData['app'] ) . '/extensions/furlRedirect.php' ) )
@@ -3528,6 +3531,15 @@ class output
 	 */
    public function showError( $message, $code=0, $logError=FALSE, $logExtra='', $header=401 )
    {
+    	//-----------------------------------------
+    	// Wipe out the saved post data
+    	//-----------------------------------------
+
+    	if( $_POST['Post'] )
+    	{
+    		$_POST['Post']	= NULL;
+    	}
+
    	//-----------------------------------------
    	// INIT
    	//-----------------------------------------
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * System Templates
 * Last Updated: $Date: 2012-05-10 21:10:13 +0100 (Thu, 10 May 2012) $
 * </pre>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * RSS Import
 * Owner: Matt Mecham
 * Last Updated: $Date: 2013-09-26 22:37:28 -0400 (Thu, 26 Sep 2013) $
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Sabre classes by Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Sabre classes by Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Sabre classes by Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Sabre classes by Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Sabre classes by Matt Mecham
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Global Search
 * Last Updated: $Date: 2012-10-09 12:16:32 -0400 (Tue, 09 Oct 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Global Search
 * Last Updated: $Date: 2012-12-03 14:03:02 -0500 (Mon, 03 Dec 2012) $
 * </pre>
@@ -2,18 +2,18 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Global Search
- * Last Updated: $Date: 2012-12-03 14:03:02 -0500 (Mon, 03 Dec 2012) $
+ * Last Updated: $Date: 2014-10-30 14:22:29 -0400 (Thu, 30 Oct 2014) $
 * </pre>
 *
- * @author 		$Author: AndyMillne $
+ * @author 		$Author: rashbrook $
 * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
 * @license		http://www.invisionpower.com/company/standards.php#license
 * @package		IP.Board
 * @subpackage	Core
 * @link		http://www.invisionpower.com
- * @version		$Rev: 11673 $
+ * @version		$Rev: 12558 $
 */ 

 if ( ! defined( 'IN_IPB' ) )
@@ -208,18 +208,32 @@ class search_engine
 		}
 		
 		/* Remove some formatting */
+		/* InnoDB Fulltext throws a syntax error if there is a + or - at the end of the search string */
+		/* @see http://stackoverflow.com/a/25972465/3113864 */
 		//$search_term = str_replace( array( '|', '\\', '/' ), '', $search_term );
 		// | is an OR operator for sphinx - don't want to block globally
 		$search_term = str_replace( array( '\\', '/' ), '', trim( $search_term ) );
-
+		
 		/* got some bullean to do? */
 		if ( $isBoolean AND strstr( $search_term, ' ' ) AND ! strstr( $search_term, '"' ) )
 		{
+			$cleaned_term = '';
+			foreach( explode( ' ', $search_term ) AS $term )
+			{
+				$cleaned_term .= trim( $term, '+-()<>@~' ) . ' ';
+			}
+			
+			$search_term = trim( $cleaned_term );
+			
 			if ( $andor == 'and' )
 			{
 				$search_term = '+' . preg_replace( '/\s+(?!-|~)/', " +", $search_term );
 			}
 		}
+		else
+		{
+			$search_term = trim( $search_term, '+-()<>@~' );
+		}

 		return array( 'search_term' => $search_term, 'removed' => $removedTerms );
 	}
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Global Search
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Admin session handler
 * Last Updated: $Date: 2012-08-21 11:56:40 -0400 (Tue, 21 Aug 2012) $
 * </pre>
@@ -7,7 +7,7 @@
 * $Author: mmecham $
 * @since		Friday 12th November 2010 16:58
 * $LastChangedDate: 2012-08-22 05:05:53 -0400 (Wed, 22 Aug 2012) $
- * @version		v3.4.6
+ * @version		v3.4.8
 * $Revision: 11245 $
 */

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -3,9 +3,9 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Public session handler
- * Last Updated: $Date: 2013-09-26 22:37:28 -0400 (Thu, 26 Sep 2013) $
+ * Last Updated: $Date: 2014-10-13 14:32:37 -0400 (Mon, 13 Oct 2014) $
 * </pre>
 *
 * @author 		$Author: rashbrook $
@@ -14,7 +14,7 @@
 * @package		IP.Board
 * @link		http://www.invisionpower.com
 * @since		26th January 2004
- * @version		$Revision: 12370 $
+ * @version		$Revision: 12539 $
 *
 */

@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Sample SSO Class
 * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
 * </pre>
@@ -3,7 +3,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Sample Mobile App SSO Class
 * Last Updated: $Date: 2012-05-10 21:10:13 +0100 (Thu, 10 May 2012) $
 * </pre>
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-IP.Board
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Share links library.
 * Created by Matt Mecham
 * Last Updated: $Date: 2013-05-08 13:48:52 -0400 (Wed, 08 May 2013) $
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Blog This plug in for share links library.
 *
 * Created by Mark Wade
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Twitter plug in for share links library.
 * This is just the basic fallback twitter share, the front end has JS to do something more fancy
 *
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Twitter plug in for share links library.
 * This is just the basic fallback twitter share, the front end has JS to do something more fancy
 *
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Twitter plug in for share links library.
 * This is just the basic fallback twitter share, the front end has JS to do something more fancy
 *
@@ -2,20 +2,20 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Twitter plug in for share links library.
 * This is just the basic fallback twitter share, the front end has JS to do something more fancy
 *
 * Created by Matt Mecham
- * Last Updated: $Date: 2013-02-25 17:56:34 -0500 (Mon, 25 Feb 2013) $
+ * Last Updated: $Date: 2014-09-05 12:52:36 -0400 (Fri, 05 Sep 2014) $
 * </pre>
 *
- * @author 		$Author: bfarber $
+ * @author 		$Author: rashbrook $
 * @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: 12023 $
+ * @version		$Rev: 12495 $
 *
 */

@@ -84,6 +84,34 @@ class sl_download
 	 */
 	public function share( $title, $url )
 	{
+		if ( ! empty( $this->settings['ccs_root_url'] ) )
+		{
+			$_urls	 = explode( "\n", str_replace( "\r", '', trim( $this->settings['ccs_root_url'] ) ) );
+			$_urls[] = $this->settings['_original_base_url'];
+			$ok      = FALSE;
+			
+			foreach( $_urls as $_url )
+			{
+				if ( ! empty($_url) AND parse_url( $url, PHP_URL_HOST ) === parse_url( $_url, PHP_URL_HOST ) )
+				{
+					$ok = TRUE;
+					break;
+				}
+			}
+			
+			if ( $ok !== TRUE ) 
+			{
+				$this->registry->output->showError( 'no_permission', 100234.2, false, null, 403 );
+			}
+		}
+		else
+		{
+			if ( parse_url( $url, PHP_URL_HOST ) !== parse_url( $this->settings['_original_base_url'], PHP_URL_HOST ) )
+			{
+				$this->registry->output->showError( 'no_permission', 100234.3, false, null, 403 );
+			}
+		}
+
 		$title = IPSText::convertCharsets( $title, IPS_DOC_CHAR_SET, 'utf-8' );
 		
 		$_qmCount	= substr_count( $url, '?' );
@@ -2,7 +2,7 @@
 /**
 * <pre>
 * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
 * Twitter plug in for share links library.
 * This is just the basic fallback twitter share, the front end has JS to do something more fancy
 *